hw/sd/sdcard: Convert CMD to sd_cmd_handler format
cover hw/sd/sdcard: Convert CMD to sd_cmd_handler format
For each switch case in the big sd_normal_command() function, extract the corresponding sd_cmd_handler.
Based-on: <[email protected]>
Full series for testing:
https://gitlab.com/philmd/qemu/-/tags/emmc-v4
Philippe Mathieu-Daudé (21):
hw/sd/sdcard: Add sd_cmd_SWITCH_FUNCTION handler (CMD6) hw/sd/sdcard: Add sd_cmd_DE/SELECT_CARD handler (CMD7) hw/sd/sdcard: Add sd_cmd_SEND_IF_COND handler (CMD8) hw/sd/sdcard: Add sd_cmd_SEND_CSD/CID handlers (CMD9 & CMD10) hw/sd/sdcard: Add spi_cmd_SEND_CSD/CID handlers (CMD9 & CMD10) hw/sd/sdcard: Add sd_cmd_STOP_TRANSMISSION handler (CMD12) hw/sd/sdcard: Add sd_cmd_SEND_STATUS handler (CMD13) hw/sd/sdcard: Add sd_cmd_GO_INACTIVE_STATE handler (CMD15) hw/sd/sdcard: Add sd_cmd_SET_BLOCKLEN handler (CMD16) hw/sd/sdcard: Add sd_cmd_READ_SINGLE_BLOCK handler (CMD17) hw/sd/sdcard: Add sd_cmd_WRITE_SINGLE_BLOCK handler (CMD24) hw/sd/sdcard: Add sd_cmd_PROGRAM_CSD handler (CMD27) hw/sd/sdcard: Add sd_cmd_SET/CLR_WRITE_PROT handler (CMD28 & CMD29) hw/sd/sdcard: Add sd_cmd_SEND_WRITE_PROT handler (CMD30) hw/sd/sdcard: Add sd_cmd_ERASE_WR_BLK_START/END handlers (CMD32 &
CMD33)
hw/sd/sdcard: Add sd_cmd_ERASE handler (CMD38) hw/sd/sdcard: Add sd_cmd_LOCK_UNLOCK handler (CMD42) hw/sd/sdcard: Add sd_cmd_APP_CMD handler (CMD55) hw/sd/sdcard: Add sd_cmd_GEN_CMD handler (CMD56) hw/sd/sdcard: Add spi_cmd_READ_OCR handler (CMD58) hw/sd/sdcard: Add spi_cmd_CRC_ON_OFF handler (CMD59)
hw/sd/sd.c | 843 +++++++++++++++++++++++++++++------------------------ 1 file changed, 459 insertions(+), 384 deletions(-)
Signature · 1 line
2.41.0
PATCH 1/21 hw/sd/sdcard: Add sd_cmd_SWITCH_FUNCTION handler (CMD6)
--- hw/sd/sd.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-)
hw/sd/sd.c +17 -12
@@ -240,7 +240,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [6 ] ="SWITCH_FUNC" , [7 ] ="SELECT/DESELECT_CARD" , + [7 ] ="SELECT/DESELECT_CARD" , [8 ] ="SEND_IF_COND" , [9 ] ="SEND_CSD" , [10 ] ="SEND_CID" , [12 ] ="STOP_TRANSMISSION" , [13 ] ="SEND_STATUS" ,
@@ -1244,6 +1244,20 @@ static sd_rsp_type_t sd_cmd_SEND_RELATIVE_ADDR(SDState *sd, SDRequest req) } } +/* CMD6 */ +static sd_rsp_type_t sd_cmd_SWITCH_FUNCTION (SDState *sd,SDRequest req) +{ +if (sd->mode != sd_data_transfer_mode) { +return sd_invalid_mode_for_cmd (sd, req); + } +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + +sd_function_switch (sd, req.arg); +return sd_cmd_to_sendingdata (sd, req,0 ,NULL ,64 ); +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1310,17 +1324,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 6 :/* CMD6: SWITCH_FUNCTION */ -if (sd->mode != sd_data_transfer_mode) { -return sd_invalid_mode_for_cmd (sd, req); - } -if (sd->state != sd_transfer_state) { -return sd_invalid_state_for_cmd (sd, req); - } - -sd_function_switch (sd, req.arg); -return sd_cmd_to_sendingdata (sd, req,0 ,NULL ,64 ); -case 7 :/* CMD7: SELECT/DESELECT_CARD */ rca =sd_req_get_rca (sd, req);switch (sd->state) {
@@ -2266,6 +2269,7 @@ static const SDProto sd_proto_spi = { [0] = {0, sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, [1] = {0, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, [5] = {9, sd_spi, "IO_SEND_OP_COND", sd_cmd_optional}, + [6] = {10, sd_spi, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2288,6 +2292,7 @@ static const SDProto sd_proto_sd = { [3] = {0, sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR}, [4] = {0, sd_bc, "SEND_DSR", sd_cmd_unimplemented}, [5] = {9, sd_bc, "IO_SEND_OP_COND", sd_cmd_optional}, + [6] = {10, sd_adtc, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 2/21 hw/sd/sdcard: Add sd_cmd_DE/SELECT_CARD handler (CMD7)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 85 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 47 insertions(+), 38 deletions(-)
hw/sd/sd.c +47 -38
@@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [7 ] ="SELECT/DESELECT_CARD" , [8 ] ="SEND_IF_COND" , [9 ] ="SEND_CSD" , [10 ] ="SEND_CID" , [12 ] ="STOP_TRANSMISSION" , [13 ] ="SEND_STATUS" ,
@@ -558,6 +557,11 @@ static uint16_t sd_req_get_rca(SDState *s, SDRequest req) } } +static bool sd_req_rca_same (SDState *s,SDRequest req) +{ +return sd_req_get_rca (s, req) == s->rca; +} +/* Card Status register */ FIELD (CSR ,AKE_SEQ_ERROR ,3 ,1 )
@@ -1258,6 +1262,47 @@ static sd_rsp_type_t sd_cmd_SWITCH_FUNCTION(SDState *sd, SDRequest req)return sd_cmd_to_sendingdata (sd, req,0 ,NULL ,64 ); } +/* CMD7 */ +static sd_rsp_type_t sd_cmd_DE_SELECT_CARD (SDState *sd,SDRequest req) +{ +bool same_rca =sd_req_rca_same (sd, req); + +switch (sd->state) { +case sd_standby_state: +if (!same_rca) { +return sd_r0; + } + sd->state = sd_transfer_state; +return sd_r1b; + +case sd_transfer_state: +case sd_sendingdata_state: +if (same_rca) { +break ; + } + sd->state = sd_standby_state; +return sd_r1b; + +case sd_disconnect_state: +if (!same_rca) { +return sd_r0; + } + sd->state = sd_programming_state; +return sd_r1b; + +case sd_programming_state: +if (same_rca) { +break ; + } + sd->state = sd_disconnect_state; +return sd_r1b; + +default : +break ; + } +return sd_invalid_state_for_cmd (sd, req); +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1324,43 +1369,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 7 :/* CMD7: SELECT/DESELECT_CARD */ - rca =sd_req_get_rca (sd, req); -switch (sd->state) { -case sd_standby_state: -if (sd->rca != rca) -return sd_r0; - - sd->state = sd_transfer_state; -return sd_r1b; - -case sd_transfer_state: -case sd_sendingdata_state: -if (sd->rca == rca) -break ; - - sd->state = sd_standby_state; -return sd_r1b; - -case sd_disconnect_state: -if (sd->rca != rca) -return sd_r0; - - sd->state = sd_programming_state; -return sd_r1b; - -case sd_programming_state: -if (sd->rca == rca) -break ; - - sd->state = sd_disconnect_state; -return sd_r1b; - -default : -break ; - } -break ; -case 8 :/* CMD8: SEND_IF_COND */ if (sd->spec_version < SD_PHY_SPECv2_00_VERS) {break ;
@@ -2293,6 +2301,7 @@ static const SDProto sd_proto_sd = { [4] = {0, sd_bc, "SEND_DSR", sd_cmd_unimplemented}, [5] = {9, sd_bc, "IO_SEND_OP_COND", sd_cmd_optional}, [6] = {10, sd_adtc, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, + [7] = {0, sd_ac, "(DE)SELECT_CARD", sd_cmd_DE_SELECT_CARD}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 3/21 hw/sd/sdcard: Add sd_cmd_SEND_IF_COND handler (CMD8)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 43 ++++++++++++++++++++++++------------------- 1 file changed, 24 insertions(+), 19 deletions(-)
hw/sd/sd.c +24 -19
@@ -240,7 +240,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [8 ] ="SEND_IF_COND" , [9 ] ="SEND_CSD" , + [9 ] ="SEND_CSD" , [10 ] ="SEND_CID" , [12 ] ="STOP_TRANSMISSION" , [13 ] ="SEND_STATUS" , [15 ] ="GO_INACTIVE_STATE" ,
@@ -1303,6 +1303,27 @@ static sd_rsp_type_t sd_cmd_DE_SELECT_CARD(SDState *sd, SDRequest req)return sd_invalid_state_for_cmd (sd, req); } +/* CMD8 */ +static sd_rsp_type_t sd_cmd_SEND_IF_COND (SDState *sd,SDRequest req) +{ +if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { +return sd_cmd_illegal (sd, req); + } +if (sd->state != sd_idle_state) { +return sd_invalid_state_for_cmd (sd, req); + } + sd->vhs =0 ; + +/* No response if not exactly one VHS bit is set. */ +if (!(req.arg >>8 ) || (req.arg >> (ctz32 (req.arg & ~0xff ) +1 ))) { +return sd_is_spi (sd) ? sd_r7 : sd_r0; + } + +/* Accept. */ + sd->vhs = req.arg; +return sd_r7; +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1369,24 +1390,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 8 :/* CMD8: SEND_IF_COND */ -if (sd->spec_version < SD_PHY_SPECv2_00_VERS) { -break ; - } -if (sd->state != sd_idle_state) { -break ; - } - sd->vhs =0 ; - -/* No response if not exactly one VHS bit is set. */ -if (!(req.arg >>8 ) || (req.arg >> (ctz32 (req.arg & ~0xff ) +1 ))) { -return sd_is_spi (sd) ? sd_r7 : sd_r0; - } - -/* Accept. */ - sd->vhs = req.arg; -return sd_r7; -case 9 :/* CMD9: SEND_CSD */ rca =sd_req_get_rca (sd, req);switch (sd->state) {
@@ -2278,6 +2281,7 @@ static const SDProto sd_proto_spi = { [1] = {0, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, [5] = {9, sd_spi, "IO_SEND_OP_COND", sd_cmd_optional}, [6] = {10, sd_spi, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, + [8] = {0, sd_spi, "SEND_IF_COND", sd_cmd_SEND_IF_COND}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2302,6 +2306,7 @@ static const SDProto sd_proto_sd = { [5] = {9, sd_bc, "IO_SEND_OP_COND", sd_cmd_optional}, [6] = {10, sd_adtc, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, [7] = {0, sd_ac, "(DE)SELECT_CARD", sd_cmd_DE_SELECT_CARD}, + [8] = {0, sd_bcr, "SEND_IF_COND", sd_cmd_SEND_IF_COND}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 4/21 hw/sd/sdcard: Add sd_cmd_SEND_CSD/CID handlers (CMD9 & CMD10)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-)
hw/sd/sd.c +22 -14
@@ -240,8 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [9 ] ="SEND_CSD" , - [10 ] ="SEND_CID" , [12 ] ="STOP_TRANSMISSION" , [13 ] ="SEND_STATUS" , [15 ] ="GO_INACTIVE_STATE" , [16 ] ="SET_BLOCKLEN" , [17 ] ="READ_SINGLE_BLOCK" ,
@@ -1324,6 +1322,26 @@ static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req)return sd_r7; } +/* CMD9 */ +static sd_rsp_type_t sd_cmd_SEND_CSD (SDState *sd,SDRequest req) +{ +if (sd->state != sd_standby_state) { +return sd_invalid_state_for_cmd (sd, req); + } + +return sd_req_rca_same (sd, req) ? sd_r2_s : sd_r0; +} + +/* CMD10 */ +static sd_rsp_type_t sd_cmd_SEND_CID (SDState *sd,SDRequest req) +{ +if (sd->state != sd_standby_state) { +return sd_invalid_state_for_cmd (sd, req); + } + +return sd_req_rca_same (sd, req) ? sd_r2_i : sd_r0; +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1393,12 +1411,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 9 :/* CMD9: SEND_CSD */ rca =sd_req_get_rca (sd, req);switch (sd->state) { -case sd_standby_state: -if (sd->rca != rca) -return sd_r0; - -return sd_r2_s; -case sd_transfer_state:if (!sd_is_spi (sd)) {break ;
@@ -1414,12 +1426,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 10 :/* CMD10: SEND_CID */ rca =sd_req_get_rca (sd, req);switch (sd->state) { -case sd_standby_state: -if (sd->rca != rca) -return sd_r0; - -return sd_r2_i; -case sd_transfer_state:if (!sd_is_spi (sd)) {break ;
@@ -2307,6 +2313,8 @@ static const SDProto sd_proto_sd = { [6] = {10, sd_adtc, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, [7] = {0, sd_ac, "(DE)SELECT_CARD", sd_cmd_DE_SELECT_CARD}, [8] = {0, sd_bcr, "SEND_IF_COND", sd_cmd_SEND_IF_COND}, + [9] = {0, sd_ac, "SEND_CSD", sd_cmd_SEND_CSD}, + [10] = {0, sd_ac, "SEND_CID", sd_cmd_SEND_CID}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 5/21 hw/sd/sdcard: Add spi_cmd_SEND_CSD/CID handlers (CMD9 & CMD10)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 50 ++++++++++++++++++++------------------------------ 1 file changed, 20 insertions(+), 30 deletions(-)
hw/sd/sd.c +20 -30
@@ -1323,6 +1323,15 @@ static sd_rsp_type_t sd_cmd_SEND_IF_COND(SDState *sd, SDRequest req) }/* CMD9 */ +static sd_rsp_type_t spi_cmd_SEND_CSD (SDState *sd,SDRequest req) +{ +if (sd->state != sd_standby_state) { +return sd_invalid_state_for_cmd (sd, req); + } +return sd_cmd_to_sendingdata (sd, req,sd_req_get_address (sd, req), + sd->csd,16 ); +} +static sd_rsp_type_t sd_cmd_SEND_CSD (SDState *sd,SDRequest req) {if (sd->state != sd_standby_state) {
@@ -1333,6 +1342,15 @@ static sd_rsp_type_t sd_cmd_SEND_CSD(SDState *sd, SDRequest req) }/* CMD10 */ +static sd_rsp_type_t spi_cmd_SEND_CID (SDState *sd,SDRequest req) +{ +if (sd->state != sd_standby_state) { +return sd_invalid_state_for_cmd (sd, req); + } +return sd_cmd_to_sendingdata (sd, req,sd_req_get_address (sd, req), + sd->cid,16 ); +} +static sd_rsp_type_t sd_cmd_SEND_CID (SDState *sd,SDRequest req) {if (sd->state != sd_standby_state) {
@@ -1408,36 +1426,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 9 :/* CMD9: SEND_CSD */ - rca =sd_req_get_rca (sd, req); -switch (sd->state) { -case sd_transfer_state: -if (!sd_is_spi (sd)) { -break ; - } -return sd_cmd_to_sendingdata (sd, req,sd_req_get_address (sd, req), - sd->csd,16 ); - -default : -break ; - } -break ; - -case 10 :/* CMD10: SEND_CID */ - rca =sd_req_get_rca (sd, req); -switch (sd->state) { -case sd_transfer_state: -if (!sd_is_spi (sd)) { -break ; - } -return sd_cmd_to_sendingdata (sd, req,sd_req_get_address (sd, req), - sd->cid,16 ); - -default : -break ; - } -break ; -case 12 :/* CMD12: STOP_TRANSMISSION */ switch (sd->state) {case sd_sendingdata_state:
@@ -2288,6 +2276,8 @@ static const SDProto sd_proto_spi = { [5] = {9, sd_spi, "IO_SEND_OP_COND", sd_cmd_optional}, [6] = {10, sd_spi, "SWITCH_FUNCTION", sd_cmd_SWITCH_FUNCTION}, [8] = {0, sd_spi, "SEND_IF_COND", sd_cmd_SEND_IF_COND}, + [9] = {0, sd_spi, "SEND_CSD", spi_cmd_SEND_CSD}, + [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 6/21 hw/sd/sdcard: Add sd_cmd_STOP_TRANSMISSION handler (CMD12)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-)
hw/sd/sd.c +20 -18
@@ -240,7 +240,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [12 ] ="STOP_TRANSMISSION" , [13 ] ="SEND_STATUS" , + [13 ] ="SEND_STATUS" , [15 ] ="GO_INACTIVE_STATE" , [16 ] ="SET_BLOCKLEN" , [17 ] ="READ_SINGLE_BLOCK" , [18 ] ="READ_MULTIPLE_BLOCK" ,
@@ -1360,6 +1360,23 @@ static sd_rsp_type_t sd_cmd_SEND_CID(SDState *sd, SDRequest req)return sd_req_rca_same (sd, req) ? sd_r2_i : sd_r0; } +/* CMD12 */ +static sd_rsp_type_t sd_cmd_STOP_TRANSMISSION (SDState *sd,SDRequest req) +{ +switch (sd->state) { +case sd_sendingdata_state: + sd->state = sd_transfer_state; +return sd_r1b; +case sd_receivingdata_state: + sd->state = sd_programming_state; +/* Bzzzzzzztt .... Operation complete. */ + sd->state = sd_transfer_state; +return sd_r1; +default : +return sd_invalid_state_for_cmd (sd, req); + } +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1426,23 +1443,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 12 :/* CMD12: STOP_TRANSMISSION */ -switch (sd->state) { -case sd_sendingdata_state: - sd->state = sd_transfer_state; -return sd_r1b; - -case sd_receivingdata_state: - sd->state = sd_programming_state; -/* Bzzzzzzztt .... Operation complete. */ - sd->state = sd_transfer_state; -return sd_r1b; - -default : -break ; - } -break ; -case 13 :/* CMD13: SEND_STATUS */ rca =sd_req_get_rca (sd, req);if (sd->mode != sd_data_transfer_mode) {
@@ -2278,6 +2278,7 @@ static const SDProto sd_proto_spi = { [8] = {0, sd_spi, "SEND_IF_COND", sd_cmd_SEND_IF_COND}, [9] = {0, sd_spi, "SEND_CSD", spi_cmd_SEND_CSD}, [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID}, + [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2306,6 +2307,7 @@ static const SDProto sd_proto_sd = { [9] = {0, sd_ac, "SEND_CSD", sd_cmd_SEND_CSD}, [10] = {0, sd_ac, "SEND_CID", sd_cmd_SEND_CID}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, + [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
Signature · 1 line
2.41.0
PATCH 7/21 hw/sd/sdcard: Add sd_cmd_SEND_STATUS handler (CMD13)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 40 ++++++++++++++++++++++++++++------------ 1 file changed, 28 insertions(+), 12 deletions(-)
hw/sd/sd.c +28 -12
@@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [13 ] ="SEND_STATUS" , [15 ] ="GO_INACTIVE_STATE" , [16 ] ="SET_BLOCKLEN" , [17 ] ="READ_SINGLE_BLOCK" , [18 ] ="READ_MULTIPLE_BLOCK" ,
@@ -1377,6 +1376,32 @@ static sd_rsp_type_t sd_cmd_STOP_TRANSMISSION(SDState *sd, SDRequest req) } } +/* CMD13 */ +static sd_rsp_type_t sd_cmd_SEND_STATUS (SDState *sd,SDRequest req) +{ +if (sd->mode != sd_data_transfer_mode) { +return sd_invalid_mode_for_cmd (sd, req); + } + +switch (sd->state) { +case sd_standby_state: +case sd_transfer_state: +case sd_sendingdata_state: +case sd_receivingdata_state: +case sd_programming_state: +case sd_disconnect_state: +break ; +default : +return sd_invalid_state_for_cmd (sd, req); + } + +if (sd_is_spi (sd)) { +return sd_r2_s; + } + +return sd_req_rca_same (sd, req) ? sd_r1 : sd_r0; +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1443,17 +1468,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Basic commands (Class 0 and Class 1) */ -case 13 :/* CMD13: SEND_STATUS */ - rca =sd_req_get_rca (sd, req); -if (sd->mode != sd_data_transfer_mode) { -return sd_invalid_mode_for_cmd (sd, req); - } -if (!sd_is_spi (sd) && sd->rca != rca) { -return sd_r0; - } - -return sd_r1; -case 15 :/* CMD15: GO_INACTIVE_STATE */ if (sd->mode != sd_data_transfer_mode) {return sd_invalid_mode_for_cmd (sd, req);
@@ -2279,6 +2293,7 @@ static const SDProto sd_proto_spi = { [9] = {0, sd_spi, "SEND_CSD", spi_cmd_SEND_CSD}, [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID}, [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, + [13] = {0, sd_spi, "SEND_STATUS", sd_cmd_SEND_STATUS}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2308,6 +2323,7 @@ static const SDProto sd_proto_sd = { [10] = {0, sd_ac, "SEND_CID", sd_cmd_SEND_CID}, [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, + [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
Signature · 1 line
2.41.0
PATCH 8/21 hw/sd/sdcard: Add sd_cmd_GO_INACTIVE_STATE handler (CMD15)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)
hw/sd/sd.c +25 -12
@@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [15 ] ="GO_INACTIVE_STATE" , [16 ] ="SET_BLOCKLEN" , [17 ] ="READ_SINGLE_BLOCK" , [18 ] ="READ_MULTIPLE_BLOCK" , [21 ] ="DPS_spec" ,
@@ -1402,6 +1401,30 @@ static sd_rsp_type_t sd_cmd_SEND_STATUS(SDState *sd, SDRequest req)return sd_req_rca_same (sd, req) ? sd_r1 : sd_r0; } +/* CMD15 */ +static sd_rsp_type_t sd_cmd_GO_INACTIVE_STATE (SDState *sd,SDRequest req) +{ +if (sd->mode != sd_data_transfer_mode) { +return sd_invalid_mode_for_cmd (sd, req); + } +switch (sd->state) { +case sd_standby_state: +case sd_transfer_state: +case sd_sendingdata_state: +case sd_receivingdata_state: +case sd_programming_state: +case sd_disconnect_state: +break ; +default : +return sd_invalid_state_for_cmd (sd, req); + } +if (sd_req_rca_same (sd, req)) { + sd->state = sd_inactive_state; + } + +return sd_r0; +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1467,17 +1490,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) }switch (req.cmd) { -/* Basic commands (Class 0 and Class 1) */ -case 15 :/* CMD15: GO_INACTIVE_STATE */ -if (sd->mode != sd_data_transfer_mode) { -return sd_invalid_mode_for_cmd (sd, req); - } - rca =sd_req_get_rca (sd, req); -if (sd->rca == rca) { - sd->state = sd_inactive_state; - } -return sd_r0; -/* Block read commands (Class 2) */ case 16 :/* CMD16: SET_BLOCKLEN */ switch (sd->state) {
@@ -2324,6 +2336,7 @@ static const SDProto sd_proto_sd = { [11] = {0, sd_ac, "VOLTAGE_SWITCH", sd_cmd_optional}, [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS}, + [15] = {0, sd_ac, "GO_INACTIVE_STATE", sd_cmd_GO_INACTIVE_STATE}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
Signature · 1 line
2.41.0
PATCH 9/21 hw/sd/sdcard: Add sd_cmd_SET_BLOCKLEN handler (CMD16)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 37 +++++++++++++++++++------------------ 1 file changed, 19 insertions(+), 18 deletions(-)
hw/sd/sd.c +19 -18
@@ -240,7 +240,7 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [16 ] ="SET_BLOCKLEN" , [17 ] ="READ_SINGLE_BLOCK" , + [17 ] ="READ_SINGLE_BLOCK" , [18 ] ="READ_MULTIPLE_BLOCK" , [21 ] ="DPS_spec" , [24 ] ="WRITE_BLOCK" , [25 ] ="WRITE_MULTIPLE_BLOCK" ,
@@ -1425,6 +1425,22 @@ static sd_rsp_type_t sd_cmd_GO_INACTIVE_STATE(SDState *sd, SDRequest req)return sd_r0; } +/* CMD16 */ +static sd_rsp_type_t sd_cmd_SET_BLOCKLEN (SDState *sd,SDRequest req) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } +if (req.arg > (1 <<HWBLOCK_SHIFT )) { + sd->card_status |=BLOCK_LEN_ERROR ; + }else { +trace_sdcard_set_blocklen (req.arg); + sd->blk_len = req.arg; + } + +return sd_r1; +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1491,23 +1507,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Block read commands (Class 2) */ -case 16 :/* CMD16: SET_BLOCKLEN */ -switch (sd->state) { -case sd_transfer_state: -if (req.arg > (1 <<HWBLOCK_SHIFT )) { - sd->card_status |=BLOCK_LEN_ERROR ; - }else { -trace_sdcard_set_blocklen (req.arg); - sd->blk_len = req.arg; - } - -return sd_r1; - -default : -break ; - } -break ; -case 17 :/* CMD17: READ_SINGLE_BLOCK */ addr =sd_req_get_address (sd, req);switch (sd->state) {
@@ -2306,6 +2305,7 @@ static const SDProto sd_proto_spi = { [10] = {0, sd_spi, "SEND_CID", spi_cmd_SEND_CID}, [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [13] = {0, sd_spi, "SEND_STATUS", sd_cmd_SEND_STATUS}, + [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2337,6 +2337,7 @@ static const SDProto sd_proto_sd = { [12] = {0, sd_ac, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS}, [15] = {0, sd_ac, "GO_INACTIVE_STATE", sd_cmd_GO_INACTIVE_STATE}, + [16] = {2, sd_ac, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
Signature · 1 line
2.41.0
PATCH 10/21 hw/sd/sdcard: Add sd_cmd_READ_SINGLE_BLOCK handler (CMD17)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 37 ++++++++++++++++++++----------------- 1 file changed, 20 insertions(+), 17 deletions(-)
hw/sd/sd.c +20 -17
@@ -240,7 +240,6 @@ static const char *sd_response_name(sd_rsp_type_t rsp)static const char *sd_cmd_name (SDState *sd,uint8_t cmd) {static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { - [17 ] ="READ_SINGLE_BLOCK" , [18 ] ="READ_MULTIPLE_BLOCK" , [21 ] ="DPS_spec" , [24 ] ="WRITE_BLOCK" , [25 ] ="WRITE_MULTIPLE_BLOCK" ,
@@ -1441,6 +1440,24 @@ static sd_rsp_type_t sd_cmd_SET_BLOCKLEN(SDState *sd, SDRequest req)return sd_r1; } +/* CMD17 */ +static sd_rsp_type_t sd_cmd_READ_SINGLE_BLOCK (SDState *sd,SDRequest req) +{ +uint64_t addr; + +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + + addr =sd_req_get_address (sd, req); +if (!address_in_range (sd,"READ_SINGLE_BLOCK" , addr, sd->blk_len)) { +return sd_r1; + } + +sd_blk_read (sd, addr, sd->blk_len); +return sd_cmd_to_sendingdata (sd, req, addr,NULL , sd->blk_len); +} +/* CMD19 */ static sd_rsp_type_t sd_cmd_SEND_TUNING_BLOCK (SDState *sd,SDRequest req) {
@@ -1507,22 +1524,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)switch (req.cmd) {/* Block read commands (Class 2) */ -case 17 :/* CMD17: READ_SINGLE_BLOCK */ - addr =sd_req_get_address (sd, req); -switch (sd->state) { -case sd_transfer_state: - -if (!address_in_range (sd,"READ_SINGLE_BLOCK" , addr, sd->blk_len)) { -return sd_r1; - } -sd_blk_read (sd, addr, sd->blk_len); -return sd_cmd_to_sendingdata (sd, req, addr,NULL , sd->blk_len); - -default : -break ; - } -break ; -case 18 :/* CMD18: READ_MULTIPLE_BLOCK */ addr =sd_req_get_address (sd, req);switch (sd->state) {
@@ -2306,6 +2307,7 @@ static const SDProto sd_proto_spi = { [12] = {0, sd_spi, "STOP_TRANSMISSION", sd_cmd_STOP_TRANSMISSION}, [13] = {0, sd_spi, "SEND_STATUS", sd_cmd_SEND_STATUS}, [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, + [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2338,6 +2340,7 @@ static const SDProto sd_proto_sd = { [13] = {0, sd_ac, "SEND_STATUS", sd_cmd_SEND_STATUS}, [15] = {0, sd_ac, "GO_INACTIVE_STATE", sd_cmd_GO_INACTIVE_STATE}, [16] = {2, sd_ac, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, + [17] = {2, sd_adtc, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
Signature · 1 line
2.41.0
PATCH 11/21 hw/sd/sdcard: Add sd_cmd_WRITE_SINGLE_BLOCK handler (CMD24)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 57 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 30 insertions(+), 27 deletions(-)
hw/sd/sd.c +30 -27
@@ -242,7 +242,7 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd)static const char *cmd_abbrev[SDMMC_CMD_MAX ] = { [18 ] ="READ_MULTIPLE_BLOCK" , [21 ] ="DPS_spec" , - [24 ] ="WRITE_BLOCK" , [25 ] ="WRITE_MULTIPLE_BLOCK" , + [25 ] ="WRITE_MULTIPLE_BLOCK" , [26 ] ="MANUF_RSVD" , [27 ] ="PROGRAM_CSD" , [28 ] ="SET_WRITE_PROT" , [29 ] ="CLR_WRITE_PROT" , [30 ] ="SEND_WRITE_PROT" ,
@@ -1487,6 +1487,33 @@ static sd_rsp_type_t sd_cmd_SET_BLOCK_COUNT(SDState *sd, SDRequest req)return sd_r1; } +/* CMD24 */ +static sd_rsp_type_t sd_cmd_WRITE_SINGLE_BLOCK (SDState *sd,SDRequest req) +{ +uint64_t addr; + +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + + addr =sd_req_get_address (sd, req); +if (!address_in_range (sd,"WRITE_SINGLE_BLOCK" , addr, sd->blk_len)) { +return sd_r1; + } + +if (sd->size <=SDSC_MAX_CAPACITY ) { +if (sd_wp_addr (sd, addr)) { + sd->card_status |=WP_VIOLATION ; + } + } +if (sd->csd[14 ] &0x30 ) { + sd->card_status |=WP_VIOLATION ; + } + + sd->blk_written =0 ; +return sd_cmd_to_receivingdata (sd, req, addr, sd->blk_len); +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1544,32 +1571,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)break ;/* Block write commands (Class 4) */ -case 24 :/* CMD24: WRITE_SINGLE_BLOCK */ - addr =sd_req_get_address (sd, req); -switch (sd->state) { -case sd_transfer_state: - -if (!address_in_range (sd,"WRITE_SINGLE_BLOCK" , addr, - sd->blk_len)) { -return sd_r1; - } - -if (sd->size <=SDSC_MAX_CAPACITY ) { -if (sd_wp_addr (sd, sd->data_start)) { - sd->card_status |=WP_VIOLATION ; - } - } -if (sd->csd[14 ] &0x30 ) { - sd->card_status |=WP_VIOLATION ; - } - sd->blk_written =0 ; -return sd_cmd_to_receivingdata (sd, req, addr, sd->blk_len); - -default : -break ; - } -break ; -case 25 :/* CMD25: WRITE_MULTIPLE_BLOCK */ addr =sd_req_get_address (sd, req);switch (sd->state) {
@@ -2308,6 +2309,7 @@ static const SDProto sd_proto_spi = { [13] = {0, sd_spi, "SEND_STATUS", sd_cmd_SEND_STATUS}, [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK}, + [24] = {4, sd_spi, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2344,6 +2346,7 @@ static const SDProto sd_proto_sd = { [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, + [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 12/21 hw/sd/sdcard: Add sd_cmd_PROGRAM_CSD handler (CMD27)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
hw/sd/sd.c +9 -4
@@ -243,7 +243,7 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [18] = "READ_MULTIPLE_BLOCK", [21] = "DPS_spec", [25] = "WRITE_MULTIPLE_BLOCK", - [26] = "MANUF_RSVD", [27] = "PROGRAM_CSD", + [26] = "MANUF_RSVD", [28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT", [30] = "SEND_WRITE_PROT", [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END",
@@ -1514,6 +1514,12 @@ static sd_rsp_type_t sd_cmd_WRITE_SINGLE_BLOCK(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req, addr, sd->blk_len); } +/* CMD27 */ +static sd_rsp_type_t sd_cmd_PROGRAM_CSD (SDState *sd,SDRequest req) +{ +return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->csd)); +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1603,9 +1609,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 26 :/* CMD26: PROGRAM_CID */ return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid)); -case 27 :/* CMD27: PROGRAM_CSD */ -return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->csd)); -/* Write protection (Class 6) */ case 28 :/* CMD28: SET_WRITE_PROT */ if (sd->size >SDSC_MAX_CAPACITY ) {
@@ -2310,6 +2313,7 @@ static const SDProto sd_proto_spi = { [16] = {2, sd_spi, "SET_BLOCKLEN", sd_cmd_SET_BLOCKLEN}, [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK}, [24] = {4, sd_spi, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, + [27] = {4, sd_spi, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2347,6 +2351,7 @@ static const SDProto sd_proto_sd = { [20] = {2, sd_ac, "SPEED_CLASS_CONTROL", sd_cmd_optional}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, + [27] = {4, sd_adtc, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 13/21 hw/sd/sdcard: Add sd_cmd_SET/CLR_WRITE_PROT handler (CMD28 & CMD29)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 91 +++++++++++++++++++++++++++--------------------------- 1 file changed, 46 insertions(+), 45 deletions(-)
hw/sd/sd.c +46 -45
@@ -244,7 +244,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [21] = "DPS_spec", [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", - [28] = "SET_WRITE_PROT", [29] = "CLR_WRITE_PROT", [30] = "SEND_WRITE_PROT", [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END", [38] = "ERASE",
@@ -1520,6 +1519,48 @@ static sd_rsp_type_t sd_cmd_PROGRAM_CSD(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->csd)); } +static sd_rsp_type_t sd_cmd_SET_CLR_WRITE_PROT (SDState *sd,SDRequest req, +bool is_write) +{ +uint64_t addr; + +if (sd->size >SDSC_MAX_CAPACITY ) { +return sd_illegal; + } + +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + + addr =sd_req_get_address (sd, req); +if (!address_in_range (sd, is_write ?"SET_WRITE_PROT" :"CLR_WRITE_PROT" , + addr,1 )) { +return sd_r1b; + } + + sd->state = sd_programming_state; +if (is_write) { +set_bit (sd_addr_to_wpnum (addr), sd->wp_group_bmap); + }else { +clear_bit (sd_addr_to_wpnum (addr), sd->wp_group_bmap); + } +/* Bzzzzzzztt .... Operation complete. */ + sd->state = sd_transfer_state; +return sd_r1; +} + +/* CMD28 */ +static sd_rsp_type_t sd_cmd_SET_WRITE_PROT (SDState *sd,SDRequest req) +{ +return sd_cmd_SET_CLR_WRITE_PROT (sd, req, true); +} + +/* CMD29 */ +static sd_rsp_type_t sd_cmd_CLR_WRITE_PROT (SDState *sd,SDRequest req) +{ +return sd_cmd_SET_CLR_WRITE_PROT (sd, req, false); +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1610,50 +1651,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));/* Write protection (Class 6) */ -case 28 :/* CMD28: SET_WRITE_PROT */ -if (sd->size >SDSC_MAX_CAPACITY ) { -return sd_illegal; - } - addr =sd_req_get_address (sd, req); -switch (sd->state) { -case sd_transfer_state: -if (!address_in_range (sd,"SET_WRITE_PROT" , addr,1 )) { -return sd_r1b; - } - - sd->state = sd_programming_state; -set_bit (sd_addr_to_wpnum (addr), sd->wp_group_bmap); -/* Bzzzzzzztt .... Operation complete. */ - sd->state = sd_transfer_state; -return sd_r1b; - -default : -break ; - } -break ; - -case 29 :/* CMD29: CLR_WRITE_PROT */ -if (sd->size >SDSC_MAX_CAPACITY ) { -return sd_illegal; - } - addr =sd_req_get_address (sd, req); -switch (sd->state) { -case sd_transfer_state: -if (!address_in_range (sd,"CLR_WRITE_PROT" , addr,1 )) { -return sd_r1b; - } - - sd->state = sd_programming_state; -clear_bit (sd_addr_to_wpnum (addr), sd->wp_group_bmap); -/* Bzzzzzzztt .... Operation complete. */ - sd->state = sd_transfer_state; -return sd_r1b; - -default : -break ; - } -break ; -case 30 :/* CMD30: SEND_WRITE_PROT */ if (sd->size >SDSC_MAX_CAPACITY ) {return sd_illegal;
@@ -2314,6 +2311,8 @@ static const SDProto sd_proto_spi = { [17] = {2, sd_spi, "READ_SINGLE_BLOCK", sd_cmd_READ_SINGLE_BLOCK}, [24] = {4, sd_spi, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, [27] = {4, sd_spi, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, + [28] = {6, sd_spi, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, + [29] = {6, sd_spi, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2352,6 +2351,8 @@ static const SDProto sd_proto_sd = { [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, [24] = {4, sd_adtc, "WRITE_SINGLE_BLOCK", sd_cmd_WRITE_SINGLE_BLOCK}, [27] = {4, sd_adtc, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, + [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, + [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 14/21 hw/sd/sdcard: Add sd_cmd_SEND_WRITE_PROT handler (CMD30)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-)
hw/sd/sd.c +25 -22
@@ -244,7 +244,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [21] = "DPS_spec", [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", - [30] = "SEND_WRITE_PROT", [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END", [38] = "ERASE", [40] = "DPS_spec",
@@ -1561,11 +1560,33 @@ static sd_rsp_type_t sd_cmd_CLR_WRITE_PROT(SDState *sd, SDRequest req)return sd_cmd_SET_CLR_WRITE_PROT (sd, req, false); } +/* CMD30 */ +static sd_rsp_type_t sd_cmd_SEND_WRITE_PROT (SDState *sd,SDRequest req) +{ +uint64_t addr; +uint32_t data; + +if (sd->size >SDSC_MAX_CAPACITY ) { +return sd_illegal; + } + +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + + addr =sd_req_get_address (sd, req); +if (!address_in_range (sd,"SEND_WRITE_PROT" , addr, sd->blk_len)) { +return sd_r1; + } + + data =sd_wpbits (sd, req.arg); +return sd_cmd_to_sendingdata (sd, req, addr, &data,sizeof (data)); +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;uint64_t addr; -uint32_t data; sd->last_cmd_name =sd_cmd_name (sd, req.cmd);/* CMD55 precedes an ACMD, so we are not interested in tracing it.
@@ -1650,26 +1671,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 26 :/* CMD26: PROGRAM_CID */ return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid)); -/* Write protection (Class 6) */ -case 30 :/* CMD30: SEND_WRITE_PROT */ -if (sd->size >SDSC_MAX_CAPACITY ) { -return sd_illegal; - } - addr =sd_req_get_address (sd, req); -switch (sd->state) { -case sd_transfer_state: -if (!address_in_range (sd,"SEND_WRITE_PROT" , - req.arg, sd->blk_len)) { -return sd_r1; - } - data =sd_wpbits (sd, req.arg); -return sd_cmd_to_sendingdata (sd, req, addr, &data,sizeof (data)); - -default : -break ; - } -break ; -/* Erase commands (Class 5) */ case 32 :/* CMD32: ERASE_WR_BLK_START */ switch (sd->state) {
@@ -2313,6 +2314,7 @@ static const SDProto sd_proto_spi = { [27] = {4, sd_spi, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, [28] = {6, sd_spi, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, [29] = {6, sd_spi, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, + [30] = {6, sd_spi, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2353,6 +2355,7 @@ static const SDProto sd_proto_sd = { [27] = {4, sd_adtc, "PROGRAM_CSD", sd_cmd_PROGRAM_CSD}, [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, + [30] = {6, sd_adtc, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT}, [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 15/21 hw/sd/sdcard: Add sd_cmd_ERASE_WR_BLK_START/END handlers (CMD32 & CMD33)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 47 ++++++++++++++++++++++++----------------------- 1 file changed, 24 insertions(+), 23 deletions(-)
hw/sd/sd.c +24 -23
@@ -244,7 +244,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [21] = "DPS_spec", [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", - [32] = "ERASE_WR_BLK_START", [33] = "ERASE_WR_BLK_END", [38] = "ERASE", [40] = "DPS_spec", [42] = "LOCK_UNLOCK",
@@ -1583,6 +1582,26 @@ static sd_rsp_type_t sd_cmd_SEND_WRITE_PROT(SDState *sd, SDRequest req)return sd_cmd_to_sendingdata (sd, req, addr, &data,sizeof (data)); } +/* CMD32 */ +static sd_rsp_type_t sd_cmd_ERASE_WR_BLK_START (SDState *sd,SDRequest req) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + sd->erase_start = req.arg; +return sd_r1; +} + +/* CMD33 */ +static sd_rsp_type_t sd_cmd_ERASE_WR_BLK_END (SDState *sd,SDRequest req) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + sd->erase_end = req.arg; +return sd_r1; +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1672,28 +1691,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));/* Erase commands (Class 5) */ -case 32 :/* CMD32: ERASE_WR_BLK_START */ -switch (sd->state) { -case sd_transfer_state: - sd->erase_start = req.arg; -return sd_r1; - -default : -break ; - } -break ; - -case 33 :/* CMD33: ERASE_WR_BLK_END */ -switch (sd->state) { -case sd_transfer_state: - sd->erase_end = req.arg; -return sd_r1; - -default : -break ; - } -break ; -case 38 :/* CMD38: ERASE */ switch (sd->state) {case sd_transfer_state:
@@ -2315,6 +2312,8 @@ static const SDProto sd_proto_spi = { [28] = {6, sd_spi, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, [29] = {6, sd_spi, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, [30] = {6, sd_spi, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT}, + [32] = {5, sd_spi, "ERASE_WR_BLK_START", sd_cmd_ERASE_WR_BLK_START}, + [33] = {5, sd_spi, "ERASE_WR_BLK_END", sd_cmd_ERASE_WR_BLK_END}, [34] = {10, sd_spi, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional},
@@ -2356,6 +2355,8 @@ static const SDProto sd_proto_sd = { [28] = {6, sd_ac, "SET_WRITE_PROT", sd_cmd_SET_WRITE_PROT}, [29] = {6, sd_ac, "CLR_WRITE_PROT", sd_cmd_CLR_WRITE_PROT}, [30] = {6, sd_adtc, "SEND_WRITE_PROT", sd_cmd_SEND_WRITE_PROT}, + [32] = {5, sd_ac, "ERASE_WR_BLK_START", sd_cmd_ERASE_WR_BLK_START}, + [33] = {5, sd_ac, "ERASE_WR_BLK_END", sd_cmd_ERASE_WR_BLK_END}, [34] = {10, sd_adtc, "READ_SEC_CMD", sd_cmd_optional}, [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 16/21 hw/sd/sdcard: Add sd_cmd_ERASE handler (CMD38)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 41 ++++++++++++++++++++--------------------- 1 file changed, 20 insertions(+), 21 deletions(-)
hw/sd/sd.c +20 -21
@@ -244,7 +244,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [21] = "DPS_spec", [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", - [38] = "ERASE", [40] = "DPS_spec", [42] = "LOCK_UNLOCK", [54] = "SDIO_RSVD", [55] = "APP_CMD",
@@ -1602,6 +1601,24 @@ static sd_rsp_type_t sd_cmd_ERASE_WR_BLK_END(SDState *sd, SDRequest req)return sd_r1; } +/* CMD38 */ +static sd_rsp_type_t sd_cmd_ERASE (SDState *sd,SDRequest req) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } +if (sd->csd[14 ] &0x30 ) { + sd->card_status |=WP_VIOLATION ; +return sd_r1b; + } + + sd->state = sd_programming_state; +sd_erase (sd); +/* Bzzzzzzztt .... Operation complete. */ + sd->state = sd_transfer_state; +return sd_r1b; +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1690,26 +1707,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 26 :/* CMD26: PROGRAM_CID */ return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid)); -/* Erase commands (Class 5) */ -case 38 :/* CMD38: ERASE */ -switch (sd->state) { -case sd_transfer_state: -if (sd->csd[14 ] &0x30 ) { - sd->card_status |=WP_VIOLATION ; -return sd_r1b; - } - - sd->state = sd_programming_state; -sd_erase (sd); -/* Bzzzzzzztt .... Operation complete. */ - sd->state = sd_transfer_state; -return sd_r1b; - -default : -break ; - } -break ; -/* Lock card commands (Class 7) */ case 42 :/* CMD42: LOCK_UNLOCK */ return sd_cmd_to_receivingdata (sd, req,0 ,0 );
@@ -2318,6 +2315,7 @@ static const SDProto sd_proto_spi = { [35] = {10, sd_spi, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional}, [37] = {10, sd_spi, "CONTROL_ASSD_SYSTEM", sd_cmd_optional}, + [38] = {5, sd_spi, "ERASE", sd_cmd_ERASE}, [50] = {10, sd_spi, "DIRECT_SECURE_READ", sd_cmd_optional}, [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional},
@@ -2361,6 +2359,7 @@ static const SDProto sd_proto_sd = { [35] = {10, sd_adtc, "WRITE_SEC_CMD", sd_cmd_optional}, [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional}, [37] = {10, sd_ac, "CONTROL_ASSD_SYSTEM", sd_cmd_optional}, + [38] = {5, sd_ac, "ERASE", sd_cmd_ERASE}, [43] = {1, sd_ac, "Q_MANAGEMENT", sd_cmd_optional}, [44] = {1, sd_ac, "Q_TASK_INFO_A", sd_cmd_optional}, [45] = {1, sd_ac, "Q_TASK_INFO_B", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 17/21 hw/sd/sdcard: Add sd_cmd_LOCK_UNLOCK handler (CMD42)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
hw/sd/sd.c +8 -5
@@ -245,7 +245,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", [40] = "DPS_spec", - [42] = "LOCK_UNLOCK", [54] = "SDIO_RSVD", [55] = "APP_CMD", [56] = "GEN_CMD", [60] = "MANUF_RSVD", [61] = "MANUF_RSVD",
@@ -1619,6 +1618,12 @@ static sd_rsp_type_t sd_cmd_ERASE(SDState *sd, SDRequest req)return sd_r1b; } +/* CMD42 */ +static sd_rsp_type_t sd_cmd_LOCK_UNLOCK (SDState *sd,SDRequest req) +{ +return sd_cmd_to_receivingdata (sd, req,0 ,0 ); +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint16_t rca;
@@ -1707,10 +1712,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 26 :/* CMD26: PROGRAM_CID */ return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid)); -/* Lock card commands (Class 7) */ -case 42 :/* CMD42: LOCK_UNLOCK */ -return sd_cmd_to_receivingdata (sd, req,0 ,0 ); -/* Application specific commands (Class 8) */ case 55 :/* CMD55: APP_CMD */ rca =sd_req_get_rca (sd, req);
@@ -2316,6 +2317,7 @@ static const SDProto sd_proto_spi = { [36] = {10, sd_spi, "SEND_PSI", sd_cmd_optional}, [37] = {10, sd_spi, "CONTROL_ASSD_SYSTEM", sd_cmd_optional}, [38] = {5, sd_spi, "ERASE", sd_cmd_ERASE}, + [42] = {7, sd_spi, "LOCK_UNLOCK", sd_cmd_LOCK_UNLOCK}, [50] = {10, sd_spi, "DIRECT_SECURE_READ", sd_cmd_optional}, [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional},
@@ -2360,6 +2362,7 @@ static const SDProto sd_proto_sd = { [36] = {10, sd_adtc, "SEND_PSI", sd_cmd_optional}, [37] = {10, sd_ac, "CONTROL_ASSD_SYSTEM", sd_cmd_optional}, [38] = {5, sd_ac, "ERASE", sd_cmd_ERASE}, + [42] = {7, sd_adtc, "LOCK_UNLOCK", sd_cmd_LOCK_UNLOCK}, [43] = {1, sd_ac, "Q_MANAGEMENT", sd_cmd_optional}, [44] = {1, sd_ac, "Q_TASK_INFO_A", sd_cmd_optional}, [45] = {1, sd_ac, "Q_TASK_INFO_B", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 18/21 hw/sd/sdcard: Add sd_cmd_APP_CMD handler (CMD55)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 53 ++++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 25 deletions(-)
hw/sd/sd.c +28 -25
@@ -245,7 +245,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", [40] = "DPS_spec", - [54] = "SDIO_RSVD", [55] = "APP_CMD", [56] = "GEN_CMD", [60] = "MANUF_RSVD", [61] = "MANUF_RSVD", [62] = "MANUF_RSVD", [63] = "MANUF_RSVD",
@@ -1624,9 +1623,34 @@ static sd_rsp_type_t sd_cmd_LOCK_UNLOCK(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,0 ); } +/* CMD55 */ +static sd_rsp_type_t sd_cmd_APP_CMD (SDState *sd,SDRequest req) +{ +switch (sd->state) { +case sd_ready_state: +case sd_identification_state: +case sd_inactive_state: +return sd_invalid_state_for_cmd (sd, req); +case sd_idle_state: +if (!sd_is_spi (sd) &&sd_req_get_rca (sd, req) !=0x0000 ) { +qemu_log_mask (LOG_GUEST_ERROR , +"SD: illegal RCA 0x%04x for APP_CMD\n" , req.cmd); + } +/* fall-through */ +default : +break ; + } +if (!sd_is_spi (sd) && !sd_req_rca_same (sd, req)) { +return sd_r0; + } + sd->expecting_acmd = true; + sd->card_status |=APP_CMD ; + +return sd_r1; +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) { -uint16_t rca;uint64_t addr; sd->last_cmd_name =sd_cmd_name (sd, req.cmd);
@@ -1713,29 +1737,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));/* Application specific commands (Class 8) */ -case 55 :/* CMD55: APP_CMD */ - rca =sd_req_get_rca (sd, req); -switch (sd->state) { -case sd_ready_state: -case sd_identification_state: -return sd_illegal; -case sd_idle_state: -if (rca) { -qemu_log_mask (LOG_GUEST_ERROR , -"SD: illegal RCA 0x%04x for APP_CMD\n" , req.cmd); - } -default : -break ; - } -if (!sd_is_spi (sd)) { -if (sd->rca != rca) { -return sd_r0; - } - } - sd->expecting_acmd = true; - sd->card_status |=APP_CMD ; -return sd_r1; -case 56 :/* CMD56: GEN_CMD */ switch (sd->state) {case sd_transfer_state:
@@ -2321,6 +2322,7 @@ static const SDProto sd_proto_spi = { [50] = {10, sd_spi, "DIRECT_SECURE_READ", sd_cmd_optional}, [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional}, + [55] = {8, sd_spi, "APP_CMD", sd_cmd_APP_CMD}, [57 ] = {10 , sd_spi,"DIRECT_SECURE_WRITE" , sd_cmd_optional}, }, .acmd = {
@@ -2373,6 +2375,7 @@ static const SDProto sd_proto_sd = { [50] = {10, sd_adtc, "DIRECT_SECURE_READ", sd_cmd_optional}, [52] = {9, sd_bc, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_bc, "IO_RW_EXTENDED", sd_cmd_optional}, + [55] = {8, sd_ac, "APP_CMD", sd_cmd_APP_CMD}, [57] = {10, sd_adtc, "DIRECT_SECURE_WRITE", sd_cmd_optional}, [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 19/21 hw/sd/sdcard: Add sd_cmd_GEN_CMD handler (CMD56)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-)
hw/sd/sd.c +17 -19
@@ -245,7 +245,6 @@ static const char *sd_cmd_name(SDState *sd, uint8_t cmd) [25] = "WRITE_MULTIPLE_BLOCK", [26] = "MANUF_RSVD", [40] = "DPS_spec", - [56] = "GEN_CMD", [60] = "MANUF_RSVD", [61] = "MANUF_RSVD", [62] = "MANUF_RSVD", [63] = "MANUF_RSVD", };
@@ -910,9 +909,6 @@ static void sd_blk_write(SDState *sd, uint64_t addr, uint32_t len) } } -#define APP_READ_BLOCK (a, len) memset(sd->data, 0xec, len) -#define APP_WRITE_BLOCK (a, len) -static void sd_erase (SDState *sd) {uint64_t erase_start = sd->erase_start;
@@ -1649,6 +1645,21 @@ static sd_rsp_type_t sd_cmd_APP_CMD(SDState *sd, SDRequest req)return sd_r1; } +/* CMD56 */ +static sd_rsp_type_t sd_cmd_GEN_CMD (SDState *sd,SDRequest req) +{ +if (sd->state != sd_transfer_state) { +return sd_invalid_state_for_cmd (sd, req); + } + +if (req.arg &1 ) { +return sd_cmd_to_sendingdata (sd, req,0 , + sd->vendor_data,sizeof (sd->vendor_data)); + }else { +return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->vendor_data)); + } +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint64_t addr;
@@ -1737,21 +1748,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));/* Application specific commands (Class 8) */ -case 56 :/* CMD56: GEN_CMD */ -switch (sd->state) { -case sd_transfer_state: -if (req.arg &1 ) { -return sd_cmd_to_sendingdata (sd, req,0 , - sd->vendor_data, -sizeof (sd->vendor_data)); - } -return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->vendor_data)); - -default : -break ; - } -break ; -case 58 :/* CMD58: READ_OCR (SPI) */ return sd_r3;
@@ -2323,6 +2319,7 @@ static const SDProto sd_proto_spi = { [52] = {9, sd_spi, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_spi, "IO_RW_EXTENDED", sd_cmd_optional}, [55] = {8, sd_spi, "APP_CMD", sd_cmd_APP_CMD}, + [56] = {8, sd_spi, "GEN_CMD", sd_cmd_GEN_CMD}, [57 ] = {10 , sd_spi,"DIRECT_SECURE_WRITE" , sd_cmd_optional}, }, .acmd = {
@@ -2376,6 +2373,7 @@ static const SDProto sd_proto_sd = { [52] = {9, sd_bc, "IO_RW_DIRECT", sd_cmd_optional}, [53] = {9, sd_bc, "IO_RW_EXTENDED", sd_cmd_optional}, [55] = {8, sd_ac, "APP_CMD", sd_cmd_APP_CMD}, + [56] = {8, sd_adtc, "GEN_CMD", sd_cmd_GEN_CMD}, [57] = {10, sd_adtc, "DIRECT_SECURE_WRITE", sd_cmd_optional}, [58] = {11, sd_adtc, "READ_EXTR_MULTI", sd_cmd_optional}, [59] = {11, sd_adtc, "WRITE_EXTR_MULTI", sd_cmd_optional},
Signature · 1 line
2.41.0
PATCH 20/21 hw/sd/sdcard: Add spi_cmd_READ_OCR handler (CMD58)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
hw/sd/sd.c +7 -3
@@ -1660,6 +1660,12 @@ static sd_rsp_type_t sd_cmd_GEN_CMD(SDState *sd, SDRequest req) } } +/* CMD58 */ +static sd_rsp_type_t spi_cmd_READ_OCR (SDState *sd,SDRequest req) +{ +return sd_r3; +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint64_t addr;
@@ -1748,9 +1754,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid));/* Application specific commands (Class 8) */ -case 58 :/* CMD58: READ_OCR (SPI) */ -return sd_r3; -case 59 :/* CMD59: CRC_ON_OFF (SPI) */ return sd_r1;
@@ -2321,6 +2324,7 @@ static const SDProto sd_proto_spi = { [55] = {8, sd_spi, "APP_CMD", sd_cmd_APP_CMD}, [56] = {8, sd_spi, "GEN_CMD", sd_cmd_GEN_CMD}, [57] = {10, sd_spi, "DIRECT_SECURE_WRITE", sd_cmd_optional}, + [58 ] = {0 , sd_spi,"READ_OCR" , spi_cmd_READ_OCR}, }, .acmd = { [41 ] = {8 , sd_spi,"SEND_OP_COND" , spi_cmd_SEND_OP_COND},
Signature · 1 line
2.41.0
PATCH 21/21 hw/sd/sdcard: Add spi_cmd_CRC_ON_OFF handler (CMD59)
In reply to Philippe Mathieu-Daudé--- hw/sd/sd.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-)
hw/sd/sd.c +7 -4
@@ -1666,6 +1666,12 @@ static sd_rsp_type_t spi_cmd_READ_OCR(SDState *sd, SDRequest req)return sd_r3; } +/* CMD59 */ +static sd_rsp_type_t spi_cmd_CRC_ON_OFF (SDState *sd,SDRequest req) +{ +return sd_r1; +} +static sd_rsp_type_t sd_normal_command (SDState *sd,SDRequest req) {uint64_t addr;
@@ -1753,10 +1759,6 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)case 26 :/* CMD26: PROGRAM_CID */ return sd_cmd_to_receivingdata (sd, req,0 ,sizeof (sd->cid)); -/* Application specific commands (Class 8) */ -case 59 :/* CMD59: CRC_ON_OFF (SPI) */ -return sd_r1; -default :qemu_log_mask (LOG_GUEST_ERROR ,"SD: Unknown CMD%i\n" , req.cmd);return sd_illegal;
@@ -2325,6 +2327,7 @@ static const SDProto sd_proto_spi = { [56] = {8, sd_spi, "GEN_CMD", sd_cmd_GEN_CMD}, [57] = {10, sd_spi, "DIRECT_SECURE_WRITE", sd_cmd_optional}, [58] = {0, sd_spi, "READ_OCR", spi_cmd_READ_OCR}, + [59 ] = {0 , sd_spi,"CRC_ON_OFF" , spi_cmd_CRC_ON_OFF}, }, .acmd = { [41 ] = {8 , sd_spi,"SEND_OP_COND" , spi_cmd_SEND_OP_COND},
Signature · 1 line
2.41.0