rockchip: Remove ARCH= references from documentation

[oweals/u-boot.git] / cmd / mmc.c

diff --git a/cmd/mmc.c b/cmd/mmc.c
index ca8f982f53f6e47fe62fc234a29035f74285bf9b..97e5d91859c9fc9e2ec200fcc128c4c0d1a4b5a6 100644 (file)
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -5,9 +5,11 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
 #include <mmc.h>
+#include <part.h>
 #include <sparse_format.h>
 #include <image-sparse.h>
 
@@ -26,7 +28,7 @@ static void print_mmcinfo(struct mmc *mmc)
 
        printf("Bus Speed: %d\n", mmc->clock);
 #if CONFIG_IS_ENABLED(MMC_VERBOSE)
-       printf("Mode : %s\n", mmc_mode_name(mmc->selected_mode));
+       printf("Mode: %s\n", mmc_mode_name(mmc->selected_mode));
        mmc_dump_capabilities("card capabilities", mmc->card_caps);
        mmc_dump_capabilities("host capabilities", mmc->host_caps);
 #endif
@@ -54,6 +56,8 @@ static void print_mmcinfo(struct mmc *mmc)
        if (!IS_SD(mmc) && mmc->version >= MMC_VERSION_4_41) {
                bool has_enh = (mmc->part_support & ENHNCD_SUPPORT) != 0;
                bool usr_enh = has_enh && (mmc->part_attr & EXT_CSD_ENH_USR);
+               u8 wp, ext_csd[MMC_MAX_BLOCK_LEN];
+               int ret;
 
 #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
                puts("HC WP Group Size: ");
@@ -90,6 +94,28 @@ static void print_mmcinfo(struct mmc *mmc)
                                        putc('\n');
                        }
                }
+               ret = mmc_send_ext_csd(mmc, ext_csd);
+               if (ret)
+                       return;
+               wp = ext_csd[EXT_CSD_BOOT_WP_STATUS];
+               for (i = 0; i < 2; ++i) {
+                       printf("Boot area %d is ", i);
+                       switch (wp & 3) {
+                       case 0:
+                               printf("not write protected\n");
+                               break;
+                       case 1:
+                               printf("power on protected\n");
+                               break;
+                       case 2:
+                               printf("permanently protected\n");
+                               break;
+                       default:
+                               printf("in reserved protection state\n");
+                               break;
+                       }
+                       wp >>= 2;
+               }
        }
 }
 static struct mmc *init_mmc_device(int dev, bool force_init)
@@ -108,9 +134,17 @@ static struct mmc *init_mmc_device(int dev, bool force_init)
                mmc->has_init = 0;
        if (mmc_init(mmc))
                return NULL;
+
+#ifdef CONFIG_BLOCK_CACHE
+       struct blk_desc *bd = mmc_get_blk_desc(mmc);
+       blkcache_invalidate(bd->if_type, bd->devnum);
+#endif
+
        return mmc;
 }
-static int do_mmcinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+
+static int do_mmcinfo(struct cmd_tbl *cmdtp, int flag, int argc,
+                     char *const argv[])
 {
        struct mmc *mmc;
 
@@ -143,8 +177,9 @@ static int confirm_key_prog(void)
        puts("Authentication key programming aborted\n");
        return 0;
 }
-static int do_mmcrpmb_key(cmd_tbl_t *cmdtp, int flag,
-                         int argc, char * const argv[])
+
+static int do_mmcrpmb_key(struct cmd_tbl *cmdtp, int flag,
+                         int argc, char *const argv[])
 {
        void *key_addr;
        struct mmc *mmc = find_mmc_device(curr_device);
@@ -161,8 +196,9 @@ static int do_mmcrpmb_key(cmd_tbl_t *cmdtp, int flag,
        }
        return CMD_RET_SUCCESS;
 }
