]> git.kernelconcepts.de Git - karo-tx-uboot.git/blobdiff - common/cmd_mmc.c
Merge branch 'common-devel' into uboot-merge
[karo-tx-uboot.git] / common / cmd_mmc.c
index 4323f76b30549cb0a83b19c8c95b755259d2af14..c9c1a19791956e2385f837888ef03dddf5b1cb8f 100644 (file)
@@ -2,38 +2,21 @@
  * (C) Copyright 2003
  * Kyle Harris, kharris@nexus-tech.net
  *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
 #include <mmc.h>
 
-#ifndef CONFIG_GENERIC_MMC
 static int curr_device = -1;
-
+#ifndef CONFIG_GENERIC_MMC
 int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        int dev;
 
        if (argc < 2)
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
 
        if (strcmp(argv[1], "init") == 0) {
                if (argc == 2) {
@@ -44,12 +27,12 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                } else if (argc == 3) {
                        dev = (int)simple_strtoul(argv[2], NULL, 10);
                } else {
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
                }
 
                if (mmc_legacy_init(dev) != 0) {
                        puts("No MMC card found\n");
-                       return 1;
+                       return CMD_RET_FAILURE;
                }
 
                curr_device = dev;
@@ -58,26 +41,26 @@ int do_mmc (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
                if (argc == 2) {
                        if (curr_device < 0) {
                                puts("No MMC device available\n");
-                               return 1;
+                               return CMD_RET_FAILURE;
                        }
                } else if (argc == 3) {
                        dev = (int)simple_strtoul(argv[2], NULL, 10);
 
 #ifdef CONFIG_SYS_MMC_SET_DEV
                        if (mmc_set_dev(dev) != 0)
-                               return 1;
+                               return CMD_RET_FAILURE;
 #endif
                        curr_device = dev;
                } else {
-                       return cmd_usage(cmdtp);
+                       return CMD_RET_USAGE;
                }
 
                printf("mmc%d is current device\n", curr_device);
        } else {
-               return cmd_usage(cmdtp);
+               return CMD_RET_USAGE;
        }
 
-       return 0;
+       return CMD_RET_SUCCESS;
 }
 
 U_BOOT_CMD(
@@ -88,6 +71,12 @@ U_BOOT_CMD(
 );
 #else /* !CONFIG_GENERIC_MMC */
 
+enum mmc_state {
+       MMC_INVALID,
+       MMC_READ,
+       MMC_WRITE,
+       MMC_ERASE,
+};
 static void print_mmcinfo(struct mmc *mmc)
 {
        printf("Device: %s\n", mmc->name);
@@ -101,151 +90,337 @@ static void print_mmcinfo(struct mmc *mmc)
        printf("Rd Block Len: %d\n", mmc->read_bl_len);
 
        printf("%s version %d.%d\n", IS_SD(mmc) ? "SD" : "MMC",
-                       (mmc->version >> 4) & 0xf, mmc->version & 0xf);
+                       (mmc->version >> 8) & 0xf, mmc->version & 0xff);
 
        printf("High Capacity: %s\n", mmc->high_capacity ? "Yes" : "No");
-       printf("Capacity: %lld\n", mmc->capacity);
+       puts("Capacity: ");
+       print_size(mmc->capacity, "\n");
 
        printf("Bus Width: %d-bit\n", mmc->bus_width);
 }
 
-int do_mmcinfo (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_mmcinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
        struct mmc *mmc;
-       int dev_num;
 
-       if (argc < 2)
-               dev_num = 0;
-       else
-               dev_num = simple_strtoul(argv[1], NULL, 0);
+       if (curr_device < 0) {
+               if (get_mmc_num() > 0)
+                       curr_device = 0;
+               else {
+                       puts("No MMC device available\n");
+                       return CMD_RET_FAILURE;
+               }
+       }
 
-       mmc = find_mmc_device(dev_num);
+       mmc = find_mmc_device(curr_device);
 
        if (mmc) {
                mmc_init(mmc);
 
                print_mmcinfo(mmc);
+               return CMD_RET_SUCCESS;
+       } else {
+               printf("no mmc device at slot %x\n", curr_device);
+               return CMD_RET_FAILURE;
        }
-
-       return 0;
 }
 
 U_BOOT_CMD(
-       mmcinfo, 2, 0, do_mmcinfo,
+       mmcinfo, 1, 0, do_mmcinfo,
        "display MMC info",
-       "<dev num>\n"
-       "    - device number of the device to dislay info of\n"
-       ""
+       "- display info of the current MMC device"
 );
 
