ENGR00268442 mmc: remove the boot partition access codes on 3.0.35

Regarding to the following community commit, remove all the boot
partition access codes added before.
-
371a689f64b0da140c3bcd3f55305ffa1c3a58ef
mmc: MMC boot partitions support.

Allows device MMC boot partitions to be accessed. MMC partitions are
treated effectively as separate block devices on the same MMC card.
-

Boot partition access howto:
-
To enable write access to /dev/mmcblkXbootY, disable the forced
read-only access with:

echo 0 > /sys/block/mmcblkXbootY/force_ro

To re-enable read-only access:

echo 1 > /sys/block/mmcblkXbootY/force_ro
-

Signed-off-by: Richard Zhu <r65037@freescale.com>

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index ce5e63c61b516ea2ee409ce5bb513faa51c3f9a8..5c8fa764ca43a5c4c2b46d23fa412e4e5b8f4baa 100644 (file)
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -496,7 +496,7 @@ setup_boot_partitions(struct device *dev, struct device_attribute *attr,
                const char *buf, size_t count)
 {
        int err, busy = 0;
-       u32 part, new_part;
+       u32 part;
        u8 *ext_csd, boot_config;
        struct mmc_command cmd;
        struct mmc_card *card = container_of(dev, struct mmc_card, dev);
@@ -514,12 +514,28 @@ setup_boot_partitions(struct device *dev, struct device_attribute *attr,
 
        /* it's a normal SD/MMC but user request to configure boot partition */
        if (card->ext_csd.boot_size <= 0) {
-               printk(KERN_ERR "%s: this is a normal SD/MMC card"
-                       " but you request to access boot partition!\n",
+               pr_err("%s: fail to send SWITCH command to card " \
+                               "to update boot_config of the EXT_CSD!\n",
                        mmc_hostname(card->host));
                return -EINVAL;
        }
 
+       /*
+        * partition must be -
+        * 0 - user area
+        * 1 - boot partition 1
+        * 2 - boot partition 2
+        * DO NOT switch the partitions that used to be accessed
+        * in OS layer HERE
+        */
+       if (part & EXT_CSD_BOOT_PARTITION_ACCESS_MASK) {
+               pr_err("%s: DO NOT switch the partitions that used to be\n" \
+                       " accessed in OS layer HERE. please following the\n" \
+                       " guidance of Documentation/mmc/mmc-dev-parts.txt.\n",
+                       mmc_hostname(card->host));
+               return -EINVAL;
+       }
+
        ext_csd = kmalloc(512, GFP_KERNEL);
        if (!ext_csd) {
                printk(KERN_ERR "%s: could not allocate a buffer to "
@@ -574,29 +590,11 @@ setup_boot_partitions(struct device *dev, struct device_attribute *attr,
                goto err_rtn;
        }
 
-       /* switch the partitions that used to be accessed in OS layer */
-       /* partition must be -
-        * 0 - user area
-        * 1 - boot partition 1
-        * 2 - boot partition 2
-        */
-       if ((part & EXT_CSD_BOOT_PARTITION_ACCESS_MASK) > 2) {
-               printk(KERN_ERR "%s: wrong partition id"
-                       " 0 (user area), 1 (boot1), 2 (boot2)\n",
-                       mmc_hostname(card->host));
-               err = -EINVAL;
-               goto err_rtn;
-       }
-
-
-       /* Send SWITCH command to change partition for access */
-       boot_config &= ~EXT_CSD_BOOT_PARTITION_ACCESS_MASK;
-       boot_config |= (part & EXT_CSD_BOOT_PARTITION_ACCESS_MASK);
        err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
                EXT_CSD_PART_CONFIG, boot_config, card->ext_csd.part_time);
        if (err) {
-               printk(KERN_ERR "%s: fail to send SWITCH command"
-                               " to card to swich partition for access!\n",
+               pr_err("%s: fail to send SWITCH command to card " \
+                               "to update boot_config of the EXT_CSD!\n",
                        mmc_hostname(card->host));
                goto err_rtn;
        }
@@ -634,14 +632,6 @@ setup_boot_partitions(struct device *dev, struct device_attribute *attr,
                goto err_rtn;
        }
 
-       new_part = ext_csd[EXT_CSD_PART_CONFIG] &
-               EXT_CSD_BOOT_PARTITION_ACCESS_MASK;
-       if ((part & EXT_CSD_BOOT_PARTITION_ACCESS_MASK) != new_part) {
-               printk(KERN_ERR "%s: after SWITCH, current part id %d is not"
-                               " same as requested partition %d!\n",
-                       mmc_hostname(card->host), new_part, part);
-               goto err_rtn;
-       }
        card->ext_csd.boot_config = ext_csd[EXT_CSD_PART_CONFIG];
 
 err_rtn:
@@ -669,8 +659,8 @@ setup_boot_bus(struct device *dev, struct device_attribute *attr,
        sscanf(buf, "%d\n", &boot_bus);
 
        if (card->csd.mmca_vsn < CSD_SPEC_VER_4) {
-               printk(KERN_ERR "%s: invalid mmc version"
-                       " mmc version is below version 4!)\n",
+               pr_err("%s: fail to send SWITCH command to card " \
+                               "to update boot_config of the EXT_CSD!\n",
                        mmc_hostname(card->host));
                return -EINVAL;
        }
@@ -794,16 +784,6 @@ static ssize_t mmc_boot_info_show(struct device *dev,
                "Reserved",
                "User area enabled for boot"};
 
-       char *boot_partition_access[8] = {
-               "No access to boot partition",
-               "R/W boot partition 1",
-               "R/W boot partition 2",
-               "R/W Replay Protected Memory Block (RPMB)",
-               "Access to General Purpose partition 1",
-               "Access to General Purpose partition 2",
-               "Access to General Purpose partition 3",
-               "Access to General Purpose partition 4"};
-
        char *bus_width[4] = {
                "x1 (sdr) or x4 (ddr) bus width in boot operation mode",
                "x4 (sdr/ddr) bus width in boot operation mode",
@@ -817,7 +797,6 @@ static ssize_t mmc_boot_info_show(struct device *dev,
        "Reserved"};
 
        int partition;
-       int access;
        int width;
        int mode;
        u8 *ext_csd = NULL;
@@ -830,7 +809,6 @@ static ssize_t mmc_boot_info_show(struct device *dev,
        mmc_read_ext_csd(card, ext_csd);
 
        partition = (card->ext_csd.boot_config >> 3) & 0x7;
-       access = card->ext_csd.boot_config & 0x7;
        width =  card->ext_csd.boot_bus_width & 0x3;
        mode = (card->ext_csd.boot_bus_width >> 3) & 0x3;
 
@@ -843,7 +821,6 @@ static ssize_t mmc_boot_info_show(struct device *dev,
                "boot_partition:0x%02x;\n"
                "  BOOT_ACK:%x - %s\n"
                "  BOOT_PARTITION-ENABLE: %x - %s\n"
-               "  PARTITION_ACCESS:%x - %s\n"
                "boot_bus:0x%02x\n"
                "  BOOT_MODE:%x - %s\n"
                "  RESET_BOOT_BUS_WIDTH:%x - %s\n"
@@ -872,8 +849,6 @@ static ssize_t mmc_boot_info_show(struct device *dev,
                        "No boot acknowledge sent",
                partition,
                boot_partition[partition],
-               access,
-               boot_partition_access[access],
 
                card->ext_csd.boot_bus_width,
                mode,