fastboot: mt85xx: add command to flash/erase emmc hwpart

This patch includes the following:
1. Add fastboot command to erase the whole EMMC_USER
2. Add fastboot command to flash image at EMMC_BOOT1
3. Add fastboot command to erase the whole EMMC_BOOT1
4. Enale CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT for mt8518

Signed-off-by: mingming lee <mingming.lee@mediatek.com>

diff --git a/configs/mt8518_ap1_emmc_defconfig b/configs/mt8518_ap1_emmc_defconfig
index e7c9d633f180901b1670806e4c5662c6c1f0057e..50219dd446086f591fc127e401fc8fbb02a34a56 100644 (file)
--- a/configs/mt8518_ap1_emmc_defconfig
+++ b/configs/mt8518_ap1_emmc_defconfig
@@ -21,6 +21,7 @@ CONFIG_CLK=y
 CONFIG_USB_FUNCTION_FASTBOOT=y
 CONFIG_FASTBOOT_BUF_ADDR=0x56000000
 CONFIG_FASTBOOT_BUF_SIZE=0x1E00000
+CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT=y
 CONFIG_FASTBOOT_FLASH=y
 CONFIG_FASTBOOT_FLASH_MMC_DEV=0
 CONFIG_DM_MMC=y

diff --git a/drivers/fastboot/Kconfig b/drivers/fastboot/Kconfig
index 9f85054bfb9c1730817291637b1b83a8d75893a6..d4436dfc9173dc3c32274b2b6b135d9c00ca65f6 100644 (file)
--- a/drivers/fastboot/Kconfig
+++ b/drivers/fastboot/Kconfig
@@ -104,6 +104,36 @@ config FASTBOOT_FLASH_NAND_TRIMFFS
          When flashing NAND enable the DROP_FFS flag to drop trailing all-0xff
          pages.
 
+config FASTBOOT_MMC_BOOT1_SUPPORT
+       bool "Enable EMMC_BOOT1 flash/erase"
+       depends on FASTBOOT_FLASH_MMC && EFI_PARTITION && ARCH_MEDIATEK
+       help
+         The fastboot "flash" and "erase" commands normally does operations
+         on EMMC userdata. Define this to enable the special commands to
+         flash/erase EMMC_BOOT1.
+         The default target name for updating EMMC_BOOT1 is "mmc0boot0".
+
+config FASTBOOT_MMC_BOOT1_NAME
+       string "Target name for updating EMMC_BOOT1"
+       depends on FASTBOOT_MMC_BOOT1_SUPPORT
+       default "mmc0boot0"
+       help
+         The fastboot "flash" and "erase" commands support operations on
+         EMMC_BOOT1. This occurs when the specified "EMMC_BOOT1 name" on
+         the "fastboot flash" and "fastboot erase" commands match the value
+         defined here.
+         The default target name for updating EMMC_BOOT1 is "mmc0boot0".
+
+config FASTBOOT_MMC_USER_NAME
+       string "Target name for erasing EMMC_USER"
+       depends on FASTBOOT_FLASH_MMC && EFI_PARTITION && ARCH_MEDIATEK
+       default "mmc0"
+       help
+         The fastboot "erase" command supports erasing EMMC_USER. This occurs
+         when the specified "EMMC_USER name" on the "fastboot erase" commands
+         match the value defined here.
+         The default target name for erasing EMMC_USER is "mmc0".
+
 config FASTBOOT_GPT_NAME
        string "Target name for updating GPT"
        depends on FASTBOOT_FLASH_MMC && EFI_PARTITION

diff --git a/drivers/fastboot/fb_mmc.c b/drivers/fastboot/fb_mmc.c
index b0b19c576252c4e6266939be72cb900dc7041a1a..d7cf9f4aac7d50e8650b9e5281a8f88f3e6fa4a8 100644 (file)
--- a/drivers/fastboot/fb_mmc.c
+++ b/drivers/fastboot/fb_mmc.c
@@ -129,6 +129,76 @@ static void write_raw_image(struct blk_desc *dev_desc, disk_partition_t *info,
        fastboot_okay(NULL, response);
 }
 
