ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hw/sd/sdcard: Store command class in SDProto 

Store the command class altogether with the other command
fields (handler, name and type).

Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Cédric Le Goater <clg@redhat.com>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Message-Id: <20240628070216.92609-42-philmd@linaro.org>
This commit is contained in:
Philippe Mathieu-Daudé 2024-06-17 05:28:09 +02:00
parent 1ab08790bb
commit de32f0aa9a
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hw/sd/sd.c
View File

@ -94,6 +94,7 @@ typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req);
typedef struct SDProto { typedef struct SDProto {
const char *name; const char *name;
struct { struct {
const unsigned class;
const sd_cmd_type_t type; const sd_cmd_type_t type;
const char *name; const char *name;
sd_cmd_handler handler; sd_cmd_handler handler;
@ -349,13 +350,6 @@ static void sd_set_mode(SDState *sd)
} }
} }
static const int sd_cmd_class[SDMMC_CMD_MAX] = {
0, 0, 0, 0, 0, 9, 10, 0, 0, 0, 0, 1, 0, 0, 0, 0,
2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 6, 6, 6, 6,
5, 5, 10, 10, 10, 10, 5, 9, 9, 9, 7, 7, 7, 7, 7, 7,
7, 7, 10, 7, 9, 9, 9, 8, 8, 10, 8, 8, 8, 8, 8, 8,
};
static uint8_t sd_crc7(const void *message, size_t width) static uint8_t sd_crc7(const void *message, size_t width)
{ {
int i, bit; int i, bit;
@ -1298,7 +1292,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
sd->multi_blk_cnt = 0; sd->multi_blk_cnt = 0;
} }
if (sd_cmd_class[req.cmd] == 6 && FIELD_EX32(sd->ocr, OCR, CARD_CAPACITY)) { if (sd->proto->cmd[req.cmd].class == 6 && FIELD_EX32(sd->ocr, OCR,
CARD_CAPACITY)) {
/* Only Standard Capacity cards support class 6 commands */ /* Only Standard Capacity cards support class 6 commands */
return sd_illegal; return sd_illegal;
} }
@ -1883,6 +1878,8 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
static bool cmd_valid_while_locked(SDState *sd, unsigned cmd) static bool cmd_valid_while_locked(SDState *sd, unsigned cmd)
{ {
unsigned cmd_class;
/* Valid commands in locked state: /* Valid commands in locked state:
* basic class (0) * basic class (0)
* lock card class (7) * lock card class (7)
@ -1897,7 +1894,12 @@ static bool cmd_valid_while_locked(SDState *sd, unsigned cmd)
if (cmd == 16 || cmd == 55) { if (cmd == 16 || cmd == 55) {
return true; return true;
} }
return sd_cmd_class[cmd] == 0 || sd_cmd_class[cmd] == 7; if (!sd->proto->cmd[cmd].handler) {
return false;
}
cmd_class = sd->proto->cmd[cmd].class;
return cmd_class == 0 || cmd_class == 7;
} }
int sd_do_command(SDState *sd, SDRequest *req, int sd_do_command(SDState *sd, SDRequest *req,
@ -2275,22 +2277,22 @@ void sd_enable(SDState *sd, bool enable)
static const SDProto sd_proto_spi = { static const SDProto sd_proto_spi = {
.name = "SPI", .name = "SPI",
.cmd = { .cmd = {
[0] = { sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, [0] = {0, sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
[1] = { sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, [1] = {0, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
}, },
.acmd = { .acmd = {
[41] = { sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND}, [41] = {8, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
}, },
}; };
static const SDProto sd_proto_sd = { static const SDProto sd_proto_sd = {
.name = "SD", .name = "SD",
.cmd = { .cmd = {
[0] = { sd_bc, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE}, [0] = {0, sd_bc, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
[2] = { sd_bcr, "ALL_SEND_CID", sd_cmd_ALL_SEND_CID}, [2] = {0, sd_bcr, "ALL_SEND_CID", sd_cmd_ALL_SEND_CID},
[3] = { sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR}, [3] = {0, sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR},
[19] = { sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK}, [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
[23] = { sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT}, [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
}, },
}; };