From: "Cédric Le Goater" <clg@kaod.org>
To: "Philippe Mathieu-Daudé" <philmd@redhat.com>
Cc: "Cédric Le Goater" <clg@kaod.org>,
"Bin Meng" <bin.meng@windriver.com>,
"Joel Stanley" <joel@jms.id.au>,
qemu-block@nongnu.org, qemu-devel@nongnu.org
Subject: [RFC PATCH 16/17] hw/sd: Support boot area in emmc image
Date: Fri, 18 Mar 2022 14:28:23 +0100 [thread overview]
Message-ID: <20220318132824.1134400-17-clg@kaod.org> (raw)
In-Reply-To: <20220318132824.1134400-1-clg@kaod.org>
From: Joel Stanley <joel@jms.id.au>
This assumes a specially constructued image:
dd if=/dev/zero of=mmc-bootarea.img count=2 bs=1M
dd if=u-boot-spl.bin of=mmc-bootarea.img conv=notrunc
dd if=u-boot.bin of=mmc-bootarea.img conv=notrunc count=64 bs=1K
cat mmc-bootarea.img obmc-phosphor-image.wic > mmc.img
truncate --size 16GB mmc.img
truncate --size 128MB mmc-bootarea.img
For now this still requires a mtd image to load the SPL:
qemu-system-arm -M tacoma-bmc -nographic \
-global driver=sd-card,property=emmc,value=true \
-drive file=mmc.img,if=sd,index=2 \
-drive file=mmc-bootarea.img,if=mtd,format=raw
Signed-off-by: Joel Stanley <joel@jms.id.au>
[clg: - changes on the definition names ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
include/hw/sd/sd.h | 1 +
hw/sd/sd.c | 33 +++++++++++++++++++++++++++++++++
2 files changed, 34 insertions(+)
diff --git a/include/hw/sd/sd.h b/include/hw/sd/sd.h
index dfe661079b8a..02cfc8cecfac 100644
--- a/include/hw/sd/sd.h
+++ b/include/hw/sd/sd.h
@@ -133,6 +133,7 @@ struct SDCardClass {
const struct SDProto *proto;
uint8_t spec_version;
void (*set_csd)(SDState *sd, uint64_t size);
+ uint32_t (*bootpart_offset)(SDState *sd);
};
#define TYPE_SD_BUS "sd-bus"
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index d3bda6c2aa6b..e975fcf18512 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -839,9 +839,40 @@ void sd_set_cb(SDState *sd, qemu_irq readonly, qemu_irq insert)
qemu_set_irq(insert, sd->blk ? blk_is_inserted(sd->blk) : 0);
}
+/*
+ * This requires a disk image that has two boot partitions inserted at the
+ * beginning of it. The size of the boot partitions are configured in the
+ * ext_csd structure, which is hardcoded in qemu. They are currently set to
+ * 1MB each.
+ */
+static uint32_t sd_emmc_bootpart_offset(SDState *sd)
+{
+ unsigned int access = sd->ext_csd[EXT_CSD_PART_CONFIG] &
+ EXT_CSD_PART_CONFIG_ACC_MASK;
+ unsigned int boot_capacity = sd->ext_csd[EXT_CSD_BOOT_MULT] << 17;
+
+ switch (access) {
+ case EXT_CSD_PART_CONFIG_ACC_DEFAULT:
+ return boot_capacity * 2;
+ case EXT_CSD_PART_CONFIG_ACC_BOOT0:
+ return 0;
+ case EXT_CSD_PART_CONFIG_ACC_BOOT0 + 1:
+ return boot_capacity * 1;
+ default:
+ g_assert_not_reached();
+ }
+}
+
+static uint32_t sd_bootpart_offset(SDState *sd)
+{
+ SDCardClass *sc = SD_CARD_GET_CLASS(sd);
+ return sc->bootpart_offset ? sc->bootpart_offset(sd) : 0;
+}
+
static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
{
trace_sdcard_read_block(addr, len);
+ addr += sd_bootpart_offset(sd);
if (!sd->blk || blk_pread(sd->blk, addr, sd->data, len) < 0) {
fprintf(stderr, "sd_blk_read: read error on host side\n");
}
@@ -850,6 +881,7 @@ static void sd_blk_read(SDState *sd, uint64_t addr, uint32_t len)
static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len)
{
trace_sdcard_write_block(addr, len);
+ addr += sd_bootpart_offset(sd);
if (!sd->blk || blk_pwrite(sd->blk, addr, sd->data, len, 0) < 0) {
fprintf(stderr, "sd_blk_write: write error on host side\n");
}
@@ -2546,6 +2578,7 @@ static void emmc_class_init(ObjectClass *klass, void *data)
sc->proto = &sd_proto_emmc;
sc->spec_version = SD_PHY_SPECv3_01_VERS; /* eMMC requirement */
sc->set_csd = sd_emmc_set_csd;
+ sc->bootpart_offset = sd_emmc_bootpart_offset;
}
static const TypeInfo emmc_info = {
--
2.34.1
next prev parent reply other threads:[~2022-03-18 13:53 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-18 13:28 [RFC PATCH 00/17] hw/sd: Rework models for eMMC support Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 01/17] hw/sd: When card is in wrong state, log which state it is Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 02/17] hw/sd: Move proto_name to SDProto structure Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 03/17] hw/sd: Introduce sd_cmd_handler type Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 04/17] hw/sd: Add sd_cmd_illegal() handler Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 05/17] hw/sd: Add sd_cmd_unimplemented() handler Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 06/17] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 07/17] hw/sd: Add sd_cmd_SEND_OP_CMD() handler Cédric Le Goater
2022-05-09 21:12 ` Philippe Mathieu-Daudé via
2022-05-10 6:57 ` Cédric Le Goater
2022-05-30 17:25 ` Philippe Mathieu-Daudé via
2022-03-18 13:28 ` [RFC PATCH 08/17] hw/sd: Add sd_cmd_ALL_SEND_CID() handler Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 09/17] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 10/17] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler Cédric Le Goater
2022-05-09 21:05 ` Philippe Mathieu-Daudé via
2022-05-10 6:57 ` Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 11/17] hw/sd: Add eMMC support Cédric Le Goater
2022-03-28 12:10 ` Jerome Forissier
2022-03-28 14:13 ` Cédric Le Goater
2022-05-09 21:17 ` Philippe Mathieu-Daudé via
2022-05-10 7:15 ` Cédric Le Goater
2022-05-10 13:53 ` Cédric Le Goater
2022-05-30 17:02 ` Philippe Mathieu-Daudé via
2022-05-31 5:49 ` Cédric Le Goater
2022-05-30 17:40 ` Philippe Mathieu-Daudé via
2022-05-31 5:58 ` Cédric Le Goater
2022-05-31 8:03 ` Philippe Mathieu-Daudé via
2022-05-31 8:18 ` Cédric Le Goater
2022-05-30 18:29 ` Philippe Mathieu-Daudé via
2022-05-31 6:01 ` Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 12/17] hw/sd: Fix SET_BLOCK_COUNT command argument Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 13/17] hw/sd: Update CMD1 definition for MMC Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 14/17] hw/sd: Add CMD21 tuning sequence Cédric Le Goater
2022-03-18 13:28 ` [RFC PATCH 15/17] hw/sd: Add mmc switch function support Cédric Le Goater
2022-03-18 13:28 ` Cédric Le Goater [this message]
2022-03-18 13:28 ` [RFC PATCH 17/17] hw/sd: Subtract bootarea size from blk Cédric Le Goater
2022-05-09 21:22 ` Philippe Mathieu-Daudé via
2022-04-21 6:48 ` [RFC PATCH 00/17] hw/sd: Rework models for eMMC support Cédric Le Goater
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=20220318132824.1134400-17-clg@kaod.org \
--to=clg@kaod.org \
--cc=bin.meng@windriver.com \
--cc=joel@jms.id.au \
--cc=philmd@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
/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).