Commit 2ed61fb5 authored by Philippe Mathieu-Daudé's avatar Philippe Mathieu-Daudé Committed by Peter Maydell
Browse files

sdcard: Display command name when tracing CMD/ACMD 



The SDBus will reuse these functions, so we put them in a new source file.

Signed-off-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-id: 20180309153654.13518-3-f4bug@amsat.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
[PMM: slight wordsmithing of comments, added note that string
 returned does not need to be freed]
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 586634b9

hw/sd/Makefile.objs

+1 −1
Original line number Diff line number Diff line 
common-obj-$(CONFIG_PL181) += pl181.o

common-obj-$(CONFIG_SSI_SD) += ssi-sd.o

common-obj-$(CONFIG_SD) += sd.o core.o

common-obj-$(CONFIG_SD) += sd.o core.o sdmmc-internal.o

common-obj-$(CONFIG_SDHCI) += sdhci.o



obj-$(CONFIG_MILKYMIST) += milkymist-memcard.o

hw/sd/sd.c

+8 −5
Original line number Diff line number Diff line
@@ -875,8 +875,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) 
     * However there is no ACMD55, so we want to trace this particular case.

     */

    if (req.cmd != 55 || sd->expecting_acmd) {

        trace_sdcard_normal_command(req.cmd, req.arg,

                                    sd_state_name(sd->state));

        trace_sdcard_normal_command(sd_cmd_name(req.cmd), req.cmd,

                                    req.arg, sd_state_name(sd->state));

    }



    /* Not interpreting this as an app command */
@@ -1455,7 +1455,8 @@ static sd_rsp_type_t sd_normal_command(SDState *sd, SDRequest req) 
static sd_rsp_type_t sd_app_command(SDState *sd,

                                    SDRequest req)

