From nobody Tue Feb 10 03:39:22 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 (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1513198448192716.7408727807818; Wed, 13 Dec 2017 12:54:08 -0800 (PST) Received: from localhost ([::1]:37603 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePE2R-0002la-5c for importer@patchew.org; Wed, 13 Dec 2017 15:53:59 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39527) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDuJ-0004Xq-EI for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDuI-0007LI-8y for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:35 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:42755) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDuI-0007Jy-1M; Wed, 13 Dec 2017 15:45:34 -0500 Received: by mail-qt0-x243.google.com with SMTP id g9so5392767qth.9; Wed, 13 Dec 2017 12:45:33 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id n64sm1507938qkd.97.2017.12.13.12.45.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:45:32 -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=PFxtEHbPyEJgvEtVcfjCeaVfNqc3d6DLBS0VcPEmtJc=; b=ZX5qDqWJE3WQCOVJ9weAEO6RU083xZeTf2x+iU/qUA3myIvhawXusdIScphEwn5vyu BVVTbhihWA5L68Y6eoZiQ9iCKtUINZuwW1lkSaccueTKPtUdc5+vgxJLNP1XOusUW8Zp xXYq8yxEnLADaj6fg57iNIIGeeNaHYvNQWtEPufG4wS9zyLV24Sagkc7j16uyBhz09kJ u/GCJaWtmAHx8ze8aBgT62tRCGQKTnPZq3vaHFgCva0GWsDBJi9SNg+XXb2gWGrt/fCD Dhdlrcra63unLbE5maU75hQCjaeEtNCNgvYYPD5jHcmQt1xQtw6Uz3V/mOHLPfEVQKTH 3Vpg== 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=PFxtEHbPyEJgvEtVcfjCeaVfNqc3d6DLBS0VcPEmtJc=; b=ZPv23Yj5Acp+PfgjCVHT6/UIiYqRu32+R1MN5nFuF7cKRJD2niTBHL+462q1FZphrt fj4+loUe9KGeLYnLAgQsFNjc3o4N073LvCOTxJQgdpl6GkElFCoNN7SfnApzjutChBo+ /u7cccq8h64yPneMkygtxU8d8fOxJj6ZIADMB3ji5yVJuzTDbGDtdFgqzewgSCK3iqNq 9O9m6bg8EB5Y9WVQKLnzA4D2GxPKr6///JHTzQNki6siq6ob1sS3mQnMOAlyXem9dKOB loJgpBCmAdzS+zp1UVnfglCLscSucxGhSwALhp/Vz+/eVR3mUmr0OW8ECn0KPCTG5YwN PGRQ== X-Gm-Message-State: AKGB3mLf8rtJ5taugbpUEopQ482OY04ZqBPM4hr3T3mWaFAhBnniy8X4 eIJO3Fmp1negdcBD+EDRfek= X-Google-Smtp-Source: ACJfBovLUcN9X8jw/mZohUt1ocOeoHRisShNiEtZgcaiaoFwRhYq0zlC7kvMcny9lmd6N1C4K18Uvg== X-Received: by 10.200.51.201 with SMTP id d9mr12859790qtb.319.1513197933558; Wed, 13 Dec 2017 12:45:33 -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 , Clement Deschamps , =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= , Igor Mammedov , Eduardo Habkost Date: Wed, 13 Dec 2017 17:44:35 -0300 Message-Id: <20171213204436.5379-11-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20171213204436.5379-1-f4bug@amsat.org> References: <20171213204436.5379-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 10/11] hw/sd/pxa2xx: implement the SD_BUS_MASTER interface 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: 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_0 Z_629925259 SPT_0 This MMC Interface is a SD bus master. Replace qbus_create_inplace() by sdbus_create_bus(), remove the PXA2XX_MMCI_BUS type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/pxa2xx_mmci.c | 36 ++++++++++++------------------------ 1 file changed, 12 insertions(+), 24 deletions(-) diff --git a/hw/sd/pxa2xx_mmci.c b/hw/sd/pxa2xx_mmci.c index f34951e1d1..da5f302f3c 100644 --- a/hw/sd/pxa2xx_mmci.c +++ b/hw/sd/pxa2xx_mmci.c @@ -24,9 +24,6 @@ #define TYPE_PXA2XX_MMCI "pxa2xx-mmci" #define PXA2XX_MMCI(obj) OBJECT_CHECK(PXA2xxMMCIState, (obj), TYPE_PXA2XX_= MMCI) =20 -#define TYPE_PXA2XX_MMCI_BUS "pxa2xx-mmci-bus" -#define PXA2XX_MMCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_PXA2XX_MMCI_B= US) - struct PXA2xxMMCIState { SysBusDevice parent_obj; =20 @@ -38,7 +35,7 @@ struct PXA2xxMMCIState { qemu_irq readonly; =20 BlockBackend *blk; - SDBus sdbus; + SDBus *sdbus; =20 uint32_t status; uint32_t clkrt; @@ -183,7 +180,7 @@ static void pxa2xx_mmci_fifo_update(PXA2xxMMCIState *s) =20 if (s->cmdat & CMDAT_WR_RD) { while (s->bytesleft && s->tx_len) { - sdbus_write_data(&s->sdbus, s->tx_fifo[s->tx_start++]); + sdbus_write_data(s->sdbus, s->tx_fifo[s->tx_start++]); s->tx_start &=3D 0x1f; s->tx_len --; s->bytesleft --; @@ -193,7 +190,7 @@ static void pxa2xx_mmci_fifo_update(PXA2xxMMCIState *s) } else while (s->bytesleft && s->rx_len < 32) { s->rx_fifo[(s->rx_start + (s->rx_len ++)) & 0x1f] =3D - sdbus_read_data(&s->sdbus); + sdbus_read_data(s->sdbus); s->bytesleft --; s->intreq |=3D INT_RXFIFO_REQ; } @@ -227,7 +224,7 @@ static void pxa2xx_mmci_wakequeues(PXA2xxMMCIState *s) request.arg =3D s->arg; request.crc =3D 0; /* FIXME */ =20 - rsplen =3D sdbus_do_command(&s->sdbus, &request, response); + rsplen =3D sdbus_do_command(s->sdbus, &request, response); s->intreq |=3D INT_END_CMD; =20 memset(s->resp_fifo, 0, sizeof(s->resp_fifo)); @@ -509,8 +506,8 @@ void pxa2xx_mmci_handlers(PXA2xxMMCIState *s, qemu_irq = readonly, s->readonly =3D readonly; s->inserted =3D coverswitch; =20 - pxa2xx_mmci_set_inserted(dev, sdbus_get_inserted(&s->sdbus)); - pxa2xx_mmci_set_readonly(dev, sdbus_get_readonly(&s->sdbus)); + pxa2xx_mmci_set_inserted(dev, sdbus_get_inserted(s->sdbus)); + pxa2xx_mmci_set_readonly(dev, sdbus_get_readonly(s->sdbus)); } =20 static void pxa2xx_mmci_reset(DeviceState *d) @@ -555,21 +552,16 @@ static void pxa2xx_mmci_instance_init(Object *obj) qdev_init_gpio_out_named(dev, &s->rx_dma, "rx-dma", 1); qdev_init_gpio_out_named(dev, &s->tx_dma, "tx-dma", 1); =20 - qbus_create_inplace(&s->sdbus, sizeof(s->sdbus), - TYPE_PXA2XX_MMCI_BUS, DEVICE(obj), "sd-bus"); + s->sdbus =3D sdbus_create_bus(dev, "sd-bus"); } =20 static void pxa2xx_mmci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + SDBusClass *sbc =3D SDBUS_MASTER_CLASS(klass); =20 dc->vmsd =3D &vmstate_pxa2xx_mmci; dc->reset =3D pxa2xx_mmci_reset; -} - -static void pxa2xx_mmci_bus_class_init(ObjectClass *klass, void *data) -{ - SDBusClass *sbc =3D SD_BUS_CLASS(klass); =20 sbc->set_inserted =3D pxa2xx_mmci_set_inserted; sbc->set_readonly =3D pxa2xx_mmci_set_readonly; @@ -581,19 +573,15 @@ static const TypeInfo pxa2xx_mmci_info =3D { .instance_size =3D sizeof(PXA2xxMMCIState), .instance_init =3D pxa2xx_mmci_instance_init, .class_init =3D pxa2xx_mmci_class_init, -}; - -static const TypeInfo pxa2xx_mmci_bus_info =3D { - .name =3D TYPE_PXA2XX_MMCI_BUS, - .parent =3D TYPE_SD_BUS, - .instance_size =3D sizeof(SDBus), - .class_init =3D pxa2xx_mmci_bus_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_SD_BUS_MASTER_INTERFACE }, + { }, + }, }; =20 static void pxa2xx_mmci_register_types(void) { type_register_static(&pxa2xx_mmci_info); - type_register_static(&pxa2xx_mmci_bus_info); } =20 type_init(pxa2xx_mmci_register_types) --=20 2.15.1