From nobody Mon Feb 9 22:38:12 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 151319850530757.67792017516865; Wed, 13 Dec 2017 12:55:05 -0800 (PST) Received: from localhost ([::1]:37606 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePE3S-0003aE-K0 for importer@patchew.org; Wed, 13 Dec 2017 15:55:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39514) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ePDuF-0004Wy-NG for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:34 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ePDuC-0007C3-Ip for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:31 -0500 Received: from mail-qk0-x241.google.com ([2607:f8b0:400d:c09::241]:35641) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ePDuC-0007BX-D0 for qemu-devel@nongnu.org; Wed, 13 Dec 2017 15:45:28 -0500 Received: by mail-qk0-x241.google.com with SMTP id c13so3676009qke.2 for ; Wed, 13 Dec 2017 12:45:28 -0800 (PST) Received: from x1.local ([138.117.48.211]) by smtp.gmail.com with ESMTPSA id n64sm1507938qkd.97.2017.12.13.12.45.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Dec 2017 12:45:27 -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=8P6Xi7JgRIRXNFeKzZQhoyIGkAX+iowht7A3hEjneUo=; b=kk3is0UudruQJGlMwq4GjnThfY+71/MDfnBQT0Z9M0S822Yd/ETvQ/gMzHZJkFIasD vRhZ/H2N1jOyzyJKI9coc0DjD7zjaBAr3sIu5rgZePVFyPQ9figi0nzVHDlT0OAWfO0y zSzMMvT8ypV4R2eP9ZFhZIg24Ce/I5BIOGTUiUWRa2/6ZDRmGOufCAzGZQwdlOltkZzB UBgxHKflRR4gRXE3R7oIBxj8TxIAwoz5ygagSuAK2ILr73IwYiV/r5SkVh/N5jGNzo3x zxmDja8Q+5QG1Noc2UKx7PNO/RU2RzkA+7TTHfggXcICaYzbWqJ7k6Smjoe3URSKAjBS 0DIw== 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=8P6Xi7JgRIRXNFeKzZQhoyIGkAX+iowht7A3hEjneUo=; b=em/Hlw8z8ItZ0hIlAicMash/53uLwxcTPITQujHQSMEtl/Bf9h7RYhNf7I6jAjaBNT bshWwvtDZsmtglxoKdGL32e/mY6KoECE21bf5sT02eIP6Wl8ehzV67ljWEvl/ERcCmzO ykmuVZp+4X2woq3N0t1wSkaG0kHDINX2Y5x+xvkJnc0sFLgFNg8FDf0+L/fcR7b9YEXc Epw9z1uILk0gN9LnNEufDa75WXWhKv2O18x3USVFH7cxflXuZSBp/Xw+QUHEn3FkOD3L LmkXqxydX8wp/O1CI4GL2eowYg/B7VxXqEJ/urIsjJTgDiCEiav4BYIUpMKX664Z6YRR bCUA== X-Gm-Message-State: AKGB3mJrrsXAg5pItQrQQueIhdJII+ryT0JrGzbHJ0w8zPPAkq9/1pKD pHIhrq1g4yEgFiSEipougqQ= X-Google-Smtp-Source: ACJfBosqLf4fMrfz41oamO5M8HjoLgJXEpg014pgH2mg5ImUFuyVGV5eiiiie6VzP2HLaQeCI/ewbw== X-Received: by 10.55.73.13 with SMTP id w13mr12077443qka.201.1513197927930; Wed, 13 Dec 2017 12:45:27 -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:34 -0300 Message-Id: <20171213204436.5379-10-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:c09::241 Subject: [Qemu-devel] [PATCH 09/11] sdhci: 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: Sai Pavan Boddu , Peter Crosthwaite , =?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 The SDHCI is a SD master, let it implement the SD_BUS_MASTER interface, this even allow remove the SDHCI_BUS type. Signed-off-by: Philippe Mathieu-Daud=C3=A9 --- hw/sd/sdhci.c | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 40596f6ebe..d8188fdc2a 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -35,9 +35,6 @@ #include "qemu/log.h" #include "trace.h" =20 -#define TYPE_SDHCI_BUS "sdhci-bus" -#define SDHCI_BUS(obj) OBJECT_CHECK(SDBus, (obj), TYPE_SDHCI_BUS) - /* Default SD/MMC host controller features information, which will be * presented in CAPABILITIES register of generic SD host controller at res= et. * If not stated otherwise: @@ -1279,11 +1276,15 @@ static Property sdhci_properties[] =3D { static void sdhci_class_init(ObjectClass *klass, void *data) { DeviceClass *dc =3D DEVICE_CLASS(klass); + SDBusClass *sbc =3D SDBUS_MASTER_CLASS(klass); =20 set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd =3D &sdhci_vmstate; dc->props =3D sdhci_properties; dc->reset =3D sdhci_poweron_reset; + + sbc->set_inserted =3D sdhci_set_inserted; + sbc->set_readonly =3D sdhci_set_readonly; } =20 /* --- qdev PCI --- */ @@ -1328,6 +1329,7 @@ static const TypeInfo sdhci_pci_info =3D { .instance_size =3D sizeof(SDHCIState), .class_init =3D sdhci_pci_class_init, .interfaces =3D (InterfaceInfo[]) { + { TYPE_SD_BUS_MASTER_INTERFACE }, { INTERFACE_CONVENTIONAL_PCI_DEVICE }, { }, }, @@ -1383,30 +1385,16 @@ static const TypeInfo sdhci_sysbus_info =3D { .instance_init =3D sdhci_sysbus_init, .instance_finalize =3D sdhci_sysbus_finalize, .class_init =3D sdhci_sysbus_class_init, -}; - -/* --- qdev bus master --- */ - -static void sdhci_bus_class_init(ObjectClass *klass, void *data) -{ - SDBusClass *sbc =3D SD_BUS_CLASS(klass); - - sbc->set_inserted =3D sdhci_set_inserted; - sbc->set_readonly =3D sdhci_set_readonly; -} - -static const TypeInfo sdhci_bus_info =3D { - .name =3D TYPE_SDHCI_BUS, - .parent =3D TYPE_SD_BUS, - .instance_size =3D sizeof(SDBus), - .class_init =3D sdhci_bus_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_SD_BUS_MASTER_INTERFACE }, + { }, + }, }; =20 static void sdhci_register_types(void) { type_register_static(&sdhci_pci_info); type_register_static(&sdhci_sysbus_info); - type_register_static(&sdhci_bus_info); } =20 type_init(sdhci_register_types) --=20 2.15.1