From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: "Bin Meng" <bmeng.cn@gmail.com>,
"Steven Lee" <steven_lee@aspeedtech.com>,
"Andrew Jeffery" <andrew@codeconstruct.com.au>,
"Francisco Iglesias" <francisco.iglesias@amd.com>,
"Sai Pavan Boddu" <sai.pavan.boddu@amd.com>,
"Luc Michel" <luc.michel@amd.com>,
qemu-arm@nongnu.org, qemu-block@nongnu.org,
"Troy Lee" <leetroy@gmail.com>,
"Jamin Lin" <jamin_lin@aspeedtech.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Joel Stanley" <joel@jms.id.au>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>,
"Edgar E . Iglesias" <edgar.iglesias@amd.com>,
"Cédric Le Goater" <clg@kaod.org>,
"Sai Pavan Boddu" <sai.pavan.boddu@xilinx.com>,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>
Subject: [PATCH v48 11/12] hw/sd/sdcard: Add mmc SWITCH function support (CMD6)
Date: Wed, 10 Jul 2024 16:14:07 +0200 [thread overview]
Message-ID: <20240710141408.69275-12-philmd@linaro.org> (raw)
In-Reply-To: <20240710141408.69275-1-philmd@linaro.org>
From: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
switch operation in mmc cards, updated the ext_csd register to
request changes in card operations. Here we implement similar
sequence but requests are mostly dummy and make no change.
Implement SWITCH_ERROR if the write operation offset goes beyond
length of ext_csd.
Signed-off-by: Sai Pavan Boddu <sai.pavan.boddu@xilinx.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
[PMD: Convert to SDProto handlers, add trace events]
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Andrew Jeffery <andrew@codeconstruct.com.au>
---
hw/sd/sd.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
hw/sd/trace-events | 2 ++
2 files changed, 58 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index c2ea942389..86b857d414 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -653,6 +653,7 @@ static bool sd_req_rca_same(SDState *s, SDRequest req)
FIELD(CSR, AKE_SEQ_ERROR, 3, 1)
FIELD(CSR, APP_CMD, 5, 1)
FIELD(CSR, FX_EVENT, 6, 1)
+FIELD(CSR, SWITCH_ERROR, 7, 1)
FIELD(CSR, READY_FOR_DATA, 8, 1)
FIELD(CSR, CURRENT_STATE, 9, 4)
FIELD(CSR, ERASE_RESET, 13, 1)
@@ -1117,6 +1118,47 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
return ret;
}
+enum ExtCsdAccessMode {
+ EXT_CSD_ACCESS_MODE_COMMAND_SET = 0,
+ EXT_CSD_ACCESS_MODE_SET_BITS = 1,
+ EXT_CSD_ACCESS_MODE_CLEAR_BITS = 2,
+ EXT_CSD_ACCESS_MODE_WRITE_BYTE = 3
+};
+
+static void mmc_function_switch(SDState *sd, uint32_t arg)
+{
+ uint8_t access = extract32(arg, 24, 2);
+ uint8_t index = extract32(arg, 16, 8);
+ uint8_t value = extract32(arg, 8, 8);
+ uint8_t b = sd->ext_csd[index];
+
+ trace_sdcard_switch(access, index, value, extract32(arg, 0, 2));
+
+ if (index >= 192) {
+ qemu_log_mask(LOG_GUEST_ERROR, "MMC switching illegal offset\n");
+ sd->card_status |= R_CSR_SWITCH_ERROR_MASK;
+ return;
+ }
+
+ switch (access) {
+ case EXT_CSD_ACCESS_MODE_COMMAND_SET:
+ qemu_log_mask(LOG_UNIMP, "MMC Command set switching not supported\n");
+ return;
+ case EXT_CSD_ACCESS_MODE_SET_BITS:
+ b |= value;
+ break;
+ case EXT_CSD_ACCESS_MODE_CLEAR_BITS:
+ b &= ~value;
+ break;
+ case EXT_CSD_ACCESS_MODE_WRITE_BYTE:
+ b = value;
+ break;
+ }
+
+ trace_sdcard_ext_csd_update(index, sd->ext_csd[index], b);
+ sd->ext_csd[index] = b;
+}
+
static void sd_function_switch(SDState *sd, uint32_t arg)
{
int i, mode, new_func;
@@ -1428,6 +1470,19 @@ static sd_rsp_type_t sd_cmd_SWITCH_FUNCTION(SDState *sd, SDRequest req)
return sd_cmd_to_sendingdata(sd, req, 0, NULL, 64);
}
+static sd_rsp_type_t emmc_cmd_SWITCH(SDState *sd, SDRequest req)
+{
+ switch (sd->state) {
+ case sd_transfer_state:
+ sd->state = sd_programming_state;
+ mmc_function_switch(sd, req.arg);
+ sd->state = sd_transfer_state;
+ return sd_r1b;
+ default:
+ return sd_invalid_state_for_cmd(sd, req);
+ }
+}
+
/* CMD7 */
static sd_rsp_type_t sd_cmd_DE_SELECT_CARD(SDState *sd, SDRequest req)
{
@@ -2619,6 +2674,7 @@ static const SDProto sd_proto_emmc = {
[3] = {0, sd_ac, "SET_RELATIVE_ADDR", emmc_cmd_SET_RELATIVE_ADDR},
[4] = {0, sd_bc, "SEND_DSR", sd_cmd_unimplemented},
[5] = {0, sd_ac, "SLEEP/AWAKE", emmc_cmd_sleep_awake},
+ [6] = {10, sd_adtc, "SWITCH", emmc_cmd_SWITCH},
[7] = {0, sd_ac, "(DE)SELECT_CARD", sd_cmd_DE_SELECT_CARD},
[8] = {0, sd_adtc, "SEND_EXT_CSD", emmc_cmd_SEND_EXT_CSD},
[9] = {0, sd_ac, "SEND_CSD", sd_cmd_SEND_CSD},
diff --git a/hw/sd/trace-events b/hw/sd/trace-events
index 7d0de368aa..5454e55077 100644
--- a/hw/sd/trace-events
+++ b/hw/sd/trace-events
@@ -58,6 +58,8 @@ sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t
sdcard_read_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint64_t size, uint32_t blklen) "%s %20s/ CMD%02d ofs %"PRIu32" size %"PRIu64" blklen %" PRIu32
sdcard_set_voltage(uint16_t millivolts) "%u mV"
sdcard_ext_csd_bootmode(int64_t uptime_ns, int64_t clk_cycles, unsigned enabled) "%"PRId64" ns, %"PRId64" cycles, boot mode: %u"
+sdcard_ext_csd_update(unsigned index, uint8_t oval, uint8_t nval) "index %u: 0x%02x -> 0x%02x"
+sdcard_switch(unsigned access, unsigned index, unsigned value, unsigned set) "SWITCH acc:%u idx:%u val:%u set:%u"
# pxa2xx_mmci.c
pxa2xx_mmci_read(uint8_t size, uint32_t addr, uint32_t value) "size %d addr 0x%02x value 0x%08x"
--
2.41.0
next prev parent reply other threads:[~2024-07-10 14:16 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-07-10 14:13 [PATCH v48 00/12] hw/sd/sdcard: Add eMMC support Philippe Mathieu-Daudé
2024-07-10 14:13 ` [PATCH v48 01/12] hw/sd/sdcard: Basis for " Philippe Mathieu-Daudé
2024-07-10 14:13 ` [PATCH v48 02/12] hw/sd/sdcard: Register generic command handlers Philippe Mathieu-Daudé
2024-07-10 14:13 ` [PATCH v48 03/12] hw/sd/sdcard: Register unimplemented " Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 04/12] hw/sd/sdcard: Add emmc_cmd_SET_RELATIVE_ADDR handler (CMD3) Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 05/12] hw/sd/sdcard: Fix SET_BLOCK_COUNT command argument on eMMC (CMD23) Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 06/12] hw/sd/sdcard: Add mmc_cmd_PROGRAM_CID handler (CMD26) Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 07/12] hw/sd/sdcard: Implement eMMC sleep state (CMD5) Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 08/12] hw/sd/sdcard: Add emmc_cmd_SEND_EXT_CSD handler (CMD8) Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 09/12] hw/sd/sdcard: Add eMMC 'boot-size' property Philippe Mathieu-Daudé
2024-07-10 14:14 ` [PATCH v48 10/12] hw/sd/sdcard: Implement eMMC 'boot-mode' Philippe Mathieu-Daudé
2024-07-10 14:14 ` Philippe Mathieu-Daudé [this message]
2024-07-10 14:14 ` [PATCH v48 12/12] hw/sd/sdcard: Support boot area in emmc image Philippe Mathieu-Daudé
2024-07-10 15:35 ` [PATCH v48 00/12] hw/sd/sdcard: Add eMMC support Cédric Le Goater
2024-07-10 16:57 ` Philippe Mathieu-Daudé
2024-07-10 19:20 ` Cédric Le Goater
2024-07-11 11:03 ` Cédric Le Goater
2024-07-11 14:08 ` Philippe Mathieu-Daudé
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=20240710141408.69275-12-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=andrew@codeconstruct.com.au \
--cc=bmeng.cn@gmail.com \
--cc=clg@kaod.org \
--cc=edgar.iglesias@amd.com \
--cc=edgar.iglesias@xilinx.com \
--cc=francisco.iglesias@amd.com \
--cc=jamin_lin@aspeedtech.com \
--cc=joel@jms.id.au \
--cc=leetroy@gmail.com \
--cc=luc.michel@amd.com \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sai.pavan.boddu@amd.com \
--cc=sai.pavan.boddu@xilinx.com \
--cc=steven_lee@aspeedtech.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).