cmd: mmc: add mmc partconf read capability

This patch allows to show the EXT_CSD[179] partition_config
register info, just by specifying the dev param:

  U-Boot> mmc partconf 0
  EXT_CSD[179], PARTITION_CONFIG:
  BOOT_ACK: 0x0
  BOOT_PARTITION_ENABLE: 0x0
  PARTITION_ACCESS: 0x0

Signed-off-by: Angelo Dureghello <angelo@sysam.it>
Signed-off-by: Anatolij Gustschin <agust@denx.de>

diff --git a/cmd/mmc.c b/cmd/mmc.c
index f7b75684adedc0673f03664aee63c1f71275bdc6..00697fc1f2b7bd8323ca0c0fb723685c1949595d 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -643,6 +643,28 @@ static int do_mmc_boot_resize(cmd_tbl_t *cmdtp, int flag,
        printf("EMMC RPMB partition Size %d MB\n", rpmbsize);
        return CMD_RET_SUCCESS;
 }
+
+static int mmc_partconf_print(struct mmc *mmc)
+{
+       u8 ack, access, part;
+
+       if (mmc->part_config == MMCPART_NOAVAILABLE) {
+               printf("No part_config info for ver. 0x%x\n", mmc->version);
+               return CMD_RET_FAILURE;
+       }
+
+       access = EXT_CSD_EXTRACT_PARTITION_ACCESS(mmc->part_config);
+       ack = EXT_CSD_EXTRACT_BOOT_ACK(mmc->part_config);
+       part = EXT_CSD_EXTRACT_BOOT_PART(mmc->part_config);
+
+       printf("EXT_CSD[179], PARTITION_CONFIG:\n"
+               "BOOT_ACK: 0x%x\n"
+               "BOOT_PARTITION_ENABLE: 0x%x\n"
+               "PARTITION_ACCESS: 0x%x\n", ack, part, access);
+
+       return CMD_RET_SUCCESS;
+}
+
 static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag,
                           int argc, char * const argv[])
 {
@@ -650,13 +672,10 @@ static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag,
        struct mmc *mmc;
        u8 ack, part_num, access;
 
-       if (argc != 5)
+       if (argc != 2 && argc != 5)
                return CMD_RET_USAGE;
 
        dev = simple_strtoul(argv[1], NULL, 10);
-       ack = simple_strtoul(argv[2], NULL, 10);
-       part_num = simple_strtoul(argv[3], NULL, 10);
-       access = simple_strtoul(argv[4], NULL, 10);
 
        mmc = init_mmc_device(dev, false);
        if (!mmc)
@@ -667,6 +686,13 @@ static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag,
                return CMD_RET_FAILURE;
        }
 
+       if (argc == 2)
+               return mmc_partconf_print(mmc);
+
+       ack = simple_strtoul(argv[2], NULL, 10);
+       part_num = simple_strtoul(argv[3], NULL, 10);
+       access = simple_strtoul(argv[4], NULL, 10);
+
        /* acknowledge to be sent during boot operation */
        return mmc_set_part_conf(mmc, ack, part_num, access);
 }
@@ -832,8 +858,8 @@ U_BOOT_CMD(
        " - Set the BOOT_BUS_WIDTH field of the specified device\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"
-       "mmc partconf dev boot_ack boot_partition partition_access\n"
-       " - Change the bits of the PARTITION_CONFIG field of the specified device\n"
+       "mmc partconf dev [boot_ack boot_partition partition_access]\n"
+       " - Show or change the bits of the PARTITION_CONFIG field of the specified device\n"
        "mmc rst-function dev value\n"
        " - Change the RST_n_FUNCTION field of the specified device\n"
        "   WARNING: This is a write-once field and 0 / 1 / 2 are the only valid values.\n"

diff --git a/drivers/mmc/mmc_boot.c b/drivers/mmc/mmc_boot.c
index ac6f56f157a49078118348ab999c45c44b9fe398..6d77ce95e7e2ecaf68a47411396eade2d39c2685 100644 (file)
--- a/drivers/mmc/mmc_boot.c
+++ b/drivers/mmc/mmc_boot.c
@@ -100,10 +100,19 @@ int mmc_set_boot_bus_width(struct mmc *mmc, u8 width, u8 reset, u8 mode)
  */
 int mmc_set_part_conf(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
 {
-       return 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));
+       int ret;
+       u8 part_conf;
+
+       part_conf = EXT_CSD_BOOT_ACK(ack) |
+                   EXT_CSD_BOOT_PART_NUM(part_num) |
+                   EXT_CSD_PARTITION_ACCESS(access);
+
+       ret = mmc_switch(mmc, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_PART_CONF,
+                        part_conf);
+       if (!ret)
+               mmc->part_config = part_conf;
+
+       return ret;
 }
 
 /*

diff --git a/include/mmc.h b/include/mmc.h
index 16a5c20a2887f36114c1f90fc4d69bda1bbea0d9..010ebe048c45ffb68d3ffcb0614b9b243bddcbcc 100644 (file)
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -221,6 +221,10 @@
 #define EXT_CSD_BOOT_PART_NUM(x)       (x << 3)
 #define EXT_CSD_PARTITION_ACCESS(x)    (x << 0)
 
+#define EXT_CSD_EXTRACT_BOOT_ACK(x)            (((x) >> 6) & 0x1)
+#define EXT_CSD_EXTRACT_BOOT_PART(x)           (((x) >> 3) & 0x7)
+#define EXT_CSD_EXTRACT_PARTITION_ACCESS(x)    ((x) & 0x7)
+
 #define EXT_CSD_BOOT_BUS_WIDTH_MODE(x) (x << 3)
 #define EXT_CSD_BOOT_BUS_WIDTH_RESET(x)        (x << 2)
 #define EXT_CSD_BOOT_BUS_WIDTH_WIDTH(x)        (x)