mmc: Split mmc struct, rework mmc initialization (v2)

[people/ms/u-boot.git] / common / cmd_mmc.c

diff --git a/common/cmd_mmc.c b/common/cmd_mmc.c
index a322063cf6ab06b647f29a43826e5ec7f3b4af4f..bd1edc8c844871e85be5b3e812436e082d66f40e 100644 (file)
--- a/common/cmd_mmc.c
+++ b/common/cmd_mmc.c
@@ -79,7 +79,7 @@ enum mmc_state {
 };
 static void print_mmcinfo(struct mmc *mmc)
 {
-       printf("Device: %s\n", mmc->name);
+       printf("Device: %s\n", mmc->cfg->name);
        printf("Manufacturer ID: %x\n", mmc->cid[0] >> 24);
        printf("OEM: %x\n", (mmc->cid[0] >> 8) & 0xffff);
        printf("Name: %c%c%c%c%c \n", mmc->cid[0] & 0xff,
@@ -131,36 +131,6 @@ U_BOOT_CMD(
        "- display info of the current MMC device"
 );
 
-#ifdef CONFIG_SUPPORT_EMMC_BOOT
-static int boot_part_access(struct mmc *mmc, u8 ack, u8 part_num, u8 access)
-{
-       int err;
-       err = mmc_boot_part_access(mmc, ack, part_num, access);
-
-       if ((err == 0) && (access != 0)) {
-               printf("\t\t\t!!!Notice!!!\n");
-
-               printf("!You must close EMMC boot Partition");
-               printf("after all images are written\n");
-
-               printf("!EMMC boot partition has continuity");
-               printf("at image writing time.\n");
-
-               printf("!So, do not close the boot partition");
-               printf("before all images are written.\n");
-               return 0;
-       } else if ((err == 0) && (access == 0))
-               return 0;
-       else if ((err != 0) && (access != 0)) {
-               printf("EMMC boot partition-%d OPEN Failed.\n", part_num);
-               return 1;
-       } else {
-               printf("EMMC boot partition-%d CLOSE Failed.\n", part_num);
-               return 1;
-       }
-}
-#endif
-
 static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        enum mmc_state state;
@@ -195,7 +165,7 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                        return 1;
                else
                        return 0;
-       } else if (strncmp(argv[1], "part", 4) == 0) {
+       } else if (strcmp(argv[1], "part") == 0) {
                block_dev_desc_t *mmc_dev;
                struct mmc *mmc;
 
@@ -273,15 +243,16 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
                return 0;
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
-       } else if ((strcmp(argv[1], "open") == 0) ||
-                       (strcmp(argv[1], "close") == 0)) {
+       } else if (strcmp(argv[1], "partconf") == 0) {
                int dev;
                struct mmc *mmc;
-               u8 part_num, access = 0;
+               u8 ack, part_num, access;
 
-               if (argc == 4) {
+               if (argc == 6) {
                        dev = simple_strtoul(argv[2], NULL, 10);
-                       part_num = simple_strtoul(argv[3], 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;
                }
@@ -293,25 +264,39 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                }
 
                if (IS_SD(mmc)) {
-                       printf("SD device cannot be opened/closed\n");
+                       puts("PARTITION_CONFIG only exists on eMMC\n");
                        return 1;
                }
 
-               if ((part_num <= 0) || (part_num > MMC_NUM_BOOT_PARTITION)) {
-                       printf("Invalid boot partition number:\n");
-                       printf("Boot partition number cannot be <= 0\n");
-                       printf("EMMC44 supports only 2 boot partitions\n");
+               /* acknowledge to be sent during boot operation */
+               return mmc_set_part_conf(mmc, ack, part_num, access);
+       } else if (strcmp(argv[1], "bootbus") == 0) {
+               int dev;
+               struct mmc *mmc;
+               u8 width, reset, mode;
+
+               if (argc == 6) {
+                       dev = simple_strtoul(argv[2], NULL, 10);
+                       width = simple_strtoul(argv[3], NULL, 10);
+                       reset = simple_strtoul(argv[4], NULL, 10);
+                       mode = 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 (strcmp(argv[1], "open") == 0)
-                       access = part_num; /* enable R/W access to boot part*/
-               else
-                       access = 0; /* No access to boot partition */
+               if (IS_SD(mmc)) {
+                       puts("BOOT_BUS_WIDTH only exists on eMMC\n");
+                       return 1;
+               }
 
                /* acknowledge to be sent during boot operation */
-               return boot_part_access(mmc, 1, part_num, access);
-
+               return mmc_set_boot_bus_width(mmc, width, reset, mode);
        } else if (strcmp(argv[1], "bootpart-resize") == 0) {
                int dev;
                struct mmc *mmc;
@@ -445,12 +430,12 @@ U_BOOT_CMD(
        "mmc dev [dev] [part] - show or set current mmc device [partition]\n"
        "mmc list - lists available devices\n"
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
-       "mmc open <dev> <boot_partition>\n"
-       " - Enable boot_part for booting and enable R/W access of boot_part\n"
-       "mmc close <dev> <boot_partition>\n"
-       " - Enable boot_part for booting and disable access to boot_part\n"
+       "mmc bootbus dev boot_bus_width reset_boot_bus_width boot_mode\n"
+       " - 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"
 #endif
        "mmc setdsr - set DSR register value\n"
        );