On 6/28/24 9:01 AM, Philippe Mathieu-Daudé wrote:
> Store the command class altogether with the other command
> fields (handler, name and type).
>
> Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Cédric Le Goater <clg@redhat.com>
Thanks,
C.
> ---
> hw/sd/sd.c | 36 +++++++++++++++++++-----------------
> 1 file changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/hw/sd/sd.c b/hw/sd/sd.c
> index c4cc48926d..a816493d37 100644
> --- a/hw/sd/sd.c
> +++ b/hw/sd/sd.c
> @@ -95,6 +95,7 @@ typedef sd_rsp_type_t (*sd_cmd_handler)(SDState *sd, SDRequest req);
> typedef struct SDProto {
> const char *name;
> struct {
> + const unsigned class;
> const sd_cmd_type_t type;
> const char *name;
> sd_cmd_handler handler;
> @@ -352,13 +353,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)
> {
> int i, bit;
> @@ -1306,7 +1300,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req)
> 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 */
> return sd_illegal;
> }
> @@ -1891,6 +1886,8 @@ static sd_rsp_type_t sd_app_command(SDState *sd,
>
> static bool cmd_valid_while_locked(SDState *sd, unsigned cmd)
> {
> + unsigned cmd_class;
> +
> /* Valid commands in locked state:
> * basic class (0)
> * lock card class (7)
> @@ -1905,7 +1902,12 @@ static bool cmd_valid_while_locked(SDState *sd, unsigned cmd)
> if (cmd == 16 || cmd == 55) {
> 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,
> @@ -2273,22 +2275,22 @@ void sd_enable(SDState *sd, bool enable)
> static const SDProto sd_proto_spi = {
> .name = "SPI",
> .cmd = {
> - [0] = { sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
> - [1] = { sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
> + [0] = {0, sd_spi, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
> + [1] = {0, sd_spi, "SEND_OP_COND", spi_cmd_SEND_OP_COND},
> },
> .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 = {
> .name = "SD",
> .cmd = {
> - [0] = { sd_bc, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
> - [2] = { sd_bcr, "ALL_SEND_CID", sd_cmd_ALL_SEND_CID},
> - [3] = { sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR},
> - [19] = { sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
> - [23] = { sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
> + [0] = {0, sd_bc, "GO_IDLE_STATE", sd_cmd_GO_IDLE_STATE},
> + [2] = {0, sd_bcr, "ALL_SEND_CID", sd_cmd_ALL_SEND_CID},
> + [3] = {0, sd_bcr, "SEND_RELATIVE_ADDR", sd_cmd_SEND_RELATIVE_ADDR},
> + [19] = {2, sd_adtc, "SEND_TUNING_BLOCK", sd_cmd_SEND_TUNING_BLOCK},
> + [23] = {2, sd_ac, "SET_BLOCK_COUNT", sd_cmd_SET_BLOCK_COUNT},
> },
> };
>