Hi Simon,

On Sat, 28 Jan 2023 at 23:01, Simon Glass sjg@chromium.org wrote:

Hi Loic,

On Thu, 26 Jan 2023 at 02:24, Loic Poulain loic.poulain@linaro.org wrote:

...

The default erase command applies on erase group unit, and simply round down to erase group size. When the start block is not aligned to erase group size (e.g. erasing partition) it causes unwanted erasing of the previous blocks, part of the same erase group (e.g. owned by other logical partition, or by the partition table itself).

To prevent this issue, a simple solution is to use TRIM as argument of the Erase command, which is usually supported with eMMC > 4.0, and allow to apply erase operation to write blocks instead of erase group

Signed-off-by: Loic Poulain loic.poulain@linaro.org

v2: Add mmc unit test change to the series

drivers/mmc/mmc_write.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

Reviewed-by: Simon Glass sjg@chromium.org

Please see below

...

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index 5b7aeeb012..a6f93380dd 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -15,7 +15,7 @@ #include <linux/math64.h> #include "mmc_private.h"

-static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) +static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt, u32 args) { struct mmc_cmd cmd; ulong end; @@ -52,7 +52,7 @@ static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) goto err_out;

    cmd.cmdidx = MMC_CMD_ERASE;

•   cmd.cmdarg = MMC_ERASE_ARG;
  

•   cmd.cmdarg = args ? args : MMC_ERASE_ARG;
    cmd.resp_type = MMC_RSP_R1b;
  
    err = mmc_send_cmd(mmc, &cmd, NULL);
  

@@ -77,7 +77,7 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) #endif int dev_num = block_dev->devnum; int err = 0;

•   u32 start_rem, blkcnt_rem;
  

•   u32 start_rem, blkcnt_rem, erase_args = 0;
    struct mmc *mmc = find_mmc_device(dev_num);
    lbaint_t blk = 0, blk_r = 0;
    int timeout_ms = 1000;
  

@@ -97,13 +97,25 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) */ err = div_u64_rem(start, mmc->erase_grp_size, &start_rem); err = div_u64_rem(blkcnt, mmc->erase_grp_size, &blkcnt_rem);

•   if (start_rem || blkcnt_rem)
  

•           printf("\n\nCaution! Your devices Erase group is 0x%x\n"
  

•                  "The erase range would be change to "
  

•                  "0x" LBAF "~0x" LBAF "\n\n",
  

•                  mmc->erase_grp_size, start & ~(mmc->erase_grp_size - 1),
  

•                  ((start + blkcnt + mmc->erase_grp_size - 1)
  

•                  & ~(mmc->erase_grp_size - 1)) - 1);
  

•   if (start_rem || blkcnt_rem) {
  

•           if (mmc->can_trim) {
  

•                   /* Trim function applies the erase operation to write
  

•                    * blocks instead of erase groups.
  

•                    */
  

•                   erase_args = MMC_TRIM_ARG;
  

•           } else {
  

•                   /* The card ignores all LSB's below the erase group
  

•                    * size, rounding down the addess to a erase group
  

•                    * boundary.
  

•                    */
  

•                   printf("\n\nCaution! Your devices Erase group is 0x%x\n"
  

•                          "The erase range would be change to "
  

•                          "0x" LBAF "~0x" LBAF "\n\n",
  

•                          mmc->erase_grp_size, start & ~(mmc->erase_grp_size - 1),
  

•                          ((start + blkcnt + mmc->erase_grp_size - 1)
  

•                          & ~(mmc->erase_grp_size - 1)) - 1);
  

Should this return an error, or just go ahead?

It would indeed make sense to return an error since mmc_erase does not perform what we expect. Now, since this behavior exists for a while, we may also want to keep it for legacy, though it should be a corner case...

Regards, Loic

Hi Jaehoon,

On Mon, 6 Feb 2023 at 06:05, Jaehoon Chung jh80.chung@samsung.com wrote:

Hi,

...

-----Original Message----- From: Loic Poulain loic.poulain@linaro.org Sent: Thursday, January 26, 2023 6:24 PM To: sjg@chromium.org; peng.fan@nxp.com; jh80.chung@samsung.com Cc: u-boot@lists.denx.de; Loic Poulain loic.poulain@linaro.org Subject: [PATCH v2 2/3] mmc: erase: Use TRIM erase when available

The default erase command applies on erase group unit, and simply round down to erase group size. When the start block is not aligned to erase group size (e.g. erasing partition) it causes unwanted erasing of the previous blocks, part of the same erase group (e.g. owned by other logical partition, or by the partition table itself).

To prevent this issue, a simple solution is to use TRIM as argument of the Erase command, which is usually supported with eMMC > 4.0, and allow to apply erase operation to write blocks instead of erase group

Signed-off-by: Loic Poulain loic.poulain@linaro.org

v2: Add mmc unit test change to the series

drivers/mmc/mmc_write.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index 5b7aeeb012..a6f93380dd 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -15,7 +15,7 @@ #include <linux/math64.h> #include "mmc_private.h"

-static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) +static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt, u32 args) { struct mmc_cmd cmd; ulong end; @@ -52,7 +52,7 @@ static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) goto err_out;

  cmd.cmdidx = MMC_CMD_ERASE;

