This commit is contained in:
commit
a803f87202
|
@ -1313,6 +1313,13 @@ config CMD_BKOPS_ENABLE
|
|||
on a eMMC device. The feature is optionally available on eMMC devices
|
||||
conforming to standard >= 4.41.
|
||||
|
||||
config CMD_MMC_REG
|
||||
bool "Enable support for reading card registers in the mmc command"
|
||||
depends on CMD_MMC
|
||||
help
|
||||
Enable the commands for reading card registers. This is useful
|
||||
mostly for debugging or extracting details from the card.
|
||||
|
||||
config CMD_MMC_RPMB
|
||||
bool "Enable support for RPMB in the mmc command"
|
||||
depends on SUPPORT_EMMC_RPMB
|
||||
|
|
96
cmd/mmc.c
96
cmd/mmc.c
|
@ -1110,6 +1110,93 @@ static int do_mmc_boot_wp(struct cmd_tbl *cmdtp, int flag,
|
|||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
|
||||
#if CONFIG_IS_ENABLED(CMD_MMC_REG)
|
||||
static int do_mmc_reg(struct cmd_tbl *cmdtp, int flag,
|
||||
int argc, char *const argv[])
|
||||
{
|
||||
ALLOC_CACHE_ALIGN_BUFFER(u8, ext_csd, MMC_MAX_BLOCK_LEN);
|
||||
struct mmc *mmc;
|
||||
int i, ret;
|
||||
u32 off;
|
||||
|
||||
if (argc < 3 || argc > 5)
|
||||
return CMD_RET_USAGE;
|
||||
|
||||
mmc = find_mmc_device(curr_device);
|
||||
if (!mmc) {
|
||||
printf("no mmc device at slot %x\n", curr_device);
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
if (IS_SD(mmc)) {
|
||||
printf("SD registers are not supported\n");
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
|
||||
off = simple_strtoul(argv[3], NULL, 10);
|
||||
if (!strcmp(argv[2], "cid")) {
|
||||
if (off > 3)
|
||||
return CMD_RET_USAGE;
|
||||
printf("CID[%i]: 0x%08x\n", off, mmc->cid[off]);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], mmc->cid[off]);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
if (!strcmp(argv[2], "csd")) {
|
||||
if (off > 3)
|
||||
return CMD_RET_USAGE;
|
||||
printf("CSD[%i]: 0x%08x\n", off, mmc->csd[off]);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], mmc->csd[off]);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
if (!strcmp(argv[2], "dsr")) {
|
||||
printf("DSR: 0x%08x\n", mmc->dsr);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], mmc->dsr);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
if (!strcmp(argv[2], "ocr")) {
|
||||
printf("OCR: 0x%08x\n", mmc->ocr);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], mmc->ocr);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
if (!strcmp(argv[2], "rca")) {
|
||||
printf("RCA: 0x%08x\n", mmc->rca);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], mmc->rca);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
if (!strcmp(argv[2], "extcsd") &&
|
||||
mmc->version >= MMC_VERSION_4_41) {
|
||||
ret = mmc_send_ext_csd(mmc, ext_csd);
|
||||
if (ret)
|
||||
return CMD_RET_FAILURE;
|
||||
if (!strcmp(argv[3], "all")) {
|
||||
/* Dump the entire register */
|
||||
printf("EXT_CSD:");
|
||||
for (i = 0; i < MMC_MAX_BLOCK_LEN; i++) {
|
||||
if (!(i % 10))
|
||||
printf("\n%03i: ", i);
|
||||
printf(" %02x", ext_csd[i]);
|
||||
}
|
||||
printf("\n");
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
off = simple_strtoul(argv[3], NULL, 10);
|
||||
if (off > 512)
|
||||
return CMD_RET_USAGE;
|
||||
printf("EXT_CSD[%i]: 0x%02x\n", off, ext_csd[off]);
|
||||
if (argv[4])
|
||||
env_set_hex(argv[4], ext_csd[off]);
|
||||
return CMD_RET_SUCCESS;
|
||||
}
|
||||
|
||||
return CMD_RET_FAILURE;
|
||||
}
|
||||
#endif
|
||||
|
||||
static struct cmd_tbl cmd_mmc[] = {
|
||||
U_BOOT_CMD_MKENT(info, 1, 0, do_mmcinfo, "", ""),
|
||||
U_BOOT_CMD_MKENT(read, 4, 1, do_mmc_read, "", ""),
|
||||
|
@ -1142,6 +1229,9 @@ static struct cmd_tbl cmd_mmc[] = {
|
|||
U_BOOT_CMD_MKENT(bkops-enable, 2, 0, do_mmc_bkops_enable, "", ""),
|
||||
U_BOOT_CMD_MKENT(bkops, 4, 0, do_mmc_bkops, "", ""),
|
||||
#endif
|
||||
#if CONFIG_IS_ENABLED(CMD_MMC_REG)
|
||||
U_BOOT_CMD_MKENT(reg, 5, 0, do_mmc_reg, "", ""),
|
||||
#endif
|
||||
};
|
||||
|
||||
static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc,
|
||||
|
@ -1229,6 +1319,12 @@ U_BOOT_CMD(
|
|||
" WARNING: This is a write-once setting.\n"
|
||||
"mmc bkops <dev> [auto|manual] [enable|disable]\n"
|
||||
" - configure background operations handshake on device\n"
|
||||
#endif
|
||||
#if CONFIG_IS_ENABLED(CMD_MMC_REG)
|
||||
"mmc reg read <reg> <offset> [env] - read card register <reg> offset <offset>\n"
|
||||
" (optionally into [env] variable)\n"
|
||||
" - reg: cid/csd/dsr/ocr/rca/extcsd\n"
|
||||
" - offset: for cid/csd [0..3], for extcsd [0..511,all]\n"
|
||||
#endif
|
||||
);
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ Synopsis
|
|||
mmc bootpart-resize <dev> <dev part size MB> <RPMB part size MB>
|
||||
mmc partconf <dev> [[varname] | [<boot_ack> <boot_partition> <partition_access>]]
|
||||
mmc rst-function <dev> <value>
|
||||
mmc reg read <reg> <offset> [env]
|
||||
|
||||
Description
|
||||
-----------
|
||||
|
@ -183,6 +184,31 @@ The 'mmc rst-function' command changes the RST_n_FUNCTION field.
|
|||
0x3
|
||||
Reserved
|
||||
|
||||
The 'mmc reg read <reg> <offset> [env]' reads eMMC card register and
|
||||
either print it to standard output, or store the value in environment
|
||||
variable.
|
||||
|
||||
<reg> with
|
||||
optional offset <offset> into the register array, and print it to
|
||||
standard output or store it into environment variable [env].
|
||||
|
||||
reg
|
||||
cid
|
||||
The Device IDentification (CID) register. Uses offset.
|
||||
csd
|
||||
The Device-Specific Data (CSD) register. Uses offset.
|
||||
dsr
|
||||
The driver stage register (DSR).
|
||||
ocr
|
||||
The operation conditions register (OCR).
|
||||
rca
|
||||
The relative Device address (RCA) register.
|
||||
extcsd
|
||||
The Extended CSD register. Uses offset.
|
||||
offset
|
||||
For 'cid'/'csd' 128 bit registers '[0..3]' in 32-bit increments. For 'extcsd' 512 bit register '[0..512,all]' in 8-bit increments, or 'all' to read the entire register.
|
||||
env
|
||||
Optional environment variable into which 32-bit value read from register should be stored.
|
||||
|
||||
Examples
|
||||
--------
|
||||
|
|
|
@ -46,6 +46,7 @@ config SPL_DM_MMC
|
|||
depends on SPL_DM && DM_MMC
|
||||
default n if ARCH_MVEBU && !MVEBU_SPL_BOOT_DEVICE_MMC
|
||||
default y
|
||||
select SPL_BLK
|
||||
help
|
||||
This enables the MultiMediaCard (MMC) uclass which supports MMC and
|
||||
Secure Digital I/O (SDIO) cards. Both removable (SD, micro-SD, etc.)
|
||||
|
|
|
@ -50,8 +50,8 @@ static int pci_mmc_probe(struct udevice *dev)
|
|||
desc = mmc_get_blk_desc(&plat->mmc);
|
||||
desc->removable = !(plat->cfg.host_caps & MMC_CAP_NONREMOVABLE);
|
||||
|
||||
host->ioaddr = (void *)dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, 0, 0, PCI_REGION_TYPE,
|
||||
PCI_REGION_MEM);
|
||||
host->ioaddr = dm_pci_map_bar(dev, PCI_BASE_ADDRESS_0, 0, 0,
|
||||
PCI_REGION_TYPE, PCI_REGION_MEM);
|
||||
host->name = dev->name;
|
||||
host->cd_gpio = priv->cd_gpio;
|
||||
host->mmc = &plat->mmc;
|
||||
|
|
|
@ -306,14 +306,19 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd,
|
|||
if (stat & SDHCI_INT_ERROR)
|
||||
break;
|
||||
|
||||
if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) {
|
||||
if (host->quirks & SDHCI_QUIRK_BROKEN_R1B) {
|
||||
if (host->quirks & SDHCI_QUIRK_BROKEN_R1B &&
|
||||
cmd->resp_type & MMC_RSP_BUSY && !data) {
|
||||
unsigned int state =
|
||||
sdhci_readl(host, SDHCI_PRESENT_STATE);
|
||||
|
||||
if (!(state & SDHCI_DAT_ACTIVE))
|
||||
return 0;
|
||||
} else {
|
||||
printf("%s: Timeout for status update!\n",
|
||||
__func__);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
}
|
||||
|
||||
if (get_timer(start) >= SDHCI_READ_STATUS_TIMEOUT) {
|
||||
printf("%s: Timeout for status update: %08x %08x\n",
|
||||
__func__, stat, mask);
|
||||
return -ETIMEDOUT;
|
||||
}
|
||||
} while ((stat & mask) != mask);
|
||||
|
||||
|
|
|
@ -57,6 +57,7 @@
|
|||
#define SDHCI_PRESENT_STATE 0x24
|
||||
#define SDHCI_CMD_INHIBIT BIT(0)
|
||||
#define SDHCI_DATA_INHIBIT BIT(1)
|
||||
#define SDHCI_DAT_ACTIVE BIT(2)
|
||||
#define SDHCI_DOING_WRITE BIT(8)
|
||||
#define SDHCI_DOING_READ BIT(9)
|
||||
#define SDHCI_SPACE_AVAILABLE BIT(10)
|
||||
|
|
Loading…
Reference in New Issue
Block a user