From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Joel Stanley" <joel@jms.id.au>,
"Luc Michel" <luc.michel@amd.com>,
"Francisco Iglesias" <francisco.iglesias@amd.com>,
qemu-block@nongnu.org,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Vincent Palatin" <vpalatin@chromium.org>,
"Sai Pavan Boddu" <sai.pavan.boddu@amd.com>,
"Bin Meng" <bmeng.cn@gmail.com>,
"Cédric Le Goater" <clg@kaod.org>
Subject: [RFC PATCH 19/19] hw/sd/sdcard: Add boot config support
Date: Thu, 27 Jun 2024 19:10:59 +0200 [thread overview]
Message-ID: <20240627171059.84349-20-philmd@linaro.org> (raw)
In-Reply-To: <20240627171059.84349-1-philmd@linaro.org>
From: Joel Stanley <joel@jms.id.au>
Introduced "boot-config" property to set CSD 179, the boot config
register.
With this correctly set we can use the enable bit to detect if
partition support is enabled.
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
hw/sd/sd.c | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index bbf054ea1e..b598974bbf 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -129,6 +129,7 @@ struct SDState {
uint8_t spec_version;
BlockBackend *blk;
bool aspeed_emmc_kludge;
+ uint8_t boot_config;
const SDProto *proto;
@@ -505,6 +506,8 @@ static void mmc_set_ext_csd(SDState *sd, uint64_t size)
sd->ext_csd[159] = 0x00; /* Max enhanced area size */
sd->ext_csd[158] = 0x00; /* ... */
sd->ext_csd[157] = 0xEC; /* ... */
+
+ sd->ext_csd[EXT_CSD_PART_CONFIG] = sd->boot_config;
}
static void sd_emmc_set_csd(SDState *sd, uint64_t size)
@@ -1004,8 +1007,14 @@ 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 enable = sd->ext_csd[EXT_CSD_PART_CONFIG] &
+ EXT_CSD_PART_CONFIG_EN_MASK;
unsigned int boot_capacity = sd_boot_capacity_bytes(sd);
+ if (!enable) {
+ return 0;
+ }
+
switch (access) {
case EXT_CSD_PART_CONFIG_ACC_DEFAULT:
return boot_capacity * 2;
@@ -2808,6 +2817,7 @@ static Property sd_properties[] = {
* whether card should be in SSI or MMC/SD mode. It is also up to the
* board to ensure that ssi transfers only occur when the chip select
* is asserted. */
+ DEFINE_PROP_UINT8("boot-config", SDState, boot_config, 0x0),
DEFINE_PROP_END_OF_LIST()
};
--
2.41.0
next prev parent reply other threads:[~2024-06-27 17:15 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-27 17:10 [PATCH 00/19] hw/sd: Add support for eMMC cards Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 01/19] hw/sd/sdcard: Introduce set_csd/set_cid handlers Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 02/19] hw/sd/sdcard: Cover more SDCardStates Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 03/19] hw/sd/sdcard: Basis for eMMC support Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 04/19] hw/sd/sdcard: Register generic command handlers Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 05/19] hw/sd/sdcard: Register unimplemented " Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 06/19] hw/sd/sdcard: Add emmc_cmd_SET_RELATIVE_ADDR() handler Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 07/19] hw/sd/sdcard: Add emmc_cmd_SEND_OP_COND handler (CMD1) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 08/19] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 09/19] hw/sd/sdcard: Add mmc_cmd_PROGRAM_CID handler (CMD26) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [PATCH 10/19] hw/sd/sdcard: Implement eMMC sleep state (CMD5) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 11/19] hw/sd/sdcard: Add experimental 'x-aspeed-emmc-kludge' property Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 12/19] hw/sd/sdcard: Adapt sd_cmd_ALL_SEND_CID handler for eMMC (CMD2) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 13/19] hw/sd/sdcard: Adapt sd_cmd_APP_CMD handler for eMMC (CMD55) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 14/19] hw/sd/sdcard: Add emmc_cmd_SEND_EXT_CSD handler (CMD8) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 15/19] hw/sd/sdcard: add emmc_cmd_SEND_TUNING_BLOCK handler (CMD21) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 16/19] hw/sd/sdcard: Add mmc SWITCH function support (CMD6) Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 17/19] hw/sd/sdcard: Support boot area in emmc image Philippe Mathieu-Daudé
2024-06-27 17:10 ` [RFC PATCH 18/19] hw/sd/sdcard: Subtract bootarea size from blk Philippe Mathieu-Daudé
2024-06-27 17:10 ` Philippe Mathieu-Daudé [this message]
2024-06-28 6:46 ` [PATCH 00/19] hw/sd: Add support for eMMC cards 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=20240627171059.84349-20-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=bmeng.cn@gmail.com \
--cc=clg@kaod.org \
--cc=francisco.iglesias@amd.com \
--cc=joel@jms.id.au \
--cc=luc.michel@amd.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sai.pavan.boddu@amd.com \
--cc=vpalatin@chromium.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).