From nobody Mon Feb 9 20:59:53 2026 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