From: "Philippe Mathieu-Daudé" <philippe.mathieu.daude@gmail.com>
To: qemu-devel@nongnu.org
Cc: "Cédric Le Goater" <clg@kaod.org>,
"Bin Meng" <bin.meng@windriver.com>,
qemu-block@nongnu.org, "Joel Stanley" <joel@jms.id.au>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>,
"Sai Pavan Boddu" <sai.pavan.boddu@xilinx.com>,
"Edgar E . Iglesias" <edgar.iglesias@xilinx.com>
Subject: [PATCH v2 21/25] hw/sd: Add mmc switch function support
Date: Mon, 30 May 2022 21:38:12 +0200 [thread overview]
Message-ID: <20220530193816.45841-22-philippe.mathieu.daude@gmail.com> (raw)
In-Reply-To: <20220530193816.45841-1-philippe.mathieu.daude@gmail.com>
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>
[ clg: - ported on SDProto framework ]
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
hw/sd/sd.c | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/hw/sd/sd.c b/hw/sd/sd.c
index 672af1e839..907d4f5760 100644
--- a/hw/sd/sd.c
+++ b/hw/sd/sd.c
@@ -476,6 +476,7 @@ static void sd_set_rca(SDState *sd)
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)
@@ -873,6 +874,43 @@ static uint32_t sd_wpbits(SDState *sd, uint64_t addr)
return ret;
}
+enum {
+ MMC_CMD6_ACCESS_COMMAND_SET = 0,
+ MMC_CMD6_ACCESS_SET_BITS,
+ MMC_CMD6_ACCESS_CLEAR_BITS,
+ MMC_CMD6_ACCESS_WRITE_BYTE,
+};
+
+static void mmc_function_switch(SDState *sd, uint32_t arg)
+{
+ uint32_t access = extract32(arg, 24, 2);
+ uint32_t index = extract32(arg, 16, 8);
+ uint32_t value = extract32(arg, 8, 8);
+ uint8_t b = sd->ext_csd[index];
+
+ switch (access) {
+ case MMC_CMD6_ACCESS_COMMAND_SET:
+ qemu_log_mask(LOG_UNIMP, "MMC Command set switching not supported\n");
+ return;
+ case MMC_CMD6_ACCESS_SET_BITS:
+ b |= value;
+ break;
+ case MMC_CMD6_ACCESS_CLEAR_BITS:
+ b &= ~value;
+ break;
+ case MMC_CMD6_ACCESS_WRITE_BYTE:
+ b = value;
+ break;
+ }
+
+ if (index >= 192) {
+ sd->card_status |= R_CSR_SWITCH_ERROR_MASK;
+ return;
+ }
+
+ sd->ext_csd[index] = b;
+}
+
static void sd_function_switch(SDState *sd, uint32_t arg)
{
int i, mode, new_func;
@@ -2257,6 +2295,19 @@ static sd_rsp_type_t sd_emmc_cmd_SEND_TUNING_BLOCK(SDState *sd, SDRequest req)
return sd_r1;
}
+static sd_rsp_type_t sd_emmc_cmd_SWITCH_FUNCTION(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);
+ }
+}
+
static const SDProto sd_proto_emmc = {
.name = "eMMC",
.cmd = {
@@ -2265,6 +2316,7 @@ static const SDProto sd_proto_emmc = {
[2] = sd_emmc_cmd_ALL_SEND_CID,
[3] = sd_emmc_cmd_SEND_RELATIVE_ADDR,
[5] = sd_cmd_illegal,
+ [6] = sd_emmc_cmd_SWITCH_FUNCTION,
[19] = sd_cmd_SEND_TUNING_BLOCK,
[21] = sd_emmc_cmd_SEND_TUNING_BLOCK,
[41] = sd_cmd_illegal,
--
2.36.1
next prev parent reply other threads:[~2022-05-30 20:01 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-30 19:37 [PATCH v2 00/25] hw/sd: Rework models for eMMC support Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 01/25] hw/sd/sdcard: Return ILLEGAL for CMD19/CMD23 prior SD spec v3.01 Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 02/25] hw/sd: When card is in wrong state, log which state it is Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 03/25] hw/sd: When card is in wrong state, log which spec version is used Philippe Mathieu-Daudé
2022-05-31 8:01 ` Cédric Le Goater
2022-05-30 19:37 ` [PATCH v2 04/25] hw/sd: Move proto_name to SDProto structure Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 05/25] hw/sd: Introduce sd_cmd_handler type Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 06/25] hw/sd: Add sd_cmd_illegal() handler Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 07/25] hw/sd: Add sd_cmd_unimplemented() handler Philippe Mathieu-Daudé
2022-05-30 19:37 ` [PATCH v2 08/25] hw/sd: Add sd_cmd_GO_IDLE_STATE() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 09/25] hw/sd: Add sd_cmd_SEND_OP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 10/25] hw/sd: Add sd_cmd_ALL_SEND_CID() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 11/25] hw/sd: Add sd_cmd_SEND_RELATIVE_ADDR() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 12/25] hw/sd: Add sd_cmd_SEND_TUNING_BLOCK() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 13/25] hw/sd: Add sd_cmd_SET_BLOCK_COUNT() handler Philippe Mathieu-Daudé
2022-05-31 8:02 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 14/25] hw/sd: Basis for eMMC support Philippe Mathieu-Daudé
2022-05-31 7:54 ` Philippe Mathieu-Daudé via
2022-05-31 8:50 ` Cédric Le Goater
2022-05-31 9:05 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 15/25] hw/sd: Add sd_emmc_cmd_SEND_OP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 16/25] hw/sd: Add sd_emmc_cmd_ALL_SEND_CID() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 17/25] hw/sd: Add sd_emmc_cmd_SEND_RELATIVE_ADDR() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 18/25] hw/sd: Add sd_emmc_cmd_APP_CMD() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 19/25] hw/sd: add sd_emmc_cmd_SEND_TUNING_BLOCK() handler Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 20/25] hw/sd: Add CMD21 tuning sequence Philippe Mathieu-Daudé
2022-05-30 19:38 ` Philippe Mathieu-Daudé [this message]
2022-05-30 19:38 ` [PATCH v2 22/25] hw/sd: Add sd_emmc_cmd_SEND_EXT_CSD() handler Philippe Mathieu-Daudé
2022-05-31 8:48 ` Cédric Le Goater
2022-05-30 19:38 ` [PATCH v2 23/25] hw/sd: Support boot area in emmc image Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 24/25] hw/sd: Subtract bootarea size from blk Philippe Mathieu-Daudé
2022-05-30 19:38 ` [PATCH v2 25/25] hw/sd: Add boot config support Philippe Mathieu-Daudé
2022-05-31 6:31 ` [PATCH v2 00/25] hw/sd: Rework models for eMMC support Cédric Le Goater
2022-05-31 7:56 ` Philippe Mathieu-Daudé via
2022-05-31 7:58 ` Philippe Mathieu-Daudé via
2022-05-31 9:19 ` Cédric Le Goater
2022-05-31 19:07 ` Philippe Mathieu-Daudé via
2022-06-01 5:50 ` 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=20220530193816.45841-22-philippe.mathieu.daude@gmail.com \
--to=philippe.mathieu.daude@gmail.com \
--cc=bin.meng@windriver.com \
--cc=clg@kaod.org \
--cc=edgar.iglesias@xilinx.com \
--cc=f4bug@amsat.org \
--cc=joel@jms.id.au \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=sai.pavan.boddu@xilinx.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).