• cmd.cmdarg = MMC_ERASE_ARG;
  

• cmd.cmdarg = args ? args : MMC_ERASE_ARG;
  

It there any case to pass by other value?

Not at the moment, but it can be used to support eMMC 'Secure Erase' arg.

Regards, Loic

On 1/26/23 18:24, Loic Poulain wrote:

The default erase command applies on erase group unit, and simply round down to erase group size. When the start block is not aligned to erase group size (e.g. erasing partition) it causes unwanted erasing of the previous blocks, part of the same erase group (e.g. owned by other logical partition, or by the partition table itself).

To prevent this issue, a simple solution is to use TRIM as argument of the Erase command, which is usually supported with eMMC > 4.0, and allow to apply erase operation to write blocks instead of erase group

Signed-off-by: Loic Poulain loic.poulain@linaro.org Reviewed-by: Simon Glass sjg@chromium.org

Applied to u-boot-mmc/master.

Best Regards, Jaehoon Chung

---

v2: Add mmc unit test change to the series

drivers/mmc/mmc_write.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c index 5b7aeeb012..a6f93380dd 100644 --- a/drivers/mmc/mmc_write.c +++ b/drivers/mmc/mmc_write.c @@ -15,7 +15,7 @@ #include <linux/math64.h> #include "mmc_private.h"

-static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) +static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt, u32 args) { struct mmc_cmd cmd; ulong end; @@ -52,7 +52,7 @@ static ulong mmc_erase_t(struct mmc *mmc, ulong start, lbaint_t blkcnt) goto err_out;

cmd.cmdidx = MMC_CMD_ERASE;

• cmd.cmdarg = MMC_ERASE_ARG;

• cmd.cmdarg = args ? args : MMC_ERASE_ARG; cmd.resp_type = MMC_RSP_R1b;

  err = mmc_send_cmd(mmc, &cmd, NULL);

@@ -77,7 +77,7 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) #endif int dev_num = block_dev->devnum; int err = 0;

• u32 start_rem, blkcnt_rem;

• u32 start_rem, blkcnt_rem, erase_args = 0; struct mmc *mmc = find_mmc_device(dev_num); lbaint_t blk = 0, blk_r = 0; int timeout_ms = 1000;

@@ -97,13 +97,25 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) */ err = div_u64_rem(start, mmc->erase_grp_size, &start_rem); err = div_u64_rem(blkcnt, mmc->erase_grp_size, &blkcnt_rem);

• if (start_rem || blkcnt_rem)

• printf("\n\nCaution! Your devices Erase group is 0x%x\n"
  

•        "The erase range would be change to "
  

•        "0x" LBAF "~0x" LBAF "\n\n",
  

•        mmc->erase_grp_size, start & ~(mmc->erase_grp_size - 1),
  

•        ((start + blkcnt + mmc->erase_grp_size - 1)
  

•        & ~(mmc->erase_grp_size - 1)) - 1);
  

• if (start_rem || blkcnt_rem) {

• if (mmc->can_trim) {
  

• 	/* Trim function applies the erase operation to write
  

• 	 * blocks instead of erase groups.
  

• 	 */
  

• 	erase_args = MMC_TRIM_ARG;
  

• } else {
  

• 	/* The card ignores all LSB's below the erase group
  

• 	 * size, rounding down the addess to a erase group
  

• 	 * boundary.
  

• 	 */
  

• 	printf("\n\nCaution! Your devices Erase group is 0x%x\n"
  

• 	       "The erase range would be change to "
  

• 	       "0x" LBAF "~0x" LBAF "\n\n",
  

• 	       mmc->erase_grp_size, start & ~(mmc->erase_grp_size - 1),
  

• 	       ((start + blkcnt + mmc->erase_grp_size - 1)
  

• 	       & ~(mmc->erase_grp_size - 1)) - 1);
  

• }
  

• }

  while (blk < blkcnt) { if (IS_SD(mmc) && mmc->ssr.au) {

@@ -113,7 +125,7 @@ ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt) blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ? mmc->erase_grp_size : (blkcnt - blk); }

• err = mmc_erase_t(mmc, start + blk, blk_r);
  

• err = mmc_erase_t(mmc, start + blk, blk_r, erase_args);
  

  if (err) break;

