]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
sandbox: mmc: Fix up MMC emulator for valgrind
authorSimon Glass <sjg@chromium.org>
Wed, 25 Sep 2019 14:56:00 +0000 (08:56 -0600)
committerBin Meng <bmeng.cn@gmail.com>
Tue, 8 Oct 2019 05:57:39 +0000 (13:57 +0800)
At present running sandbox with valgrind produces some warnings due to the
MMC emulator not filling in all the expected fields. Fix it.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Tested-by: Bin Meng <bmeng.cn@gmail.com>
[bmeng: use sizeof() instead of hardcoded 16]
Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
drivers/mmc/sandbox_mmc.c

index 2fa7d8c3dcde8633e5d275e209477880bf3b71bf..899952d773cdd063122cbb37382f5e8bf82c6231 100644 (file)
@@ -27,6 +27,7 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
 {
        switch (cmd->cmdidx) {
        case MMC_CMD_ALL_SEND_CID:
+               memset(cmd->response, '\0', sizeof(cmd->response));
                break;
        case SD_CMD_SEND_RELATIVE_ADDR:
                cmd->response[0] = 0 << 16; /* mmc->rca */
@@ -43,11 +44,14 @@ static int sandbox_mmc_send_cmd(struct udevice *dev, struct mmc_cmd *cmd,
        case MMC_CMD_SEND_CSD:
                cmd->response[0] = 0;
                cmd->response[1] = 10 << 16;    /* 1 << block_len */
+               cmd->response[2] = 0;
+               cmd->response[3] = 0;
                break;
        case SD_CMD_SWITCH_FUNC: {
                if (!data)
                        break;
                u32 *resp = (u32 *)data->dest;
+               resp[3] = 0;
                resp[7] = cpu_to_be32(SD_HIGHSPEED_BUSY);
                if ((cmd->cmdarg & 0xF) == UHS_SDR12_BUS_SPEED)
                        resp[4] = (cmd->cmdarg & 0xF) << 24;