From nobody Tue Oct 28 04:17:45 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 1515003044223790.9477517954042; Wed, 3 Jan 2018 10:10:44 -0800 (PST) Received: from localhost ([::1]:60028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnUx-0001p9-5g for importer@patchew.org; Wed, 03 Jan 2018 13:10:43 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47736) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWnSk-0000Ie-KZ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWnSj-0006wJ-Bx for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:26 -0500 Received: from mail-qt0-x243.google.com ([2607:f8b0:400d:c0d::243]:33328) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWnSj-0006w7-7H for qemu-devel@nongnu.org; Wed, 03 Jan 2018 13:08:25 -0500 Received: by mail-qt0-x243.google.com with SMTP id e2so3140772qti.0 for ; Wed, 03 Jan 2018 10:08:25 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id 46sm914901qtx.65.2018.01.03.10.08.22 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 10:08:24 -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=YGAdjpithFfFe23EztE5ncLKf8K3csj/YQOlXGsP6yU=; b=dYS/7N5wOH5Z00GpcX358YXfovPfep5ciUIEcDln8Jgje7hdv1r7V83iKj5D/fouyR 8ER/KGq16RG3/2ReHJVvBwNKl3nJPcj6+/iTvL3lcDNIZ8u0A++k9QxVeZrOnD7GYa4r TAFLTZF6fsqFX5vELbrUFVoMpoXamAfqyHHM7atTrrSayjofZUtGZXAmEPSBEG6p0eLJ 2PWy2s9yp7kIHQRTly409pieHAgwkJJa68mlioK4MtDpBU7TjoCSU7vF+pdyKi7opwaa Pk62au2jhgJ/pGG8ytznBWj7HYATmwnyzaUqtOUyzh7XF6Dy1zhgBB/nQ1IogqSWD9iB iQmg== 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=YGAdjpithFfFe23EztE5ncLKf8K3csj/YQOlXGsP6yU=; b=EayMDAMNvNIlkGkd4s0v1tcMYeY3g87WbLGiTsxJpyN7Gq7shz16GLWfcXVQh9drG6 3+cSYZCTcjlhrBrs+89wSOHAEdA7K3rzbLW/J+Bbt+ul8n91BVwR3EmQOKvKlnTi3lwY SEd5MGwSVlDDCDeneyGtIAOgn1Z1PDvyrPtQ5evA0UcCLpizqH+ktBfcw+/4FG4CFml7 83+HezHsUOuQdjsl6DVPUFYxs/hI/aI0VUUax3aXVqTPzwLW9EsSIqg5Ok92S/GM4W+j BY5llqWTeAe0rj/JFycenaIkzBDlQ2kWNS1wzUgi9cHoIrmaqwKS+FJNh72zdQvvSmfh 7XQw== X-Gm-Message-State: AKGB3mJ79+dfDLiIHUq/jjoc7fbz3PQPqKxf/dKT+W+qdpG5bC32SJaA 8Ox/JzQtskkBk1N5dDcbm+4= X-Google-Smtp-Source: ACJfBovGahQpELTOgTWehd9zvvd6Odd4xlfEy/tags1DGZqGZiVuJnBrk/cJm5yaHXtwuCJIG1Xt8Q== X-Received: by 10.200.42.228 with SMTP id c33mr3063859qta.256.1515002904856; Wed, 03 Jan 2018 10:08:24 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 15:07:52 -0300 Message-Id: <20180103180805.18140-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103180805.18140-1-f4bug@amsat.org> References: <20180103180805.18140-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 v5 04/17] sdhci: refactor same sysbus/pci properties into a common one 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 Now both sysbus/pci classes inherit of the 'pending-insert-quirk' property, which is a HCI dependent property (regardless if accessed through a MMIO sysbus or a PCI bus). So far only the BCM implementation has to use it. Add sysbus/pci/sdbus comments to have clearer code blocks separation. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Alistair Francis --- hw/sd/sdhci.c | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/hw/sd/sdhci.c b/hw/sd/sdhci.c index 365bc80009..a11469fbca 100644 --- a/hw/sd/sdhci.c +++ b/hw/sd/sdhci.c @@ -1266,13 +1266,17 @@ const VMStateDescription sdhci_vmstate =3D { =20 /* Capabilities registers provide information on supported features of this * specific host controller implementation */ -static Property sdhci_pci_properties[] =3D { +static Property sdhci_properties[] =3D { DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, SDHC_CAPAB_REG_DEFAULT), DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), + DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, + false), DEFINE_PROP_END_OF_LIST(), }; =20 +/* --- qdev PCI --- */ + static void sdhci_pci_realize(PCIDevice *dev, Error **errp) { SDHCIState *s =3D PCI_SDHCI(dev); @@ -1305,7 +1309,7 @@ static void sdhci_pci_class_init(ObjectClass *klass, = void *data) k->class_id =3D PCI_CLASS_SYSTEM_SDHCI; set_bit(DEVICE_CATEGORY_STORAGE, dc->categories); dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_pci_properties; + dc->props =3D sdhci_properties; dc->reset =3D sdhci_poweron_reset; } =20 @@ -1320,14 +1324,7 @@ static const TypeInfo sdhci_pci_info =3D { }, }; =20 -static Property sdhci_sysbus_properties[] =3D { - DEFINE_PROP_UINT32("capareg", SDHCIState, capareg, - SDHC_CAPAB_REG_DEFAULT), - DEFINE_PROP_UINT32("maxcurr", SDHCIState, maxcurr, 0), - DEFINE_PROP_BOOL("pending-insert-quirk", SDHCIState, pending_insert_qu= irk, - false), - DEFINE_PROP_END_OF_LIST(), -}; +/* --- qdev SysBus --- */ =20 static void sdhci_sysbus_init(Object *obj) { @@ -1360,7 +1357,7 @@ static void sdhci_sysbus_class_init(ObjectClass *klas= s, void *data) DeviceClass *dc =3D DEVICE_CLASS(klass); =20 dc->vmsd =3D &sdhci_vmstate; - dc->props =3D sdhci_sysbus_properties; + dc->props =3D sdhci_properties; dc->realize =3D sdhci_sysbus_realize; dc->reset =3D sdhci_poweron_reset; } @@ -1374,6 +1371,8 @@ static const TypeInfo sdhci_sysbus_info =3D { .class_init =3D sdhci_sysbus_class_init, }; =20 +/* --- qdev bus master --- */ + static void sdhci_bus_class_init(ObjectClass *klass, void *data) { SDBusClass *sbc =3D SD_BUS_CLASS(klass); --=20 2.15.1