Hi Loic,

On Thu, 26 Jan 2023 at 02:24, Loic Poulain loic.poulain@linaro.org wrote:

Verify that erasing blocks does not impact adjacent ones.

• Write four blocks [0 1 2 3]
• Erase two blocks [ 1 2 ]
• Verify [0 1 2 3 ]

Signed-off-by: Loic Poulain loic.poulain@linaro.org

v2: Add this change to the series

test/dm/mmc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

This looks good, but can you add the trim command to sandbox_mmc_send_cmd()? Then you can test that as well.

diff --git a/test/dm/mmc.c b/test/dm/mmc.c index f744452ff2..b1eb8bee2f 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -30,7 +30,7 @@ static int dm_test_mmc_blk(struct unit_test_state *uts) struct udevice *dev; struct blk_desc *dev_desc; int i;

•   char write[1024], read[1024];
  

•   char write[4 * 512], read[4 * 512];
  
    ut_assertok(uclass_get_device(UCLASS_MMC, 0, &dev));
    ut_assertok(blk_get_device_by_str("mmc", "0", &dev_desc));
  

@@ -39,14 +39,14 @@ static int dm_test_mmc_blk(struct unit_test_state *uts) ut_asserteq(512, dev_desc->blksz); for (i = 0; i < sizeof(write); i++) write[i] = i;

•   ut_asserteq(2, blk_dwrite(dev_desc, 0, 2, write));
  

•   ut_asserteq(2, blk_dread(dev_desc, 0, 2, read));
  

•   ut_asserteq(4, blk_dwrite(dev_desc, 0, 4, write));
  

•   ut_asserteq(4, blk_dread(dev_desc, 0, 4, read));
    ut_asserteq_mem(write, read, sizeof(write));
  
  

•   /* Now erase them */
  

•   memset(write, '\0', sizeof(write));
  

•   ut_asserteq(2, blk_derase(dev_desc, 0, 2));
  

•   ut_asserteq(2, blk_dread(dev_desc, 0, 2, read));
  

•   /* Now erase two of them [1 - 2] and verify all blocks */
  

•   memset(&write[512], '\0', 2 * 512);
  

•   ut_asserteq(2, blk_derase(dev_desc, 1, 2));
  

•   ut_asserteq(4, blk_dread(dev_desc, 0, 4, read));
    ut_asserteq_mem(write, read, sizeof(write));
  
    return 0;
  

-- 2.34.1

Regards, Simon

On 1/26/23 18:24, Loic Poulain wrote:

Verify that erasing blocks does not impact adjacent ones.

• Write four blocks [0 1 2 3]
• Erase two blocks [ 1 2 ]
• Verify [0 1 2 3 ]

Signed-off-by: Loic Poulain loic.poulain@linaro.org

Applied to u-boot-mmc/master.

Best Regards, Jaehoon Chung

---

v2: Add this change to the series

test/dm/mmc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/dm/mmc.c b/test/dm/mmc.c index f744452ff2..b1eb8bee2f 100644 --- a/test/dm/mmc.c +++ b/test/dm/mmc.c @@ -30,7 +30,7 @@ static int dm_test_mmc_blk(struct unit_test_state *uts) struct udevice *dev; struct blk_desc *dev_desc; int i;

• char write[1024], read[1024];

• char write[4 * 512], read[4 * 512];

  ut_assertok(uclass_get_device(UCLASS_MMC, 0, &dev)); ut_assertok(blk_get_device_by_str("mmc", "0", &dev_desc));

@@ -39,14 +39,14 @@ static int dm_test_mmc_blk(struct unit_test_state *uts) ut_asserteq(512, dev_desc->blksz); for (i = 0; i < sizeof(write); i++) write[i] = i;

• ut_asserteq(2, blk_dwrite(dev_desc, 0, 2, write));
• ut_asserteq(2, blk_dread(dev_desc, 0, 2, read));

• ut_asserteq(4, blk_dwrite(dev_desc, 0, 4, write));
• ut_asserteq(4, blk_dread(dev_desc, 0, 4, read)); ut_asserteq_mem(write, read, sizeof(write));

• /* Now erase them */
• memset(write, '\0', sizeof(write));
• ut_asserteq(2, blk_derase(dev_desc, 0, 2));
• ut_asserteq(2, blk_dread(dev_desc, 0, 2, read));

• /* Now erase two of them [1 - 2] and verify all blocks */

• memset(&write[512], '\0', 2 * 512);

• ut_asserteq(2, blk_derase(dev_desc, 1, 2));

• ut_asserteq(4, blk_dread(dev_desc, 0, 4, read)); ut_asserteq_mem(write, read, sizeof(write));

  return 0;