From patchwork Wed Dec 13 19:58:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 10110829 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A198C60327 for ; Wed, 13 Dec 2017 20:04:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 972B22891E for ; Wed, 13 Dec 2017 20:04:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B2CE2892E; Wed, 13 Dec 2017 20:04:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 13D4C2891E for ; Wed, 13 Dec 2017 20:04:04 +0000 (UTC) Received: from localhost ([::1]:37373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDG7-0006Td-5v for patchwork-qemu-devel@patchwork.kernel.org; Wed, 13 Dec 2017 15:04:03 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57705) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDBr-0002tq-Kf for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDBq-0005b8-Tx for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:39 -0500 Received: from mail-qk0-x242.google.com ([2607:f8b0:400d:c09::242]:36542) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDBq-0005am-Pm for qemu-devel@nongnu.org; Wed, 13 Dec 2017 14:59:38 -0500 Received: by mail-qk0-x242.google.com with SMTP id 8so3509992qkj.3 for ; Wed, 13 Dec 2017 11:59:38 -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=mA6ysxPAJFJ2GZWTZYxgfX7wBsNWwLuWJcrH3L1CWXU=; b=D037Qhvb7yhbCFezaXvGP4WCMLZbms00PH4dsdLd575VnJhCti2yKVo3KGQlfjnOh0 D5kqIUU6RUmLShtIRuW2q7PfJbGhHI9p83cmMYB4g6dJxGQsSsLvtlGHaSbE1I/WyKlN DlmTCfpo8fiQA5FD1BeON/6ma36pazFfwT6/6/GunR+0J5B20qaKI5NStY/x3HYuDUF0 lj1jfW/kiS5iIiejW3rwb4wfm3Wk57mIma3TTHd+FL+gll327RkInQzQ7bZ6dnM5RJwT aABaeIGlwH5lpZ12e1GhCHY+6Z92410/V0sjkdgEkQl4bZ1qseaRSYYTBPMHdvQelt+k ULlQ== 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=mA6ysxPAJFJ2GZWTZYxgfX7wBsNWwLuWJcrH3L1CWXU=; b=eztpK+JZT7wad8cP/r8VpSjZLt5r1zA5UY5XSABliLlWNmUvRSSSf/QXylPlWsIX6X x0Vm21ntWUv7ZgBWEgY6XmPAPmPyDiNxXd6QmNIdCFmqUamOHktWs7KH5+aMDX/aoqJ1 9GBp44MSjBCFyitJ2cFMOn6jWzkLL/bSY+q7CpA9t2GJO5DPA5OP027/eT1K+7CYyXSc MJXq2vZ2dwbajvW/fhNhj1tbTEQyFq3ARaJK8F69dY/Vp536TC/IBnNc9Cte12KWU5ln De1nvOu16vkrzHFQohSvlDgr3jwMm19uK19rqN1aN7aRrpv7K19PzjagIyh8kwumFlMO hb9Q== X-Gm-Message-State: AKGB3mI91eM5k8hMhXCFmmqTUz8Lmv25xm828ApCTYrzimcNGmx/UuSp gqYyqm2CBHEOuzBvpX1UqN0= X-Google-Smtp-Source: ACJfBos6vjOXucrRjPwlzBL3ghBkI8ocxSM0Hd3yF5FV+28fHRaeM7OSKlYenJhRG12q4NUiF9hHnw== X-Received: by 10.55.245.19 with SMTP id l19mr12744879qkk.157.1513195178221; Wed, 13 Dec 2017 11:59:38 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id o5sm1518876qtc.72.2017.12.13.11.59.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 11:59:37 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , "Edgar E . Iglesias" , Prasad J Pandit , Peter Maydell , Andrew Baumann , Andrey Smirnov , Andrey Yurovsky Date: Wed, 13 Dec 2017 16:58:45 -0300 Message-Id: <20171213195852.30439-8-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213195852.30439-1-f4bug@amsat.org> References: <20171213195852.30439-1-f4bug@amsat.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400d:c09::242 Subject: [Qemu-devel] [PATCH 07/14] 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: Sai Pavan Boddu , Peter Crosthwaite , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Philippe Mathieu-Daudé 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 c8b7b1ca4c..a96cd8a2df 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1182,6 +1182,15 @@ static void sdhci_initfn(SDHCIState *s) s->transfer_timer = timer_new_ns(QEMU_CLOCK_VIRTUAL, sdhci_data_transfer, s); } +static void sdhci_realizefn(SDHCIState *s, Error **errp) +{ + s->buf_maxsz = sdhci_get_fifolen(s); + s->fifo_buffer = 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); @@ -1272,12 +1281,11 @@ static void sdhci_pci_realize(PCIDevice *dev, Error **errp) SDHCIState *s = PCI_SDHCI(dev); dev->config[PCI_CLASS_PROG] = 0x01; /* Standard Host supported DMA */ dev->config[PCI_INTERRUPT_PIN] = 0x01; /* interrupt pin A */ + sdhci_initfn(s); - s->buf_maxsz = sdhci_get_fifolen(s); - s->fifo_buffer = g_malloc0(s->buf_maxsz); + sdhci_realizefn(s, errp); + s->irq = 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); } @@ -1334,11 +1342,9 @@ static void sdhci_sysbus_realize(DeviceState *dev, Error ** errp) SDHCIState *s = SYSBUS_SDHCI(dev); SysBusDevice *sbd = SYS_BUS_DEVICE(dev); - s->buf_maxsz = sdhci_get_fifolen(s); - s->fifo_buffer = 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); }