mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hw/sd/sdcard: Add mmc SWITCH function support (CMD6)

Browse Source 
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>
Tested-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240712162719.88165-11-philmd@linaro.org>
This commit is contained in:
Sai Pavan Boddu 2022-05-25 09:21:22 +02:00 committed by Philippe Mathieu-Daudé
parent c3561ab624
commit 8f25b74a32
2 changed files with 58 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
hw/sd/sd.c
View File

@ -642,6 +642,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)
@ -1091,6 +1092,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 emmc_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;
@ -1402,6 +1444,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;
emmc_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)
{
@ -2581,6 +2636,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},

2
hw/sd/trace-events
View File

@ -57,6 +57,8 @@ sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"
sdcard_write_data(const char *proto, const char *cmd_desc, uint8_t cmd, uint32_t offset, uint8_t value) "%s %20s/ CMD%02d ofs %"PRIu32" value 0x%02x"
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_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"