From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: Hao Wu <wuhaotsh@google.com>, Tyrone Ting <kfting@nuvoton.com>,
Shengtan Mao <stmao@google.com>,
Peter Maydell <peter.maydell@linaro.org>
Subject: [PULL 03/12] hw/arm: Attach MMC to quanta-gbs-bmc
Date: Tue, 2 Nov 2021 06:59:25 -0400 [thread overview]
Message-ID: <20211102105934.214596-4-richard.henderson@linaro.org> (raw)
In-Reply-To: <20211102105934.214596-1-richard.henderson@linaro.org>
From: Shengtan Mao <stmao@google.com>
Signed-off-by: Shengtan Mao <stmao@google.com>
Signed-off-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Hao Wu <wuhaotsh@google.com>
Reviewed-by: Tyrone Ting <kfting@nuvoton.com>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20211008002628.1958285-4-wuhaotsh@google.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
hw/arm/npcm7xx_boards.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/hw/arm/npcm7xx_boards.c b/hw/arm/npcm7xx_boards.c
index a656169f61..dec7d16ae5 100644
--- a/hw/arm/npcm7xx_boards.c
+++ b/hw/arm/npcm7xx_boards.c
@@ -27,6 +27,9 @@
#include "qemu-common.h"
#include "qemu/datadir.h"
#include "qemu/units.h"
+#include "sysemu/blockdev.h"
+#include "sysemu/sysemu.h"
+#include "sysemu/block-backend.h"
#define NPCM750_EVB_POWER_ON_STRAPS 0x00001ff7
#define QUANTA_GSJ_POWER_ON_STRAPS 0x00001fff
@@ -81,6 +84,22 @@ static void npcm7xx_connect_dram(NPCM7xxState *soc, MemoryRegion *dram)
&error_abort);
}
+static void sdhci_attach_drive(SDHCIState *sdhci)
+{
+ DriveInfo *di = drive_get_next(IF_SD);
+ BlockBackend *blk = di ? blk_by_legacy_dinfo(di) : NULL;
+
+ BusState *bus = qdev_get_child_bus(DEVICE(sdhci), "sd-bus");
+ if (bus == NULL) {
+ error_report("No SD bus found in SOC object");
+ exit(1);
+ }
+
+ DeviceState *carddev = qdev_new(TYPE_SD_CARD);
+ qdev_prop_set_drive_err(carddev, "drive", blk, &error_fatal);
+ qdev_realize_and_unref(carddev, bus, &error_fatal);
+}
+
static NPCM7xxState *npcm7xx_create_soc(MachineState *machine,
uint32_t hw_straps)
{
@@ -355,6 +374,7 @@ static void quanta_gbs_init(MachineState *machine)
drive_get(IF_MTD, 0, 0));
quanta_gbs_i2c_init(soc);
+ sdhci_attach_drive(&soc->mmc.sdhci);
npcm7xx_load_kernel(machine, soc);
}
--
2.25.1
next prev parent reply other threads:[~2021-11-02 11:07 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-02 10:59 [PULL 00/12] target/arm patch queue Richard Henderson
2021-11-02 10:59 ` [PULL 01/12] hw/sd: add nuvoton MMC Richard Henderson
2021-11-02 10:59 ` [PULL 02/12] hw/arm: Add Nuvoton SD module to board Richard Henderson
2021-11-02 10:59 ` Richard Henderson [this message]
2021-11-02 10:59 ` [PULL 04/12] tests/qtest/libqos: add SDHCI commands Richard Henderson
2021-11-02 10:59 ` [PULL 05/12] tests/qtest: add qtests for npcm7xx sdhci Richard Henderson
2021-11-02 17:48 ` Philippe Mathieu-Daudé
2021-11-02 10:59 ` [PULL 06/12] target/arm: Advertise MVE to gdb when present Richard Henderson
2021-11-02 10:59 ` [PULL 07/12] target/arm: Use tcg_constant_i32() in op_smlad() Richard Henderson
2021-11-02 10:59 ` [PULL 08/12] target/arm: Introduce store_cpu_field_constant() helper Richard Henderson
2021-11-02 10:59 ` [PULL 09/12] target/arm: Use the constant variant of store_cpu_field() when possible Richard Henderson
2021-11-02 10:59 ` [PULL 10/12] target/arm: Use tcg_constant_i64() in do_sat_addsub_64() Richard Henderson
2021-11-02 10:59 ` [PULL 11/12] target/arm: Use tcg_constant_i32() in gen_rev16() Richard Henderson
2021-11-02 10:59 ` [PULL 12/12] hw/arm/virt: Rename default_bus_bypass_iommu Richard Henderson
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=20211102105934.214596-4-richard.henderson@linaro.org \
--to=richard.henderson@linaro.org \
--cc=kfting@nuvoton.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
--cc=stmao@google.com \
--cc=wuhaotsh@google.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).