+#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT
+static int fb_mmc_erase_mmc_hwpart(struct blk_desc *dev_desc)
+{
+       lbaint_t blks;
+
+       debug("Start Erasing mmc hwpart[%u]...\n", dev_desc->hwpart);
+
+       blks = fb_mmc_blk_write(dev_desc, 0, dev_desc->lba, NULL);
+
+       if (blks != dev_desc->lba) {
+               pr_err("Failed to erase mmc hwpart[%u]\n", dev_desc->hwpart);
+               return 1;
+       }
+
+       printf("........ erased %lu bytes from mmc hwpart[%u]\n",
+              dev_desc->lba * dev_desc->blksz, dev_desc->hwpart);
+
+       return 0;
+}
+
+static void fb_mmc_boot1_ops(struct blk_desc *dev_desc, void *buffer,
+                            u32 buff_sz, char *response)
+{
+       lbaint_t blkcnt;
+       lbaint_t blks;
+       unsigned long blksz;
+
+       // To operate on EMMC_BOOT1 (mmc0boot0), we first change the hwpart
+       if (blk_dselect_hwpart(dev_desc, 1)) {
+               pr_err("Failed to select hwpart\n");
+               fastboot_fail("Failed to select hwpart", response);
+               return;
+       }
+
+       if (buffer) { /* flash */
+
+               /* determine number of blocks to write */
+               blksz = dev_desc->blksz;
+               blkcnt = ((buff_sz + (blksz - 1)) & ~(blksz - 1));
+               blkcnt = lldiv(blkcnt, blksz);
+
+               if (blkcnt > dev_desc->lba) {
+                       pr_err("Image size too large\n");
+                       fastboot_fail("Image size too large", response);
+                       return;
+               }
+
+               debug("Start Flashing Image to EMMC_BOOT1...\n");
+
+               blks = fb_mmc_blk_write(dev_desc, 0, blkcnt, buffer);
+
+               if (blks != blkcnt) {
+                       pr_err("Failed to write EMMC_BOOT1\n");
+                       fastboot_fail("Failed to write EMMC_BOOT1", response);
+                       return;
+               }
+
+               printf("........ wrote %lu bytes to EMMC_BOOT1\n",
+                      blkcnt * blksz);
+       } else { /* erase */
+               if (fb_mmc_erase_mmc_hwpart(dev_desc)) {
+                       fastboot_fail("Failed to erase EMMC_BOOT1", response);
+                       return;
+               }
+       }
+
+       fastboot_okay(NULL, response);
+}
+#endif
+
 #ifdef CONFIG_ANDROID_BOOT_IMAGE
 /**
  * Read Android boot image header from boot partition.
@@ -345,8 +415,21 @@ void fastboot_mmc_flash_write(const char *cmd, void *download_buffer,
                return;
        }
 
+#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT
+       if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) {
+               fb_mmc_boot1_ops(dev_desc, download_buffer,
+                                download_bytes, response);
+               return;
+       }
+#endif
+
 #if CONFIG_IS_ENABLED(EFI_PARTITION)
+#ifndef CONFIG_FASTBOOT_MMC_USER_NAME
        if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0) {
+#else
+       if (strcmp(cmd, CONFIG_FASTBOOT_GPT_NAME) == 0 ||
+           strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) {
+#endif
                printf("%s: updating MBR, Primary and Backup GPT(s)\n",
                       __func__);
                if (is_valid_gpt_buf(dev_desc, download_buffer)) {
@@ -457,6 +540,25 @@ void fastboot_mmc_erase(const char *cmd, char *response)
                return;
        }
 
+#ifdef CONFIG_FASTBOOT_MMC_BOOT1_SUPPORT
+       if (strcmp(cmd, CONFIG_FASTBOOT_MMC_BOOT1_NAME) == 0) {
+               /* erase EMMC boot1 */
+               fb_mmc_boot1_ops(dev_desc, NULL, 0, response);
+               return;
+       }
+#endif
+
+#ifdef CONFIG_FASTBOOT_MMC_USER_NAME
+       if (strcmp(cmd, CONFIG_FASTBOOT_MMC_USER_NAME) == 0) {
+               /* erase EMMC userdata */
+               if (fb_mmc_erase_mmc_hwpart(dev_desc))
+                       fastboot_fail("Failed to erase EMMC_USER", response);
+               else
+                       fastboot_okay(NULL, response);
+               return;
+       }
+#endif
+
        ret = part_get_info_by_name_or_alias(dev_desc, cmd, &info);
        if (ret < 0) {
                pr_err("cannot find partition: '%s'\n", cmd);