From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820179122233.47064764859783; Fri, 12 Jan 2018 21:09:39 -0800 (PST) Received: from localhost ([::1]:38832 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE4Q-0001RG-Iu for importer@patchew.org; Sat, 13 Jan 2018 00:09:32 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47025) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2c-0000Lv-Uq for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2c-0003o7-0m for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:38 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:38852) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2b-0003nX-TL for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:37 -0500 Received: by mail-qt0-x242.google.com with SMTP id d4so8556077qtj.5 for ; Fri, 12 Jan 2018 21:07:37 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07: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=H55m8SAxQCZteXEHo639T3ncP9waoJie0p/fu8nR8T8=; b=Jz0P4p8O79wgewt1NtxnpNkHEH2F/xoI8vM9nTtrLJgHreB3Venyq9P6Xl3C8DcBs+ lHkqnCVn5aODcSS58gHylgEjLVgNqLhk+I/momkf3kf+HPh8JWuGzbqnZ12E9GbltYRD Vy+C+qb6wNMeiUCoQxJJF+zkQjVOuE9NowBVWQl9KkQ126b9fI+oL+mG6o+nMwym8M9M HvQPsWiqqEelG8QRr6RvPXpDBVTLHDlrMptLyLV0Wsk6MVgZ3/FmcgcAlqy+jT7IHMwj epw+YG9LmDzGQCWU7SXR22buAf/fCH8Kc8CMqDESz+iPU08QnWzQZqt5OrH73TzLcu5w JwVQ== 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=XoXWvX6sXCc1P7K4XzwlCOC+dKhDWC7lu6G3OURt+M8H60jQBHEYByk6bD3DatWo00 GU85Y8g/KFWf7hUnlCm/KpFiznasoYCvevpMR7gxFtB+YYW+FxvAClvt6cjDYyT0UQMu 3eI1dYQfh2iNj68LIFO2PFlVSCotAzSqsRyncA66dxxMTIPVIsh1EB616rKwdAvHShTF ZeJAhtGZslKwXSP/qNzB0o7uT491B76Le/2qYMsMi8hd9kKD6qfDr9u1v+RaJx0TVIlI vxyu0ac87oMRbwKrYaW1C/HJyz7Gx3toCFYdSdwvsd3kfqxW32H1B8sGzn9Y7FSfBut/ L9jA== X-Gm-Message-State: AKwxytfYaG2UyCAlQmsQfKI2BOSjaVvoXjr3AbomD7uP8ObfyHE5u6Mv /MPkfDRmrXsDMuK/hi1Xv3Q= X-Google-Smtp-Source: ACJfBot4ouOTmGrO9TnSJoncawgXpn7LtHHA1HY5+H28OHUV9kF510jM+OXRYh4S/jzcTX7gka84wA== X-Received: by 10.200.19.136 with SMTP id h8mr10845535qtj.238.1515820057386; Fri, 12 Jan 2018 21:07:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:04 -0300 Message-Id: <20180113050717.22969-2-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 01/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 =20 -#include "hw/sd/sdhci.h" - /* R/W SDMA System Address register 0x0 */ #define SDHC_SYSAD 0x00 =20 @@ -227,6 +225,4 @@ enum { sdhc_gap_write =3D 2 /* SDHC stopped at block gap during write oper= ation */ }; =20 -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 =20 #include "qemu-common.h" -#include "hw/block/block.h" #include "hw/pci/pci.h" #include "hw/sysbus.h" #include "hw/sd/sd.h" =20 /* SD/MMC host controller state */ typedef struct SDHCIState { + /*< private >*/ union { PCIDevice pcidev; SysBusDevice busdev; }; + + /*< public >*/ SDBus sdbus; MemoryRegion iomem; =20 @@ -46,6 +48,7 @@ typedef struct SDHCIState { qemu_irq ro_cb; qemu_irq irq; =20 + /* 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 */ =20 + /* 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" =20 --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820181117265.5963138652853; Fri, 12 Jan 2018 21:09:41 -0800 (PST) Received: from localhost ([::1]:38834 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE4a-0001UH-2P for importer@patchew.org; Sat, 13 Jan 2018 00:09:40 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47052) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2f-0000Nr-Jl for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2e-0003s6-TB for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:41 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:38854) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2e-0003rb-O6 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:40 -0500 Received: by mail-qt0-x244.google.com with SMTP id d4so8556146qtj.5 for ; Fri, 12 Jan 2018 21:07:40 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:39 -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=E3zgiU1j/LzYxFXVPmxdCiky/XMOAVSDa7ZI6RR+yxY=; b=az0N4NBY2+5oNBWdvaTlc76mzf6RUjxhatzJyL1wFtmDAE+9NOCPZB5J1TPAGEJI/5 1F+Y5mbR4J7mpTgQ3TpmHYmxFRp3sdY2bU1XOdwykg0azsYd3ntCAb1f1CzbbWhCxWmi dwemItOpNsLw0Q0WnkGHzSFP2tYuKlLAwQxRJBgdl96hssUO+8DSXf/xOU2VKk42gJjh FKrl0ClveI9C/r384qA/QeamrF272YQ7WSwW7cWKo2wr9ppnp1KQBwLSmNTdJ4cp5Rkp wBxlVJBlLzyfEBunEh6iQ58oPPv9A0H6Akso/XFi+BE9CQmb6VgM4q1clbHm3ehGN19p gZQg== 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=E3zgiU1j/LzYxFXVPmxdCiky/XMOAVSDa7ZI6RR+yxY=; b=C6GQBiWW6PQ/EC2fEzwjUHNkiR8QNuyAtRIHBZBhub9MoTKZfx1drIWfq0ceX1pG9n 16682l547uNxOBicWZr19ioBN+nNAr4h0n1yBELVf24n4FNcqkNZ19reWKC1HgCaZjnS A0iaPHsNsfWJGK9ntzQRkoSuRU7S51gIyTRmBc8B0TUSurvFo5p25y9leZ+jMt1F4wib BteTazUWgCxxReCIHMkYkMTr0XCr5CPA6MVHKqG1vT4KM7JLmMYmAewiyMXbtCcF3nM1 Xu3k6CdqlJBxYF9n4yIQht0psaYZ2lCvKNSaZ7t+8popmvlhWxR0ViJRs3GyXO1VKlcJ kWlQ== X-Gm-Message-State: AKwxyteRcj8IhqTXIj/I/F9uxbQRXl+eXKv1zDsaEcPP9e3Oe96OH1Ur syjdwGMLKmlDqTHXHUdethM= X-Google-Smtp-Source: ACJfBotJQydgCGlwR1APn7j4TXC3QqOzSWMUgCxd0RLoX1sD2zMuS85zPrsHblz4pJo0t9ZTcoFbEw== X-Received: by 10.200.57.74 with SMTP id t10mr9314069qtb.22.1515820060302; Fri, 12 Jan 2018 21:07:40 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:05 -0300 Message-Id: <20180113050717.22969-3-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 02/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 1335373d3c..dacd726537 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -44,8 +44,6 @@ typedef struct SDHCIState { =20 QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; - qemu_irq eject_cb; - qemu_irq ro_cb; qemu_irq irq; =20 /* 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); =20 g_free(s->fifo_buffer); s->fifo_buffer =3D NULL; --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15158203398781002.9446716010788; Fri, 12 Jan 2018 21:12:19 -0800 (PST) Received: from localhost ([::1]:38901 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE78-0003Rj-TV for importer@patchew.org; Sat, 13 Jan 2018 00:12:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47072) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2m-0000Ry-Cs for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2i-0003wg-Cj for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:48 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:36033) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2i-0003w7-8I for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:44 -0500 Received: by mail-qk0-x244.google.com with SMTP id d21so11262677qkj.3 for ; Fri, 12 Jan 2018 21:07:44 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07: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=U63ud3/TGN7ofUkP1waAKgJ+ZfPvkNKRr3B4G7CLeZM=; b=B0DBJBYKj6iRRl+WKNblxWZ5OKmnlSf9/eqYiqGx9YrbAu2wHOLzk2ZaySQduO6Dwl 6g/B0nq5EYbBjnh5OEv2OEFxBQly0LfC2X+MTsr3dO4qAWc0E2xGEMbhGZLirjfe4K9p qa967t5ECIF1YIzY+eKbczXd0Ll01c9rw92jZNu3H2KXRCakqJan4ltyMPzpPEBzpvxB /0dcr013vrtnWM05kqMTxm5IL5mxe8wj+U2T24GXInjNJ8OR8C5DOEkWnCXF7Hk1eajF Yjutn5S8nhjUgps0C+1shX4+H5yNZv18GqdWZZH0sD45wWZAPSB4eG+xzAEdy5cI1cPV SlPA== 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=U63ud3/TGN7ofUkP1waAKgJ+ZfPvkNKRr3B4G7CLeZM=; b=eMdymfEkJRTNZyxfXyPYBmGWwdtTer4aKg/njAOg+SmEWH4btBnrXcj28ES+7KgyiS 7ut7fI9BkFUKaCBMnkDU5qHEQY20uxexTY4buQai4as8+qW+CILxJ91d0PBh1Qzen/s1 DTWTmpZtsI8efD8o1sY+qTt1YRHEGsL7sbwa/wHKdq/ElCh11SxXISmrRmad7Np8Izzc GqC0kgP1KGZhKGstHyb4p0V8WX9FvP5txnw5xNOzTsI3La3m4NKxnsuaKQQz6pXe+PZu YViSqEXoKw7ODbhPxegFIKmbWisM6FZeQjjfHMBoIydLTNi5BUxhgntoYsO+PsEobhr/ cU2g== X-Gm-Message-State: AKwxytc2wvi03AdscDqfNETT2vPppBjTiQRs0y3ynG0Lg6Dwh4saAWFN frM0q9gi1mZd9t2/iqlanh0= X-Google-Smtp-Source: ACJfBou7XT6OmcDI0hr85wVU1mMLrEgEvNskOcHYgXjT60TusE3KNgGgxqoaDpZxPPoxdKhyvaa+2A== X-Received: by 10.55.192.4 with SMTP id o4mr40169291qki.268.1515820063797; Fri, 12 Jan 2018 21:07:43 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:06 -0300 Message-Id: <20180113050717.22969-4-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 03/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Add common/sysbus/pci/sdbus comments to have clearer code blocks separation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- include/hw/sd/sdhci.h | 4 +++- hw/sd/sdhci.c | 46 ++++++++++++++++++++++++++++------------------ 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index dacd726537..8041c9629e 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -79,13 +79,15 @@ typedef struct SDHCIState { 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 in= t */ 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; =20 #define TYPE_PCI_SDHCI "sdhci-pci" diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 365bc80009..6c3389cfdc 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -23,6 +23,7 @@ */ =20 #include "qemu/osdep.h" +#include "qapi/error.h" #include "hw/hw.h" #include "sysemu/block-backend.h" #include "sysemu/blockdev.h" @@ -1185,8 +1186,23 @@ static inline unsigned int sdhci_get_fifolen(SDHCISt= ate *s) } } =20 +/* --- qdev common --- */ + +/* Capabilities registers provide information on supported features of this + * specific host controller implementation */ +static Property sdhci_capareg_property =3D + DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFA= ULT); + +static Property sdhci_maxcurr_property =3D + DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0); + static void sdhci_initfn(SDHCIState *s) { + DeviceState *dev =3D DEVICE(s); + + qdev_property_add_static(dev, &sdhci_capareg_property, &error_abort); + qdev_property_add_static(dev, &sdhci_maxcurr_property, &error_abort); + qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), TYPE_SDHCI_BUS, DEVICE(s), "sd-bus"); =20 @@ -1264,14 +1280,7 @@ const VMStateDescription sdhci_vmstate =3D { }, }; =20 -/* Capabilities registers provide information on supported features of this - * specific host controller implementation */ -static Property sdhci_pci_properties[] =3D { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev PCI --- */ =20 static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { @@ -1305,7 +1314,6 @@ static void sdhci_pci_class_init(ObjectClass *klass, = void *data) k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_pci_properties; dc->reset =3D sdhci_poweron_reset; } =20 @@ -1320,20 +1328,21 @@ static const TypeInfo sdhci_pci_info =3D { }, }; =20 -static Property sdhci_sysbus_properties[] =3D { - 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_qu= irk, - false), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev SysBus --- */ + +static Property sdhci_sysbus_pending_insert_quirk_property =3D + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, + pending_insert_quirk, false); =20 static void sdhci_sysbus_init(Object *obj) { SDHCIState *s =3D SYSBUS_SDHCI(obj); =20 sdhci_initfn(s); + + qdev_property_add_static(DEVICE(obj), + &sdhci_sysbus_pending_insert_quirk_property, + &error_abort); } =20 static void sdhci_sysbus_finalize(Object *obj) @@ -1360,7 +1369,6 @@ static void sdhci_sysbus_class_init(ObjectClass *klas= s, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_sysbus_properties; dc->realize =3D sdhci_sysbus_realize; dc->reset =3D sdhci_poweron_reset; } @@ -1374,6 +1382,8 @@ static const TypeInfo sdhci_sysbus_info =3D { .class_init =3D sdhci_sysbus_class_init, }; =20 +/* --- qdev bus master --- */ + static void sdhci_bus_class_init(ObjectClass *klass, void *data) { SDBusClass *sbc =3D SD_BUS_CLASS(klass); --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 151582034038618.00854216487687; Fri, 12 Jan 2018 21:12:20 -0800 (PST) Received: from localhost ([::1]:38900 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE79-0003Rg-DY for importer@patchew.org; Sat, 13 Jan 2018 00:12:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47071) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2m-0000Rx-Ch for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2l-00040z-F4 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:48 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:46729) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2l-00040b-AM for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:47 -0500 Received: by mail-qt0-x241.google.com with SMTP id r39so8538124qtr.13 for ; Fri, 12 Jan 2018 21:07:47 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:46 -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=D6MN2WGqMfZZ2eOEUpBrydCfRSLGDE+YjtGVsGZWPmE=; b=Se2M0I8NXS6zNDLTehZOkLObAKJ0X6wwDpaS0DMTs5O14vlqoc+IB2mKI05RuhiWrH +3Y/goDQ6YJdEkHMhLpvI4MtTZSw93FRdcSFTJ1d370x/yvjRRTo+A4C+1GP0Rir72ox w3h7hEwvNNpuVVxFG+Dof6Pt5CxLoSlNU9pdFATAE/ldsp8+FbNLK8MW0mZgTkmbokB8 XumL9XdBhUBI3s5EB7jR3YelrLYN9UtHSHfcNRtizwssEC9b25e9qXkVjvVr8bfM+jEh OC6Fb8vaER8MGuWlWZEwD+A7LwK0nyYRhr+jEysH935uO6q1ay7KY8qevi4jcIVHMspO yDRw== 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=D6MN2WGqMfZZ2eOEUpBrydCfRSLGDE+YjtGVsGZWPmE=; b=hgI4KrqnwXjd28sgzZ+J/OzlTOCAFR+UnbXgCAVy8Osp2XVRjKG57QNTQ2hsKWOzXv 7mWtp9oeDuczDpMnq7eZWMYVdusmO4fS4Q5QsVkRNqQ9ntrQksEeVCgzoMteGfdkICzU zTprTxU5uspG403lTVQmH77fiOEmj3tPtXXdpZJMKoKukKYyJMCdpTYsBKu5ZxwF9L1P 9OxUnB23111Vf4pO1XA+z+4uPrY1MSH0YMjmlGkwq4b+q75r6IcPHg0aPbJhTynHxe9l 1fMr9vmh23tIa17RyAqLTZQaG3JGZNDfh4hHSBsZBty/AiBE97U9iT3wz5Vso5wJTEVz Mj3g== X-Gm-Message-State: AKwxytdCwfCcU2ad4peOlKdGjgzx7PFJZT4bog9TwRsRAW3CKtlIcqlm GTXzw4cAXjc6aTrZSaJGxd8= X-Google-Smtp-Source: ACJfBou8hIexa7BVaRJmy0IlTRByPoKspLAyLJ55he8OcqFs+7DvZmCFJOW00MscGYNNpPyIJIDV+g== X-Received: by 10.200.51.103 with SMTP id u36mr5327141qta.127.1515820066895; Fri, 12 Jan 2018 21:07:46 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:07 -0300 Message-Id: <20180113050717.22969-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v7 04/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Now both inherited classes appear as DEVICE_CATEGORY_STORAGE. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 6c3389cfdc..191f0d26ee 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1280,6 +1280,15 @@ const VMStateDescription sdhci_vmstate =3D { }, }; =20 +static void sdhci_common_class_init(ObjectClass *klass, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + + set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); + dc->vmsd =3D &sdhci_vmstate; + dc->reset =3D sdhci_poweron_reset; +} + /* --- qdev PCI --- */ =20 static void sdhci_pci_realize(PCIDevice *dev, Error **errp) @@ -1304,7 +1313,6 @@ static void sdhci_pci_exit(PCIDevice *dev) =20 static void sdhci_pci_class_init(ObjectClass *klass, void *data) { - DeviceClass *dc =3D DEVICE_CLASS(klass); PCIDeviceClass *k =3D PCI_DEVICE_CLASS(klass); =20 k->realize =3D sdhci_pci_realize; @@ -1312,9 +1320,8 @@ static void sdhci_pci_class_init(ObjectClass *klass, = void *data) k->vendor_id =3D PCI_VENDOR_ID_REDHAT; k->device_id =3D PCI_DEVICE_ID_REDHAT_SDHCI; k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; - set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); - dc->vmsd =3D &sdhci_vmstate; - dc->reset =3D sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } =20 static const TypeInfo sdhci_pci_info =3D { @@ -1368,9 +1375,9 @@ static void sdhci_sysbus_class_init(ObjectClass *klas= s, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 - dc->vmsd =3D &sdhci_vmstate; dc->realize =3D sdhci_sysbus_realize; - dc->reset =3D sdhci_poweron_reset; + + sdhci_common_class_init(klass, data); } =20 static const TypeInfo sdhci_sysbus_info =3D { --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15158203443264.980008818244414; Fri, 12 Jan 2018 21:12:24 -0800 (PST) Received: from localhost ([::1]:38903 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE7D-0003VC-AC for importer@patchew.org; Sat, 13 Jan 2018 00:12:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47095) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2p-0000X1-HN for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2o-00044M-Oi for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:51 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:46732) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2o-00043f-Ja for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:50 -0500 Received: by mail-qt0-x243.google.com with SMTP id r39so8538195qtr.13 for ; Fri, 12 Jan 2018 21:07:50 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:49 -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=9P8o0HSeEHTqeiXvnLy5md0YPzw9KoWYhd3d+tNGasg=; b=pwO3mVde6U/Aod7Dm0L9RFlkXcpKQ7TzEssAM/xleOLjlB/++1QKtgAg4oKpkR35sN lcehhWZLAhypHCDEz4PyX5NCAc+G/KpI/46ibAox3fK+H4TLWTFWkMOWF8cuB3EkiNFy l2nbAJssmAf/Qzg8hQziomBVNhW4Jha4sqyWoG9I3GETKnQDu+X1Ez4UaipwvTtvw1Ql LrWxo6eUsC9KR5fmWEnPhUvjHycHMdnGuFP5qrUS1sj5CNPAtDEbEtND2dM8QNVn8Mhe ljwqH3tYTWHBPtcrHD1iSx78OS46Go9XWjeFcAA0cw7d9zW451EdiG30ws62x2te5XRG 8WhA== 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=9P8o0HSeEHTqeiXvnLy5md0YPzw9KoWYhd3d+tNGasg=; b=I46G3a2HLwiMWZ2rzEErT6evL0SCJ/lxvb6H7cbZJZgAXz7iPgAZJMcSjUlYY3mnmH I+vSiiVir30FqfGWnsfacMiNepNO/hvoPG/gs84xVCQKAxtxSbw2XO+ss0wCiAeNVVbt 010F8TmmXU8MwlspCjyz4XGoXk3axlmD4QLAXu0Ycev3bmgi78/eKiHykn6zEjYiGJRs fkNDxpZudDnTW5NeNWRLAKBiW6hGOcs3GcD5sldwxXHnWyVTxwX7wNpYtTy/axTl3HrQ GI45EGEI1s5BjsRTYs1vFzU2oNoge9rYVhKRv/8OI1gDzL9fnTbHIkDErd0nozXh5JCJ QSEg== X-Gm-Message-State: AKwxytfL96H9hyhBxTLnIPs/Fw0p3x6WnS2JKbVVsRyrjTU1VkGgKjiH 2KkoEvGNylK6xM5XBNAWJ1qDFZ70 X-Google-Smtp-Source: ACJfBou8TQEK5GZgOrZCLNWYmpVFztm186KvPLHezekBSyOP/CGeGYZiiAZ4GamVQ5mPNDwApPLekQ== X-Received: by 10.200.57.23 with SMTP id s23mr10034920qtb.328.1515820070181; Fri, 12 Jan 2018 21:07:50 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:08 -0300 Message-Id: <20180113050717.22969-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 05/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 191f0d26ee..b464143959 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1221,6 +1221,15 @@ static void sdhci_uninitfn(SDHCIState *s) s->fifo_buffer =3D NULL; } =20 +static void sdhci_common_realize(SDHCIState *s, Error **errp) +{ + s->buf_maxsz =3D sdhci_get_fifolen(s); + s->fifo_buffer =3D g_malloc0(s->buf_maxsz); + + memory_region_init_io(&s->iomem, OBJECT(s), &sdhci_mmio_ops, s, "sdhci= ", + SDHC_REGISTERS_MAP_SIZE); +} + static bool sdhci_pending_insert_vmstate_needed(void *opaque) { SDHCIState *s =3D opaque; @@ -1294,14 +1303,16 @@ static void sdhci_common_class_init(ObjectClass *kl= ass, void *data) static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_initfn(s); + sdhci_common_realize(s, errp); + if (errp && *errp) { + return; + } + dev->config[PCI_CLASS_PROG] =3D 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ - sdhci_initfn(s); - s->buf_maxsz =3D sdhci_get_fifolen(s); - s->fifo_buffer =3D g_malloc0(s->buf_maxsz); s->irq =3D 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); } =20 @@ -1363,11 +1374,12 @@ static void sdhci_sysbus_realize(DeviceState *dev, = Error ** errp) SDHCIState *s =3D SYSBUS_SDHCI(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); =20 - s->buf_maxsz =3D sdhci_get_fifolen(s); - s->fifo_buffer =3D 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); } =20 --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 151582051829490.82464192110263; Fri, 12 Jan 2018 21:15:18 -0800 (PST) Received: from localhost ([::1]:38947 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE9s-0005UX-Mq for importer@patchew.org; Sat, 13 Jan 2018 00:15:08 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47108) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2s-0000ak-TL for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2r-00046p-S4 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:54 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:37871) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2r-00046S-Md for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:53 -0500 Received: by mail-qt0-x242.google.com with SMTP id f2so8558406qtj.4 for ; Fri, 12 Jan 2018 21:07:53 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:52 -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=MviXOmT5cUyZNTBnmoJ12+XJqylwJh0IMRRuX1MXWeQ=; b=T4PYyrKjFlS5s3V/LU4HEcHN+jFkScAYm1beL6FpFBzq/EOFGMrSTxaIO+ekrJSemh iDWDpWZMeLZD3iB8SG6ejsqpl32anbqsCE7I/j8mnCN9SxRANAveHPw7kowyv6JcrTZn c+u2jQ39uctUxC1F9fCm8hKug0p/ryX+MbAfxiXExO2jBgRmbIr11wjj2YpLeqg5EJZ6 /fJ/SSP6/gP3G6MUVifiUzq9UiRBaLa5ePFyQdQVgJfRcvrxtlK801s+r0KewXcTMUlW BEPeXHQ3zYFO3uhUE2N7mUueVnq8J380VKWOS+Y8fSinwh9nFffoi7d/WcurdFMZmQoe ZZsA== 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=MviXOmT5cUyZNTBnmoJ12+XJqylwJh0IMRRuX1MXWeQ=; b=Q2f58wYplLKFpJXL0A3foYgd8E9bwON8hjASDym66Pn2Vw654jSAmiEADg8BjUsXo2 jrZ/Syh1sWYt1BBekWsj2BD/ZO7Nrwv42iwZBuokmQ5ddT7xwM/SxhqM7Ms7madIlN/m OS/wafNxKAmZiYgCwFBAAb/fVbNyHf3k0E6le5znB2pORqtSTlwaZup5/gqbfokRKXa7 j3Dt2xVl6qyson0xDGPiP06R7zsyCTsxFxMKNC0qwSNx942nQGKoaiidHaAssKgSp4XR jwoW4VycF+hhTBBl74pAF1EX6m3DZ9LlrZKEv5VxX01BKBjbgBY5/2v2zdhy7dTlY8uu WuXg== X-Gm-Message-State: AKwxytec+abw4AeZn02LP3GsT2UIriANOll9gxtNDqTFBr5G9yLeHVsG 1VQZDj3GZ78Hwo/qOdp3YVA= X-Google-Smtp-Source: ACJfBouWVWXRBU3ccR7gNL/SJhRiRr+Le/mhRGk4uD0vFecJd1JMPgDg+Sc/0v68wnaQ/pmepNq2wQ== X-Received: by 10.200.41.131 with SMTP id 3mr39853100qts.247.1515820073335; Fri, 12 Jan 2018 21:07:53 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:09 -0300 Message-Id: <20180113050717.22969-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 06/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index b464143959..ded4fa4885 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -32,6 +32,7 @@ #include "qemu/bitops.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" +#include "qapi/error.h" #include "qemu/log.h" =20 /* host controller debug messages */ @@ -1230,6 +1231,17 @@ static void sdhci_common_realize(SDHCIState *s, Erro= r **errp) SDHC_REGISTERS_MAP_SIZE); } =20 +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 =3D NULL; +} + static bool sdhci_pending_insert_vmstate_needed(void *opaque) { SDHCIState *s =3D opaque; @@ -1319,6 +1331,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error *= *errp) static void sdhci_pci_exit(PCIDevice *dev) { SDHCIState *s =3D PCI_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); sdhci_uninitfn(s); } =20 @@ -1383,11 +1397,19 @@ static void sdhci_sysbus_realize(DeviceState *dev, = Error ** errp) sysbus_init_mmio(sbd, &s->iomem); } =20 +static void sdhci_sysbus_unrealize(DeviceState *dev, Error **errp) +{ + SDHCIState *s =3D SYSBUS_SDHCI(dev); + + sdhci_common_unrealize(s, &error_abort); +} + static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->realize =3D sdhci_sysbus_realize; + dc->unrealize =3D sdhci_sysbus_unrealize; =20 sdhci_common_class_init(klass, data); } --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820691913292.9632453111186; Fri, 12 Jan 2018 21:18:11 -0800 (PST) Received: from localhost ([::1]:39150 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaECp-0007pl-0c for importer@patchew.org; Sat, 13 Jan 2018 00:18:11 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47128) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE2x-0000f7-3B for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2v-0004Aj-13 for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:59 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39504) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2u-0004AM-Rn for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:07:56 -0500 Received: by mail-qt0-x243.google.com with SMTP id k19so8563421qtj.6 for ; Fri, 12 Jan 2018 21:07:56 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07:55 -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=C/Rh/3N6IQ7JGOKkFV/SqfZHBWTrIBA/IGDtlWSoBGE=; b=H/FbHiAVHkB1Xv1xGhx04Cr6mkOtg9MFPTfRcLmKZ8rXcf6xisQPYI/+VDtFycsHIv /WSTP+M+4WgbD7lUDwxhuLltyDWVXcuBJ5mDKL+la/dEJRAGLhB53GsWw3TtmNyC0Rra JH/P7t5+j1c31J25TKWu2ByDzHBakA8Y8Fvkxdm5DqdLd+DfSqGmJ7q7nPugJw28BgHH +Xgw/xCS9T70BXJQEFcwI3Q0jNnsfw+Q+JVMB+7bR+MKI50Ogg3cQTSvKUuk/HhGyZky 8CLsQ+dWPanLSDZ75HrIqG1BM+WqIrZy0g/RTKcL66ksAzzjkepmMPsPZBXqKZcXeXCC hqjw== 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=C/Rh/3N6IQ7JGOKkFV/SqfZHBWTrIBA/IGDtlWSoBGE=; b=taVcxBOzBG0NRKEAbxA9uMW4SIRQ5ijMQNq4mLzgl82+hGGB5gvwNZxwoo9XW1pYSN 8OudgWkevvCNUKobQUiJxvzltclhY0x5G36mLcoyNhqIKCYcOHFFQAlWeZ86s2rS5sF9 JE/KBvu6H/aLhn78ZqCKF9Bi6Ioen4N1nFmDFX8m+isnGjL3fmmy5BqSjY0ObuoYuhoc nTHDwydyuUFEBCX263YMi4iKpb0B/3c5BKpwSIPJ8gIout3ca1AtdI/4iecGpWMZ0JyN QlIarBChBVhiDe9AjVgM8MsFQUJ7refNNujd/RmFm8MuTIO/aFLseCKtfrfiT7J1JIi3 on/Q== X-Gm-Message-State: AKwxytcx/Kqlj6potAh3QdZJOZKZHIYIEgaGXnhr/2cKdsKkBu394tv/ ZhaXOREUgE7NB/0eiePLVvE= X-Google-Smtp-Source: ACJfBotLYrgX7v5pGPDf2zBfpDXInGsMnJWf8Cc0Aj7TgNjjICyg+QbFIZDl1r+wBpBp2TmsAk/thQ== X-Received: by 10.200.43.250 with SMTP id n55mr37462096qtn.20.1515820076495; Fri, 12 Jan 2018 21:07:56 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:10 -0300 Message-Id: <20180113050717.22969-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 07/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 ded4fa4885..d0a91b60d5 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -947,7 +947,8 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,= unsigned size) ret =3D (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; } =20 @@ -1153,8 +1154,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", --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820514524369.6077830070351; Fri, 12 Jan 2018 21:15:14 -0800 (PST) Received: from localhost ([::1]:38948 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE9x-0005Wz-Hb for importer@patchew.org; Sat, 13 Jan 2018 00:15:13 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE30-0000gS-RK for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE2z-0004FO-3d for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:02 -0500 Received: from mail-qt0-x241.google.com ([2607:f8b0:400d:c0d::241]:45064) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE2y-0004F3-TU for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:01 -0500 Received: by mail-qt0-x241.google.com with SMTP id x27so503688qtm.12 for ; Fri, 12 Jan 2018 21:08:00 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.07.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:07: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=enddOtly9WygYNGc/XqkCPw6zClfJsQXUkw+GRSZh10=; b=YS7EX3YbtSX5H3GFwmI5X+1ZjNCMhHUW9DMah/7HgsbJ7C6j48un8/GsLY+G0IdnPd /9oE+tib0tlN6l77rvoKRkrSi+ZlxcLB/9+CermKSn24Xp8LJcDlnWHxf8FAHqRQTi+u egeTkJ//avn0SMhJUOIJOTR3YLFkehisZ3lqbejx2lMT6uQMgyQBKWxvHeLvDR3/PbvY Djsp25W00B98iVst9KUWBCGFv+VdBLWNRZhmMaif3ug1Rm0xz/mikL5MDCbr6tO2/k9t JRvQ2CzqeyfaumtxK2NwJHBi8GDHoc95A3+vbroMW8p8XUXPFzbYSwnSSWvUq/bopvGB qhmw== 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=enddOtly9WygYNGc/XqkCPw6zClfJsQXUkw+GRSZh10=; b=ZQwYckYwMw6fmTMLXKkWOgLvlbf9DekH1z3UgsR+R0/Zhuci/M1UPQMJ27sMbmG3Ph kv206mdOIVA0srFhfJMjRANyS8WFvHwKTdWDd29BHpX23vQV4euOyi50GAIsE+MMXfLP +eHAOybf24qFdjIJdY1kfq0EfGFKVYgMetIiEak23hAnbCFCbvnTb+JpWKbE2onPQRfs SRraO+j9H7FR5TzZJq0OKbZ8s0oIeAIs9WT+dAdG6Es323JKsb9u9JKqqmNdnj18JHtp xv47wf2EImisdxpyk+5i9pB8wi63tR0ZDBFU5ZattLbaKzxW8qqI//fxn+RwBpjgv0ec f/mw== X-Gm-Message-State: AKwxytcULNpk7PnkdPBUw7ZaHNK0wdbCqtsU9ugaM9GjjmHHWpfY3JYg cuCYkvpc6dB8lwcC+Fvvlwg= X-Google-Smtp-Source: ACJfBovTjieDs4OKlUvGuPg8WbkrtWXPOfcEnRji0PF2lSCwFR1keRXeXIq4TaQ30fB3KM/bqVGjYQ== X-Received: by 10.200.39.173 with SMTP id w42mr4746693qtw.206.1515820080374; Fri, 12 Jan 2018 21:08:00 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:11 -0300 Message-Id: <20180113050717.22969-9-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c0d::241 Subject: [Qemu-devel] [PATCH v7 08/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 zero-initialize ADMADescr 'dscr' in sdhci_do_adma() to avoid: hw/sd/sdhci.c: In function =E2=80=98sdhci_do_adma=E2=80=99: hw/sd/sdhci.c:714:29: error: =E2=80=98dscr.addr=E2=80=99 may be used unin= itialized in this function [-Werror=3Dmaybe-uninitialized] trace_sdhci_adma("link", s->admasysaddr); ^ Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 d0a91b60d5..7b075f6cb8 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -34,30 +34,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" =20 #define TYPE_SDHCI_BUS "sdhci-bus" #define SDHCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_SDHCI_BUS) @@ -156,8 +133,8 @@ static void sdhci_raise_insertion_irq(void *opaque) static void sdhci_set_inserted(DeviceState *dev, bool level) { SDHCIState *s =3D (SDHCIState *)dev; - DPRINT_L1("Card state changed: %s!\n", level ? "insert" : "eject"); =20 + 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, @@ -239,7 +216,8 @@ static void sdhci_send_command(SDHCIState *s) s->acmd12errsts =3D 0; request.cmd =3D s->cmdreg >> 8; request.arg =3D s->argument; - DPRINT_L1("sending CMD%u ARG[0x%08x]\n", request.cmd, request.arg); + + trace_sdhci_send_command(request.cmd, request.arg); rlen =3D sdbus_do_command(&s->sdbus, &request, response); =20 if (s->cmdreg & SDHC_CMD_RESPONSE) { @@ -247,7 +225,7 @@ static void sdhci_send_command(SDHCIState *s) s->rspreg[0] =3D (response[0] << 24) | (response[1] << 16) | (response[2] << 8) | response[3]; s->rspreg[1] =3D s->rspreg[2] =3D s->rspreg[3] =3D 0; - DPRINT_L1("Response: RSPREG[31..0]=3D0x%08x\n", s->rspreg[0]); + trace_sdhci_response4(s->rspreg[0]); } else if (rlen =3D=3D 16) { s->rspreg[0] =3D (response[11] << 24) | (response[12] << 16) | (response[13] << 8) | response[14]; @@ -257,11 +235,10 @@ static void sdhci_send_command(SDHCIState *s) (response[5] << 8) | response[6]; s->rspreg[3] =3D (response[0] << 16) | (response[1] << 8) | response[2]; - DPRINT_L1("Response received:\n RSPREG[127..96]=3D0x%08x, RSPR= EG[95.." - "64]=3D0x%08x,\n RSPREG[63..32]=3D0x%08x, RSPREG[31..0]= =3D0x%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 |=3D SDHC_EIS_CMDTIMEOUT; s->norintsts |=3D SDHC_NIS_ERR; @@ -295,7 +272,7 @@ static void sdhci_end_transfer(SDHCIState *s) =20 request.cmd =3D 0x0C; request.arg =3D 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] =3D (response[0] << 24) | (response[1] << 16) | @@ -364,7 +341,7 @@ static uint32_t sdhci_read_dataport(SDHCIState *s, unsi= gned size) =20 /* first check that a valid data exists in host controller input buffe= r */ if ((s->prnsts & SDHC_DATA_AVAILABLE) =3D=3D 0) { - ERRPRINT("Trying to read from empty buffer\n"); + trace_sdhci_error("read from empty buffer"); return 0; } =20 @@ -373,8 +350,7 @@ static uint32_t sdhci_read_dataport(SDHCIState *s, unsi= gned size) s->data_count++; /* check if we've read all valid data (blksize bytes) from buffer = */ if ((s->data_count) >=3D (s->blksize & 0x0fff)) { - DPRINT_L2("All %u bytes of data have been read from input buff= er\n", - s->data_count); + trace_sdhci_read_dataport(s->data_count); s->prnsts &=3D ~SDHC_DATA_AVAILABLE; /* no more data in a buff= er */ s->data_count =3D 0; /* next buff read must start at position= [0] */ =20 @@ -457,7 +433,7 @@ static void sdhci_write_dataport(SDHCIState *s, uint32_= t value, unsigned size) =20 /* 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; } =20 @@ -466,8 +442,7 @@ static void sdhci_write_dataport(SDHCIState *s, uint32_= t value, unsigned size) s->data_count++; value >>=3D 8; if (s->data_count >=3D (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 =3D 0; s->prnsts &=3D ~SDHC_SPACE_AVAILABLE; if (s->prnsts & SDHC_DOING_WRITE) { @@ -655,15 +630,14 @@ static void sdhci_do_adma(SDHCIState *s) { unsigned int n, begin, length; const uint16_t block_size =3D s->blksize & 0x0fff; - ADMADescr dscr; + ADMADescr dscr =3D {}; int i; =20 for (i =3D 0; i < SDHC_ADMA_DESCS_PER_DELAY; ++i) { s->admaerr &=3D ~SDHC_ADMAERR_LENGTH_MISMATCH; =20 get_adma_description(s, &dscr); - DPRINT_L2("ADMA loop: addr=3D" TARGET_FMT_plx ", len=3D%d, attr=3D= %x\n", - dscr.addr, dscr.length, dscr.attr); + trace_sdhci_adma_loop(dscr.addr, dscr.length, dscr.attr); =20 if ((dscr.attr & SDHC_ADMA_ATTR_VALID) =3D=3D 0) { /* Indicate that error occurred in ST_FDS state */ @@ -746,8 +720,7 @@ static void sdhci_do_adma(SDHCIState *s) break; case SDHC_ADMA_ATTR_ACT_LINK: /* link to next descriptor table */ s->admasysaddr =3D dscr.addr; - DPRINT_L1("ADMA link: admasysaddr=3D0x%" PRIx64 "\n", - s->admasysaddr); + trace_sdhci_adma("link", s->admasysaddr); break; default: s->admasysaddr +=3D dscr.incr; @@ -755,8 +728,7 @@ static void sdhci_do_adma(SDHCIState *s) } =20 if (dscr.attr & SDHC_ADMA_ATTR_INT) { - DPRINT_L1("ADMA interrupt: admasysaddr=3D0x%" PRIx64 "\n", - s->admasysaddr); + trace_sdhci_adma("interrupt", s->admasysaddr); if (s->norintstsen & SDHC_NISEN_DMA) { s->norintsts |=3D SDHC_NIS_DMA; } @@ -767,15 +739,15 @@ static void sdhci_do_adma(SDHCIState *s) /* ADMA transfer terminates if blkcnt =3D=3D 0 or by END attribute= */ if (((s->trnmod & SDHC_TRNS_BLK_CNT_EN) && (s->blkcnt =3D=3D 0)) || (dscr.attr & SDHC_ADMA_ATTR_E= ND)) { - 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 !=3D 0)) { - ERRPRINT("SD/MMC host ADMA length mismatch\n"); + trace_sdhci_error("SD/MMC host ADMA length mismatch"); s->admaerr |=3D 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 |=3D SDHC_EIS_ADMAERR; s->norintsts |=3D SDHC_NIS_ERR; } @@ -811,7 +783,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; } =20 @@ -819,7 +791,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; } =20 @@ -828,14 +800,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; } =20 sdhci_do_adma(s); break; default: - ERRPRINT("Unsupported DMA type\n"); + trace_sdhci_error("Unsupported DMA type"); break; } } else { @@ -870,8 +842,8 @@ static inline bool sdhci_buff_access_is_sequential(SDHCIState *s, unsigned byte_num) { if ((s->data_count & 0x3) !=3D byte_num) { - ERRPRINT("Non-sequential access to Buffer Data Port register" - "is prohibited\n"); + trace_sdhci_error("Non-sequential access to Buffer Data Port regis= ter" + "is prohibited\n"); return false; } return true; @@ -901,8 +873,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 =3D sdhci_read_dataport(s, size); - DPRINT_L2("read %ub: addr[0x%04x] -> %u(0x%x)\n", size, (int)o= ffset, - ret, ret); + trace_sdhci_access("rd", size << 3, offset, "->", ret, ret); return ret; } break; @@ -954,7 +925,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,= unsigned size) =20 ret >>=3D (offset & 0x3) * 8; ret &=3D (1ULL << (size * 8)) - 1; - DPRINT_L2("read %ub: addr[0x%04x] -> %u(0x%x)\n", size, (int)offset, r= et, ret); + trace_sdhci_access("rd", size << 3, offset, "->", ret, ret); return ret; } =20 @@ -1158,8 +1129,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("wr", size << 3, offset, "<-", + value >> shift, value >> shift); } =20 static const MemoryRegionOps sdhci_mmio_ops =3D { diff --git a/hw/sd/trace-events b/hw/sd/trace-events index 6eca3470e2..0a121156a3 100644 --- a/hw/sd/trace-events +++ b/hw/sd/trace-events @@ -1,5 +1,19 @@ # See docs/devel/tracing.txt for syntax documentation. =20 +# hw/sd/sdhci.c +sdhci_set_inserted(const char *level) "card state changed: %s" +sdhci_send_command(uint8_t cmd, uint32_t arg) "CMD%02u ARG[0x%08x]" +sdhci_error(const char *msg) "%s" +sdhci_response4(uint32_t r0) "RSPREG[31..0]=3D0x%08x" +sdhci_response16(uint32_t r3, uint32_t r2, uint32_t r1, uint32_t r0) "RSPR= EG[127..96]=3D0x%08x, RSPREG[95..64]=3D0x%08x, RSPREG[63..32]=3D0x%08x, RSP= REG[31..0]=3D0x%08x" +sdhci_end_transfer(uint8_t cmd, uint32_t arg) "Automatically issue CMD%02u= 0x%08x" +sdhci_adma(const char *desc, uint32_t sysad) "%s: admasysaddr=3D0x%" PRIx32 +sdhci_adma_loop(uint64_t addr, uint16_t length, uint8_t attr) "addr=3D0x%0= 8" PRIx64 ", len=3D%d, attr=3D0x%x" +sdhci_adma_transfer_completed(void) "" +sdhci_access(const char *access, unsigned int size, uint64_t offset, const= char *dir, uint64_t val, uint64_t val2) "%s%u: addr[0x%04" PRIx64 "] %s 0x= %08" PRIx64 " (%" PRIu64 ")" +sdhci_read_dataport(uint16_t data_count) "all %u bytes of data have been r= ead from input buffer" +sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u byt= es 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" --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820827247523.0515872275885; Fri, 12 Jan 2018 21:20:27 -0800 (PST) Received: from localhost ([::1]:39369 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaEF0-000196-3y for importer@patchew.org; Sat, 13 Jan 2018 00:20:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE33-0000is-2e for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE32-0004Iu-2y for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:05 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:41007) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE31-0004IW-UA for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:03 -0500 Received: by mail-qk0-x244.google.com with SMTP id l29so1661048qkj.8 for ; Fri, 12 Jan 2018 21:08:03 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.00 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08: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=5aaWDXyRjKxJJ2BMNxhxO0tPqbu5O3CVxq7E7Tuul+w=; b=OaHhUSkp+cMZWA8m6QFW2i4Ib2eMzYiLMG0wdITGKYySR964kHLCR7F/qCLB8YKPrv EHfT9NGP/FYRd+Zq7RJTClmmWoj6tr9MEov7U9TJsyQrUgmzuQ7ttCqwf/Zxqg5JbyOR jL4QbIDw+iJPqIgnyZlli/vp55SBBbwDIMmQTcOxKyKKMIHX0o/6dh25ljXzng4lWPAt amYJM4c+pA3Q7TqchFG4XajlW2kAPEhTZAgWghItDO8/ytxR+ovRH+Hbd6Qj3u59ZX9F VG5TrZYQxrvT7iHy6ZuO9cXjIZlD6/Rko0+l8UERAS1iTpLKa/PbBJOu6yyC1H6WJbqF rhuw== 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=5aaWDXyRjKxJJ2BMNxhxO0tPqbu5O3CVxq7E7Tuul+w=; b=uRViWHGQlsZnPiPR466v0gHEZ7C3d3ILpwttS9o9JCV6YQ55eGWYIoBpOShE7Hpt1u XFoh/A/mKzH75KSjB7vDjunRZz5KMyPHeYnGvIzCWv+tYvScfhH2UkDiiusOvot4q6Sl IXHpGUkQgRDLpRbwViD7FMwRGYim8lALfbMtzWRUp/L9KOGQ0d1WyMVB3q+IMWzc+FeK Fb3mvhDjmNE5JMNlmcSF0j02xwL74/X5p19yhu42Z9fIBupsxbUFM0wUhFneMGjSQJNg YwZRMQCZCHdjiz3oHgQuaMU9wVCkU8RWMA0wFIBmMeT0xEV3XuJihi9e+omgF3LJUT+c Hf9Q== X-Gm-Message-State: AKwxytdI87yEuWF0QBNvHupWJgp+1NPfMuna0w/nuuimgoJyNI4F+nXQ eWmvKqKXe8vYuyJ6xHZYa+g= X-Google-Smtp-Source: ACJfBouvcbPBCEstXfIrufxQi0SzVj0Um5MEMOnazpJVadT335xXoA+ASjYJjCBvMfMbbh7OZP/N6A== X-Received: by 10.55.200.207 with SMTP id t76mr40411201qkl.291.1515820083563; Fri, 12 Jan 2018 21:08:03 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:12 -0300 Message-Id: <20180113050717.22969-10-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 09/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 =20 /* R/W Command Register 0x0 */ #define SDHC_CMDREG 0x0E diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 7b075f6cb8..e8f4a3478a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -99,7 +99,6 @@ (SDHC_CAPAB_BASECLKFREQ << 8) | (SDHC_CAPAB_TOUNIT << 7) | \ (SDHC_CAPAB_TOCLKFREQ)) =20 -#define MASK_TRNMOD 0x0037 #define MASKED_WRITE(reg, mask, val) (reg =3D (reg & (mask)) | (val)) =20 static uint8_t sdhci_slotint(SDHCIState *s) @@ -1026,7 +1025,7 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t val= , unsigned size) if (!(s->capareg & SDHC_CAN_DO_DMA)) { value &=3D ~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); =20 /* Writing to the upper byte of CMDREG triggers SD command generat= ion */ --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820912126859.8598260938971; Fri, 12 Jan 2018 21:21:52 -0800 (PST) Received: from localhost ([::1]:39446 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaEGJ-0001xG-Ip for importer@patchew.org; Sat, 13 Jan 2018 00:21:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47167) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE37-0000mY-2i for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:10 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE35-0004NA-9b for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:09 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:43289) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE35-0004Mu-4s for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:07 -0500 Received: by mail-qt0-x242.google.com with SMTP id s3so8546425qtb.10 for ; Fri, 12 Jan 2018 21:08:07 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08:06 -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=X4rWpFiogVCuwXf0+63+YQFMftUkMNX9eMGUtJUT4KA=; b=bBa7NwkmQVigk1gf8RvU1nl1h/BbB7mFyHRGnaiAFkBnO3ox4IHwlZUJxVf4i5ofIw rgJqWiLgElWWQjClyUEvLJ9v7k2sph6iFT6HzvBZaj/SQ+S9XL8S1BSCJ1R4aQIk+Be8 JVtC9zIj/DdqH2zCXCJNIBnd2yRgA013ampnRAj5hsw4Ezf3/3USmjUgieRtxSDNoepU k4/rxRZ6lyz3M6lo3YcBU5y94QTC++E5+eAQ9/MNjt9Zhpqpk72g+yTNn+5dd/dYsQkW U7f7oUYXmO3TzNaMrBp69vHyrYdJ0G3Dtn2zu0vxGy0hGrHzaNsF8zT7o6oqU3mCQQfa SbHQ== 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=X4rWpFiogVCuwXf0+63+YQFMftUkMNX9eMGUtJUT4KA=; b=muNEM/7QE4lgDXB1U/fdwxOnuPSAa58U5OLMQTvyggXPps8AeyX6OTKIUpqDiIyrM1 RmFh8c0TVB9YMzZogwHA/DTmTz6YBO13PkAj8+VbL2uZcdChfUbW1LHpYJqVnE0EhC48 pjt+/KoynDJKkLZXPcwJGOZ1zh5vGJZPrpx8jiIr/9qZ9O2rLF4ZZ307CkkRxrHBqPvr 8LeUhpk3L4EaGCrlurQ9c5AwTPDEKMzNcjGQCMJ7l+G3LUjT5oGRGsQMsxZ5yiDyJxWg EhiybthLJlckNd8ZhkO1Q1blj4olDHJ6fYy6UZuUROFJPlCc5Vj+iE4ITgImbir/N66G bqpA== X-Gm-Message-State: AKwxytfSKWBNSNSLuFx9JsZKBmw94lL/j3KMQx7TBV65KhxqIbxn8KGI fNEQ2X0xGdukTV6I7Sqy24g= X-Google-Smtp-Source: ACJfBovQhgLx4oIkCoviMg3t33qblGNXk3DIzOu5d7mgZGY0flYy7esi2YXET3cxTWW0LGU+GEp2hw== X-Received: by 10.200.16.21 with SMTP id z21mr41074010qti.101.1515820086733; Fri, 12 Jan 2018 21:08:06 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:13 -0300 Message-Id: <20180113050717.22969-11-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 10/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 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 e941bc2386..fc807f08f3 100644 --- a/hw/sd/sdhci-internal.h +++ b/hw/sd/sdhci-internal.h @@ -174,7 +174,7 @@ #define SDHC_ACMD12ERRSTS 0x3C =20 /* 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 e8f4a3478a..3df33f5e93 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -898,7 +898,7 @@ static uint64_t sdhci_read(void *opaque, hwaddr offset,= unsigned size) case SDHC_ACMD12ERRSTS: ret =3D s->acmd12errsts; break; - case SDHC_CAPAREG: + case SDHC_CAPAB: ret =3D s->capareg; break; case SDHC_MAXCURR: --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820700023608.4020819806004; Fri, 12 Jan 2018 21:18:20 -0800 (PST) Received: from localhost ([::1]:39152 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaECx-0007uA-5n for importer@patchew.org; Sat, 13 Jan 2018 00:18:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47190) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE39-0000o5-Fa for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE38-0004QO-8j for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:11 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:42832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE38-0004Pz-4Z for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:10 -0500 Received: by mail-qt0-x243.google.com with SMTP id c2so8545829qtn.9 for ; Fri, 12 Jan 2018 21:08:10 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08:09 -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=yWz0Zoy601VfmF0l3430zf5LMQZPHgKMdNR5Oz0UKK4=; b=uJOXX8dNyi3KmqJx2vrHNk+HRqQP0QLn0z5oYDFtj2PX0Sb0Q1uOjJv3a4aOin25KW ELpTy7EI5SQs5qMm+alkHApcwk67pu87Dy/aAST3JSR2QXUEaanlapyWzLAo4HvHe1h0 lwimrPAbtcOaapU7BpL1dKOOPbK7I14dsuVZ9aB/f3QIS5Y4QH9ggROTZjdXSoD8ARbM UH4TtqsBwYEcF7ZOy6886ZEUISDNzrPNdWcIEXasWA4bEPX6C1Q/J51M0h4R22qpicQM j1lMHZF39chV5RWn8Sq4wQ33HEpLsN/YZbCyo/ANqekhRR3khsfocT9DftDpPks5kOZ4 c07A== 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=yWz0Zoy601VfmF0l3430zf5LMQZPHgKMdNR5Oz0UKK4=; b=LAYNRV8Tsz1NyatAwDZcSoJOeTF+ttAzLeAUGLwBQrR0be8/MYg6svd1aTWFuQ/q6r uZDAF6iA8+uozbTSmPlupGR9j4+JSVaQD3Tz2NPD3dZEQULq3p3w+DyTFjXjVcM5wvl8 ns0HX+FD8EEql2GPh549SDKCnndg90K+katyV16RwXekiRwEjVzerN+WEg601X7CHo9V HKjYgfvYJyW65nVaEObCL7qFnvHYKDKh8mx26dIJehBiJEvzuENt1r/7BKL+82VcfekZ J6ZhOvkMWI+LFvOlqzZlwZhuSSuSHDfqxat0bEKHkNLYdjj+15nFINHbnSvu34GzfLXY BTkg== X-Gm-Message-State: AKwxytcbN3HOUojQ4AghjWNeVIpNnLl0bBjbuANh0VThA3luMYfAfUzC wBMJmaxPNveDs8y8zsD6Io0= X-Google-Smtp-Source: ACJfBos1uVKUUdMBZ0C6YWQJpQ3CbPGt/oRWDJJ3HrSvNPaPzzbiti1LKf2igRiJvrt+0sAuWmJjVA== X-Received: by 10.237.43.229 with SMTP id e92mr43234345qtd.178.1515820089759; Fri, 12 Jan 2018 21:08:09 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:14 -0300 Message-Id: <20180113050717.22969-12-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 11/14] 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 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 8041c9629e..442e30aff2 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -72,8 +72,8 @@ typedef struct SDHCIState { uint64_t admasysaddr; /* ADMA System Address Register */ =20 /* Read-only registers */ - uint32_t capareg; /* Capabilities Register */ - uint32_t maxcurr; /* Maximum Current Capabilities Register */ + uint64_t capareg; /* Capabilities Register */ + uint64_t maxcurr; /* Maximum Current Capabilities Register */ =20 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 3df33f5e93..983569ba8b 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -899,10 +899,16 @@ static uint64_t sdhci_read(void *opaque, hwaddr offse= t, unsigned size) ret =3D s->acmd12errsts; break; case SDHC_CAPAB: - ret =3D s->capareg; + ret =3D (uint32_t)s->capareg; + break; + case SDHC_CAPAB + 4: + ret =3D (uint32_t)(s->capareg >> 32); break; case SDHC_MAXCURR: - ret =3D s->maxcurr; + ret =3D (uint32_t)s->maxcurr; + break; + case SDHC_MAXCURR + 4: + ret =3D (uint32_t)(s->maxcurr >> 32); break; case SDHC_ADMAERR: ret =3D s->admaerr; @@ -1123,6 +1129,15 @@ sdhci_write(void *opaque, hwaddr offset, uint64_t va= l, 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 >> shi= ft); + break; + default: qemu_log_mask(LOG_UNIMP, "SDHC wr_%ub @0x%02" HWADDR_PRIx " <- 0x%= 08x " "not implemented\n", size, offset, value >> shift); @@ -1163,10 +1178,10 @@ static inline unsigned int sdhci_get_fifolen(SDHCIS= tate *s) /* Capabilities registers provide information on supported features of this * specific host controller implementation */ static Property sdhci_capareg_property =3D - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFA= ULT); + DEFINE_PROP_UINT64("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFA= ULT); =20 static Property sdhci_maxcurr_property =3D - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0); + DEFINE_PROP_UINT64("maxcurr", SDHCIState, maxcurr, 0); =20 static void sdhci_initfn(SDHCIState *s) { --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515820997019204.13571234919357; Fri, 12 Jan 2018 21:23:17 -0800 (PST) Received: from localhost ([::1]:39508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaEHk-0002nM-24 for importer@patchew.org; Sat, 13 Jan 2018 00:23:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47239) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE3B-0000oJ-Vw for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:15 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE3B-0004UN-4s for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:13 -0500 Received: from mail-qk0-x243.google.com ([2607:f8b0:400d:c09::243]:44865) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE3B-0004Tg-0A for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:13 -0500 Received: by mail-qk0-x243.google.com with SMTP id u76so11202370qku.11 for ; Fri, 12 Jan 2018 21:08:12 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08:12 -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=5CC72kBzgUGkGr5aYQ0/VyYlw8Vi9DxizOgCVAFFmTQ=; b=FJuJRqpxC1xslsuBV2pJE+mzM0hTJKG9XVXk4Cj9i6X4U+yBRNCEBmdXK2yQMYRdfL EX/Iq2DROpliYjh9f96pA+7qBp9zWXcB5hgq9oOmlADv06DYp9k7S0CO9kcYTEfZxLRM nTIwcRBQvD8vhgNkUJdBADkJXGZTie5FvNDWGL5OiuBqAB0y4/OK747TECBDrHyDAu/p PEk7+R8t7mf+f4eK/W6IlFH1ZQ4bSprdbQDOv7B1iZqVleryKnF12GsPLizzMFe/3dZs 159ZCM3PLmGvckCAVjie41pOdgqGPyKbvBc7TYthBjdrVKgaC+NBvvXeZNB0vN5Ma9SI 802w== 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=5CC72kBzgUGkGr5aYQ0/VyYlw8Vi9DxizOgCVAFFmTQ=; b=f+1Ift3oQCv14dVAbqTaXRRo5XqxBloAHOJuuhxDUkCvEPFbeq6UDBPokrIIHEtUdj 4bJGQeJ7ACURkpSl+m7U+lQS7538kZ/jgNQIgeXW8AbTyJa3SxXpg6yGYwnZgUPNxqG7 q+TQbSP6P6mFqVR7pERDPvMDsbUMVBdaCqAqHiEPFdNGhQut+snn3mQQlWpWnEZzgik2 +D9h+pk9x/01q+BcaQW16Ww+yawtiKCYHswH7un/Nm7/HuDiOnLknxETeae6+74ACl/7 GWHt9vhX3syr/MFWBY6oli28tdpzYlTAA1n/tcdolhI2c7M3+rr4K1VIf6fcQ0smkjNJ l++g== X-Gm-Message-State: AKwxyteYLG+NW6Z8QeFJBps0NmtPNWN8u/wV2Aa+NMtQkIBY1x8zZMPb gFR3xIcsUdP7luJRpNOpbxg= X-Google-Smtp-Source: ACJfBouWZ8CWZM0BjH/nB+DPCDlo8ZyR6ioLdvxHP0Q/lqbdqElAisyMmQ1dhRWeEUksYNSKs2qoMQ== X-Received: by 10.55.185.198 with SMTP id j189mr2108605qkf.243.1515820092582; Fri, 12 Jan 2018 21:08:12 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:15 -0300 Message-Id: <20180113050717.22969-13-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 12/14] 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: Andrey Smirnov , "Edgar E . Iglesias" , Kevin O'Connor , qemu-devel@nongnu.org, Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 From: Andrey Smirnov Signed-off-by: Andrey Smirnov Reviewed-by: Peter Maydell Reviewed-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 983569ba8b..226a22c5fb 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1129,6 +1129,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; =20 case SDHC_CAPAB: case SDHC_CAPAB + 4: --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 15158205158541016.260292394086; Fri, 12 Jan 2018 21:15:15 -0800 (PST) Received: from localhost ([::1]:38949 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE9y-0005ZH-Px for importer@patchew.org; Sat, 13 Jan 2018 00:15:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47263) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE3I-0000uo-ON for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE3E-0004Zc-PS for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:20 -0500 Received: from mail-qt0-x242.google.com ([2607:f8b0:400d:c0d::242]:42832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE3E-0004ZE-Jx for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:16 -0500 Received: by mail-qt0-x242.google.com with SMTP id c2so8545984qtn.9 for ; Fri, 12 Jan 2018 21:08:16 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.12 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08:15 -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=j8Xp8Ayv08t1/xE5LS43lsvcEHREQDX38HAij2rm1zo=; b=OxAJb90LJbaauZvz/6bo+smlLODMSGSmYkEQjDZUwa5OJ8tJWW3dJcsJPic9hJO/9O 6SZw1HAvaNTUm/LRu8kaGgMHtnzM453AIpAg5Np05mKABrxRctePVVi4w++eSVJa2PvO NP7LlHn1E2QEq8qS38Yz1BjvZZcMpdCnpTcpSscyHVlz+/y6YPDecK+jTR1IO859TYiM oKg4vywLoYsaGOnbjG3dQKet2VKyYKual5uZUezvggVBk2xu/PDP5JmvOW5KG8RyFrgK XZoVq32deVU8QTSibLWvEAIYhM8TnvFsdtVbNkfJ1vVuT08B9dD+fcHcI6LrEEGKPFgU 4TBg== 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=j8Xp8Ayv08t1/xE5LS43lsvcEHREQDX38HAij2rm1zo=; b=Z6jBaSOp4xLswagbMnYGRjqqsc5t83HeBiNcKCjQAH6kQW8MEercz7NicWQ0Jr48aa 5fv8soJ41xr/P2SPoSiSX+zAS5448cs9BPQybgRmPpklbPY2Ip7PAazwnSMe5TMfqawl hB0yoAg+uBoJ2cM3vbuqdYp/kzzTASJlSRjZMoALtPKMLZiOZKFvX7d68pAjK6WDNvVA G9/DiBVe2KdipMo6zr5fi4svSPagqSdyARmYzrHkeRQmWCOgjEQCwSYnZxv+4CpsabvE +r9M6Jbf4uOwkAI+bYMbkxLye2WuoIQvRa3ss4EjgCaUCoU112Xn8ypv/FbjQEFX6W+M FKtA== X-Gm-Message-State: AKwxytckuHIXjkJOGXKyCoyMENB3EsY+v+83c3yjZhJi36IyaiemJUTU XZ7c3CflLjFEBve+95sSDbI= X-Google-Smtp-Source: ACJfBosLVswOw/iYYuljMGY0gruPSR9e5amRzKcZqycuR472wd4tDQeW8F8wgU17eaR86deUXB4lFw== X-Received: by 10.237.61.33 with SMTP id g30mr16938851qtf.82.1515820096211; Fri, 12 Jan 2018 21:08:16 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell , Kevin O'Connor , Paolo Bonzini , Marcel Apfelbaum , Gerd Hoffmann , "Michael S . Tsirkin" Date: Sat, 13 Jan 2018 02:07:16 -0300 Message-Id: <20180113050717.22969-14-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 13/14] sdhci: fix the PCI device, using the PCI address space for DMA 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 While SysBus devices can use the get_system_memory() address space, PCI devices should use the bus master address space for DMA. Suggested-by: Peter Maydell Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Peter Maydell --- Should we check for the PCI_COMMAND_MASTER bit before using pci_get_address_space()? include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 33 +++++++++++++++++++-------------- 2 files changed, 20 insertions(+), 14 deletions(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 442e30aff2..4a102b86ce 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -41,6 +41,7 @@ typedef struct SDHCIState { /*< public >*/ SDBus sdbus; MemoryRegion iomem; + AddressSpace *dma_as; =20 QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 226a22c5fb..024b559f14 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -496,7 +496,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 +=3D s->data_count - begin; if (s->data_count =3D=3D block_size) { @@ -518,7 +518,7 @@ static void sdhci_sdma_transfer_multi_blocks(SDHCIState= *s) s->data_count =3D block_size; boundary_count -=3D 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 +=3D s->data_count - begin; if (s->data_count =3D=3D block_size) { @@ -556,11 +556,9 @@ static void sdhci_sdma_transfer_single_block(SDHCIStat= e *s) for (n =3D 0; n < datacnt; n++) { s->fifo_buffer[n] =3D sdbus_read_data(&s->sdbus); } - dma_memory_write(&address_space_memory, s->sdmasysad, s->fifo_buff= er, - datacnt); + dma_memory_write(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt); } else { - dma_memory_read(&address_space_memory, s->sdmasysad, s->fifo_buffe= r, - datacnt); + dma_memory_read(s->dma_as, s->sdmasysad, s->fifo_buffer, datacnt); for (n =3D 0; n < datacnt; n++) { sdbus_write_data(&s->sdbus, s->fifo_buffer[n]); } @@ -584,7 +582,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) hwaddr entry_addr =3D (hwaddr)s->admasysaddr; switch (SDHC_DMA_TYPE(s->hostctl)) { case SDHC_CTRL_ADMA2_32: - dma_memory_read(&address_space_memory, entry_addr, (uint8_t *)&adm= a2, + dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma2, sizeof(adma2)); adma2 =3D le64_to_cpu(adma2); /* The spec does not specify endianness of descriptor table. @@ -596,7 +594,7 @@ static void get_adma_description(SDHCIState *s, ADMADes= cr *dscr) dscr->incr =3D 8; break; case SDHC_CTRL_ADMA1_32: - dma_memory_read(&address_space_memory, entry_addr, (uint8_t *)&adm= a1, + dma_memory_read(s->dma_as, entry_addr, (uint8_t *)&adma1, sizeof(adma1)); adma1 =3D le32_to_cpu(adma1); dscr->addr =3D (hwaddr)(adma1 & 0xFFFFF000); @@ -609,12 +607,12 @@ static void get_adma_description(SDHCIState *s, ADMAD= escr *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 =3D 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 =3D le64_to_cpu(dscr->attr); dscr->attr &=3D 0xfffffff8; @@ -673,7 +671,7 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count =3D block_size; length -=3D 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 +=3D s->data_count - begin; @@ -697,7 +695,7 @@ static void sdhci_do_adma(SDHCIState *s) s->data_count =3D block_size; length -=3D 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 +=3D s->data_count - begin; @@ -1314,7 +1312,8 @@ static void sdhci_pci_realize(PCIDevice *dev, Error *= *errp) dev->config[PCI_CLASS_PROG] =3D 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] =3D 0x01; /* interrupt pin A */ s->irq =3D pci_allocate_irq(dev); - pci_register_bar(dev, 0, 0, &s->iomem); + s->dma_as =3D pci_get_address_space(dev); + pci_register_bar(dev, 0, PCI_BASE_ADDRESS_SPACE_MEMORY, &s->iomem); } =20 static void sdhci_pci_exit(PCIDevice *dev) @@ -1382,6 +1381,9 @@ static void sdhci_sysbus_realize(DeviceState *dev, Er= ror ** errp) return; } =20 + s->dma_as =3D g_new0(AddressSpace, 1); + address_space_init(s->dma_as, get_system_memory(), "sdhci-dma"); + sysbus_init_irq(sbd, &s->irq); sysbus_init_mmio(sbd, &s->iomem); } @@ -1391,6 +1393,9 @@ static void sdhci_sysbus_unrealize(DeviceState *dev, = Error **errp) SDHCIState *s =3D SYSBUS_SDHCI(dev); =20 sdhci_common_unrealize(s, &error_abort); + + address_space_destroy(s->dma_as); + g_free(s->dma_as); } =20 static void sdhci_sysbus_class_init(ObjectClass *klass, void *data) --=20 2.15.1 From nobody Wed Apr 24 00:24:14 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515821072042543.611012392828; Fri, 12 Jan 2018 21:24:32 -0800 (PST) Received: from localhost ([::1]:39577 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaEIx-0003X9-45 for importer@patchew.org; Sat, 13 Jan 2018 00:24:31 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaE3I-0000ux-WD for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eaE3I-0004eA-2A for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:20 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:39506) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eaE3H-0004dN-UG for qemu-devel@nongnu.org; Sat, 13 Jan 2018 00:08:19 -0500 Received: by mail-qt0-x243.google.com with SMTP id k19so8563908qtj.6 for ; Fri, 12 Jan 2018 21:08:19 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d26sm5165209qtk.54.2018.01.12.21.08.16 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 12 Jan 2018 21:08:18 -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=mDn5APQvNM90fLPeDEQNCpAFzsn+HkdaQHt0ovoBaJI=; b=qlGvhOlcI2a7awiHpWubYerfsw0ATDwcS1nCoJgkzjR05GHDXNyCeuBDoJ4akhuoK8 u+x2+dKChNAOhEEn/b7Sd4VrwiBERoG3EkNQXe7JrRqCqS0680PBqzFk1aKYWLLnCUIP za3oR1MZVF7hJyIJdcZA5PmhIQAJXMagnc92o+LzV6hiAdYnVaRhxdBhWXMfYFhKojTZ Ks+53TgdeqXB9c8CrcNAuHZTOC9KRpRVP9FLGD7ydhe6FR55bey+VsD5JcOqD1mhcrm1 Zvutj0FKZhj4SOg4/Eq3LzFy+OEjy8r3pgQ3T7UjUiYlgvhQhr4IlG0BDBDbA0as7RJj 5Mng== 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=mDn5APQvNM90fLPeDEQNCpAFzsn+HkdaQHt0ovoBaJI=; b=SGwancHaudTnzSx0Rz/YqFVm5X4Mo6EUT0ux0azKIUmS/pP+VHnLe3wG4XYvBb4JzA 2hXDQ88BcSHyCYqy2cTEsrg34T/35xc+VyIH8+tj24iUtptq13OXYR4x7ac2C2fGvPQh PtvAN9YXvS2KYIy6QLGCAtydaB+b7Vg8b5W1Tzp3L+BoAglmLJPWX79bqS0YPt+NX802 OFao3AHqCfnfArex6lQxEsaBBfcCgJFr5zVTZNaZqgLt8c0oev50R4Bulm+rxaFROPKe R71UaZG1hYo39bw7+7tN+9xR9GWDTqmxHwDhnjbwujeuiIH2MBIxlF0hfRSVvCDch6re 51Fg== X-Gm-Message-State: AKwxytev3k4O7wLhmvatzVQ189GiX5yYEhjgeh1B3vStWoJHRgwEAG/i /O00MQjVIhK7NDGGGjDeVFI= X-Google-Smtp-Source: ACJfBovwgXtLkLU6HhWQiyTSNXj6mN7mFNpLEgnV48gm+5yeYC/kfr1l/vTy7ghhfTOVRH70G40HvQ== X-Received: by 10.237.54.97 with SMTP id e88mr39903107qtb.298.1515820099582; Fri, 12 Jan 2018 21:08:19 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Peter Maydell Date: Sat, 13 Jan 2018 02:07:17 -0300 Message-Id: <20180113050717.22969-15-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180113050717.22969-1-f4bug@amsat.org> References: <20180113050717.22969-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 v7 14/14] sdhci: add a 'dma' property to the sysbus devices 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" , Andrey Smirnov , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Kevin O'Connor , Paolo Bonzini Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 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=C3=A9 --- include/hw/sd/sdhci.h | 1 + hw/sd/sdhci.c | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/include/hw/sd/sdhci.h b/include/hw/sd/sdhci.h index 4a102b86ce..cb37182536 100644 --- a/include/hw/sd/sdhci.h +++ b/include/hw/sd/sdhci.h @@ -42,6 +42,7 @@ typedef struct SDHCIState { SDBus sdbus; MemoryRegion iomem; AddressSpace *dma_as; + MemoryRegion *dma_mr; =20 QEMUTimer *insert_timer; /* timer for 'changing' sd card. */ QEMUTimer *transfer_timer; diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 024b559f14..cfb4320509 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1354,6 +1354,10 @@ static Property sdhci_sysbus_pending_insert_quirk_pr= operty =3D DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_quirk, false); =20 +static Property sdhci_sysbus_dma_mr_property =3D + DEFINE_PROP_LINK("dma", SDHCIState, + dma_mr, TYPE_MEMORY_REGION, MemoryRegion *); + static void sdhci_sysbus_init(Object *obj) { SDHCIState *s =3D SYSBUS_SDHCI(obj); @@ -1363,11 +1367,19 @@ static void sdhci_sysbus_init(Object *obj) qdev_property_add_static(DEVICE(obj), &sdhci_sysbus_pending_insert_quirk_property, &error_abort); + qdev_property_add_static(DEVICE(obj), + &sdhci_sysbus_dma_mr_property, + &error_abort); } =20 static void sdhci_sysbus_finalize(Object *obj) { SDHCIState *s =3D SYSBUS_SDHCI(obj); + + if (s->dma_mr) { + object_unparent(OBJECT(s->dma_mr)); + } + sdhci_uninitfn(s); } =20 @@ -1382,7 +1394,10 @@ static void sdhci_sysbus_realize(DeviceState *dev, E= rror ** errp) } =20 s->dma_as =3D g_new0(AddressSpace, 1); - address_space_init(s->dma_as, get_system_memory(), "sdhci-dma"); + /* use system_memory() if property "dma" not set */ + address_space_init(s->dma_as, + s->dma_mr ? s->dma_mr : get_system_memory(), + "sdhci-dma"); =20 sysbus_init_irq(sbd, &s->irq); sysbus_init_mmio(sbd, &s->iomem); --=20 2.15.1