cmd_mmc.c: Add 'partconf' command to mmc

Add a partconf sub-command to the mmc command to allow for setting
the boot_ack, boot_partition and partition_access fields of
PARTITION_CONFIG (formerly BOOT_CONFIG, EXT_CSD[179]).  Part of this
requires changing the check for 'part' from an strncmp to a strcmp, like
the rest of the sub-commands.

Cc: Andy Fleming <afleming@gmail.com>
Cc: Pantelis Antoniou <panto@antoniou-consulting.com>
Acked-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Tom Rini <trini@ti.com>
Signed-off-by: Pantelis Antoniou <panto@antoniou-consulting.com>
master
Tom Rini 11 years ago committed by Pantelis Antoniou
parent f1fd957e12
commit 792970b0a3
  1. 30
      common/cmd_mmc.c
  2. 21
      drivers/mmc/mmc.c
  3. 2
      include/mmc.h

@ -195,7 +195,7 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
return 1; return 1;
else else
return 0; return 0;
} else if (strncmp(argv[1], "part", 4) == 0) { } else if (strcmp(argv[1], "part") == 0) {
block_dev_desc_t *mmc_dev; block_dev_desc_t *mmc_dev;
struct mmc *mmc; struct mmc *mmc;
@ -311,7 +311,33 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
/* acknowledge to be sent during boot operation */ /* acknowledge to be sent during boot operation */
return boot_part_access(mmc, 1, part_num, access); return boot_part_access(mmc, 1, part_num, access);
} else if (strcmp(argv[1], "partconf") == 0) {
int dev;
struct mmc *mmc;
u8 ack, part_num, access;
if (argc == 6) {
dev = simple_strtoul(argv[2], NULL, 10);
ack = simple_strtoul(argv[3], NULL, 10);
part_num = simple_strtoul(argv[4], NULL, 10);
access = simple_strtoul(argv[5], NULL, 10);
} else {
return CMD_RET_USAGE;
}
mmc = find_mmc_device(dev);
if (!mmc) {
printf("no mmc device at slot %x\n", dev);
return 1;
}
if (IS_SD(mmc)) {
puts("PARTITION_CONFIG only exists on eMMC\n");
return 1;
}
/* acknowledge to be sent during boot operation */
return mmc_set_part_conf(mmc, ack, part_num, access);
} else if (strcmp(argv[1], "bootpart-resize") == 0) { } else if (strcmp(argv[1], "bootpart-resize") == 0) {
int dev; int dev;
struct mmc *mmc; struct mmc *mmc;
@ -451,6 +477,8 @@ U_BOOT_CMD(
" - Enable boot_part for booting and disable access to boot_part\n" " - Enable boot_part for booting and disable access to boot_part\n"
"mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n" "mmc bootpart-resize <dev> <boot part size MB> <RPMB part size MB>\n"
" - Change sizes of boot and RPMB partitions of specified device\n" " - Change sizes of boot and RPMB partitions of specified device\n"
"mmc partconf dev boot_ack boot_partition partition_access\n"
" - Change the bits of the PARTITION_CONFIG field of the specified device\n"
#endif #endif
"mmc setdsr - set DSR register value\n" "mmc setdsr - set DSR register value\n"
); );

@ -1505,4 +1505,25 @@ int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
} }
return 0; return 0;
} }
/*
* Modify EXT_CSD[179] which is PARTITION_CONFIG (formerly BOOT_CONFIG)
* based on the passed in values for BOOT_ACK, BOOT_PARTITION_ENABLE and
* PARTITION_ACCESS.
*
* Returns 0 on success.
*/
int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
{
int err;
err = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
EXT_CSD_BOOT_ACK(ack) |
EXT_CSD_BOOT_PART_NUM(part_num) |
EXT_CSD_PARTITION_ACCESS(access));
if (err)
return err;
return 0;
}
#endif #endif

@ -312,6 +312,8 @@ int mmc_boot_partition_size_change(struct mmc *mmc, unsigned long bootsize,
unsigned long rpmbsize); unsigned long rpmbsize);
/* Function to send commands to open/close the specified boot partition */ /* Function to send commands to open/close the specified boot partition */
int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access); int mmc_boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access);
/* Function to modify the PARTITION_CONFIG field of EXT_CSD */
int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access);
/** /**
* Start device initialization and return immediately; it does not block on * Start device initialization and return immediately; it does not block on

Loading…
Cancel
Save