From patchwork Wed Jan 3 18:07:49 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855127 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Yp/a0dSN"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfC94q1jz9s7n for ; Thu, 4 Jan 2018 05:11:49 +1100 (AEDT) Received: from localhost ([::1]:60033 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnVz-0002cY-Kp for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:11:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47656) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSc-0000AS-9Y for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSb-0006t8-6W for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:18 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:42895) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSb-0006su-1i for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:17 -0500 Received: by mail-qt0-x244.google.com with SMTP id g9so3106807qth.9 for ; Wed, 03 Jan 2018 10:08:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=H55m8SAxQCZteXEHo639T3ncP9waoJie0p/fu8nR8T8=; b=Yp/a0dSNFgdspuB6ZrrKCeu5Bgle7xbTyzgK/tC/LkqK4d1MNwlHOcU1GrqNzccwas cmwAmel3RRDaAUZO8hWfi2+N7SyImZKy4HPzpS6+uPs/Dieff0Rx2UFBZk1yYlfuok4j B0xIW3fdCL3yk0k38r/ouOAiUSv/rxMeh+nJYPPuNfYzSNt81VuGI1KSvaMomLYaFl8m HG5mtx1xAtiIyXfceH2CB/ltNfzpmqVBDZWT8F9bG9Ng++ACJmYyKqHEbETEPljPjlV/ 756VmDqSZgchy1hOJK7vvCILOVlnZpH7zHuRCW9uMvX9tsIjpdCVQl48T4jcn3PVWRC1 AyIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=H55m8SAxQCZteXEHo639T3ncP9waoJie0p/fu8nR8T8=; b=GAQmulM0sA8kBg5HQfbIvlaA1g8Bfr5kXC29DHzHpgvynLzoHENnb7ZNBvkv5ZbR/m RMTG0V6QjoJwn7thmZCU1Qdd4+t8IQfGtDIw7rzqTgzUXphx6oOhuUBZwsgbGRCFxDkP 73xe/EHbbkiIKaIxg2Jc7c4RKhC3AHaslShkk8zqfkeOmXVxZ1HVZecSEIQikp515M7N KIRHNgjrnHVYvvCAvLCY+8khlCdbM4IYXVNKmRFERHhU9W/LLJBesFv3B76SfSvmA8od hf9GKiIoQyHoKNJWR3h0P+92T2WQVhUfx66M2eMs34L9lE6RYbEpTXAhgiC/m0aRzRUA Y4YQ== X-Gm-Message-State: AKGB3mLd9LDuL+z0CdnOglZVhZPoKfQix9HapMhoZacs6utSy60tMP5h 2pLlptoU0gX/iLJH+EQLJfY= X-Google-Smtp-Source: ACJfBou2x/gWISwfPod595UrZ4Z6fGe/7cCKEnaqnEU9/moKkDM5My2R7kaVpskCCA2qQYQgZZ120A== X-Received: by 10.200.46.50 with SMTP id r47mr2793874qta.314.1515002896594; Wed, 03 Jan 2018 10:08:16 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:15 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:49 -0300 Message-Id: <20180103180805.18140-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::244 Subject: [Qemu-devel] [PATCH v5 01/17] sdhci: clean up includes X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 4 ---- include/hw/sd/sdhci.h | 7 ++++++- hw/sd/sdhci.c | 1 + 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 161177cf39..248fd027f9 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,8 +24,6 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H -#include "hw/sd/sdhci.h" - /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 @@ -227,6 +225,4 @@ enum { sdhc_gap_write = 2 /* SDHC stopped at block gap during write operation */ }; -extern const VMStateDescription sdhci_vmstate; - #endif diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 0f0c3f1e64..1335373d3c 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -26,17 +26,19 @@ #define SDHCI_H #include "qemu-common.h" -#include "hw/block/block.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/sd/sd.h" /* SD/MMC host controller state */ typedef struct SDHCIState { + /*< private >*/ union { PCIDevice pcidev; SysBusDevice busdev; }; + + /*< public >*/ SDBus sdbus; MemoryRegion iomem; @@ -46,6 +48,7 @@ typedef struct SDHCIState { qemu_irq ro_cb; qemu_irq irq; + /* Registers cleared on reset */ uint32_t sdmasysad; /* SDMA System Address register */ uint16_t blksize; /* Host DMA Buff Boundary and Transfer BlkSize Reg */ uint16_t blkcnt; /* Blocks count for current transfer */ @@ -70,8 +73,10 @@ typedef struct SDHCIState { uint16_t acmd12errsts; /* Auto CMD12 error status register */ uint64_t admasysaddr; /* ADMA System Address Register */ + /* Read-only registers */ uint32_t capareg; /* Capabilities Register */ uint32_t maxcurr; /* Maximum Current Capabilities Register */ + uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b064a087c9..b7d2a20985 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -29,6 +29,7 @@ #include "sysemu/dma.h" #include "qemu/timer.h" #include "qemu/bitops.h" +#include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" From patchwork Wed Jan 3 18:07:50 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855131 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QZhFLGEK"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfGZ3hhhz9s7n for ; Thu, 4 Jan 2018 05:14:45 +1100 (AEDT) Received: from localhost ([::1]:60048 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnYo-00051k-Oj for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:14:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47685) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSe-0000CU-Ud for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSe-0006u3-0M for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:20 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:40846) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSd-0006tz-Rd for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:19 -0500 Received: by mail-qk0-x244.google.com with SMTP id q14so2563321qke.7 for ; Wed, 03 Jan 2018 10:08:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=2mIZ1+ERDoLCA/liKrMORJCCzNPqggsi8TdqmV4QACk=; b=QZhFLGEKIU+LSpFiZ2hwE2wDkth5ygJG+ahYfEtI1Fs6DKVGkLeHYX/jkzQzdd+l5w z5JOvMv70LwOKwUZ1iJGzbX6DXmbmXtaIv1oYwb3goai5bVJjP6YaaSl0ZFwngRvRt4k G/qbTNvstvpJUhgMMFm4+9TFqy6p7/wjJUU3+jO21knJVICoDDvl+xRkJEIcYRdyZYY7 yo9ec9PYZjqrDC97f2G5zuXc2Pnxtk0b+zOcsgawOh6vLUnqHowoUwDYfxhHRDB7HM3T q0ASHyt+lGu396vUJZ80SyvJOAO0MHcteBJWwlw9JtANRRwCroGExyveZl7lAe7SydLR Ex8g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=2mIZ1+ERDoLCA/liKrMORJCCzNPqggsi8TdqmV4QACk=; b=KcOrs8VR4r3F5rBJCthB8eRm3z/S7lY7Of0cKtg0n8ZIBCMpuibWFKkNUXCeqtQ4rR VQT2h3K3cvLdLh2uaVhFopJ129QFZFtNEr5fO90hOEuRHlwxykV8loNj0fFlYGZQF9Lv 6Cg08npxArWJgbhF5EgOkBOmpSUeHZZVJ3fYMTmdLB2vLfQlJw3+JBdVZgfTCUy+pZoi tpyqy9aOaiux4x8hL52uu5PVMB3sC/gCBzpbwt2Lgm+YB3352wZNqjHYDdrMx2GaOoir GXAb59XTknr+pThQ0fae2vjjMX+eiJRvUqaLBRTxAMQg1zejEpOyEql/6WEXe0XvY/JB uKHQ== X-Gm-Message-State: AKGB3mLq0rGVbLkrgsM8Y2Hys4vFSf5v+/XzHb+H38ISBzRC9YY0KuS8 EvykHo5Jk3K98fZyu2Kab1A= X-Google-Smtp-Source: ACJfBotlZ2FlBSrrYhlPDlkufTW7rZTnlmhBXwOm7s9sy0JCg4/ZLlhPyp86SfsYoqB3Q5E9K/zRzA== X-Received: by 10.55.33.159 with SMTP id f31mr2875464qki.78.1515002899343; Wed, 03 Jan 2018 10:08:19 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:18 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:50 -0300 Message-Id: <20180103180805.18140-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v5 02/17] sdhci: sort registers comments X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Acked-by: Alistair Francis --- include/hw/sd/sdhci.h | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 1335373d3c..749cc279ed 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -49,14 +49,20 @@ typedef struct SDHCIState { qemu_irq irq; /* Registers cleared on reset */ + /* 0x00 */ uint32_t sdmasysad; /* SDMA System Address register */ uint16_t blksize; /* Host DMA Buff Boundary and Transfer BlkSize Reg */ uint16_t blkcnt; /* Blocks count for current transfer */ + /* 0x08 */ uint32_t argument; /* Command Argument Register */ uint16_t trnmod; /* Transfer Mode Setting Register */ uint16_t cmdreg; /* Command Register */ + /* 0x10 */ uint32_t rspreg[4]; /* Response Registers 0-3 */ + /* 0x20 */ + /* Buffer Data Port Register - virtual access point to R and W buffers */ uint32_t prnsts; /* Present State Register */ + /* 0x28 */ uint8_t hostctl; /* Host Control Register */ uint8_t pwrcon; /* Power control Register */ uint8_t blkgap; /* Block Gap Control Register */ @@ -64,6 +70,7 @@ typedef struct SDHCIState { uint16_t clkcon; /* Clock control Register */ uint8_t timeoutcon; /* Timeout Control Register */ uint8_t admaerr; /* ADMA Error Status Register */ + /* 0x30 */ uint16_t norintsts; /* Normal Interrupt Status Register */ uint16_t errintsts; /* Error Interrupt Status Register */ uint16_t norintstsen; /* Normal Interrupt Status Enable Register */ @@ -71,23 +78,25 @@ typedef struct SDHCIState { uint16_t norintsigen; /* Normal Interrupt Signal Enable Register */ uint16_t errintsigen; /* Error Interrupt Signal Enable Register */ uint16_t acmd12errsts; /* Auto CMD12 error status register */ + /* 0x50 */ + /* Force Event Auto CMD12 Error Interrupt Reg - write only */ + /* Force Event Error Interrupt Register- write only */ + /* 0x58 */ uint64_t admasysaddr; /* ADMA System Address Register */ /* Read-only registers */ + /* 0x40 */ uint32_t capareg; /* Capabilities Register */ + /* 0x48 */ uint32_t maxcurr; /* Maximum Current Capabilities Register */ uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; uint16_t data_count; /* current element in FIFO buffer */ uint8_t stopped_state;/* Current SDHC state */ - bool pending_insert_quirk;/* Quirk for Raspberry Pi card insert int */ bool pending_insert_state; - /* Buffer Data Port Register - virtual access point to R and W buffers */ - /* Software Reset Register - always reads as 0 */ - /* Force Event Auto CMD12 Error Interrupt Reg - write only */ - /* Force Event Error Interrupt Register- write only */ - /* RO Host Controller Version Register always reads as 0x2401 */ + /* Configurable properties */ + bool pending_insert_quirk; /* Quirk for Raspberry Pi card insert int */ } SDHCIState; #define TYPE_PCI_SDHCI "sdhci-pci" From patchwork Wed Jan 3 18:07:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855123 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="az6WpueQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBf8C59pRz9s7n for ; Thu, 4 Jan 2018 05:09:15 +1100 (AEDT) Received: from localhost ([::1]:60019 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTV-0000LI-M9 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:09:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47719) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSh-0000GB-E2 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:26 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSg-0006vC-L5 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:23 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:43628) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSg-0006uw-GL for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:22 -0500 Received: by mail-qk0-x243.google.com with SMTP id j137so2557968qke.10 for ; Wed, 03 Jan 2018 10:08:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ReGJAGR3j6lmjUuw+VhJZfn2TmeJK5SK1EzuYDBcNlE=; b=az6WpueQN6/Z1gvJkh3S9I0JneLM3vFtfxq9HVeJSgKUUoLc0MIm4n5Gm7/4CotVp1 5ovHJFzpS3lqbujHMpaHIfs1l2EayduBBNZ6j7q4zJvjUaJ4RlxTd/eQgsTPoah6IOtC SYEbc9ojmDoSw64nOX42LeuWanjJI85AaCazAhkLuYuXfTrNInqG8v7N/blEFG0LGZ6K sFOhM7xxgoxNHqcxneds+35hTsK6P4YzsRN7n9anQSX24zqFet+GyEiPYVeoVxk6aYSy 8HoVH4+pnRuywFj4g53IVRK2qNDBjpuvX6WdBGOAo4CZJ6PUnvVTSghlwE9qFyyu9Tgq 351Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ReGJAGR3j6lmjUuw+VhJZfn2TmeJK5SK1EzuYDBcNlE=; b=RRYJcupxPf+1vBapr+vS3ZThMkfqXZS2MW0HDeNmquLbeNd12UY1VEBwvAmpQYIfAL ZngER0gbxdZlFrhT0wN6nRmQX6d/Xw+/K5HrMwkQsL9QtgPD6SzBSNjKAddd0/Vd+mTg x5S1q9jSMwn3zrow6tyttgwkRa3Mte3Iweu9cOLbqubX5TQqj17yq6mwshPdllac2vk4 NOs7RaoX1niTnkJWhbUS75Z0OzpOwIp4q35sthfsUnaSU7wQV7BzbozlLT6zJNVOk4XF mhhAa6TjsPa4hNUw5vYOfmg/gxb6drfFaahvqp+u7/3h7kwMP/c5QMngX3oWCCHxRVl3 R9Lw== X-Gm-Message-State: AKGB3mI8dEjJZmYfA7inEoyXISMk0I8/BFzhznQ+BUsLbpHfweQeRPLL MsXJMug6rQOd8FlWRFBwUG0= X-Google-Smtp-Source: ACJfBosUB+jd5WgN9ZfAO+S0zvMKzbcU7GFBiRiS20bvSg5IpQuDD9HQ+SCuYiIVQj76ByGPP9mNyg== X-Received: by 10.55.132.70 with SMTP id g67mr2808717qkd.111.1515002902057; Wed, 03 Jan 2018 10:08:22 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:21 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:51 -0300 Message-Id: <20180103180805.18140-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v5 03/17] sdhci: remove dead code X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 -- hw/sd/sdhci.c | 2 -- 2 files changed, 4 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 749cc279ed..a6fe064f51 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -44,8 +44,6 @@ typedef struct SDHCIState { QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; - qemu_irq eject_cb; - qemu_irq ro_cb; qemu_irq irq; /* Registers cleared on reset */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b7d2a20985..365bc80009 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1200,8 +1200,6 @@ static void sdhci_uninitfn(SDHCIState *s) timer_free(s->insert_timer); timer_del(s->transfer_timer); timer_free(s->transfer_timer); - qemu_free_irq(s->eject_cb); - qemu_free_irq(s->ro_cb); g_free(s->fifo_buffer); s->fifo_buffer = NULL; From patchwork Wed Jan 3 18:07:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855125 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dYS/7N5w"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBf8b5cHsz9s82 for ; Thu, 4 Jan 2018 05:09:35 +1100 (AEDT) Received: from localhost ([::1]:60022 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTp-0000Wz-NR for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:09:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSk-0000Ie-KZ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSj-0006wJ-Bx for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:26 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSj-0006w7-7H for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:25 -0500 Received: by mail-qt0-x243.google.com with SMTP id e2so3140772qti.0 for ; Wed, 03 Jan 2018 10:08:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=YGAdjpithFfFe23EztE5ncLKf8K3csj/YQOlXGsP6yU=; b=dYS/7N5wOH5Z00GpcX358YXfovPfep5ciUIEcDln8Jgje7hdv1r7V83iKj5D/fouyR 8ER/KGq16RG3/2ReHJVvBwNKl3nJPcj6+/iTvL3lcDNIZ8u0A++k9QxVeZrOnD7GYa4r TAFLTZF6fsqFX5vELbrUFVoMpoXamAfqyHHM7atTrrSayjofZUtGZXAmEPSBEG6p0eLJ 2PWy2s9yp7kIHQRTly409pieHAgwkJJa68mlioK4MtDpBU7TjoCSU7vF+pdyKi7opwaa Pk62au2jhgJ/pGG8ytznBWj7HYATmwnyzaUqtOUyzh7XF6Dy1zhgBB/nQ1IogqSWD9iB iQmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=YGAdjpithFfFe23EztE5ncLKf8K3csj/YQOlXGsP6yU=; b=EayMDAMNvNIlkGkd4s0v1tcMYeY3g87WbLGiTsxJpyN7Gq7shz16GLWfcXVQh9drG6 3+cSYZCTcjlhrBrs+89wSOHAEdA7K3rzbLW/J+Bbt+ul8n91BVwR3EmQOKvKlnTi3lwY SEd5MGwSVlDDCDeneyGtIAOgn1Z1PDvyrPtQ5evA0UcCLpizqH+ktBfcw+/4FG4CFml7 83+HezHsUOuQdjsl6DVPUFYxs/hI/aI0VUUax3aXVqTPzwLW9EsSIqg5Ok92S/GM4W+j BY5llqWTeAe0rj/JFycenaIkzBDlQ2kWNS1wzUgi9cHoIrmaqwKS+FJNh72zdQvvSmfh 7XQw== X-Gm-Message-State: AKGB3mJ79+dfDLiIHUq/jjoc7fbz3PQPqKxf/dKT+W+qdpG5bC32SJaA 8Ox/JzQtskkBk1N5dDcbm+4= X-Google-Smtp-Source: ACJfBovGahQpELTOgTWehd9zvvd6Odd4xlfEy/tags1DGZqGZiVuJnBrk/cJm5yaHXtwuCJIG1Xt8Q== X-Received: by 10.200.42.228 with SMTP id c33mr3063859qta.256.1515002904856; Wed, 03 Jan 2018 10:08:24 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:24 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:52 -0300 Message-Id: <20180103180805.18140-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v5 04/17] sdhci: refactor same sysbus/pci properties into a common one X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now both sysbus/pci classes inherit of the 'pending-insert-quirk' property, which is a HCI dependent property (regardless if accessed through a MMIO sysbus or a PCI bus). So far only the BCM implementation has to use it. Add sysbus/pci/sdbus comments to have clearer code blocks separation. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 365bc80009..a11469fbca 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1266,13 +1266,17 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ -static Property sdhci_pci_properties[] = { +static Property sdhci_properties[] = { DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, + false), DEFINE_PROP_END_OF_LIST(), }; +/* --- qdev PCI --- */ + static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s = PCI_SDHCI(dev); @@ -1305,7 +1309,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) k->class_id = PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_pci_properties; + dc->props = sdhci_properties; dc->reset = sdhci_poweron_reset; } @@ -1320,14 +1324,7 @@ static const TypeInfo sdhci_pci_info = { }, }; -static Property sdhci_sysbus_properties[] = { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), - DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, - false), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev SysBus --- */ static void sdhci_sysbus_init(Object *obj) { @@ -1360,7 +1357,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) DeviceClass *dc = DEVICE_CLASS(klass); dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_sysbus_properties; + dc->props = sdhci_properties; dc->realize = sdhci_sysbus_realize; dc->reset = sdhci_poweron_reset; } @@ -1374,6 +1371,8 @@ static const TypeInfo sdhci_sysbus_info = { .class_init = sdhci_sysbus_class_init, }; +/* --- qdev bus master --- */ + static void sdhci_bus_class_init(ObjectClass *klass, void *data) { SDBusClass *sbc = SD_BUS_CLASS(klass); From patchwork Wed Jan 3 18:07:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855135 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="HFiTU8mT"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfLC0FJ9z9s83 for ; Thu, 4 Jan 2018 05:17:55 +1100 (AEDT) Received: from localhost ([::1]:60069 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnbs-0007Rt-Td for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:17:52 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47763) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSn-0000Lk-2O for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:30 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSm-0006xS-6y for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:29 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:34145) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSm-0006xJ-2Q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:28 -0500 Received: by mail-qt0-x243.google.com with SMTP id 33so3136370qtv.1 for ; Wed, 03 Jan 2018 10:08:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=vEONWK2QEUtykrU5iMWji4TbfJ2EtqRDFmSoRb1Clmw=; b=HFiTU8mT5jl07LKK/A4IKxbSRKqWyIQYkT/OvycKQKDxmXdelyVlHt65NKIYPeCDTl T8DiGTCK2blzwArCN+CFhMQmmuQ9qdIVyytL3FZBcNAQLvDVsuTwWq1yo1/RDRC9EDrO WY7uuWbFd4cVkco/D9VF33T/pDwNihdwytPALpq4ghwiajYlzadC/3bkKD0jL0zXUmPF qtnPlO66QoJWgmJDwEKGymWTQ4q5kCfnEQoIUm1WmxP02NyJ76nfuHKgvH1RC0DAOyNA vnOkp9+8hsbO3DnDMuFcOrRdp5gga0NWv+isuRmm69fjqt3GWrnaa5X7cHKUUNfmYTHW 0Kwg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=vEONWK2QEUtykrU5iMWji4TbfJ2EtqRDFmSoRb1Clmw=; b=PNyMKRcu0W4Ez8/rkA0Ee9sb8IJo11z2Hf2/W/AorbXoMv0LK8GoP842+rH12SVXUa PPckN4TJOkZ2DWJ0k1pZWf2hBkq1BWFdCQwZsr60BVJnLPUMgQpaty9TAYrzWG5xWFaU wgXM9lINmYTLp8tMpuPv7ei2awc5x2eQtIVRr48yVDA0iNRPZh0TARrQg30z4f8pWWgm TfKW1xc0m/c/wUrl0OKniJqtJ+iDleVXlRV2b3v6z4aOM+/xTiH8pg4AXoVK3KKw9Mw6 3RPN/g+SqBb31oH7O+i7iWJ2wD23XpbFY4jlFilLXVVtEpISEXmC/j3OsXs9GFjq6hJo 63zg== X-Gm-Message-State: AKGB3mI3k28uATpbAhLTxc2Dog9S0wKlCdoBkrzfLv2iu0eK80tPJ2jw z9FOkLVjJqouuTyq6hhBaTA= X-Google-Smtp-Source: ACJfBotjE4K/gVsckSom8zcVePb1CNjCKj2VORfwnB8N8Y0nMnI4OHFAzJsAg/0LTGFfatKzyOLItA== X-Received: by 10.200.44.243 with SMTP id 48mr2597539qtx.99.1515002907726; Wed, 03 Jan 2018 10:08:27 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.25 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:27 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:53 -0300 Message-Id: <20180103180805.18140-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::243 Subject: [Qemu-devel] [PATCH v5 05/17] sdhci: refactor common sysbus/pci class_init() into sdhci_common_class_init() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Now both inherited classes appear as DEVICE_CATEGORY_STORAGE. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a11469fbca..68bcf75478 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1275,6 +1275,16 @@ static Property sdhci_properties[] = { DEFINE_PROP_END_OF_LIST(), }; +static void sdhci_common_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc = DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); + dc->vmsd = &sdhci_vmstate; + dc->props = sdhci_properties; + dc->reset = sdhci_poweron_reset; +} + /* --- qdev PCI --- */ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) @@ -1299,7 +1309,6 @@ static void sdhci_pci_exit(PCIDevice *dev) static void sdhci_pci_class_init(ObjectClass *klass, void *data) { - DeviceClass *dc = DEVICE_CLASS(klass); PCIDeviceClass *k = PCI_DEVICE_CLASS(klass); k->realize = sdhci_pci_realize; @@ -1307,10 +1316,8 @@ static void sdhci_pci_class_init(ObjectClass *klass, void *data) k->vendor_id = PCI_VENDOR_ID_REDHAT; k->device_id = PCI_DEVICE_ID_REDHAT_SDHCI; k->class_id = PCI_CLASS_SYSTEM_SDHCI; - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_properties; - dc->reset = sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } static const TypeInfo sdhci_pci_info = { @@ -1356,10 +1363,9 @@ static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); - dc->vmsd = &sdhci_vmstate; - dc->props = sdhci_properties; dc->realize = sdhci_sysbus_realize; - dc->reset = sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } static const TypeInfo sdhci_sysbus_info = { From patchwork Wed Jan 3 18:07:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855130 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ioyOlWk1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfCr2Zbdz9s7n for ; Thu, 4 Jan 2018 05:12:24 +1100 (AEDT) Received: from localhost ([::1]:60042 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnWY-000360-Bp for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:12:22 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSq-0000OZ-7R for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSp-0006yW-4m for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:32 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:37327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSp-0006yP-0F for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:31 -0500 Received: by mail-qk0-x244.google.com with SMTP id p13so2563669qke.4 for ; Wed, 03 Jan 2018 10:08:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M4J6MSMa/IPwPSEzuEyAErAcejKT/MFYGbr9Qb4aAiY=; b=ioyOlWk1vVveRcWLP22TppXMHA3JGyvsAHlGZRdAriwPvXYHOPDvApETJcdVNN5B5k 8HXCbnPjF/SL8e9sCQlyXi8qs6W/2u0bNHcYGFniUw66B5hw6SMof6HaNItfyzzNA+wc CqNebkWNpDPBLiFfnTn/o+y13iLYcRgnufXYV3YUXMaDSgNNjK7GL21Y2apxrbt7qjWD HyZdIakkHmtLRZuJftH8HDsC5oMH8EsbHaGovhPadPyyxE+xc1AXDkATJqTRuJcz6XiM 6ycjLfjS5gHgC6dsGnlhe8AXuh5VlH4TfESVnEasmGEOPDgR4Vpl/8YquSUp9ZYiz07L YYng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M4J6MSMa/IPwPSEzuEyAErAcejKT/MFYGbr9Qb4aAiY=; b=CnwwHNeKRvOQT4PG1FSBLUCRiAyxMDfTWuwY8oPtmVibcDdVR7/CbXswBX165kH4Yq kNOidBxdIZJv5QR/pzBMigd885bzuNP0cASZKSqeqqVQshImcllUSTWXYLAOAfqBVWX8 LSQKbr1gqCfFYhosuqUOd5NwfcSryQ26uun7CUcUlT7koCMqg5FLAOjp0nyHlea/KSZ6 fdlB9piL2lk+KQqBLhdLhjVmHYfdJb+srjMiVfAK4YlcX1YE3kQtJbzFQXba5xtJ6z/5 vbHmt0CXNV40W8Un3KEsNWJm/iDS0gn1jys3tXY7qIf9UlRFaRBEpjDywqr20cx3mBvC vH9w== X-Gm-Message-State: AKGB3mLIYWx9dXPXSBhvA9ogJ3l+TX3Mqx3NcDSFLsfYvNS2lRkr8n8E u5vGhGLNFpeapGU3NKVB/cI= X-Google-Smtp-Source: ACJfBotG1iuScx6a0Fny99DqR3NvzoGYqW4SBbsYs9gPmkZjV5tsf7jHBvt4grntmUtzjvMTiHH50Q== X-Received: by 10.55.12.69 with SMTP id 66mr2728336qkm.93.1515002910655; Wed, 03 Jan 2018 10:08:30 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:30 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:54 -0300 Message-Id: <20180103180805.18140-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v5 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- Since previous series failed, I dropped: Reviewed-by: Alistair Francis hw/sd/sdhci.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 68bcf75478..b3dbd994fd 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1194,6 +1194,15 @@ static void sdhci_initfn(SDHCIState *s) s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); } +static void sdhci_common_realize(SDHCIState *s, Error **errp) +{ + s->buf_maxsz = sdhci_get_fifolen(s); + s->fifo_buffer = g_malloc0(s->buf_maxsz); + + memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", + SDHC_REGISTERS_MAP_SIZE); +} + static void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); @@ -1290,14 +1299,16 @@ static void sdhci_common_class_init(ObjectClass *klass, void *data) static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s = PCI_SDHCI(dev); + + sdhci_initfn(s); + sdhci_common_realize(s, errp); + if (errp && *errp) { + return; + } + dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ - sdhci_initfn(s); - s->buf_maxsz = sdhci_get_fifolen(s); - s->fifo_buffer = g_malloc0(s->buf_maxsz); s->irq = pci_allocate_irq(dev); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", - SDHC_REGISTERS_MAP_SIZE); pci_register_bar(dev, 0, 0, &s->iomem); } @@ -1351,11 +1362,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) SDHCIState *s = SYSBUS_SDHCI(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); - s->buf_maxsz = sdhci_get_fifolen(s); - s->fifo_buffer = g_malloc0(s->buf_maxsz); + sdhci_common_realize(s, errp); + if (errp && *errp) { + return; + } + sysbus_init_irq(sbd, &s->irq); - memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", - SDHC_REGISTERS_MAP_SIZE); sysbus_init_mmio(sbd, &s->iomem); } From patchwork Wed Jan 3 18:07:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855124 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YW23Psoj"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBf8S3sL8z9s7n for ; Thu, 4 Jan 2018 05:09:28 +1100 (AEDT) Received: from localhost ([::1]:60021 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTi-0000TF-G6 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:09:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47809) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSt-0000RI-E0 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSs-0006zM-7n for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:35 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:39480) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSs-0006z9-33 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:34 -0500 Received: by mail-qk0-x244.google.com with SMTP id c5so2553608qkg.6 for ; Wed, 03 Jan 2018 10:08:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=s0RktmE+TDd81TKZ+zwrIZN0pKqxOsiPP56H9HHlJvo=; b=YW23PsojWTSafl7lQqh6cYhqmAquZT0T5+WLsp9KkhU9cPZChQdRLAACbNTXWKya/n iBol+FgfGEU85f5Lz0mI1Tep5XExJXCOInJTyJDxUlAWixwS7K3V59ioYOGhTo+xMDd8 OQmZ4i4zVhfVOSbuIwUSzrHdAjmoTDUA3qx+WTFkcOu/9nFmGWPC26b2Dl8IVfzHyJvj DtSd/JSASsF9zw8/D5EI/8tPehcLS/NGPL60WmbyscJVl/f0B8lkvsIwuw8rpb0ZrE+K RoHzfw5oxW0PsQPl77QhLCFGm1rLiKe9SJaHK1tUb8iLPac5tqfj1pv921IKF+5k7MjH jJaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=s0RktmE+TDd81TKZ+zwrIZN0pKqxOsiPP56H9HHlJvo=; b=Broucmqk4OmWZfL2k2fFNH7XMZ4UNTF5JWIcxc314Oa2MUKvu/DtbfpBZBCFhKvVap OKja/I8FncX+f5Dve3pX/dBc52hoJg4Z+0GIFIkHLuowrC1g5mqXktXI2C1mxqJUDmSz oIAxQhtiW2pFAHwYJq8OIHQhj/uEE2q2ptZSMRjONDPtqaj4QACGHSG4ujZdk+uaYj2G kyuA7Uhl4evEIGeY8GD0Q8v7OiXvfyQQ8FPFdv+/P1SqjAfB+4hMbyWnq5I9Tlna/1c2 HCMlqxu980WU0cuGMiKf3GJrRcmtWSqfB1ifa0N2yF21d63O1IrqzvBdl3ZzSSeCsuM2 LiTA== X-Gm-Message-State: AKGB3mL/t5GClXzCRqccJnvpiMNOdEiJoWrSy1LQ543QrVHiUgxVkiJU U6oYGX17PrhMo8a16q6yrZY= X-Google-Smtp-Source: ACJfBosJWpFx4GEY6D/GMWUzMuVBanFN3Mrl4ScngjRdQ860fKqsGmHySsuryhlCNRkmtJN8qQeKBA== X-Received: by 10.55.124.7 with SMTP id x7mr2921549qkc.133.1515002913717; Wed, 03 Jan 2018 10:08:33 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:33 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:55 -0300 Message-Id: <20180103180805.18140-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v5 07/17] sdhci: refactor common sysbus/pci unrealize() into sdhci_common_unrealize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b3dbd994fd..089961bd66 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -31,6 +31,7 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" +#include "qapi/error.h" #include "qemu/log.h" /* host controller debug messages */ @@ -1203,15 +1204,23 @@ static void sdhci_common_realize(SDHCIState *s, Error **errp) SDHC_REGISTERS_MAP_SIZE); } +static void sdhci_common_unrealize(SDHCIState *s, Error **errp) +{ + /* This function is expected to be called only once for each class: + * - SysBus: via DeviceClass->unrealize(), + * - PCI: via PCIDeviceClass->exit(). + * However to avoid double-free and/or use-after-free we still nullify + * this variable (better safe than sorry!). */ + g_free(s->fifo_buffer); + s->fifo_buffer = NULL; +} + static void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); timer_free(s->insert_timer); timer_del(s->transfer_timer); timer_free(s->transfer_timer); - - g_free(s->fifo_buffer); - s->fifo_buffer = NULL; } static bool sdhci_pending_insert_vmstate_needed(void *opaque) @@ -1315,6 +1324,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) static void sdhci_pci_exit(PCIDevice *dev) { SDHCIState *s = PCI_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); sdhci_uninitfn(s); } @@ -1371,11 +1382,19 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) sysbus_init_mmio(sbd, &s->iomem); } +static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp) +{ + SDHCIState *s = SYSBUS_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); +} + static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc = DEVICE_CLASS(klass); dc->realize = sdhci_sysbus_realize; + dc->unrealize = sdhci_sysbus_unrealize; sdhci_common_class_init(klass, data); } From patchwork Wed Jan 3 18:07:56 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855128 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="NVj/yUl1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfCZ2WRDz9s7n for ; Thu, 4 Jan 2018 05:12:10 +1100 (AEDT) Received: from localhost ([::1]:60035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnWK-0002tl-CU for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:12:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47823) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSv-0000TE-Ri for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSv-00070R-1A for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:37 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:44836) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSu-00070L-Sl for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:36 -0500 Received: by mail-qk0-x242.google.com with SMTP id v188so2557778qkh.11 for ; Wed, 03 Jan 2018 10:08:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PPSdv9/IVveyvc4S1QmTWkeKVwjpn/n5mesAx9w2/40=; b=NVj/yUl1j+vyGnmj1Z+U960e11dfP9+6lLeyQC1x5ZG0QsZ/Cmbn3mhkLHpvde58vT klD1xzNbEzzkF6TAYL+fV03yx7aUFV6EkmHYtbgGTabx58/svCmSk47arYViPW/WA1do Co3w9Qnrz2Q/JP26V8NTxfEwmULQT8RRecN8WWoK2alBPfrl4COqHWyWA/SOTH9FthLw NKHh73JeWA4A+84Z5+RE2zUJwU6yJmsewQDBxEQvMiitqBW/VGMiA3nMvzqjocpna94g OuqsiKrPfz1aJtFpv9GHWZT4IzTUCKmkpLjDfPqu0FoUD/hV3R8yVPddP7BlyTG5p/JI /51Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PPSdv9/IVveyvc4S1QmTWkeKVwjpn/n5mesAx9w2/40=; b=qx0qG3+5eNTvG/v3TqfgbNuUceBRXRq11dIFFnX8KpG+PIPeAtgWejyzGQfx5d82nn gAL8X/duagm/TMHZntvty7ctuDgPUJ0qWahNNEktSjGuBE/1xzrUglj6tewJCkQ9F/3F OC93YfLpbBwAfxXE3WffkAhovdZkQv/2vjGSdVye4bzSatH3xeAr6SXS1/HlTFSZoJBD 6zB2pktiAi0SYpZOFOw+OsyL7LOUk0NYLrXuobRHpATH9/3JJ3Hysn/xaKqb3noO2ftr dw+HaNC11JBUDx1HFGGbuDZonCtDXkXKeOdzK04G0iU76WbcGfMyoj3CqVtJWKOs6QoC JJjA== X-Gm-Message-State: AKGB3mJ9T0pQgzz1+w3VXArhQIzRjgE9NWSZkwrepYMTTYCb4wqMHJb3 fhLi3TJNDBbD22XBRjuS9xM= X-Google-Smtp-Source: ACJfBov9VU3zPSDMf40bmwcsqy/gaCiO5S/A2rVUJxip1YWhW6vc5+F5QWP6gkjg4iYjE3tnuysa7Q== X-Received: by 10.55.57.9 with SMTP id g9mr2639174qka.196.1515002916455; Wed, 03 Jan 2018 10:08:36 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:35 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:56 -0300 Message-Id: <20180103180805.18140-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v5 08/17] sdhci: use qemu_log_mask(UNIMP) instead of fprintf() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 089961bd66..0e27dc3042 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -946,7 +946,8 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) ret = (SD_HOST_SPECv2_VERS << 16) | sdhci_slotint(s); break; default: - ERRPRINT("bad %ub read: addr[0x%04x]\n", size, (int)offset); + qemu_log_mask(LOG_UNIMP, "SDHC rd_%ub @0x%02" HWADDR_PRIx " " + "not implemented\n", size, offset); break; } @@ -1152,8 +1153,8 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) sdhci_update_irq(s); break; default: - ERRPRINT("bad %ub write offset: addr[0x%04x] <- %u(0x%x)\n", - size, (int)offset, value >> shift, value >> shift); + qemu_log_mask(LOG_UNIMP, "SDHC wr_%ub @0x%02" HWADDR_PRIx " <- 0x%08x " + "not implemented\n", size, offset, value >> shift); break; } DPRINT_L2("write %ub: addr[0x%04x] <- %u(0x%x)\n", From patchwork Wed Jan 3 18:07:57 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855132 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="fCtI/Ew1"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfGy5dL0z9s7n for ; Thu, 4 Jan 2018 05:15:06 +1100 (AEDT) Received: from localhost ([::1]:60050 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnZA-0005IR-RL for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:15:04 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47845) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnT0-0000Vu-61 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:45 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSy-00071f-DF for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:42 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:33329) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSy-00071H-6K for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:40 -0500 Received: by mail-qt0-x242.google.com with SMTP id e2so3141618qti.0 for ; Wed, 03 Jan 2018 10:08:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=U3Ev8mkmgxzAmIl/AojgQ35cDqJUtN+TRTpsRVMu1Ec=; b=fCtI/Ew1Pgc+VkCzdKyavqOz869ygAfbphcRjYLfmfjQOWIwiB1HE3aj650VjGi9Uf w7o594mgxEk/ynUmBY90YgMnMvcSIviMlEifNOvZpc6pl3Ir4Og2vy/LBH8ZPmwhpq6B B6/sFi5JhCPVIML4PoVMa7wlXi6kA4PQJlKS3nM0LrqPtpu/LfGYkJq8ummvC4WkVBM+ NRq4Zo8yvU2ZvxZneNBa7f3ULM6QKZbFmhauXL5IOWgeUkcEHpz145F0b6TC3rQd+nMV 8MV3r9vjcZk/leHgyT/3GKIqYxw1t5WhTrT+QEjw4C/3NfK6NtY8iPToOSUIwDb+6jSs jaVA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=U3Ev8mkmgxzAmIl/AojgQ35cDqJUtN+TRTpsRVMu1Ec=; b=BRlcRybjznY0kUOlfByhWX+rx42dhmO3xQaPWqk83L9T+gEfAjn+fSMo+iWCaiO0ED IeU0VuBBAAd+TVcdu3jeoI8q+gmfgFiWu7GC+Z1o8uYtmsuKv13cE/BXjdZAplPy1q2v ObGZJyrkFjLBR1oWGCFsk4oufFB2m8bII3SU5l1wMl4qb46Lno4AFq/0UHl8MATIiZxZ 46ZoDfMahm158kr0JdPIvuViwZqPQ5MamHyt1UQ/GPahTxCgUGO3X2yMKkVACmCvGCYW culhqWSS+nqhvQMufBa3G6hRzMfUiBfX6OQwcCLKY8p51dhX6egUC2mJsVczsYJFtVTH /hMA== X-Gm-Message-State: AKGB3mLqM/JgJn8JsCJseZdPsfE7CStAkDYyt0oOEFFDqbl+wxt+17jK 9uTB9v2KL22OHXocd8fETHT6lbfA X-Google-Smtp-Source: ACJfBosSrOVb3x0/0+UM2SJyIvrghbTaNFs6tzvbY8K025fQFLbJ/nzkulUK/vx0puIT5HrJSqpWNw== X-Received: by 10.237.56.197 with SMTP id k63mr2727525qte.308.1515002919618; Wed, 03 Jan 2018 10:08:39 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:38 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:57 -0300 Message-Id: <20180103180805.18140-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v5 09/17] sdhci: convert the DPRINT() calls into trace events X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" zero-initialize ADMADescr 'dscr' in sdhci_do_adma() to avoid: hw/sd/sdhci.c: In function ‘sdhci_do_adma’: hw/sd/sdhci.c:714:29: error: ‘dscr.addr’ may be used uninitialized in this function [-Werror=maybe-uninitialized] trace_sdhci_adma("link", s->admasysaddr); ^ Signed-off-by: Philippe Mathieu-Daudé Acked-by: Alistair Francis --- hw/sd/sdhci.c | 89 ++++++++++++++++++------------------------------------ hw/sd/trace-events | 14 +++++++++ 2 files changed, 44 insertions(+), 59 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0e27dc3042..a781cc5211 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -33,30 +33,7 @@ #include "sdhci-internal.h" #include "qapi/error.h" #include "qemu/log.h" - -/* host controller debug messages */ -#ifndef SDHC_DEBUG -#define SDHC_DEBUG 0 -#endif - -#define DPRINT_L1(fmt, args...) \ - do { \ - if (SDHC_DEBUG) { \ - fprintf(stderr, "QEMU SDHC: " fmt, ## args); \ - } \ - } while (0) -#define DPRINT_L2(fmt, args...) \ - do { \ - if (SDHC_DEBUG > 1) { \ - fprintf(stderr, "QEMU SDHC: " fmt, ## args); \ - } \ - } while (0) -#define ERRPRINT(fmt, args...) \ - do { \ - if (SDHC_DEBUG) { \ - fprintf(stderr, "QEMU SDHC ERROR: " fmt, ## args); \ - } \ - } while (0) +#include "trace.h" #define TYPE_SDHCI_BUS "sdhci-bus" #define SDHCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_SDHCI_BUS) @@ -155,8 +132,8 @@ static void sdhci_raise_insertion_irq(void *opaque) static void sdhci_set_inserted(DeviceState *dev, bool level) { SDHCIState *s = (SDHCIState *)dev; - DPRINT_L1("Card state changed: %s!\n", level ? "insert" : "eject"); + trace_sdhci_set_inserted(level ? "insert" : "eject"); if ((s->norintsts & SDHC_NIS_REMOVE) && level) { /* Give target some time to notice card ejection */ timer_mod(s->insert_timer, @@ -238,7 +215,8 @@ static void sdhci_send_command(SDHCIState *s) s->acmd12errsts = 0; request.cmd = s->cmdreg >> 8; request.arg = s->argument; - DPRINT_L1("sending CMD%u ARG[0x%08x]\n", request.cmd, request.arg); + + trace_sdhci_send_command(request.cmd, request.arg); rlen = sdbus_do_command(&s->sdbus, &request, response); if (s->cmdreg & SDHC_CMD_RESPONSE) { @@ -246,7 +224,7 @@ static void sdhci_send_command(SDHCIState *s) s->rspreg[0] = (response[0] << 24) | (response[1] << 16) | (response[2] << 8) | response[3]; s->rspreg[1] = s->rspreg[2] = s->rspreg[3] = 0; - DPRINT_L1("Response: RSPREG[31..0]=0x%08x\n", s->rspreg[0]); + trace_sdhci_response4(s->rspreg[0]); } else if (rlen == 16) { s->rspreg[0] = (response[11] << 24) | (response[12] << 16) | (response[13] << 8) | response[14]; @@ -256,11 +234,10 @@ static void sdhci_send_command(SDHCIState *s) (response[5] << 8) | response[6]; s->rspreg[3] = (response[0] << 16) | (response[1] << 8) | response[2]; - DPRINT_L1("Response received:\n RSPREG[127..96]=0x%08x, RSPREG[95.." - "64]=0x%08x,\n RSPREG[63..32]=0x%08x, RSPREG[31..0]=0x%08x\n", - s->rspreg[3], s->rspreg[2], s->rspreg[1], s->rspreg[0]); + trace_sdhci_response16(s->rspreg[3], s->rspreg[2], + s->rspreg[1], s->rspreg[0]); } else { - ERRPRINT("Timeout waiting for command response\n"); + trace_sdhci_error("timeout waiting for command response"); if (s->errintstsen & SDHC_EISEN_CMDTIMEOUT) { s->errintsts |= SDHC_EIS_CMDTIMEOUT; s->norintsts |= SDHC_NIS_ERR; @@ -294,7 +271,7 @@ static void sdhci_end_transfer(SDHCIState *s) request.cmd = 0x0C; request.arg = 0; - DPRINT_L1("Automatically issue CMD%d %08x\n", request.cmd, request.arg); + trace_sdhci_end_transfer(request.cmd, request.arg); sdbus_do_command(&s->sdbus, &request, response); /* Auto CMD12 response goes to the upper Response register */ s->rspreg[3] = (response[0] << 24) | (response[1] << 16) | @@ -363,7 +340,7 @@ static uint32_t sdhci_read_dataport(SDHCIState *s, unsigned size) /* first check that a valid data exists in host controller input buffer */ if ((s->prnsts & SDHC_DATA_AVAILABLE) == 0) { - ERRPRINT("Trying to read from empty buffer\n"); + trace_sdhci_error("read from empty buffer"); return 0; } @@ -372,8 +349,7 @@ static uint32_t sdhci_read_dataport(SDHCIState *s, unsigned size) s->data_count++; /* check if we've read all valid data (blksize bytes) from buffer */ if ((s->data_count) >= (s->blksize & 0x0fff)) { - DPRINT_L2("All %u bytes of data have been read from input buffer\n", - s->data_count); + trace_sdhci_read_dataport(s->data_count); s->prnsts &= ~SDHC_DATA_AVAILABLE; /* no more data in a buffer */ s->data_count = 0; /* next buff read must start at position [0] */ @@ -456,7 +432,7 @@ static void sdhci_write_dataport(SDHCIState *s, uint32_t value, unsigned size) /* Check that there is free space left in a buffer */ if (!(s->prnsts & SDHC_SPACE_AVAILABLE)) { - ERRPRINT("Can't write to data buffer: buffer full\n"); + trace_sdhci_error("Can't write to data buffer: buffer full"); return; } @@ -465,8 +441,7 @@ static void sdhci_write_dataport(SDHCIState *s, uint32_t value, unsigned size) s->data_count++; value >>= 8; if (s->data_count >= (s->blksize & 0x0fff)) { - DPRINT_L2("write buffer filled with %u bytes of data\n", - s->data_count); + trace_sdhci_write_dataport(s->data_count); s->data_count = 0; s->prnsts &= ~SDHC_SPACE_AVAILABLE; if (s->prnsts & SDHC_DOING_WRITE) { @@ -654,15 +629,14 @@ static void sdhci_do_adma(SDHCIState *s) { unsigned int n, begin, length; const uint16_t block_size = s->blksize & 0x0fff; - ADMADescr dscr; + ADMADescr dscr = {}; int i; for (i = 0; i < SDHC_ADMA_DESCS_PER_DELAY; ++i) { s->admaerr &= ~SDHC_ADMAERR_LENGTH_MISMATCH; get_adma_description(s, &dscr); - DPRINT_L2("ADMA loop: addr=" TARGET_FMT_plx ", len=%d, attr=%x\n", - dscr.addr, dscr.length, dscr.attr); + trace_sdhci_adma_loop(dscr.addr, dscr.length, dscr.attr); if ((dscr.attr & SDHC_ADMA_ATTR_VALID) == 0) { /* Indicate that error occurred in ST_FDS state */ @@ -745,8 +719,7 @@ static void sdhci_do_adma(SDHCIState *s) break; case SDHC_ADMA_ATTR_ACT_LINK: /* link to next descriptor table */ s->admasysaddr = dscr.addr; - DPRINT_L1("ADMA link: admasysaddr=0x%" PRIx64 "\n", - s->admasysaddr); + trace_sdhci_adma("link", s->admasysaddr); break; default: s->admasysaddr += dscr.incr; @@ -754,8 +727,7 @@ static void sdhci_do_adma(SDHCIState *s) } if (dscr.attr & SDHC_ADMA_ATTR_INT) { - DPRINT_L1("ADMA interrupt: admasysaddr=0x%" PRIx64 "\n", - s->admasysaddr); + trace_sdhci_adma("interrupt", s->admasysaddr); if (s->norintstsen & SDHC_NISEN_DMA) { s->norintsts |= SDHC_NIS_DMA; } @@ -766,15 +738,15 @@ static void sdhci_do_adma(SDHCIState *s) /* ADMA transfer terminates if blkcnt == 0 or by END attribute */ if (((s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt == 0)) || (dscr.attr & SDHC_ADMA_ATTR_END)) { - DPRINT_L2("ADMA transfer completed\n"); + trace_sdhci_adma_transfer_completed(); if (length || ((dscr.attr & SDHC_ADMA_ATTR_END) && (s->trnmod & SDHC_TRNS_BLK_CNT_EN) && s->blkcnt != 0)) { - ERRPRINT("SD/MMC host ADMA length mismatch\n"); + trace_sdhci_error("SD/MMC host ADMA length mismatch"); s->admaerr |= SDHC_ADMAERR_LENGTH_MISMATCH | SDHC_ADMAERR_STATE_ST_TFR; if (s->errintstsen & SDHC_EISEN_ADMAERR) { - ERRPRINT("Set ADMA error flag\n"); + trace_sdhci_error("Set ADMA error flag"); s->errintsts |= SDHC_EIS_ADMAERR; s->norintsts |= SDHC_NIS_ERR; } @@ -810,7 +782,7 @@ static void sdhci_data_transfer(void *opaque) break; case SDHC_CTRL_ADMA1_32: if (!(s->capareg & SDHC_CAN_DO_ADMA1)) { - ERRPRINT("ADMA1 not supported\n"); + trace_sdhci_error("ADMA1 not supported"); break; } @@ -818,7 +790,7 @@ static void sdhci_data_transfer(void *opaque) break; case SDHC_CTRL_ADMA2_32: if (!(s->capareg & SDHC_CAN_DO_ADMA2)) { - ERRPRINT("ADMA2 not supported\n"); + trace_sdhci_error("ADMA2 not supported"); break; } @@ -827,14 +799,14 @@ static void sdhci_data_transfer(void *opaque) case SDHC_CTRL_ADMA2_64: if (!(s->capareg & SDHC_CAN_DO_ADMA2) || !(s->capareg & SDHC_64_BIT_BUS_SUPPORT)) { - ERRPRINT("64 bit ADMA not supported\n"); + trace_sdhci_error("64 bit ADMA not supported"); break; } sdhci_do_adma(s); break; default: - ERRPRINT("Unsupported DMA type\n"); + trace_sdhci_error("Unsupported DMA type"); break; } } else { @@ -869,8 +841,8 @@ static inline bool sdhci_buff_access_is_sequential(SDHCIState *s, unsigned byte_num) { if ((s->data_count & 0x3) != byte_num) { - ERRPRINT("Non-sequential access to Buffer Data Port register" - "is prohibited\n"); + trace_sdhci_error("Non-sequential access to Buffer Data Port register" + "is prohibited\n"); return false; } return true; @@ -900,8 +872,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) case SDHC_BDATA: if (sdhci_buff_access_is_sequential(s, offset - SDHC_BDATA)) { ret = sdhci_read_dataport(s, size); - DPRINT_L2("read %ub: addr[0x%04x] -> %u(0x%x)\n", size, (int)offset, - ret, ret); + trace_sdhci_access("read", size, offset, "->", ret, ret); return ret; } break; @@ -953,7 +924,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) ret >>= (offset & 0x3) * 8; ret &= (1ULL << (size * 8)) - 1; - DPRINT_L2("read %ub: addr[0x%04x] -> %u(0x%x)\n", size, (int)offset, ret, ret); + trace_sdhci_access("read", size, offset, "->", ret, ret); return ret; } @@ -1157,8 +1128,8 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) "not implemented\n", size, offset, value >> shift); break; } - DPRINT_L2("write %ub: addr[0x%04x] <- %u(0x%x)\n", - size, (int)offset, value >> shift, value >> shift); + trace_sdhci_access("write", size, offset, "<-", + value >> shift, value >> shift); } static const MemoryRegionOps sdhci_mmio_ops = { diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 1fc0bcf44b..e4e26c6d73 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -1,5 +1,19 @@ # See docs/devel/tracing.txt for syntax documentation. +# hw/sd/sdhci.c +sdhci_set_inserted(const char *level) "card state changed: %s" +sdhci_send_command(uint8_t cmd, uint32_t arg) "sending CMD%02u ARG[0x%08x]" +sdhci_error(const char *msg) "%s" +sdhci_response4(uint32_t r0) "Response: RSPREG[31..0]=0x%08x" +sdhci_response16(uint32_t r3, uint32_t r2, uint32_t r1, uint32_t r0) "Response received: RSPREG[127..96]=0x%08x, RSPREG[95..64]=0x%08x, RSPREG[63..32]=0x%08x, RSPREG[31..0]=0x%08x" +sdhci_end_transfer(uint8_t cmd, uint32_t arg) "Automatically issue CMD%02u 0x%08x" +sdhci_adma(const char *desc, uint32_t sysad) "ADMA %s: admasysaddr=0x%" PRIx32 +sdhci_adma_loop(uint64_t addr, uint16_t length, uint8_t attr) "ADMA loop: addr=0x%08" PRIx64 ", len=%d, attr=0x%x" +sdhci_adma_transfer_completed(void) "ADMA transfer completed" +sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s %ub: addr[0x%04" PRIx64 "] %s %" PRIu64 "(0x%" PRIx64 ")" +sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been read from input buffer" +sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of data" + # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" milkymist_memcard_memory_write(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" From patchwork Wed Jan 3 18:07:58 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855129 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lmQy6GV/"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfCn5PQtz9s7n for ; Thu, 4 Jan 2018 05:12:21 +1100 (AEDT) Received: from localhost ([::1]:60040 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnWV-00033g-O4 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:12:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnT3-0000Yn-FY for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnT0-00073d-U7 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:45 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:45427) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnT0-00073U-Pg for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:42 -0500 Received: by mail-qk0-x242.google.com with SMTP id o126so2556955qke.12 for ; Wed, 03 Jan 2018 10:08:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=PEwPmDJz/2ZZ9Z5zYDCEd87igDtbUABJ+5RLWrVHoko=; b=lmQy6GV/JKyyjery3jeNjXRL5nvmRRit2efZNOT1mqQxphE1lGF2bzq+3Et1cXAuQN nWY0mgTv9N1C1ELxzYLXajhJY1AMYn8AcOjzG9nGk+mCLyw8AYA5D79/4xECrpIS5bXk gSYfmr6J8Gk9vIExoyCnrXTt/Yr3HoyGJV1kaaoOVHmeQFuTf5bedjMkTTVKhK+3Bv1A Mmg5+5mH/Jew+d5TnUcw0Kt76KlqDhzdoCO9GfUaTunOPKduMAK/KmE2DBgs0fAv3Ggy nZZZFJJzumTT8IR7fCqb/YTjk2T4Y3RxwD38M6nTpf/K+jK6DkcYfjH5n2CYDOZAu92m O/4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=PEwPmDJz/2ZZ9Z5zYDCEd87igDtbUABJ+5RLWrVHoko=; b=A+YskooJ5TBCBrLsoFzvItV0m/439oXPzxpvZcWRbbPrAT9Tqs1nVf4ppkndLs64La pmhY8NvWD7/D/uhvUzg3vRgUrlJAIsBvcfzfjuGfvVFigjE/RoOpnJxi0mWc8FnCPid3 C6u+585IjnU2SjQDzVBYVZFXTMTd7b7EH7NJp4QH7C0/1DMGqv2pi5hoX4OFmf5nkMXi opYry8Xh9g6o0EgB171N32meNxIgM55wjzv1soHdlvA/Al1A7qSUomYCwfAKgqcvylmP d/pOWGL66HwjPPsMwn+zORbX3tPSvE1kKWfV9+zHA9ctMQNeWLwSaOA3NYh5ybBs0AvR VU8w== X-Gm-Message-State: AKGB3mLKz3Ux3vezWq7FBTF73lq3z5pzC9KNGr2rM4sgqobTazkTChNt X4THmValR8IUYX2nr1tJpnw= X-Google-Smtp-Source: ACJfBotJT/jazYWn4cZvusvltrsRzuubK3OLEivZbFXKHjFa/KL7O2xXnG4dB6As/YT6hb/JpQ5qNg== X-Received: by 10.233.216.195 with SMTP id u186mr2532268qkf.341.1515002922414; Wed, 03 Jan 2018 10:08:42 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:41 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:58 -0300 Message-Id: <20180103180805.18140-11-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v5 10/17] sdhci: add a GPIO for the 'access control' LED X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" It blinks to caution the user not to remove the card while the SD card is being accessed. So far it only emits a trace event. Signed-off-by: Philippe Mathieu-Daudé Acked-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 14 ++++++++++++++ hw/sd/trace-events | 1 + 3 files changed, 17 insertions(+) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index a6fe064f51..da943a6562 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -45,6 +45,8 @@ typedef struct SDHCIState { QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; qemu_irq irq; + qemu_irq access_led; + int access_led_level; /* Registers cleared on reset */ /* 0x00 */ diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a781cc5211..de9c4e5a83 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -203,6 +203,16 @@ static void sdhci_poweron_reset(DeviceState *dev) } } +static void sdhci_led_handler(void *opaque, int line, int level) +{ + SDHCIState *s = (SDHCIState *)opaque; + + if (s->access_led_level != level) { + trace_sdhci_led(level); + s->access_led_level = level; + } +} + static void sdhci_data_transfer(void *opaque); static void sdhci_send_command(SDHCIState *s) @@ -1051,6 +1061,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) !(s->capareg & (1 << (31 - ((s->pwrcon >> 1) & 0x7))))) { s->pwrcon &= ~SDHC_POWER_ON; } + qemu_set_irq(s->access_led, s->hostctl & 1); break; case SDHC_CLKCON: if (!(mask & 0xFF000000)) { @@ -1163,6 +1174,7 @@ static void sdhci_initfn(SDHCIState *s) qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SDHCI_BUS, DEVICE(s), "sd-bus"); + s->access_led = qemu_allocate_irq(sdhci_led_handler, s, 0); s->insert_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_raise_insertion_irq, s); s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); } @@ -1193,6 +1205,8 @@ static void sdhci_uninitfn(SDHCIState *s) timer_free(s->insert_timer); timer_del(s->transfer_timer); timer_free(s->transfer_timer); + + qemu_free_irq(s->access_led); } static bool sdhci_pending_insert_vmstate_needed(void *opaque) diff --git a/hw/sd/trace-events b/hw/sd/trace-events index e4e26c6d73..f821db2046 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -13,6 +13,7 @@ sdhci_adma_transfer_completed(void) "ADMA transfer completed" sdhci_access(const char *access, unsigned int size, uint64_t offset, const char *dir, uint64_t val, uint64_t val2) "%s %ub: addr[0x%04" PRIx64 "] %s %" PRIu64 "(0x%" PRIx64 ")" sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been read from input buffer" sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of data" +sdhci_led(bool state) "LED: %u" # hw/sd/milkymist-memcard.c milkymist_memcard_memory_read(uint32_t addr, uint32_t value) "addr 0x%08x value 0x%08x" From patchwork Wed Jan 3 18:07:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855138 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="D9FZmLAJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfPK0r4hz9s7n for ; Thu, 4 Jan 2018 05:20:37 +1100 (AEDT) Received: from localhost ([::1]:60147 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWneV-0001pr-45 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:20:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnT4-0000Zv-JO for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:47 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnT3-00074W-Na for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:46 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:43629) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnT3-00074O-J4 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:45 -0500 Received: by mail-qk0-x241.google.com with SMTP id j137so2559348qke.10 for ; Wed, 03 Jan 2018 10:08:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7RBZRI3MDdPANvgFVhjDGcaIdhIZ90GFRdEqMYmMAPQ=; b=D9FZmLAJ2zV/yUhMH/rQT7pb9M+9DHKDUe5n+kTao21RWrqzaBqTZeEtFrqb/xyNOt uZFtvz9izMH02Mvrnbzmo+5eU9McJwgghfBNMDq7en/EW+RqBbuesMp+4aOaVeTgsW9A Z6x3U+/m0qGcF6ZRs4aHUausqo3xPEyNfHyZomgr5kctVG9fhpALoZfM5xB+BVOX35RS YptoE588D0bmbbUot5LFq/YuYJruArPWFKWshmH8KHzXXERAwe9p1h0j+EFOc9c3vUIy +BSVRunTVmcLn/cD6Wsgy7tRmUiJcfh/Qfl3uK3irR/KQ1ye/DNl5lNGw6IlTrwGJtyi KPKQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=7RBZRI3MDdPANvgFVhjDGcaIdhIZ90GFRdEqMYmMAPQ=; b=IKIO2peEgu9Hqyjm54SeYKZ6K+iIO4D4HklYVLWp1C4nrqjxDrgzDvhIMiy+fT9zCj ISVQisGhLJKaQuYOxZ3+nJ3KE5S+IHP+joxWFHvzu9Ou0r7/VPguvoQN03FfRlOJJoeO vHcCy6VmghEeyq2gFczkDGNXt7oetF7F1rRTZ6NaChmw1/8KX4jGdKMYS0Dg0G/yfMLI Yt/rvULCGfD03pjr0n0XffZ6xFCaNPMb9rfYMPfgc3mFPHw+x2cltb+rXkTkB6smWatw wTYdkJxmI6MnEW06aoF+SeZWRvRE+DyuRMR0/38Qxv2wGoEMklLOBKzdfLSEiZzZL/Ck zHbg== X-Gm-Message-State: AKGB3mLZFd00n+caT0Fhw4SftqxGclMvhxcvcKtWHhnXdA+8VlrpvOuV sOU0XiTETcZxHl/QKLWfnHM= X-Google-Smtp-Source: ACJfBotjEg8YOAjRp/phEOqCfNiDB+oJQtX0ptB7QIHUBcbZJb9v8WFr3OMeciFmbn554IEP5DkGGA== X-Received: by 10.55.128.129 with SMTP id b123mr2826384qkd.1.1515002925167; Wed, 03 Jan 2018 10:08:45 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:44 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:07:59 -0300 Message-Id: <20180103180805.18140-12-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v5 11/17] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 1 + hw/sd/sdhci.c | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index 248fd027f9..e941bc2386 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -43,6 +43,7 @@ #define SDHC_TRNS_ACMD12 0x0004 #define SDHC_TRNS_READ 0x0010 #define SDHC_TRNS_MULTI 0x0020 +#define SDHC_TRNMOD_MASK 0x0037 /* R/W Command Register 0x0 */ #define SDHC_CMDREG 0x0E diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index de9c4e5a83..ede51d7e45 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -98,7 +98,6 @@ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) -#define MASK_TRNMOD 0x0037 #define MASKED_WRITE(reg, mask, val) (reg = (reg & (mask)) | (val)) static uint8_t sdhci_slotint(SDHCIState *s) @@ -1035,7 +1034,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) if (!(s->capareg & SDHC_CAN_DO_DMA)) { value &= ~SDHC_TRNS_DMA; } - MASKED_WRITE(s->trnmod, mask, value & MASK_TRNMOD); + MASKED_WRITE(s->trnmod, mask, value & SDHC_TRNMOD_MASK); MASKED_WRITE(s->cmdreg, mask >> 16, value >> 16); /* Writing to the upper byte of CMDREG triggers SD command generation */ From patchwork Wed Jan 3 18:08:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855133 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="jNonjlTQ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfHH1GwDz9s82 for ; Thu, 4 Jan 2018 05:15:23 +1100 (AEDT) Received: from localhost ([::1]:60056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnZR-0005WZ-3x for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:15:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47890) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnT7-0000cm-H8 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnT6-00075O-KJ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:49 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:39481) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnT6-00075F-FT for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:48 -0500 Received: by mail-qk0-x243.google.com with SMTP id c5so2554477qkg.6 for ; Wed, 03 Jan 2018 10:08:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=lwCnM8T68G/5QwCZPQ6+Ioh1A/qfO9INOplwQdW/Po4=; b=jNonjlTQf05UQNZBTbST8+whtHR6CV4F9uFp/uEElYBtpdepp6IYGa4izMGL4RGAKx O65/jDO9wiWOZKGO4d3cwNamDWaaEQg63WihRaGvMJEAvnv9SwlvfrJAHLWqr9MWtoIH 1jIAnZa7N+XqXC8zGpQ2+4TaQRDiNti2e/exr42VPjPvsJ1o/VY2ITugEGQgAeUfwVlv Hq6TZZd/JHgx2J1CjxcFEdtzNnm+oWAT2fjGueExYdzHHuljDegBQMkO2AkLA8TqRCUq 0vvsuYqDpGiBLAxdbSVcog20YDJpaasDjheAXOVYNUY+oWuJ/dy0u6ohOZ8s0lXAgxU9 w95g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=lwCnM8T68G/5QwCZPQ6+Ioh1A/qfO9INOplwQdW/Po4=; b=lbOuZR43AHFkKcP4jXeIrr0PAWkWiw6+e5osTe23TFyUAGzalvceFZprhFJf78KpWR YTyTUwGh8sf+fOH8OA2Jju9UqgtzywDoDEHJHv27ThhFTzBP4evbtOh/21Fof0O6ADUg QJN2rNauEXN2XPZwNvXEzcj4Dbf9SaJmChknSUYbSuUGYvHzpzFhqpdqoZs0uqTta7Js jofAuOfEWUVJ+mDdFm+zzTclnAsN50pSSPnu0vF0LXAsTen1rxVy0AejjIWQWVuz1FPP 01QE+q6C/kp67xtegJsIevyBgfuM8HsnwEsAB3UlOot1FnC/Pvgoc2Dbi0MAnYdyeWlS E3lg== X-Gm-Message-State: AKGB3mKxsqZTeRD8mh2hPLt2dn6E+6NTmF8HraDEWQ8VittqtiwjFmwa d2nMbWweyCythEF1rUhDX/o= X-Google-Smtp-Source: ACJfBot2ZeuGUwL3pEJVR7GNCLCGzH6YxI0sikTIWqYemrDMnWO4ai4FsqKREgTQuqkF1NK1YwiOvA== X-Received: by 10.55.27.84 with SMTP id b81mr2832076qkb.26.1515002928112; Wed, 03 Jan 2018 10:08:48 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:47 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:00 -0300 Message-Id: <20180103180805.18140-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v5 12/17] sdhci: use FIELD_DP32() macro for the WRITE_PROTECT flag X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 6 ++++-- hw/sd/sdhci.c | 8 ++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index e941bc2386..df240ea046 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -24,6 +24,8 @@ #ifndef SDHCI_INTERNAL_H #define SDHCI_INTERNAL_H +#include "hw/registerfields.h" + /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 @@ -77,8 +79,8 @@ #define SDHC_SPACE_AVAILABLE 0x00000400 #define SDHC_DATA_AVAILABLE 0x00000800 #define SDHC_CARD_PRESENT 0x00010000 -#define SDHC_CARD_DETECT 0x00040000 -#define SDHC_WRITE_PROTECT 0x00080000 +FIELD(SDHC_PRNSTS, CARD_DETECT, 18, 1); +FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); #define TRANSFERRING_DATA(x) \ ((x) & (SDHC_DOING_READ | SDHC_DOING_WRITE)) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index ede51d7e45..2c8dc66e7a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -159,12 +159,8 @@ static void sdhci_set_readonly(DeviceState *dev, bool level) { SDHCIState *s = (SDHCIState *)dev; - if (level) { - s->prnsts &= ~SDHC_WRITE_PROTECT; - } else { - /* Write enabled */ - s->prnsts |= SDHC_WRITE_PROTECT; - } + /* Write enabled */ + s->prnsts = FIELD_DP32(s->prnsts, SDHC_PRNSTS, WRITE_PROTECT, level); } static void sdhci_reset(SDHCIState *s) From patchwork Wed Jan 3 18:08:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855140 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="FUh6aNrE"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfS93tc5z9s7G for ; Thu, 4 Jan 2018 05:23:05 +1100 (AEDT) Received: from localhost ([::1]:60246 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWngt-0004iH-IX for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:23:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47905) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTC-0000h3-Ib for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:55 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnT9-00076W-Dz for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:54 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:41431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnT9-00076J-9a for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:51 -0500 Received: by mail-qk0-x241.google.com with SMTP id a8so2565144qkb.8 for ; Wed, 03 Jan 2018 10:08:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=xKe1A6pZ3AsviA6wTBg0O0TtugAuWgK9aM91sO3hvMg=; b=FUh6aNrEQmiWQXdWcXV89ugUXjW4iTOJn5BIlEJgl0N4BhS7cQxi+nmqUMGLtheUJo 2XpAjOepBIadXVuLcKQwcy1pD7ldRNIUpI988NbFm3h+qHWbZPPi5YgKtD2v4EYg4JaP zRo0P2gQHrQ0jR6/rwv4sxB2gNJ1naINzesiqAlE2yB7HEzj6j4xeqv7ZezA5oB9aDBK n2tZCaMjzi66E6tnO0fbrsM8/fN1tjReUUBE0begI53DAMMJH4omxyx9NKnBB3pKYrMr 2LwExfdOuCXrHuzdypQv825ithGTzZoQgULtM3Hk1M7+mrOwYMyozWxWA+R3cUNgYJZ8 CwZQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=xKe1A6pZ3AsviA6wTBg0O0TtugAuWgK9aM91sO3hvMg=; b=nA52VNAREHWnTKGRUspb95BDqYg5LTSfQrDteyuGw71CZZNmdUgKt8VAiXdJ/BtRRz wo8uY8mcS7fw9R7ZBOMU4aJ83T8xaQdHRuAGGwmKR7HCvYPVQhan8y5hivHHouNF3JEh kcdzVEFQYocj+aq2TSrX0msrUICH5AbyqDL2YJz1XbTZUN3dqBUcAKekw0oN9vkekO2C JTfbtvR3g1Q7UqrXMKiOebC4m3MuQIl6q60Op0R8BGIe9OztiawvDqdDRIDUmigKJrA4 /4kijZZt6tukGWKHiqIFbrA7LbDlUqw0AID9lRfS3bBq0bdTC0limRGwAPQK6M1X4MqY cBWQ== X-Gm-Message-State: AKGB3mKGYzIHGdbunMq6rQHixKz30p0XPFyDTIU28/xtUkV9vZBr452U JCCpVAsK2ZdkFpmIkMt2nMXp72VI X-Google-Smtp-Source: ACJfBotBIgACb/1TQPepLtBFACkQHrmz81g09Ok1wxsxIqZOExYhOzs/dERK0sPrwnHU0yQ8Ilj1xg== X-Received: by 10.55.203.157 with SMTP id u29mr2826529qkl.334.1515002930925; Wed, 03 Jan 2018 10:08:50 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:50 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:01 -0300 Message-Id: <20180103180805.18140-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::241 Subject: [Qemu-devel] [PATCH v5 13/17] sdhci: rename the SDHC_CAPAB register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci-internal.h | 2 +- hw/sd/sdhci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/sd/sdhci-internal.h b/hw/sd/sdhci-internal.h index df240ea046..b7475a1b7b 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -176,7 +176,7 @@ FIELD(SDHC_PRNSTS, WRITE_PROTECT, 19, 1); #define SDHC_ACMD12ERRSTS 0x3C /* HWInit Capabilities Register 0x05E80080 */ -#define SDHC_CAPAREG 0x40 +#define SDHC_CAPAB 0x40 #define SDHC_CAN_DO_DMA 0x00400000 #define SDHC_CAN_DO_ADMA2 0x00080000 #define SDHC_CAN_DO_ADMA1 0x00100000 diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 2c8dc66e7a..5d1c6b518d 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -903,7 +903,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) case SDHC_ACMD12ERRSTS: ret = s->acmd12errsts; break; - case SDHC_CAPAREG: + case SDHC_CAPAB: ret = s->capareg; break; case SDHC_MAXCURR: From patchwork Wed Jan 3 18:08:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855134 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="QxsORJsV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfJd0ZVyz9s7n for ; Thu, 4 Jan 2018 05:16:33 +1100 (AEDT) Received: from localhost ([::1]:60065 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnaX-0006Ro-B4 for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:16:29 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47915) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTD-0000hK-A2 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:56 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTC-00077M-7e for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:55 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:41433) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTC-00077E-3J for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:54 -0500 Received: by mail-qk0-x243.google.com with SMTP id a8so2565331qkb.8 for ; Wed, 03 Jan 2018 10:08:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=HqIoJBIMtk6lRxb6mcZ6ZoxOAMXc8MnMsbyzzm4D0qo=; b=QxsORJsV9Ro0/t3rnOL2OEuZMFCkBKkbIopljYDMuPeER2LlEVVQVaEWBaqnSj6a2+ VIiKByea0w7Hvk2epZL8LjH/d1ADQNDoyVVFT+BLO5kiUkGFe1jixscZwWBJiv1ziC+e hBH3FfJdEhq9bOzuCsn5ytL3O+06G0ReUCATUIqIUgd+rug62pnyhdjX+LzXJsPUil62 H7DQiaFRhn9iYqgRTUjWfSCSISChkEQBkPPpgvMkbzFMCZfwZhjnYoNkvCgwuSMq5CjB yvWlWPFTQemJT06tzKaPHHh1vT4yyrF2TPQ76hBIqh3oZwCUr3d9XkTX56lLS7ST07Um Yuqg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=HqIoJBIMtk6lRxb6mcZ6ZoxOAMXc8MnMsbyzzm4D0qo=; b=fIDAptkvMUBKjk6JrP0xABP4GrVtiOjuqAYXapzRHKyWM41bu2UXGFJ3lKPpihM6Yp 6gutn322ec99IQe6Kw0YSN5Eq69vdTo95ZZIPw4Jj30qbue+3oE6dqPRlasKhDMaSZgh QVaUj7KlRF4628CZFtEVsHxhQ+tLXJX3uSHToEkiLB4Xrkx4Ogb77B1ft3CHpTdzFLt+ raSOywLQCYnYWEptvpfU/V0+uahgIJ8hGYsG+b6EYOGCzPytQaASEnfQ0mLWVB3n5F8P VqXUZGftQZdIwLsLFlO/xVvuMu2+QKPHYPZkNUCrXmrNmqJmlwDHl8rxWjrP7ijK85Y1 JkvQ== X-Gm-Message-State: AKGB3mINcJEC9ZUmRSjFUoEmd491Q45YbSllFikhHghJVTYieOSzlqjA vTfZaP3cGN+WsRJ4jO1wsj313DrY X-Google-Smtp-Source: ACJfBovVGg7WfD9bdrLnjs3QR0208a2+/1FrFacTJJS4Sl/91EbnMyW1z+QienxhjF8wMD0xEkrHBA== X-Received: by 10.55.142.129 with SMTP id q123mr2775746qkd.7.1515002933721; Wed, 03 Jan 2018 10:08:53 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:53 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:02 -0300 Message-Id: <20180103180805.18140-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::243 Subject: [Qemu-devel] [PATCH v5 14/17] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" running qtests: $ make check-qtest-arm GTESTER check-qtest-arm SDHC rd_4b @0x44 not implemented SDHC wr_4b @0x40 <- 0x89abcdef not implemented SDHC wr_4b @0x44 <- 0x01234567 not implemented Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 4 ++-- hw/sd/sdhci.c | 23 +++++++++++++++++++---- 2 files changed, 21 insertions(+), 6 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index da943a6562..9436375b1e 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -86,9 +86,9 @@ typedef struct SDHCIState { /* Read-only registers */ /* 0x40 */ - uint32_t capareg; /* Capabilities Register */ + uint64_t capareg; /* Capabilities Register */ /* 0x48 */ - uint32_t maxcurr; /* Maximum Current Capabilities Register */ + uint64_t maxcurr; /* Maximum Current Capabilities Register */ uint8_t *fifo_buffer; /* SD host i/o FIFO buffer */ uint32_t buf_maxsz; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 5d1c6b518d..0aed8512c3 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -904,10 +904,16 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset, unsigned size) ret = s->acmd12errsts; break; case SDHC_CAPAB: - ret = s->capareg; + ret = (uint32_t)s->capareg; + break; + case SDHC_CAPAB + 4: + ret = (uint32_t)(s->capareg >> 32); break; case SDHC_MAXCURR: - ret = s->maxcurr; + ret = (uint32_t)s->maxcurr; + break; + case SDHC_MAXCURR + 4: + ret = (uint32_t)(s->maxcurr >> 32); break; case SDHC_ADMAERR: ret = s->admaerr; @@ -1129,6 +1135,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) } sdhci_update_irq(s); break; + + case SDHC_CAPAB: + case SDHC_CAPAB + 4: + case SDHC_MAXCURR: + case SDHC_MAXCURR + 4: + qemu_log_mask(LOG_GUEST_ERROR, "SDHC wr_%ub @0x%02" HWADDR_PRIx + " <- 0x%08x read-only\n", size, offset, value >> shift); + break; + default: qemu_log_mask(LOG_UNIMP, "SDHC wr_%ub @0x%02" HWADDR_PRIx " <- 0x%08x " "not implemented\n", size, offset, value >> shift); @@ -1266,9 +1281,9 @@ const VMStateDescription sdhci_vmstate = { /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_properties[] = { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, + DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, false), DEFINE_PROP_END_OF_LIST(), From patchwork Wed Jan 3 18:08:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855136 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="UbtC0Hpy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfM201DNz9s82 for ; Thu, 4 Jan 2018 05:18:38 +1100 (AEDT) Received: from localhost ([::1]:60116 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnca-00080v-0j for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:18:36 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47931) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTF-0000kI-O0 for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTF-000788-0P for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:57 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:41434) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTE-000784-RV for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:56 -0500 Received: by mail-qk0-x244.google.com with SMTP id a8so2565484qkb.8 for ; Wed, 03 Jan 2018 10:08:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=kCnEBD1j2+LbtJTpPEDNidzLM2hB0/dYSWiHNw/OhWA=; b=UbtC0HpysbeTprxBt+H68DE3yqcvrR5keMicY0mWkjH9OBYR8A48EJKae8hv/Aiur4 vwf0brHyK/TJq4bAJLqxgOec1ef4zP1QwCQmwfr4nZMDEEx8aUi/kXnnjUXKKGGoMfgm 7V98oCGnAvme4ob9HKUN+Psu+SsQ2sr7mCvO5eK7+2Iklzq7iaIpvB3mjgduryetHpU/ bI/mmblXe4vUHdTWOaUy5ODgAwlflihRzwsSGBUf0UmZ8IE1iSOCTVXmVQoWMeZQNV8F N7wsYLRLPgv7uNWWpdPP89Qu7ukgJDtjkQCf/by3FVY5A5/Nq5R9Y0sRevutXgkKK147 JhFg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=kCnEBD1j2+LbtJTpPEDNidzLM2hB0/dYSWiHNw/OhWA=; b=YB+xhxO66Zvuu+o9boskdfzZ56eoEYgZvNTdiLPNoolk4yuHkGYwsOtqVJAY44KtdS BiLWxYAXyfB9ixR6XBW1eFYJHLwqTnGC3zTWDrE3mGplWvMazqVffiY3LvWak3MFGvpm SGPS40bSVXEy+hycWEygob9Y+4yt3AkhvrFRktYKMBQey/MOTk5vg2y4Tq6SHA9t+or0 hM3o5y9NbxovR9Bvmi/c9c4n7hxCqVjzjTbAbMd4CLmfSAVNiM1pEkpZdLS46h1B+SWk p3DEmoIMU106KYCBre8vQhUvASxqKmM/AcH3XciprpUDR8JA9isPAjHHFhZXV15USpbB sVzw== X-Gm-Message-State: AKGB3mJ0XgvExYJngh1siyw/TT57icohJZS7tp1ty3JHc7gBRDvGXihs 1RQxU4qDhbV5QaI4Rpc38qA= X-Google-Smtp-Source: ACJfBovClL5uuk4gCWTgQ+VPVsEfq4ru8PnwDCSQf7vXEzYWW2g1Paq1d7a5br+0wZ7FGw6b7PBdQw== X-Received: by 10.55.147.66 with SMTP id v63mr2739591qkd.188.1515002936496; Wed, 03 Jan 2018 10:08:56 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:55 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:03 -0300 Message-Id: <20180103180805.18140-16-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::244 Subject: [Qemu-devel] [PATCH v5 15/17] sdhci: Implement write method of ACMD12ERRSTS register X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Andrey Smirnov Reviewed-by: Peter Maydell Signed-off-by: Andrey Smirnov Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Philippe Mathieu-Daudé --- hw/sd/sdhci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 0aed8512c3..a688c6db46 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1135,6 +1135,9 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) } sdhci_update_irq(s); break; + case SDHC_ACMD12ERRSTS: + MASKED_WRITE(s->acmd12errsts, mask, value); + break; case SDHC_CAPAB: case SDHC_CAPAB + 4: From patchwork Wed Jan 3 18:08:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855137 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="b0cgmIux"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfN71k3tz9s82 for ; Thu, 4 Jan 2018 05:19:35 +1100 (AEDT) Received: from localhost ([::1]:60137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWndV-0000uv-Aq for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:19:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47949) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTI-0000ml-Eb for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:03 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTH-00079C-Jj for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:00 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:34600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTH-000791-FV for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:59 -0500 Received: by mail-qk0-x242.google.com with SMTP id g81so2561847qke.1 for ; Wed, 03 Jan 2018 10:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wcTPlANRt+KvCoyFoPcTIIvBZG2ePSc/goRHCNMXxYk=; b=b0cgmIuxZZ7Wi0Fh+P8zbMsfmh9SQf7FRW5C8jiYNR5ZqCi/XHYZsFUKnJxOBuL6hb nJANaK/e/XPeCvyfxjPMY30sbA9a/vi37Df/8rrqcmXbVhlBxmbUAb6GaEyMzlwJa6Le kwILuSxUBDKNlf//vRMgl/uPn+/GfygD7RWJlt+K47sx4oEPgJrRNqSl2BF90ucrE8tK OtU6ab4cSa6B/ewd8LCaRHYOyECPej3AUryq6QjkTVjm7v1AQW45oxc3Qu7RcN7xLtLx ZH++qTEAf4C6kLKOsWq1eGad1Bcq8L0axRfEXQlbgFSyj/Bfc0ewkLaZpMmcew00dbSu +i7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=wcTPlANRt+KvCoyFoPcTIIvBZG2ePSc/goRHCNMXxYk=; b=DHrwry32HEzOM51Vd/xWA12aYoY0kupOysXBGePj3bIN7E62oiSypWoFsqwaf3HBGS IUh24wMh+aZf4CSoLCYdb6eNP5L6idMKt6ZfvJU0HLtBqTvQC4U2gyG8Q7IGMKGqyjuE pBzxho3jNa0YhSBEVQFOCVSSC4kn+kHWPT3QjHa+gsMy7fnAvjQVnfZ7uV7369pgHUdf 4WJ+tdicnrrOesNm27+HCvO6YNZD8OuAr2mukVKCAMyjEZ2gDR5XnaoVKG87oDk1pDBV BqKrXvzxDIOg4V6dLSohpEP0b6hVuNfJKfRn5NMfZmJ80fv3wUAUv3f5dY1hXEzcgDu6 CKLQ== X-Gm-Message-State: AKGB3mIzvQHgsOzextLfT9LBI2cVkfW3Mc8TbDEgbcV1z1bFc2PUJYIe j8U9pnYPB4lNNXWbUdgNCzg= X-Google-Smtp-Source: ACJfBotJGu+Ak/z1uQlEmC/ZJklV1MSfmJD8ftUwXbwipVhTvN+duC+XdaMioQTfwyqZrEDsbMKm2w== X-Received: by 10.55.27.84 with SMTP id b81mr2832879qkb.26.1515002939127; Wed, 03 Jan 2018 10:08:59 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:58 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis Date: Wed, 3 Jan 2018 15:08:04 -0300 Message-Id: <20180103180805.18140-17-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH v5 16/17] sdhci: use deposit64() on admasysaddr X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Fam Zheng , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu?= =?utf-8?q?-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This makes the code slightly safer, and easier to review. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index a688c6db46..5ed4b472c6 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1117,12 +1117,10 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val, unsigned size) MASKED_WRITE(s->admaerr, mask, value); break; case SDHC_ADMASYSADDR: - s->admasysaddr = (s->admasysaddr & (0xFFFFFFFF00000000ULL | - (uint64_t)mask)) | (uint64_t)value; + s->admasysaddr = deposit64(s->admasysaddr, 0, 32, value); break; case SDHC_ADMASYSADDR + 4: - s->admasysaddr = (s->admasysaddr & (0x00000000FFFFFFFFULL | - ((uint64_t)mask << 32))) | ((uint64_t)value << 32); + s->admasysaddr = deposit64(s->admasysaddr, 32, 32, value); break; case SDHC_FEAER: s->acmd12errsts |= value; From patchwork Wed Jan 3 18:08:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 855139 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="upEtchF+"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zBfPy2YD8z9s7n for ; Thu, 4 Jan 2018 05:21:10 +1100 (AEDT) Received: from localhost ([::1]:60155 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnf2-0002fg-5s for incoming@patchwork.ozlabs.org; Wed, 03 Jan 2018 13:21:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47977) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnTL-0000qA-RB for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnTK-0007AS-Ez for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:03 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:42900) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnTK-0007AN-AJ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:09:02 -0500 Received: by mail-qt0-x242.google.com with SMTP id g9so3109597qth.9 for ; Wed, 03 Jan 2018 10:09:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=+2reyGTpZ2LvkTCPJXcdsfqVnGlYgxIjrtOjNunO0Fk=; b=upEtchF+GVDI6BHP8UqFoPyH68o1T3SzkZ3x9KDIbvsenM9JFhnbERSU18YutYTDYB lNoOp9YG5f86BGMwS9BG7eaZsmp7ZDi5H/nPW/k/UUPyOYl4ZTa5Q2TUdoNpJ1dKi0Fi 1UR3TVWUHXrijEsqhhB53R5s8gsEuFQuZl35nrE405drHmiQImzxvPDGUdyWHgESqjDq DbLZz8Gwi02w/BeaaHRvn+TGckiXMf/MFqQ8SjqHexw38yrMcCGUhkST9SE1UEDCDdpM Rp4f3w65KaQJYHccuI6Kls+vTSw9riWdkLtebR7dKlbjbAC2z5sKssR4+Tx3iPDC1qLt yvxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=+2reyGTpZ2LvkTCPJXcdsfqVnGlYgxIjrtOjNunO0Fk=; b=HGjG14I+//sxaD0Mg2gKLgeQmRyHfKZgLwXp/QNNY0T6HcYQWw1Jgz2079xIBvCEMG 3SdbazsS1a5Vyx2IbpZQkyFUWk4kUmAuA2eNbBYX6USyO72JRGaAWk0dJ4b0j2HOipu4 fs1nBuLlG6bXQ6UrpPmjalaldpbIB53v67GLzKYphkdTuvHyUIChlX5mJ9ZbmYgPTby0 vqDAuAEnTcfPJndL72KnP98qMhN1UME6+8WxnvRv/ef0EbuEBebxZuyTTQu6fN8mRJed MKKM5j0QyFkGJd7pe5INMD/WrSRYfZ8++oMBRA4JMhP7tos0N5mkA/PM+bfLk9oV75ng CMGQ== X-Gm-Message-State: AKGB3mLbN1O11CSEti4pXkjDGs8pqhFFUosTrkHQHJOHUpAgxMXXCRQf zH4emyjjqcfn7QEX6ZhYP60= X-Google-Smtp-Source: ACJfBospaUxfmQK+YFefoZ5ZTNglHzOCj50qj42NTOS1ZHxnxr/1FLt7hY2UCk505l1rnRgvdfhurA== X-Received: by 10.237.56.197 with SMTP id k63mr2729137qte.308.1515002941900; Wed, 03 Jan 2018 10:09:01 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:09:01 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:08:05 -0300 Message-Id: <20180103180805.18140-18-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::242 Subject: [Qemu-devel] [PATCH v5 17/17] sdhci: add a "dma-memory" property X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Add a dma property allowing machine creation to provide the address-space sdhci dma operates on. [based on a patch from Alistair Francis from qemu/xilinx tag xilinx-v2016.1] Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Alistair Francis --- include/hw/sd/sdhci.h | 2 ++ hw/sd/sdhci.c | 36 +++++++++++++++++++++++------------- 2 files changed, 25 insertions(+), 13 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 9436375b1e..2aea20f1d8 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -41,6 +41,8 @@ typedef struct SDHCIState { /*< public >*/ SDBus sdbus; MemoryRegion iomem; + MemoryRegion *dma_mr; + AddressSpace dma_as; QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 5ed4b472c6..b080950f80 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -501,7 +501,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s) s->blkcnt--; } } - dma_memory_write(&address_space_memory, s->sdmasysad, + dma_memory_write(&s->dma_as, s->sdmasysad, &s->fifo_buffer[begin], s->data_count - begin); s->sdmasysad += s->data_count - begin; if (s->data_count == block_size) { @@ -523,7 +523,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState *s) s->data_count = block_size; boundary_count -= block_size - begin; } - dma_memory_read(&address_space_memory, s->sdmasysad, + dma_memory_read(&s->dma_as, s->sdmasysad, &s->fifo_buffer[begin], s->data_count - begin); s->sdmasysad += s->data_count - begin; if (s->data_count == block_size) { @@ -561,11 +561,9 @@ static void sdhci_sdma_transfer_single_block(SDHCIState *s) for (n = 0; n < datacnt; n++) { s->fifo_buffer[n] = sdbus_read_data(&s->sdbus); } - dma_memory_write(&address_space_memory, s->sdmasysad, s->fifo_buffer, - datacnt); + dma_memory_write(&s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt); } else { - dma_memory_read(&address_space_memory, s->sdmasysad, s->fifo_buffer, - datacnt); + dma_memory_read(&s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt); for (n = 0; n < datacnt; n++) { sdbus_write_data(&s->sdbus, s->fifo_buffer[n]); } @@ -589,7 +587,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) hwaddr entry_addr = (hwaddr)s->admasysaddr; switch (SDHC_DMA_TYPE(s->hostctl)) { case SDHC_CTRL_ADMA2_32: - dma_memory_read(&address_space_memory, entry_addr, (uint8_t *)&adma2, + dma_memory_read(&s->dma_as, entry_addr, (uint8_t *)&adma2, sizeof(adma2)); adma2 = le64_to_cpu(adma2); /* The spec does not specify endianness of descriptor table. @@ -601,7 +599,7 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) dscr->incr = 8; break; case SDHC_CTRL_ADMA1_32: - dma_memory_read(&address_space_memory, entry_addr, (uint8_t *)&adma1, + dma_memory_read(&s->dma_as, entry_addr, (uint8_t *)&adma1, sizeof(adma1)); adma1 = le32_to_cpu(adma1); dscr->addr = (hwaddr)(adma1 & 0xFFFFF000); @@ -614,12 +612,12 @@ static void get_adma_description(SDHCIState *s, ADMADescr *dscr) } break; case SDHC_CTRL_ADMA2_64: - dma_memory_read(&address_space_memory, entry_addr, + dma_memory_read(&s->dma_as, entry_addr, (uint8_t *)(&dscr->attr), 1); - dma_memory_read(&address_space_memory, entry_addr + 2, + dma_memory_read(&s->dma_as, entry_addr + 2, (uint8_t *)(&dscr->length), 2); dscr->length = le16_to_cpu(dscr->length); - dma_memory_read(&address_space_memory, entry_addr + 4, + dma_memory_read(&s->dma_as, entry_addr + 4, (uint8_t *)(&dscr->addr), 8); dscr->attr = le64_to_cpu(dscr->attr); dscr->attr &= 0xfffffff8; @@ -678,7 +676,7 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count = block_size; length -= block_size - begin; } - dma_memory_write(&address_space_memory, dscr.addr, + dma_memory_write(&s->dma_as, dscr.addr, &s->fifo_buffer[begin], s->data_count - begin); dscr.addr += s->data_count - begin; @@ -702,7 +700,7 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count = block_size; length -= block_size - begin; } - dma_memory_read(&address_space_memory, dscr.addr, + dma_memory_read(&s->dma_as, dscr.addr, &s->fifo_buffer[begin], s->data_count - begin); dscr.addr += s->data_count - begin; @@ -1197,10 +1195,20 @@ static void sdhci_common_realize(SDHCIState *s, Error **errp) memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci", SDHC_REGISTERS_MAP_SIZE); + + /* use system_memory() if property "dma-memory" not set */ + address_space_init(&s->dma_as, + s->dma_mr ? s->dma_mr : get_system_memory(), + "sdhci-dma"); } static void sdhci_common_unrealize(SDHCIState *s, Error **errp) { + if (s->dma_mr) { + address_space_destroy(&s->dma_as); + object_unparent(OBJECT(&s->dma_mr)); + } + /* This function is expected to be called only once for each class: * - SysBus: via DeviceClass->unrealize(), * - PCI: via PCIDeviceClass->exit(). @@ -1287,6 +1295,8 @@ static Property sdhci_properties[] = { DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0), DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, false), + DEFINE_PROP_LINK("dma-memory", SDHCIState, dma_mr, + TYPE_MEMORY_REGION, MemoryRegion *), DEFINE_PROP_END_OF_LIST(), };