-int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+#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("Notice!\n");
+
+               printf("You must close EMMC boot Partition after all images are written\n");
+               printf("EMMC boot partition has continuity at image writing time.\n");
+               printf("So, do not close the boot partition before all images are written.\n");
+               return CMD_RET_SUCCESS;
+       } else if ((err == 0) && (access == 0))
+               return CMD_RET_SUCCESS;
+       else if ((err != 0) && (access != 0)) {
+               printf("EMMC boot partition-%d OPEN Failed.\n", part_num);
+               return CMD_RET_FAILURE;
+       } else {
+               printf("EMMC boot partition-%d CLOSE Failed.\n", part_num);
+               return CMD_RET_FAILURE;
+       }
+}
+#endif
+
+static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
-       int rc = 0;
+       enum mmc_state state;
+
+       if (argc < 2)
+               return CMD_RET_USAGE;
+
+       if (curr_device < 0) {
+               if (get_mmc_num() > 0)
+                       curr_device = 0;
+               else {
+                       puts("No MMC device available\n");
+                       return CMD_RET_FAILURE;
+               }
+       }
 
-       switch (argc) {
-       case 3:
-               if (strcmp(argv[1], "rescan") == 0) {
-                       int dev = simple_strtoul(argv[2], NULL, 10);
-                       struct mmc *mmc = find_mmc_device(dev);
+       if (strcmp(argv[1], "rescan") == 0) {
+               struct mmc *mmc;
 
-                       if (!mmc)
-                               return 1;
+               if (argc != 2)
+                       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;
+               }
+
+               mmc->has_init = 0;
+
+               if (mmc_init(mmc))
+                       return CMD_RET_FAILURE;
+               else
+                       return CMD_RET_SUCCESS;
+       } else if (strncmp(argv[1], "part", 4) == 0) {
+               block_dev_desc_t *mmc_dev;
+               struct mmc *mmc;
+
+               if (argc != 2)
+                       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;
+               }
+               mmc_init(mmc);
+               mmc_dev = mmc_get_dev(curr_device);
+               if (mmc_dev != NULL &&
+                               mmc_dev->type != DEV_TYPE_UNKNOWN) {
+                       print_part(mmc_dev);
+                       return CMD_RET_SUCCESS;
+               }
 
-                       mmc_init(mmc);
+               puts("get mmc type error!\n");
+               return CMD_RET_FAILURE;
+       } else if (strcmp(argv[1], "list") == 0) {
+               if (argc != 2)
+                       return CMD_RET_USAGE;
+               print_mmc_devices('\n');
+               return CMD_RET_SUCCESS;
+       } else if (strcmp(argv[1], "dev") == 0) {
+               int dev, part = -1;
+               struct mmc *mmc;
+
+               if (argc == 2)
+                       dev = curr_device;
+               else if (argc == 3)
+                       dev = simple_strtoul(argv[2], NULL, 10);
+               else if (argc == 4) {
+                       dev = (int)simple_strtoul(argv[2], NULL, 10);
+                       part = (int)simple_strtoul(argv[3], NULL, 10);
+                       if (part > PART_ACCESS_MASK) {
+                               printf("#part_num shouldn't be larger"
+                                       " than %d\n", PART_ACCESS_MASK);
+                               return CMD_RET_FAILURE;
+                       }
+               } else
+                       return CMD_RET_USAGE;
 
-                       return 0;
-               } else if (strncmp(argv[1], "part", 4) == 0) {
-                       int dev = simple_strtoul(argv[2], NULL, 10);
-                       block_dev_desc_t *mmc_dev;
-                       struct mmc *mmc = find_mmc_device(dev);
+               mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return CMD_RET_FAILURE;
+               }
 
