From nobody Tue Feb 10 15:45:55 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516041162552210.89183068496743; Mon, 15 Jan 2018 10:32:42 -0800 (PST) Received: from localhost ([::1]:53267 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9Yf-0005se-Aj for importer@patchew.org; Mon, 15 Jan 2018 13:32:33 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb9RS-0008KO-Lf for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb9RR-00034o-LN for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:06 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:36060) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eb9RR-00034b-Gl for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:25:05 -0500 Received: by mail-qt0-x243.google.com with SMTP id a16so15251761qtj.3 for ; Mon, 15 Jan 2018 10:25:05 -0800 (PST) Received: from x1.local ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id d20sm154623qtn.23.2018.01.15.10.25.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jan 2018 10:25:04 -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=AyjVSwp6zi5/FueRS2l/YIVyerL+NH0PvgB9AWZxGF4=; b=sqieacPD4OvKY97p/jDiEl5XJTXdC23idKRPCbuQiAg+pzm96sf95yXmp4MbUAbLF/ Q6tgFVrXTLzy2hmXeCWr9SksfuXen86PQpb8U+SNnqZzTUqPI6o+WwlXAHsITwHs/ZWv 2tfbvYUQ1Wkk2FYimtzz6I5cjvUHUCM8eVQF8k3bMzBzMIYQwVTzj9O/bRmTAUe5esky mcZM/Tr7tXDJWqb1mbwM+R3B1BmxchXegYpOQXxIhZ/XoZr65pPrp8c7dbfEQCi43W3Q AQRrwQuF2BHdhdlUUvl/2sUk6xNt/EHbWll8m0XhALSy6fFnm6nxZFCzXh1b2xwiXBLX xpZw== 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=AyjVSwp6zi5/FueRS2l/YIVyerL+NH0PvgB9AWZxGF4=; b=ruuG7FNZQnPZSJXnaIynYBzK/5rtvIFy/qwvvdoDh4J0r05tVvO1lih6zACTs4r8pi LQ8lcA/wyEEGfldhggLTAeC3v1t9Ug5kBprCmjQIAGryNpTLgKkvQBCsUVCQlefrTi4a IAmmY2DIn4LsvfQbENJbzbrgRTArCK57vQ0lhx4xl2j63Iqa6ME6ekM5PR2pbhn1J28g st5fAPU4aGuvE0GsWX2WEmKb8iEs5i8YQuLzxZnGq49mabUP6gHKG+p93cOUnAnnysLx DithYkN6cxJKyDBNvoqlIDSifOToUGOoK1KSRQyvTzRauen3Jd4A6Q5KA9Qeqx1H7jhQ xFvw== X-Gm-Message-State: AKwxytcgBy81QVNYlEWS386Lnvg1a6z2iHY5ZgJgzJsQIMseybS4Dz9Y Yoil9jSIHRWxQIa47NvkIpM= X-Google-Smtp-Source: ACJfBotSK/tpcCXHzNZE8QAyRsCUduIwurcNosloZk76UKTACSFW9Li7HxON/dQINftoSEocNkQFsA== X-Received: by 10.200.40.56 with SMTP id 53mr51898085qtq.159.1516040705049; Mon, 15 Jan 2018 10:25:05 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Paolo Bonzini , Alistair Francis , Peter Maydell Date: Mon, 15 Jan 2018 15:24:27 -0300 Message-Id: <20180115182436.2066-6-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180115182436.2066-1-f4bug@amsat.org> References: <20180115182436.2066-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 v8 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 , Marcel Apfelbaum 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 15d0961ac7..cf0c079990 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1214,6 +1214,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; @@ -1292,14 +1301,16 @@ static Property sdhci_pci_properties[] =3D { 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 @@ -1362,11 +1373,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