From nobody Tue Oct 28 12:16:37 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 1514977851385595.2262481774185; Wed, 3 Jan 2018 03:10:51 -0800 (PST) Received: from localhost ([::1]:48724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgwc-0002Bi-GN for importer@patchew.org; Wed, 03 Jan 2018 06:10:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47822) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgo1-00037F-Px for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:59 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgnw-0005qd-6V for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:57 -0500 Received: from mail-qt0-x244.google.com ([2607:f8b0:400d:c0d::244]:33012) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgnw-0005qJ-1z for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:52 -0500 Received: by mail-qt0-x244.google.com with SMTP id e2so1650071qti.0 for ; Wed, 03 Jan 2018 03:01:51 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.01.48 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:01:50 -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=wYPkglkUxzxVLw9JGgoX9hEMwMwrPzJZLRywt992EIQ=; b=WvVJ5Y63g9JTcfsFrKfi4e3v0cumOZ0fwf1cLxV1nSsKVjXQHs1E2DcMk1zvv9tnTc seCyeiLVPLTMInqZiA4n2y3h7A3AzVvcTZhbRPttFEBNyAzuh54vba8W4Oo/elf1BJth SG5aJJwFyt4t0ajlrzzU5LqN8APHbToKxE4QZvg9T4EWkis+E8TM/g/mLjviAXvXT/1U ZXzDoxl5eT3X0J8dHcI10hodGovgNxHzVInoybwuj2VylcZqVbATzmJ2ExT5LubX/h0O J8LwJM4fGURmHnVHyk05aN8ViYs3qvW1YmJNNz/Enkn6x6xJ5adjDXzfaKLO2SuXFZ6p BMTQ== 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=wYPkglkUxzxVLw9JGgoX9hEMwMwrPzJZLRywt992EIQ=; b=LP/Us3oBWFTjiWkfZ77ciVlMRVUJMVtxmEhb5qJH+rPLbTIU5VYKLMCRhy2vQgzIEY xBcjMfcseU8M9hcDcxMe+r9hTU65N4zxIEi7ESliFz4I2OQU9TB7ANH2Udr12c4m0WIY gfEYoAJtQGeHPpB4sm/QQWob+adLcDFA1J6t0rzMGbX0voir5j1RSG6s9gBBKvV2JsJ0 rKMg0b0jsALx8xnGA4KO+VgaOF4ylY+yX6w9j9bCGuG8BYzi8E6vab/GKU7gfC6zuVuh l/0+TZ+JZmvAFE/dSXu2O6s7Uy0JtWz8EQbb8mz2EsvqziFjjixNnWhuPUVhzoRJE3xr Xr1w== X-Gm-Message-State: AKGB3mKItvFRs2GjM1fzxCNRsQ9USI/k9nOfiqN1bkn2hJagX03TA5mN c7NDdRmYDBAXasK3vR+yb60= X-Google-Smtp-Source: ACJfBovNTMA1t3OB1PmcWpgWd3yi2q0NVXjicgCacKKAxiGwoogKJVbvfR920ReM0U/GXiZYxrb8Xg== X-Received: by 10.200.45.93 with SMTP id o29mr1285570qta.22.1514977311473; Wed, 03 Jan 2018 03:01:51 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 08:01:15 -0300 Message-Id: <20180103110126.29209-7-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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 v4 06/17] 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: "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 --- hw/sd/sdhci.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 38d82b4c61..d5c6d8ab0b 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 "qapi/error.h" #include "hw/sd/sdhci.h" #include "sdhci-internal.h" #include "qemu/log.h" @@ -1194,6 +1195,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); @@ -1290,14 +1300,18 @@ static void sdhci_class_init(ObjectClass *klass, vo= id *data) static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s =3D PCI_SDHCI(dev); + Error *err_local =3D NULL; + + sdhci_initfn(s); + sdhci_realizefn(s, errp); + if (errp) { + error_propagate(errp, err_local); + 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 @@ -1350,12 +1364,15 @@ static void sdhci_sysbus_realize(DeviceState *dev, = Error ** errp) { SDHCIState *s =3D SYSBUS_SDHCI(dev); SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); + Error *err_local =3D NULL; + + sdhci_realizefn(s, &err_local); + if (errp) { + error_propagate(errp, err_local); + return; + } =20 - s->buf_maxsz =3D sdhci_get_fifolen(s); - s->fifo_buffer =3D g_malloc0(s->buf_maxsz); 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