-static int do_mmcrpmb_read(cmd_tbl_t *cmdtp, int flag,
-                          int argc, char * const argv[])
+
+static int do_mmcrpmb_read(struct cmd_tbl *cmdtp, int flag,
+                          int argc, char *const argv[])
 {
        u16 blk, cnt;
        void *addr;
@@ -189,8 +225,9 @@ static int do_mmcrpmb_read(cmd_tbl_t *cmdtp, int flag,
                return CMD_RET_FAILURE;
        return CMD_RET_SUCCESS;
 }
-static int do_mmcrpmb_write(cmd_tbl_t *cmdtp, int flag,
-                           int argc, char * const argv[])
+
+static int do_mmcrpmb_write(struct cmd_tbl *cmdtp, int flag,
+                           int argc, char *const argv[])
 {
        u16 blk, cnt;
        void *addr;
@@ -215,8 +252,9 @@ static int do_mmcrpmb_write(cmd_tbl_t *cmdtp, int flag,
                return CMD_RET_FAILURE;
        return CMD_RET_SUCCESS;
 }
-static int do_mmcrpmb_counter(cmd_tbl_t *cmdtp, int flag,
-                             int argc, char * const argv[])
+
+static int do_mmcrpmb_counter(struct cmd_tbl *cmdtp, int flag,
+                             int argc, char *const argv[])
 {
        unsigned long counter;
        struct mmc *mmc = find_mmc_device(curr_device);
@@ -227,17 +265,17 @@ static int do_mmcrpmb_counter(cmd_tbl_t *cmdtp, int flag,
        return CMD_RET_SUCCESS;
 }
 
-static cmd_tbl_t cmd_rpmb[] = {
+static struct cmd_tbl cmd_rpmb[] = {
        U_BOOT_CMD_MKENT(key, 2, 0, do_mmcrpmb_key, "", ""),
        U_BOOT_CMD_MKENT(read, 5, 1, do_mmcrpmb_read, "", ""),
        U_BOOT_CMD_MKENT(write, 5, 0, do_mmcrpmb_write, "", ""),
        U_BOOT_CMD_MKENT(counter, 1, 1, do_mmcrpmb_counter, "", ""),
 };
 
-static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag,
-                     int argc, char * const argv[])
+static int do_mmcrpmb(struct cmd_tbl *cmdtp, int flag,
+                     int argc, char *const argv[])
 {
-       cmd_tbl_t *cp;
+       struct cmd_tbl *cp;
        struct mmc *mmc;
        char original_part;
        int ret;
@@ -250,7 +288,7 @@ static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag,
 
        if (cp == NULL || argc > cp->maxargs)
                return CMD_RET_USAGE;
-       if (flag == CMD_FLAG_REPEAT && !cp->repeatable)
+       if (flag == CMD_FLAG_REPEAT && !cmd_is_repeatable(cp))
                return CMD_RET_SUCCESS;
 
        mmc = init_mmc_device(curr_device, false);
@@ -258,7 +296,7 @@ static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag,
                return CMD_RET_FAILURE;
 
        if (!(mmc->version & MMC_VERSION_MMC)) {
-               printf("It is not a EMMC device\n");
+               printf("It is not an eMMC device\n");
                return CMD_RET_FAILURE;
        }
        if (mmc->version < MMC_VERSION_4_41) {
@@ -284,8 +322,8 @@ static int do_mmcrpmb(cmd_tbl_t *cmdtp, int flag,
 }
 #endif
 
-static int do_mmc_read(cmd_tbl_t *cmdtp, int flag,
-                      int argc, char * const argv[])
+static int do_mmc_read(struct cmd_tbl *cmdtp, int flag,
+                      int argc, char *const argv[])
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
@@ -326,8 +364,8 @@ static lbaint_t mmc_sparse_reserve(struct sparse_storage *info,
        return blkcnt;
 }
 
-static int do_mmc_sparse_write(cmd_tbl_t *cmdtp, int flag,
-                              int argc, char * const argv[])
+static int do_mmc_sparse_write(struct cmd_tbl *cmdtp, int flag,
+                              int argc, char *const argv[])
 {
        struct sparse_storage sparse;
        struct blk_desc *dev_desc;
@@ -377,8 +415,8 @@ static int do_mmc_sparse_write(cmd_tbl_t *cmdtp, int flag,
 #endif
 
 #if CONFIG_IS_ENABLED(MMC_WRITE)
-static int do_mmc_write(cmd_tbl_t *cmdtp, int flag,
-                       int argc, char * const argv[])
+static int do_mmc_write(struct cmd_tbl *cmdtp, int flag,
+                       int argc, char *const argv[])
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
@@ -407,8 +445,9 @@ static int do_mmc_write(cmd_tbl_t *cmdtp, int flag,
 
        return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
 }
-static int do_mmc_erase(cmd_tbl_t *cmdtp, int flag,
-                       int argc, char * const argv[])
+
+static int do_mmc_erase(struct cmd_tbl *cmdtp, int flag,
+                       int argc, char *const argv[])
 {
        struct mmc *mmc;
        u32 blk, cnt, n;
@@ -437,8 +476,8 @@ static int do_mmc_erase(cmd_tbl_t *cmdtp, int flag,
 }
 #endif
 
-static int do_mmc_rescan(cmd_tbl_t *cmdtp, int flag,
-                        int argc, char * const argv[])
+static int do_mmc_rescan(struct cmd_tbl *cmdtp, int flag,
+                        int argc, char *const argv[])
 {
        struct mmc *mmc;
 
@@ -448,8 +487,9 @@ static int do_mmc_rescan(cmd_tbl_t *cmdtp, int flag,
 
        return CMD_RET_SUCCESS;
 }
-static int do_mmc_part(cmd_tbl_t *cmdtp, int flag,
-                      int argc, char * const argv[])
+
+static int do_mmc_part(struct cmd_tbl *cmdtp, int flag,
+                      int argc, char *const argv[])
 {
        struct blk_desc *mmc_dev;
        struct mmc *mmc;
@@ -467,8 +507,9 @@ static int do_mmc_part(cmd_tbl_t *cmdtp, int flag,
        puts("get mmc type error!\n");
        return CMD_RET_FAILURE;
 }
-static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag,
-                     int argc, char * const argv[])
+
+static int do_mmc_dev(struct cmd_tbl *cmdtp, int flag,
+                     int argc, char *const argv[])
 {
        int dev, part = 0, ret;
        struct mmc *mmc;
@@ -508,8 +549,9 @@ static int do_mmc_dev(cmd_tbl_t *cmdtp, int flag,
 
        return CMD_RET_SUCCESS;
 }
-static int do_mmc_list(cmd_tbl_t *cmdtp, int flag,
-                      int argc, char * const argv[])
+
+static int do_mmc_list(struct cmd_tbl *cmdtp, int flag,
+                      int argc, char *const argv[])
 {
        print_mmc_devices('\n');
        return CMD_RET_SUCCESS;
@@ -517,7 +559,7 @@ static int do_mmc_list(cmd_tbl_t *cmdtp, int flag,
 
 #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
 static int parse_hwpart_user(struct mmc_hwpart_conf *pconf,
-                            int argc, char * const argv[])
+                            int argc, char *const argv[])
 {
        int i = 0;
 
@@ -551,7 +593,7 @@ static int parse_hwpart_user(struct mmc_hwpart_conf *pconf,
 }
 
 static int parse_hwpart_gp(struct mmc_hwpart_conf *pconf, int pidx,
-                          int argc, char * const argv[])
+                          int argc, char *const argv[])
 {
        int i;
 
@@ -584,8 +626,8 @@ static int parse_hwpart_gp(struct mmc_hwpart_conf *pconf, int pidx,
        return i;
 }
 
-static int do_mmc_hwpartition(cmd_tbl_t *cmdtp, int flag,
-                             int argc, char * const argv[])
+static int do_mmc_hwpartition(struct cmd_tbl *cmdtp, int flag,
+                             int argc, char *const argv[])
 {
        struct mmc *mmc;
        struct mmc_hwpart_conf pconf = { };
@@ -668,8 +710,8 @@ static int do_mmc_hwpartition(cmd_tbl_t *cmdtp, int flag,
 #endif
 
 #ifdef CONFIG_SUPPORT_EMMC_BOOT
-static int do_mmc_bootbus(cmd_tbl_t *cmdtp, int flag,
-                         int argc, char * const argv[])
+static int do_mmc_bootbus(struct cmd_tbl *cmdtp, int flag,
+                         int argc, char *const argv[])
 {
        int dev;
        struct mmc *mmc;
@@ -694,8 +736,9 @@ static int do_mmc_bootbus(cmd_tbl_t *cmdtp, int flag,
        /* acknowledge to be sent during boot operation */
        return mmc_set_boot_bus_width(mmc, width, reset, mode);
 }
-static int do_mmc_boot_resize(cmd_tbl_t *cmdtp, int flag,
-                             int argc, char * const argv[])
+
+static int do_mmc_boot_resize(struct cmd_tbl *cmdtp, int flag,
+                             int argc, char *const argv[])
 {
        int dev;
        struct mmc *mmc;
@@ -712,7 +755,7 @@ static int do_mmc_boot_resize(cmd_tbl_t *cmdtp, int flag,
                return CMD_RET_FAILURE;
 
        if (IS_SD(mmc)) {
-               printf("It is not a EMMC device\n");
+               printf("It is not an eMMC device\n");
                return CMD_RET_FAILURE;
        }
 
@@ -747,8 +790,8 @@ static int mmc_partconf_print(struct mmc *mmc)
        return CMD_RET_SUCCESS;
 }
 
-static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag,
-                          int argc, char * const argv[])
+static int do_mmc_partconf(struct cmd_tbl *cmdtp, int flag,
+                          int argc, char *const argv[])
 {
        int dev;
        struct mmc *mmc;
@@ -778,8 +821,9 @@ static int do_mmc_partconf(cmd_tbl_t *cmdtp, int flag,
        /* acknowledge to be sent during boot operation */
        return mmc_set_part_conf(mmc, ack, part_num, access);
 }
-static int do_mmc_rst_func(cmd_tbl_t *cmdtp, int flag,
-                          int argc, char * const argv[])
+
+static int do_mmc_rst_func(struct cmd_tbl *cmdtp, int flag,
+                          int argc, char *const argv[])
 {
        int dev;
        struct mmc *mmc;
@@ -813,8 +857,8 @@ static int do_mmc_rst_func(cmd_tbl_t *cmdtp, int flag,
        return mmc_set_rst_n_function(mmc, enable);
 }
 #endif
-static int do_mmc_setdsr(cmd_tbl_t *cmdtp, int flag,
-                        int argc, char * const argv[])
+static int do_mmc_setdsr(struct cmd_tbl *cmdtp, int flag,
+                        int argc, char *const argv[])
 {
        struct mmc *mmc;
        u32 val;
@@ -842,8 +886,8 @@ static int do_mmc_setdsr(cmd_tbl_t *cmdtp, int flag,
 }
 
 #ifdef CONFIG_CMD_BKOPS_ENABLE
-static int do_mmc_bkops_enable(cmd_tbl_t *cmdtp, int flag,
-                                  int argc, char * const argv[])
+static int do_mmc_bkops_enable(struct cmd_tbl *cmdtp, int flag,
+                              int argc, char *const argv[])
 {
        int dev;
        struct mmc *mmc;
@@ -866,9 +910,30 @@ static int do_mmc_bkops_enable(cmd_tbl_t *cmdtp, int flag,
 }
 #endif
 
-static cmd_tbl_t cmd_mmc[] = {
+static int do_mmc_boot_wp(struct cmd_tbl *cmdtp, int flag,
+                         int argc, char * const argv[])
+{
+       int err;
+       struct mmc *mmc;
+
+       mmc = init_mmc_device(curr_device, false);
+       if (!mmc)
+               return CMD_RET_FAILURE;
+       if (IS_SD(mmc)) {
+               printf("It is not an eMMC device\n");
+               return CMD_RET_FAILURE;
+       }
+       err = mmc_boot_wp(mmc);
+       if (err)
+               return CMD_RET_FAILURE;
+       printf("boot areas protected\n");
+       return CMD_RET_SUCCESS;
+}
+
+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, "", ""),
+       U_BOOT_CMD_MKENT(wp, 1, 0, do_mmc_boot_wp, "", ""),
 #if CONFIG_IS_ENABLED(MMC_WRITE)
        U_BOOT_CMD_MKENT(write, 4, 0, do_mmc_write, "", ""),
        U_BOOT_CMD_MKENT(erase, 3, 0, do_mmc_erase, "", ""),
@@ -898,9 +963,10 @@ static cmd_tbl_t cmd_mmc[] = {
 #endif
 };
 
-static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+static int do_mmcops(struct cmd_tbl *cmdtp, int flag, int argc,
+                    char *const argv[])
 {
-       cmd_tbl_t *cp;
+       struct cmd_tbl *cp;
 
        cp = find_cmd_tbl(argv[1], cmd_mmc, ARRAY_SIZE(cmd_mmc));
 
@@ -910,7 +976,7 @@ static int do_mmcops(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 
        if (cp == NULL || argc > cp->maxargs)
                return CMD_RET_USAGE;
-       if (flag == CMD_FLAG_REPEAT && !cp->repeatable)
+       if (flag == CMD_FLAG_REPEAT && !cmd_is_repeatable(cp))
                return CMD_RET_SUCCESS;
 
        if (curr_device < 0) {
@@ -938,6 +1004,7 @@ U_BOOT_CMD(
        "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"
+       "mmc wp - power on write protect booot partitions\n"
 #if CONFIG_IS_ENABLED(MMC_HW_PARTITIONING)
        "mmc hwpartition [args...] - does hardware partitioning\n"
        "  arguments (sizes in 512-byte blocks):\n"