-                       if (!mmc) {
-                               puts("no mmc devices available\n");
-                               return 1;
+               mmc_init(mmc);
+               if (part != -1) {
+                       int ret;
+                       if (mmc->part_config == MMCPART_NOAVAILABLE) {
+                               printf("Card doesn't support part_switch\n");
+                               return CMD_RET_FAILURE;
                        }
-                       mmc_init(mmc);
-                       mmc_dev = mmc_get_dev(dev);
-                       if (mmc_dev != NULL &&
-                           mmc_dev->type != DEV_TYPE_UNKNOWN) {
-                               print_part(mmc_dev);
-                               return 0;
+
+                       if (part != mmc->part_num) {
+                               ret = mmc_switch_part(dev, part);
+                               if (!ret)
+                                       mmc->part_num = part;
+
+                               printf("switch to partions #%d, %s\n",
+                                               part, (!ret) ? "OK" : "ERROR");
                        }
+               }
+               curr_device = dev;
+               if (mmc->part_config == MMCPART_NOAVAILABLE)
+                       printf("mmc%d is current device\n", curr_device);
+               else
+                       printf("mmc%d(part %d) is current device\n",
+                               curr_device, mmc->part_num);
+
+               return CMD_RET_SUCCESS;
+#ifdef CONFIG_SUPPORT_EMMC_BOOT
+       } else if ((strcmp(argv[1], "open") == 0) ||
+                       (strcmp(argv[1], "close") == 0)) {
+               int dev;
+               struct mmc *mmc;
+               u8 part_num, access = 0;
+
+               if (argc == 4) {
+                       dev = simple_strtoul(argv[2], NULL, 10);
+                       part_num = simple_strtoul(argv[3], NULL, 10);
+               } else {
+                       return CMD_RET_USAGE;
+               }
 
-                       puts("get mmc type error!\n");
-                       return 1;
+               mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return CMD_RET_FAILURE;
                }
 
-       case 0:
-       case 1:
-       case 4:
-               return cmd_usage(cmdtp);
+               if (IS_SD(mmc)) {
+                       printf("SD device cannot be opened/closed\n");
+                       return CMD_RET_FAILURE;
+               }
 
-       case 2:
-               if (!strcmp(argv[1], "list")) {
-                       print_mmc_devices('\n');
-                       return 0;
+               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");
+                       return CMD_RET_FAILURE;
                }
-               return 1;
-       default: /* at least 5 args */
-               if (strcmp(argv[1], "read") == 0) {
-                       int dev = simple_strtoul(argv[2], NULL, 10);
-                       void *addr = (void *)simple_strtoul(argv[3], NULL, 16);
-                       u32 cnt = simple_strtoul(argv[5], NULL, 16);
-                       u32 n;
-                       u32 blk = simple_strtoul(argv[4], NULL, 16);
-                       struct mmc *mmc = find_mmc_device(dev);
 
-                       if (!mmc)
-                               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 */
 
-                       printf("\nMMC read: dev # %d, block # %d, count %d ... ",
-                               dev, blk, cnt);
+               /* acknowledge to be sent during boot operation */
+               return boot_part_access(mmc, 1, part_num, access);
 
-                       mmc_init(mmc);
+       } else if (strcmp(argv[1], "bootpart") == 0) {
+               int dev;
 
-                       n = mmc->block_dev.block_read(dev, blk, cnt, addr);
+               if (argc != 5)
+                       return CMD_RET_USAGE;
 
-                       /* flush cache after read */
-                       flush_cache((ulong)addr, cnt * 512); /* FIXME */
+               dev = simple_strtoul(argv[2], NULL, 10);
+
+               u32 bootsize = simple_strtoul(argv[3], NULL, 10);
+               u32 rpmbsize = simple_strtoul(argv[4], NULL, 10);
+               struct mmc *mmc = find_mmc_device(dev);
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", dev);
+                       return CMD_RET_FAILURE;
+               }
 
-                       printf("%d blocks read: %s\n",
-                               n, (n==cnt) ? "OK" : "ERROR");
-                       return (n == cnt) ? 0 : 1;
-               } else if (strcmp(argv[1], "write") == 0) {
-                       int dev = simple_strtoul(argv[2], NULL, 10);
-                       void *addr = (void *)simple_strtoul(argv[3], NULL, 16);
-                       u32 cnt = simple_strtoul(argv[5], NULL, 16);
-                       u32 n;
-                       struct mmc *mmc = find_mmc_device(dev);
+               if (IS_SD(mmc)) {
+                       printf("It is not a EMMC device\n");
+                       return CMD_RET_FAILURE;
+               }
 
-                       int blk = simple_strtoul(argv[4], NULL, 16);
+               if (0 == mmc_boot_partition_size_change(mmc,
+                                                       bootsize, rpmbsize)) {
+                       printf("EMMC boot partition Size %d MB\n", bootsize);
+                       printf("EMMC RPMB partition Size %d MB\n", rpmbsize);
+                       return CMD_RET_SUCCESS;
+               } else {
+                       printf("EMMC boot partition Size change Failed.\n");
+                       return CMD_RET_FAILURE;
+               }
+#endif /* CONFIG_SUPPORT_EMMC_BOOT */
+       }
+       state = MMC_INVALID;
+       if (argc == 5 && strcmp(argv[1], "read") == 0)
+               state = MMC_READ;
+       else if (argc == 5 && strcmp(argv[1], "write") == 0)
+               state = MMC_WRITE;
+       else if (argc == 4 && strcmp(argv[1], "erase") == 0)
+               state = MMC_ERASE;
+
+       if (state != MMC_INVALID) {
+               struct mmc *mmc = find_mmc_device(curr_device);
+               int idx = 2;
+               u32 blk, cnt, n;
+               void *addr;
+
+               if (state != MMC_ERASE) {
+                       addr = (void *)simple_strtoul(argv[idx], NULL, 16);
+                       ++idx;
+               } else
+                       addr = NULL;
+               blk = simple_strtoul(argv[idx], NULL, 16);
+               cnt = simple_strtoul(argv[idx + 1], NULL, 16);
 
-                       if (!mmc)
-                               return 1;
+               if (!mmc) {
+                       printf("no mmc device at slot %x\n", curr_device);
+                       return CMD_RET_FAILURE;
+               }
 
-                       printf("\nMMC write: dev # %d, block # %d, count %d ... ",
-                               dev, blk, cnt);
+               printf("\nMMC %s: dev # %d, block # %d, count %d ... ",
+                               argv[1], curr_device, blk, cnt);
 
-                       mmc_init(mmc);
+               mmc_init(mmc);
 
-                       n = mmc->block_dev.block_write(dev, blk, cnt, addr);
+               if ((state == MMC_WRITE || state == MMC_ERASE)) {
+                       if (mmc_getwp(mmc) == 1) {
+                               printf("Error: card is write protected!\n");
+                               return CMD_RET_FAILURE;
+                       }
+               }
 
-                       printf("%d blocks written: %s\n",
-                               n, (n == cnt) ? "OK" : "ERROR");
-                       return (n == cnt) ? 0 : 1;
-               } else
-                       rc = cmd_usage(cmdtp);
+               switch (state) {
+               case MMC_READ:
+                       n = mmc->block_dev.block_read(curr_device, blk,
+                                                     cnt, addr);
+                       /* flush cache after read */
+                       flush_cache((ulong)addr, cnt * 512); /* FIXME */
+                       break;
+               case MMC_WRITE:
+                       n = mmc->block_dev.block_write(curr_device, blk,
+                                                     cnt, addr);
+                       break;
+               case MMC_ERASE:
+                       n = mmc->block_dev.block_erase(curr_device, blk, cnt);
+                       break;
+               default:
+                       BUG();
+               }
 
-               return rc;
+               printf("%d blocks %s: %s\n",
+                               n, argv[1], (n == cnt) ? "OK" : "ERROR");
+               return (n == cnt) ? 0 : 1;
        }
+
+       return CMD_RET_USAGE;
 }
 
 U_BOOT_CMD(
        mmc, 6, 1, do_mmcops,
        "MMC sub system",
-       "read <device num> addr blk# cnt\n"
-       "mmc write <device num> addr blk# cnt\n"
-       "mmc rescan <device num>\n"
-       "mmc part <device num> - lists available partition on mmc\n"
-       "mmc list - lists available devices");
+       "read addr blk# cnt\n"
+       "mmc write addr blk# cnt\n"
+       "mmc erase blk# cnt\n"
+       "mmc rescan\n"
+       "mmc part - lists available partition on current mmc device\n"
+       "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 bootpart <device num> <boot part size MB> <RPMB part size MB>\n"
+       " - change sizes of boot and RPMB partions of specified device\n"
 #endif
+       );
+#endif /* !CONFIG_GENERIC_MMC */