From nobody Tue Feb 10 00:39:51 2026 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) 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=temperror (zoho.com: Error in retrieving data from DNS) 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 1513308250885902.7129306455356; Thu, 14 Dec 2017 19:24:10 -0800 (PST) Received: from localhost ([::1]:43989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgbC-0003Tn-U7 for importer@patchew.org; Thu, 14 Dec 2017 22:23:47 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53615) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePgU6-0005ie-M5 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePgU5-0000v1-M6 for qemu-devel@nongnu.org; Thu, 14 Dec 2017 22:16:26 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:40598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePgU5-0000uY-Gk; Thu, 14 Dec 2017 22:16:25 -0500 Received: by mail-qk0-x241.google.com with SMTP id b123so8847368qkg.7; Thu, 14 Dec 2017 19:16:25 -0800 (PST) Received: from x1.local ([181.91.222.165]) by smtp.gmail.com with ESMTPSA id l125sm3484740qkc.3.2017.12.14.19.16.20 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Dec 2017 19:16:24 -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=Pi56S70/QP5FTX+T+8F/it7D9+WDbcWEgfzEWvyQBTE=; b=Q67cx0JjcXx4yygr0xGQO0fpbvRs1qzFbMZAP/qto8Gi0kOlISXVldlQbwFASbgqmR D8oS+BNg84/Si/Bt1qyt4xvT84pCaMvP7Wb01BsTad2alfmllVyg/xpbmpArmFZikZc2 5bYb4JvHQaHK/SxxQrhLtKro6uuVsAOgnfUcDWhB94Ua15A0Ts7U9fGRl9hTF6rr9Nhm vU/VpjZ+EK1LbE/95ADJVLZKasJtqjDvdJLH3uUT4NnnDPjxBz0WiLFKPwrPHwE6gCC3 caGuq40J8sgI0DmchulvVZ1Y/dSihfBYdOsD/fe33Jh0/l1h+aOjHcRS/h9+z9vfYnRW pozA== 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=Pi56S70/QP5FTX+T+8F/it7D9+WDbcWEgfzEWvyQBTE=; b=hACBhto/1EAD3UxhB270uuI5WGhdjDNpINPmeIaMRAydX/JT+fcTVWGyLMpgnDZ/RH cP1XLOXM+tUdcMkJGEBA0t4f64PbkhEGouHjQsl9W/Nxrjn+NcCcdirjEwopT4HCTqmq +rVuplNJktUt4ZgDO8EsLw5Z0Kk6lRZUJZGlOTNRnvmBI8AmtQW7TLNQBuIJshoD/bwY p2qIp1yamwt4w6xLIyIRiR7fLxzMKiOFBffBZsteh0rGa0NQr+4HRYHhGUE7vd/oOOYp 1k8K0QBSjCg9X8QlKsBhsplcotaaje78I+51dLpDAvZMTgc0D8Bn+FoaccXU44elN/DU RgAw== X-Gm-Message-State: AKGB3mKDMG6x1ZUiLCINTcnlcdKrS74uzmPAGFLOb0KjQyA2Pw0OSDJ7 h3CKh34Bolx3+lUd7cjaSrY= X-Google-Smtp-Source: ACJfBovsLnLkzxJe8pjSrjf+DoTg1zz4aCGL34Va7+Oti4+fPKBkatuSveT57KLK0GDSdRQgRo6uQQ== X-Received: by 10.55.73.87 with SMTP id w84mr19908465qka.215.1513307785026; Thu, 14 Dec 2017 19:16:25 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Peter Maydell , Michael Walle , Andrzej Zaborowski , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky , Eduardo Habkost Date: Fri, 15 Dec 2017 00:15:32 -0300 Message-Id: <20171215031547.31006-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171215031547.31006-1-f4bug@amsat.org> References: <20171215031547.31006-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::241 Subject: [Qemu-devel] [PATCH v2 05/20] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() 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: Prasad J Pandit , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org, Sai Pavan Boddu , qemu-arm@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_6 Z_629925259 SPT_0 Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index dbdfd54350..fc5bac5cb9 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1191,6 +1191,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_realizefn(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); @@ -1281,12 +1290,11 @@ static void sdhci_pci_realize(PCIDevice *dev, Error= **errp) SDHCIState *s =3D PCI_SDHCI(dev); 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); + sdhci_realizefn(s, errp); + 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 @@ -1343,11 +1351,9 @@ static void sdhci_sysbus_realize(DeviceState *dev, E= rror ** 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_realizefn(s, errp); + 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