From nobody Tue Oct 28 04:17:47 2025 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 1515003216483485.7844055301581; Wed, 3 Jan 2018 10:13:36 -0800 (PST) Received: from localhost ([::1]:60046 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnXj-0004IT-Ku for importer@patchew.org; Wed, 03 Jan 2018 13:13:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47784) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSq-0000OZ-7R for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:35 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSp-0006yW-4m for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:32 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:37327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSp-0006yP-0F for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:31 -0500 Received: by mail-qk0-x244.google.com with SMTP id p13so2563669qke.4 for ; Wed, 03 Jan 2018 10:08:31 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M4J6MSMa/IPwPSEzuEyAErAcejKT/MFYGbr9Qb4aAiY=; b=ioyOlWk1vVveRcWLP22TppXMHA3JGyvsAHlGZRdAriwPvXYHOPDvApETJcdVNN5B5k 8HXCbnPjF/SL8e9sCQlyXi8qs6W/2u0bNHcYGFniUw66B5hw6SMof6HaNItfyzzNA+wc CqNebkWNpDPBLiFfnTn/o+y13iLYcRgnufXYV3YUXMaDSgNNjK7GL21Y2apxrbt7qjWD HyZdIakkHmtLRZuJftH8HDsC5oMH8EsbHaGovhPadPyyxE+xc1AXDkATJqTRuJcz6XiM 6ycjLfjS5gHgC6dsGnlhe8AXuh5VlH4TfESVnEasmGEOPDgR4Vpl/8YquSUp9ZYiz07L YYng== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M4J6MSMa/IPwPSEzuEyAErAcejKT/MFYGbr9Qb4aAiY=; b=CnwwHNeKRvOQT4PG1FSBLUCRiAyxMDfTWuwY8oPtmVibcDdVR7/CbXswBX165kH4Yq kNOidBxdIZJv5QR/pzBMigd885bzuNP0cASZKSqeqqVQshImcllUSTWXYLAOAfqBVWX8 LSQKbr1gqCfFYhosuqUOd5NwfcSryQ26uun7CUcUlT7koCMqg5FLAOjp0nyHlea/KSZ6 fdlB9piL2lk+KQqBLhdLhjVmHYfdJb+srjMiVfAK4YlcX1YE3kQtJbzFQXba5xtJ6z/5 vbHmt0CXNV40W8Un3KEsNWJm/iDS0gn1jys3tXY7qIf9UlRFaRBEpjDywqr20cx3mBvC vH9w== X-Gm-Message-State: AKGB3mLIYWx9dXPXSBhvA9ogJ3l+TX3Mqx3NcDSFLsfYvNS2lRkr8n8E u5vGhGLNFpeapGU3NKVB/cI= X-Google-Smtp-Source: ACJfBotG1iuScx6a0Fny99DqR3NvzoGYqW4SBbsYs9gPmkZjV5tsf7jHBvt4grntmUtzjvMTiHH50Q== X-Received: by 10.55.12.69 with SMTP id 66mr2728336qkm.93.1515002910655; Wed, 03 Jan 2018 10:08:30 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:54 -0300 Message-Id: <20180103180805.18140-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-1-f4bug@amsat.org> MIME-Version: 1.0 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 v5 06/17] sdhci: refactor common sysbus/pci realize() into sdhci_common_realize() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: "Edgar E . Iglesias" , Peter Maydell , Eduardo Habkost , Andrey Smirnov , =?UTF-8?q?Philippe=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 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- Since previous series failed, I dropped: Reviewed-by: Alistair Francis hw/sd/sdhci.c | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 68bcf75478..b3dbd994fd 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1194,6 +1194,15 @@ static void sdhci_initfn(SDHCIState *s) s->transfer_timer =3D timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_tran= sfer, s); } =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 void sdhci_uninitfn(SDHCIState *s) { timer_del(s->insert_timer); @@ -1290,14 +1299,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 @@ -1351,11 +1362,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