qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
To: Alistair Francis <alistair.francis@xilinx.com>,
	"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Michael Walle <michael@walle.cc>,
	Andrzej Zaborowski <balrogg@gmail.com>,
	Andrew Baumann <Andrew.Baumann@microsoft.com>,
	Andrey Smirnov <andrew.smirnov@gmail.com>,
	Andrey Yurovsky <yurovsky@gmail.com>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
	qemu-devel@nongnu.org, qemu-arm@nongnu.org,
	"Prasad J Pandit" <pjp@fedoraproject.org>,
	"Peter Crosthwaite" <crosthwaite.peter@gmail.com>,
	"Sai Pavan Boddu" <saipava@xilinx.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Edgar E. Iglesias" <edgar.iglesias@gmail.com>
Subject: [Qemu-devel] [PATCH v2 15/20] sdhci: some ARM boards do support SD_HOST_SPECv3_VERS
Date: Fri, 15 Dec 2017 00:15:42 -0300	[thread overview]
Message-ID: <20171215031547.31006-16-f4bug@amsat.org> (raw)
In-Reply-To: <20171215031547.31006-1-f4bug@amsat.org>

set the property with object_property_set_uint() or qdev_prop_set_uint8().

[Zynq part based on a patch from Alistair Francis <alistair.francis@xilinx.com>
 from qemu/xilinx tag xilinx-v2015.2]
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/arm/bcm2835_peripherals.c | 7 +++++++
 hw/arm/fsl-imx6.c            | 6 ++++++
 hw/arm/xilinx_zynq.c         | 2 ++
 3 files changed, 15 insertions(+)

diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
index 12e0dd11af..ea57b3ecac 100644
--- a/hw/arm/bcm2835_peripherals.c
+++ b/hw/arm/bcm2835_peripherals.c
@@ -269,6 +269,13 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
         return;
     }
 
+    object_property_set_uint(OBJECT(&s->sdhci), SD_HOST_SPECv3_VERS,
+                             "sd-spec-version", &err);
+    if (err) {
+        error_propagate(errp, err);
+        return;
+    }
+
     object_property_set_bool(OBJECT(&s->sdhci), true, "realized", &err);
     if (err) {
         error_propagate(errp, err);
diff --git a/hw/arm/fsl-imx6.c b/hw/arm/fsl-imx6.c
index 59ef33efa9..c474e707af 100644
--- a/hw/arm/fsl-imx6.c
+++ b/hw/arm/fsl-imx6.c
@@ -348,6 +348,12 @@ static void fsl_imx6_realize(DeviceState *dev, Error **errp)
             { FSL_IMX6_uSDHC4_ADDR, FSL_IMX6_uSDHC4_IRQ },
         };
 
+        object_property_set_uint(OBJECT(&s->esdhc[i]), SD_HOST_SPECv3_VERS,
+                                 "sd-spec-version", &err);
+        if (err) {
+            error_propagate(errp, err);
+            return;
+        }
         object_property_set_bool(OBJECT(&s->esdhc[i]), true, "realized", &err);
         if (err) {
             error_propagate(errp, err);
diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
index 1836a4ed45..22e909afc9 100644
--- a/hw/arm/xilinx_zynq.c
+++ b/hw/arm/xilinx_zynq.c
@@ -248,6 +248,7 @@ static void zynq_init(MachineState *machine)
     gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]);
 
     dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI);
+    qdev_prop_set_uint8(dev, "sd-spec-version", SD_HOST_SPECv3_VERS);
     qdev_init_nofail(dev);
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0100000);
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[56-IRQ_OFFSET]);
@@ -259,6 +260,7 @@ static void zynq_init(MachineState *machine)
     object_property_set_bool(OBJECT(carddev), true, "realized", &error_fatal);
 
     dev = qdev_create(NULL, TYPE_SYSBUS_SDHCI);
+    qdev_prop_set_uint8(dev, "sd-spec-version", SD_HOST_SPECv3_VERS);
     qdev_init_nofail(dev);
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 0, 0xE0101000);
     sysbus_connect_irq(SYS_BUS_DEVICE(dev), 0, pic[79-IRQ_OFFSET]);
-- 
2.15.1

  parent reply	other threads:[~2017-12-15  3:17 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-12-15  3:15 [Qemu-devel] [PATCH v2 00/20] SDHCI: housekeeping, add a qtest and fix few issues Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 01/20] sdhci: clean up includes Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 02/20] sdhci: use deposit64() Philippe Mathieu-Daudé
2017-12-19  1:16   ` Alistair Francis
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 03/20] sdhci: move MASK_TRNMOD with other SDHC_TRN* defines in "sd-internal.h" Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 04/20] sdhci: refactor same sysbus/pci properties into a common one Philippe Mathieu-Daudé
2017-12-19  1:13   ` Alistair Francis
2017-12-29 17:21     ` Philippe Mathieu-Daudé
2018-01-03 19:36       ` Alistair Francis
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 05/20] sdhci: refactor common sysbus/pci realize() into sdhci_realizefn() Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 06/20] sdhci: refactor common sysbus/pci class_init() into sdhci_class_init() Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 07/20] sdhci: refactor common sysbus/pci unrealize() into sdhci_unrealizefn() Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 08/20] sdhci: use qemu_log_mask(UNIMP) instead of fprintf() Philippe Mathieu-Daudé
2017-12-19  1:16   ` Alistair Francis
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 09/20] sdhci: convert the DPRINT() calls into trace events Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 10/20] sdhci: add a GPIO for the access control LED Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 11/20] sdhci: add a "dma-memory" property Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 12/20] sdhci: fix CAPAB/MAXCURR registers, both are 64bit and read-only Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 13/20] sdhci: Implement write method of ACMD12ERRSTS register Philippe Mathieu-Daudé
2017-12-19  1:18   ` Alistair Francis
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 14/20] sdhci: add a "sd-spec-version" property Philippe Mathieu-Daudé
2017-12-15  3:15 ` Philippe Mathieu-Daudé [this message]
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 16/20] sdhci: add qtest to check the SD Spec version Philippe Mathieu-Daudé
2017-12-18 15:27   ` Stefan Hajnoczi
2017-12-18 23:10   ` Philippe Mathieu-Daudé
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 17/20] sdhci: add check_capab_readonly() qtest Philippe Mathieu-Daudé
2017-12-18 17:00   ` Stefan Hajnoczi
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 18/20] sdhci: add a check_capab_baseclock() qtest Philippe Mathieu-Daudé
2017-12-18 17:00   ` Stefan Hajnoczi
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 19/20] sdhci: add a check_capab_sdma() qtest Philippe Mathieu-Daudé
2017-12-18 17:01   ` Stefan Hajnoczi
2017-12-15  3:15 ` [Qemu-devel] [PATCH v2 20/20] sdhci: add a check_capab_v3() qtest Philippe Mathieu-Daudé
2017-12-18 17:01   ` Stefan Hajnoczi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20171215031547.31006-16-f4bug@amsat.org \
    --to=f4bug@amsat.org \
    --cc=Andrew.Baumann@microsoft.com \
    --cc=alistair.francis@xilinx.com \
    --cc=andrew.smirnov@gmail.com \
    --cc=balrogg@gmail.com \
    --cc=crosthwaite.peter@gmail.com \
    --cc=edgar.iglesias@gmail.com \
    --cc=edgar.iglesias@xilinx.com \
    --cc=michael@walle.cc \
    --cc=peter.maydell@linaro.org \
    --cc=pjp@fedoraproject.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=saipava@xilinx.com \
    --cc=stefanha@redhat.com \
    --cc=yurovsky@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).