From nobody Tue Oct 28 12:16:35 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 (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1514977583284837.6258876003984; Wed, 3 Jan 2018 03:06:23 -0800 (PST) Received: from localhost ([::1]:48675 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgsF-0006Uv-ML for importer@patchew.org; Wed, 03 Jan 2018 06:06:19 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47723) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eWgnq-0002wb-RJ for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eWgnq-0005n3-1Q for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:46 -0500 Received: from mail-qk0-x244.google.com ([2607:f8b0:400d:c09::244]:43206) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eWgnp-0005mw-TT for qemu-devel@nongnu.org; Wed, 03 Jan 2018 06:01:45 -0500 Received: by mail-qk0-x244.google.com with SMTP id j137so1056071qke.10 for ; Wed, 03 Jan 2018 03:01:45 -0800 (PST) Received: from x1.lan ([138.117.48.219]) by smtp.gmail.com with ESMTPSA id r55sm417735qta.57.2018.01.03.03.01.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Jan 2018 03:01:44 -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=FYEYYsSOSnHkIBumz6QW8UFkAJzx8kik6CM77ypg1ERgPDD605lrmM6AQcDOGYCYn3 h250IO0Akfqsr0PPr/kaccAg5SXmQWH6fy65TFmMc2P7t7HtJMQlbx/sw5yie83vRPv4 NgvP2+oxWy0elvFHa6n+4lB3TQ5YEUJ3SjCEbxwHL+Zdqrhf7MOga9F6Cv1fjisOAUvr w/JH3yVy2i0PkZf9iGcspsHwmSRV2QDg5ZCKc+KcyGUzUyYfXbaDX2gz15IT3VMiPL7U gZQb+n61bcWdsWofN9VDBWUoRWms2DYDmHR9aUAyoyl5oTpVxoj0OwmcaPosWh01XEp9 kQvQ== 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=ZgvIgvmkH1qtNjtn7jEx0pVBDnFHcdTyFBe5nqtD+ZTbhEGAZhgbtcHf91SWilAa8B 9RsBw+FSPA1E9X6HBmwWGxnsxyWtJo0wKtLRBTsXqYU5pUY2AKOWLnIS0DuMMxyRMgeM S5YC2T69Jb5a+BblqKZR1IHKox/WqMD/wDEKeA77jloGIzeSMYtFcoMIgih4VZvwKYAP zu80AhJmeL0K/YkYP3VFkSRkR6WAz4EJJsN+r8Hbz1YHNXQaV9SbMV8n+/6Ts09o5T+u 3iAFXL1vGMGbbtzjMr2tMEIe8pc1xGRCVJsMHqkTqQWXVlI4aOQWwbdYTjiayUGSW91B e8XA== X-Gm-Message-State: AKGB3mJ9bTHXSiIF68VW7y6OfIy2FCpy5wfvtO9qhw3vpEpvcZVTB1Tx 4UjSXWwETYwpa4bEnkzddG0= X-Google-Smtp-Source: ACJfBovpaxTYIdOv+erPugaRC04V/fyYT5DAEil1CqJ5440yH1CIwVIBR2TtZJw6qeABGbgbDBQEkA== X-Received: by 10.55.168.151 with SMTP id r145mr1133557qke.199.1514977305378; Wed, 03 Jan 2018 03:01:45 -0800 (PST) From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: Alistair Francis , Fam Zheng Date: Wed, 3 Jan 2018 08:01:13 -0300 Message-Id: <20180103110126.29209-5-f4bug@amsat.org> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20180103110126.29209-1-f4bug@amsat.org> References: <20180103110126.29209-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::244 Subject: [Qemu-devel] [PATCH v4 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 --- 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