{

    trace_sdcard_app_command(req.cmd, req.arg);

    trace_sdcard_app_command(sd_acmd_name(req.cmd),

                             req.cmd, req.arg, sd_state_name(sd->state));

    sd->card_status |= APP_CMD;

    switch (req.cmd) {

    case 6:	/* ACMD6:  SET_BUS_WIDTH */
@@ -1770,7 +1771,8 @@ void sd_write_data(SDState *sd, uint8_t value) 
    if (sd->card_status & (ADDRESS_ERROR | WP_VIOLATION))

        return;



    trace_sdcard_write_data(sd->current_cmd, value);

    trace_sdcard_write_data(sd_acmd_name(sd->current_cmd),

                            sd->current_cmd, value);

    switch (sd->current_cmd) {

    case 24:	/* CMD24:  WRITE_SINGLE_BLOCK */

        sd->data[sd->data_offset ++] = value;
@@ -1908,7 +1910,8 @@ uint8_t sd_read_data(SDState *sd) 


    io_len = (sd->ocr & (1 << 30)) ? 512 : sd->blk_len;



    trace_sdcard_read_data(sd->current_cmd, io_len);

    trace_sdcard_read_data(sd_acmd_name(sd->current_cmd),

                           sd->current_cmd, io_len);

    switch (sd->current_cmd) {

    case 6:	/* CMD6:   SWITCH_FUNCTION */

        ret = sd->data[sd->data_offset ++];

hw/sd/sdmmc-internal.c

0 → 100644
+72 −0
Original line number Diff line number Diff line 
/*

 * SD/MMC cards common helpers

 *

 * Copyright (c) 2018  Philippe Mathieu-Daudé <f4bug@amsat.org>

 *

 * This work is licensed under the terms of the GNU GPL, version 2 or later.

 * See the COPYING file in the top-level directory.

 * SPDX-License-Identifier: GPL-2.0-or-later

 */



#include "qemu/osdep.h"

#include "sdmmc-internal.h"



const char *sd_cmd_name(uint8_t cmd)

{

    static const char *cmd_abbrev[SDMMC_CMD_MAX] = {

         [0]    = "GO_IDLE_STATE",

         [2]    = "ALL_SEND_CID",            [3]    = "SEND_RELATIVE_ADDR",

         [4]    = "SET_DSR",                 [5]    = "IO_SEND_OP_COND",

         [6]    = "SWITCH_FUNC",             [7]    = "SELECT/DESELECT_CARD",

         [8]    = "SEND_IF_COND",            [9]    = "SEND_CSD",

        [10]    = "SEND_CID",               [11]    = "VOLTAGE_SWITCH",

        [12]    = "STOP_TRANSMISSION",      [13]    = "SEND_STATUS",

                                            [15]    = "GO_INACTIVE_STATE",

        [16]    = "SET_BLOCKLEN",           [17]    = "READ_SINGLE_BLOCK",

        [18]    = "READ_MULTIPLE_BLOCK",    [19]    = "SEND_TUNING_BLOCK",

        [20]    = "SPEED_CLASS_CONTROL",    [21]    = "DPS_spec",

                                            [23]    = "SET_BLOCK_COUNT",

        [24]    = "WRITE_BLOCK",            [25]    = "WRITE_MULTIPLE_BLOCK",

        [26]    = "MANUF_RSVD",             [27]    = "PROGRAM_CSD",

        [28]    = "SET_WRITE_PROT",         [29]    = "CLR_WRITE_PROT",

        [30]    = "SEND_WRITE_PROT",

        [32]    = "ERASE_WR_BLK_START",     [33]    = "ERASE_WR_BLK_END",

        [34]    = "SW_FUNC_RSVD",           [35]    = "SW_FUNC_RSVD",

        [36]    = "SW_FUNC_RSVD",           [37]    = "SW_FUNC_RSVD",

        [38]    = "ERASE",

        [40]    = "DPS_spec",

        [42]    = "LOCK_UNLOCK",            [43]    = "Q_MANAGEMENT",

        [44]    = "Q_TASK_INFO_A",          [45]    = "Q_TASK_INFO_B",

        [46]    = "Q_RD_TASK",              [47]    = "Q_WR_TASK",

        [48]    = "READ_EXTR_SINGLE",       [49]    = "WRITE_EXTR_SINGLE",

        [50]    = "SW_FUNC_RSVD",

        [52]    = "IO_RW_DIRECT",           [53]    = "IO_RW_EXTENDED",

        [54]    = "SDIO_RSVD",              [55]    = "APP_CMD",

        [56]    = "GEN_CMD",                [57]    = "SW_FUNC_RSVD",

        [58]    = "READ_EXTR_MULTI",        [59]    = "WRITE_EXTR_MULTI",

        [60]    = "MANUF_RSVD",             [61]    = "MANUF_RSVD",

        [62]    = "MANUF_RSVD",             [63]    = "MANUF_RSVD",

    };

    return cmd_abbrev[cmd] ? cmd_abbrev[cmd] : "UNKNOWN_CMD";

}



const char *sd_acmd_name(uint8_t cmd)

{

    static const char *acmd_abbrev[SDMMC_CMD_MAX] = {

         [6] = "SET_BUS_WIDTH",

        [13] = "SD_STATUS",

        [14] = "DPS_spec",                  [15] = "DPS_spec",

        [16] = "DPS_spec",

        [18] = "SECU_spec",

        [22] = "SEND_NUM_WR_BLOCKS",        [23] = "SET_WR_BLK_ERASE_COUNT",

        [41] = "SD_SEND_OP_COND",

        [42] = "SET_CLR_CARD_DETECT",

        [51] = "SEND_SCR",

        [52] = "SECU_spec",                 [53] = "SECU_spec",

        [54] = "SECU_spec",

        [56] = "SECU_spec",                 [57] = "SECU_spec",

        [58] = "SECU_spec",                 [59] = "SECU_spec",

    };



    return acmd_abbrev[cmd] ? acmd_abbrev[cmd] : "UNKNOWN_ACMD";

}

hw/sd/sdmmc-internal.h

+24 −0
Original line number Diff line number Diff line
@@ -12,4 +12,28 @@ 


#define SDMMC_CMD_MAX 64



/**

 * sd_cmd_name:

 * @cmd: A SD "normal" command, up to SDMMC_CMD_MAX.

 *

 * Returns a human-readable name describing the command.

 * The return value is always a static string which does not need

 * to be freed after use.

 *

 * Returns: The command name of @cmd or "UNKNOWN_CMD".

 */

const char *sd_cmd_name(uint8_t cmd);



/**

 * sd_acmd_name:

 * @cmd: A SD "Application-Specific" command, up to SDMMC_CMD_MAX.

 *

 * Returns a human-readable name describing the application command.

 * The return value is always a static string which does not need

 * to be freed after use.

 *

 * Returns: The application command name of @cmd or "UNKNOWN_ACMD".

 */

const char *sd_acmd_name(uint8_t cmd);



#endif

hw/sd/trace-events

+4 −4
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ sdhci_write_dataport(uint16_t data_count) "write buffer filled with %u bytes of 
sdhci_capareg(const char *desc, uint16_t val) "%s: %u"



# hw/sd/sd.c

sdcard_normal_command(uint8_t cmd, uint32_t arg, const char *state) "CMD%d arg 0x%08x (state %s)"

sdcard_app_command(uint8_t acmd, uint32_t arg) "ACMD%d arg 0x%08x"

sdcard_normal_command(const char *cmd_desc, uint8_t cmd, uint32_t arg, const char *state) "%20s/ CMD%02d arg 0x%08x (state %s)"

sdcard_app_command(const char *acmd_desc, uint8_t acmd, uint32_t arg, const char *state) "%23s/ACMD%02d arg 0x%08x (state %s)"

sdcard_response(const char *rspdesc, int rsplen) "%s (sz:%d)"

sdcard_powerup(void) ""

sdcard_inquiry_cmd41(void) ""
@@ -39,8 +39,8 @@ sdcard_lock(void) "" 
sdcard_unlock(void) ""

sdcard_read_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"

sdcard_write_block(uint64_t addr, uint32_t len) "addr 0x%" PRIx64 " size 0x%x"

sdcard_write_data(uint8_t cmd, uint8_t value) "CMD%02d value 0x%02x"

sdcard_read_data(uint8_t cmd, int length) "CMD%02d len %d"

sdcard_write_data(const char *cmd_desc, uint8_t cmd, uint8_t value) "%20s/ CMD%02d value 0x%02x"

sdcard_read_data(const char *cmd_desc, uint8_t cmd, int length) "%20s/ CMD%02d len %d"

sdcard_set_voltage(uint16_t millivolts) "%u mV"



# hw/sd/milkymist-memcard.c