[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Peng Fan]

Add function to read SD_STATUS information.
According to the information, get erase_timeout/erase_size/erase_offset.
Add a structure sd_ssr to include the erase related information.

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Eric Nelson <eric@nelint.com>
Cc: Stephen Warren <swarren@nvidia.com>
---

V4:
 include linux/sizes.h in mmc.h to avoid build break.

I dropped patch [2,3,4]/5 in V2, which is not a must in this optimization case.

V3:
 No change.

V2:
 Address Jaehoon's comments for V1
 drivers/mmc/mmc.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 include/mmc.h     |  9 ++++++++
 2 files changed, 77 insertions(+)

diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
index 43ea0bb..0312da9 100644
--- a/drivers/mmc/mmc.c
+++ b/drivers/mmc/mmc.c
@@ -21,6 +21,14 @@
 #include <div64.h>
 #include "mmc_private.h"
 
+static const unsigned int sd_au_size[] = {
+	0,		SZ_16K / 512,		SZ_32K / 512,
+	SZ_64K / 512,	SZ_128K / 512,		SZ_256K / 512,
+	SZ_512K / 512,	SZ_1M / 512,		SZ_2M / 512,
+	SZ_4M / 512,	SZ_8M / 512,		(SZ_8M + SZ_4M) / 512,
+	SZ_16M / 512,	(SZ_16M + SZ_8M) / 512,	SZ_32M / 512,	SZ_64M / 512,
+};
+
 #ifndef CONFIG_DM_MMC_OPS
 __weak int board_mmc_getwp(struct mmc *mmc)
 {
@@ -945,6 +953,62 @@ retry_scr:
 	return 0;
 }
 
+static int sd_read_ssr(struct mmc *mmc)
+{
+	int err, i;
+	struct mmc_cmd cmd;
+	ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
+	struct mmc_data data;
+	int timeout = 3;
+	unsigned int au, eo, et, es;
+
+	cmd.cmdidx = MMC_CMD_APP_CMD;
+	cmd.resp_type = MMC_RSP_R1;
+	cmd.cmdarg = mmc->rca << 16;
+
+	err = mmc_send_cmd(mmc, &cmd, NULL);
+	if (err)
+		return err;
+
+	cmd.cmdidx = SD_CMD_APP_SD_STATUS;
+	cmd.resp_type = MMC_RSP_R1;
+	cmd.cmdarg = 0;
+
+retry_ssr:
+	data.dest = (char *)ssr;
+	data.blocksize = 64;
+	data.blocks = 1;
+	data.flags = MMC_DATA_READ;
+
+	err = mmc_send_cmd(mmc, &cmd, &data);
+	if (err) {
+		if (timeout--)
+			goto retry_ssr;
+
+		return err;
+	}
+
+	for (i = 0; i < 16; i++)
+		ssr[i] = be32_to_cpu(ssr[i]);
+
+	au = (ssr[2] >> 12) & 0xF;
+	if ((au <= 9) || (mmc->version == SD_VERSION_3)) {
+		mmc->ssr.au = sd_au_size[au];
+		es = (ssr[3] >> 24) & 0xFF;
+		es |= (ssr[2] & 0xFF) << 8;
+		et = (ssr[3] >> 18) & 0x3F;
+		if (es && et) {
+			eo = (ssr[3] >> 16) & 0x3;
+			mmc->ssr.erase_timeout = (et * 1000) / es;
+			mmc->ssr.erase_offset = eo * 1000;
+		}
+	} else {
+		debug("Invalid Allocation Unit Size.\n");
+	}
+
+	return 0;
+}
+
 /* frequency bases */
 /* divided by 10 to be nice to platforms without floating point */
 static const int fbase[] = {
@@ -1350,6 +1414,10 @@ static int mmc_startup(struct mmc *mmc)
 			mmc_set_bus_width(mmc, 4);
 		}
 
+		err = sd_read_ssr(mmc);
+		if (err)
+			return err;
+
 		if (mmc->card_caps & MMC_MODE_HS)
 			mmc->tran_speed = 50000000;
 		else
diff --git a/include/mmc.h b/include/mmc.h
index aa6d5d1..e815eb3 100644
--- a/include/mmc.h
+++ b/include/mmc.h
@@ -11,6 +11,7 @@
 #define _MMC_H_
 
 #include <linux/list.h>
+#include <linux/sizes.h>
 #include <linux/compiler.h>
 #include <part.h>
 
@@ -102,6 +103,7 @@
 #define SD_CMD_SWITCH_UHS18V		11
 
 #define SD_CMD_APP_SET_BUS_WIDTH	6
+#define SD_CMD_APP_SD_STATUS		13
 #define SD_CMD_ERASE_WR_BLK_START	32
 #define SD_CMD_ERASE_WR_BLK_END		33
 #define SD_CMD_APP_SEND_OP_COND		41
@@ -392,6 +394,12 @@ struct mmc_config {
 	unsigned char part_type;
 };
 
+struct sd_ssr {
+	unsigned int au;		/* In sectors */
+	unsigned int erase_timeout;	/* In milliseconds */
+	unsigned int erase_offset;	/* In milliseconds */
+};
+
 /*
  * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device
  * with mmc_get_mmc_dev().
@@ -426,6 +434,7 @@ struct mmc {
 	uint write_bl_len;
 	uint erase_grp_size;	/* in 512-byte sectors */
 	uint hc_wp_grp_size;	/* in 512-byte sectors */
+	struct sd_ssr	ssr;	/* SD status register */
 	u64 capacity;
 	u64 capacity_user;
 	u64 capacity_boot;
-- 
2.6.2

[U-Boot] [PATCH V4 2/2] mmc: sd: optimize erase

[Peng Fan]

To SD, there is no erase group, then the value erase_grp_size
will be default 1. When erasing SD blocks, the blocks will be
erased one by one, which is time consuming.

We use AU_SIZE as a group to speed up the erasing.

Erasing 4MB with a SD2.0 Card with AU_SIZE 4MB.
`time mmc erase 0x100000 0x2000`
time: 44.856 seconds (before optimization)
time: 0.335 seconds  (after optimization)

Signed-off-by: Peng Fan <peng.fan@nxp.com>
Cc: Jaehoon Chung <jh80.chung@samsung.com>
Cc: Simon Glass <sjg@chromium.org>
Cc: Bin Meng <bmeng.cn@gmail.com>
Cc: Stefan Wahren <stefan.wahren@i2se.com>
Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
Cc: Kever Yang <kever.yang@rock-chips.com>
Cc: Eric Nelson <eric@nelint.com>
Cc: Stephen Warren <swarren@nvidia.com>
---
V4:
 No change.

V3:
 No change.

V2:
 Add test results.
 drivers/mmc/mmc_write.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/drivers/mmc/mmc_write.c b/drivers/mmc/mmc_write.c
index 0f8b5c7..2289640 100644
--- a/drivers/mmc/mmc_write.c
+++ b/drivers/mmc/mmc_write.c
@@ -100,8 +100,13 @@ unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
 		       & ~(mmc->erase_grp_size - 1)) - 1);
 
 	while (blk < blkcnt) {
-		blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
-			mmc->erase_grp_size : (blkcnt - blk);
+		if (IS_SD(mmc) && mmc->ssr.au) {
+			blk_r = ((blkcnt - blk) > mmc->ssr.au) ?
+				mmc->ssr.au : (blkcnt - blk);
+		} else {
+			blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
+				mmc->erase_grp_size : (blkcnt - blk);
+		}
 		err = mmc_erase_t(mmc, start + blk, blk_r);
 		if (err)
 			break;
-- 
2.6.2

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Jaehoon Chung]

Hi Peng,

On 09/01/2016 12:13 PM, Peng Fan wrote:
> Add function to read SD_STATUS information.
> According to the information, get erase_timeout/erase_size/erase_offset.
> Add a structure sd_ssr to include the erase related information.

Sorry for late..I'm testing with your patch on my SD-card.
After that, I will apply yours. Before applied this, i will check more carefully for not doing previous my mistake.

Best Regards,
Jaehoon Chung

> 
> Signed-off-by: Peng Fan <peng.fan@nxp.com>
> Cc: Jaehoon Chung <jh80.chung@samsung.com>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Bin Meng <bmeng.cn@gmail.com>
> Cc: Stefan Wahren <stefan.wahren@i2se.com>
> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
> Cc: Kever Yang <kever.yang@rock-chips.com>
> Cc: Eric Nelson <eric@nelint.com>
> Cc: Stephen Warren <swarren@nvidia.com>
> ---
> 
> V4:
>  include linux/sizes.h in mmc.h to avoid build break.
> 
> I dropped patch [2,3,4]/5 in V2, which is not a must in this optimization case.
> 
> V3:
>  No change.
> 
> V2:
>  Address Jaehoon's comments for V1
>  drivers/mmc/mmc.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  include/mmc.h     |  9 ++++++++
>  2 files changed, 77 insertions(+)
> 
> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
> index 43ea0bb..0312da9 100644
> --- a/drivers/mmc/mmc.c
> +++ b/drivers/mmc/mmc.c
> @@ -21,6 +21,14 @@
>  #include <div64.h>
>  #include "mmc_private.h"
>  
> +static const unsigned int sd_au_size[] = {
> +	0,		SZ_16K / 512,		SZ_32K / 512,
> +	SZ_64K / 512,	SZ_128K / 512,		SZ_256K / 512,
> +	SZ_512K / 512,	SZ_1M / 512,		SZ_2M / 512,
> +	SZ_4M / 512,	SZ_8M / 512,		(SZ_8M + SZ_4M) / 512,
> +	SZ_16M / 512,	(SZ_16M + SZ_8M) / 512,	SZ_32M / 512,	SZ_64M / 512,
> +};
> +
>  #ifndef CONFIG_DM_MMC_OPS
>  __weak int board_mmc_getwp(struct mmc *mmc)
>  {
> @@ -945,6 +953,62 @@ retry_scr:
>  	return 0;
>  }
>  
> +static int sd_read_ssr(struct mmc *mmc)
> +{
> +	int err, i;
> +	struct mmc_cmd cmd;
> +	ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
> +	struct mmc_data data;
> +	int timeout = 3;
> +	unsigned int au, eo, et, es;
> +
> +	cmd.cmdidx = MMC_CMD_APP_CMD;
> +	cmd.resp_type = MMC_RSP_R1;
> +	cmd.cmdarg = mmc->rca << 16;
> +
> +	err = mmc_send_cmd(mmc, &cmd, NULL);
> +	if (err)
> +		return err;
> +
> +	cmd.cmdidx = SD_CMD_APP_SD_STATUS;
> +	cmd.resp_type = MMC_RSP_R1;
> +	cmd.cmdarg = 0;
> +
> +retry_ssr:
> +	data.dest = (char *)ssr;
> +	data.blocksize = 64;
> +	data.blocks = 1;
> +	data.flags = MMC_DATA_READ;
> +
> +	err = mmc_send_cmd(mmc, &cmd, &data);
> +	if (err) {
> +		if (timeout--)
> +			goto retry_ssr;
> +
> +		return err;
> +	}
> +
> +	for (i = 0; i < 16; i++)
> +		ssr[i] = be32_to_cpu(ssr[i]);
> +
> +	au = (ssr[2] >> 12) & 0xF;
> +	if ((au <= 9) || (mmc->version == SD_VERSION_3)) {
> +		mmc->ssr.au = sd_au_size[au];
> +		es = (ssr[3] >> 24) & 0xFF;
> +		es |= (ssr[2] & 0xFF) << 8;
> +		et = (ssr[3] >> 18) & 0x3F;
> +		if (es && et) {
> +			eo = (ssr[3] >> 16) & 0x3;
> +			mmc->ssr.erase_timeout = (et * 1000) / es;
> +			mmc->ssr.erase_offset = eo * 1000;
> +		}
> +	} else {
> +		debug("Invalid Allocation Unit Size.\n");
> +	}
> +
> +	return 0;
> +}
> +
>  /* frequency bases */
>  /* divided by 10 to be nice to platforms without floating point */
>  static const int fbase[] = {
> @@ -1350,6 +1414,10 @@ static int mmc_startup(struct mmc *mmc)
>  			mmc_set_bus_width(mmc, 4);
>  		}
>  
> +		err = sd_read_ssr(mmc);
> +		if (err)
> +			return err;
> +
>  		if (mmc->card_caps & MMC_MODE_HS)
>  			mmc->tran_speed = 50000000;
>  		else
> diff --git a/include/mmc.h b/include/mmc.h
> index aa6d5d1..e815eb3 100644
> --- a/include/mmc.h
> +++ b/include/mmc.h
> @@ -11,6 +11,7 @@
>  #define _MMC_H_
>  
>  #include <linux/list.h>
> +#include <linux/sizes.h>
>  #include <linux/compiler.h>
>  #include <part.h>
>  
> @@ -102,6 +103,7 @@
>  #define SD_CMD_SWITCH_UHS18V		11
>  
>  #define SD_CMD_APP_SET_BUS_WIDTH	6
> +#define SD_CMD_APP_SD_STATUS		13
>  #define SD_CMD_ERASE_WR_BLK_START	32
>  #define SD_CMD_ERASE_WR_BLK_END		33
>  #define SD_CMD_APP_SEND_OP_COND		41
> @@ -392,6 +394,12 @@ struct mmc_config {
>  	unsigned char part_type;
>  };
>  
> +struct sd_ssr {
> +	unsigned int au;		/* In sectors */
> +	unsigned int erase_timeout;	/* In milliseconds */
> +	unsigned int erase_offset;	/* In milliseconds */
> +};
> +
>  /*
>   * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device
>   * with mmc_get_mmc_dev().
> @@ -426,6 +434,7 @@ struct mmc {
>  	uint write_bl_len;
>  	uint erase_grp_size;	/* in 512-byte sectors */
>  	uint hc_wp_grp_size;	/* in 512-byte sectors */
> +	struct sd_ssr	ssr;	/* SD status register */
>  	u64 capacity;
>  	u64 capacity_user;
>  	u64 capacity_boot;
> 

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Peng Fan]

Hi Jaehoon,
On Wed, Sep 07, 2016 at 03:52:53PM +0900, Jaehoon Chung wrote:
>Hi Peng,
>
>On 09/01/2016 12:13 PM, Peng Fan wrote:
>> Add function to read SD_STATUS information.
>> According to the information, get erase_timeout/erase_size/erase_offset.
>> Add a structure sd_ssr to include the erase related information.
>
>Sorry for late..I'm testing with your patch on my SD-card.
>After that, I will apply yours. Before applied this, i will check more carefully for not doing previous my mistake.

The issue in the previous patch set is that linux/size.h is not included in sandbox.h.
In this patchset, I include linux/size.h in mmc.h:)

Thanks,
Peng.

>
>Best Regards,
>Jaehoon Chung
>
>> 
>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>> Cc: Simon Glass <sjg@chromium.org>
>> Cc: Bin Meng <bmeng.cn@gmail.com>
>> Cc: Stefan Wahren <stefan.wahren@i2se.com>
>> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
>> Cc: Kever Yang <kever.yang@rock-chips.com>
>> Cc: Eric Nelson <eric@nelint.com>
>> Cc: Stephen Warren <swarren@nvidia.com>
>> ---
>> 
>> V4:
>>  include linux/sizes.h in mmc.h to avoid build break.
>> 
>> I dropped patch [2,3,4]/5 in V2, which is not a must in this optimization case.
>> 
>> V3:
>>  No change.
>> 
>> V2:
>>  Address Jaehoon's comments for V1
>>  drivers/mmc/mmc.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>  include/mmc.h     |  9 ++++++++
>>  2 files changed, 77 insertions(+)
>> 
>> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
>> index 43ea0bb..0312da9 100644
>> --- a/drivers/mmc/mmc.c
>> +++ b/drivers/mmc/mmc.c
>> @@ -21,6 +21,14 @@
>>  #include <div64.h>
>>  #include "mmc_private.h"
>>  
>> +static const unsigned int sd_au_size[] = {
>> +	0,		SZ_16K / 512,		SZ_32K / 512,
>> +	SZ_64K / 512,	SZ_128K / 512,		SZ_256K / 512,
>> +	SZ_512K / 512,	SZ_1M / 512,		SZ_2M / 512,
>> +	SZ_4M / 512,	SZ_8M / 512,		(SZ_8M + SZ_4M) / 512,
>> +	SZ_16M / 512,	(SZ_16M + SZ_8M) / 512,	SZ_32M / 512,	SZ_64M / 512,
>> +};
>> +
>>  #ifndef CONFIG_DM_MMC_OPS
>>  __weak int board_mmc_getwp(struct mmc *mmc)
>>  {
>> @@ -945,6 +953,62 @@ retry_scr:
>>  	return 0;
>>  }
>>  
>> +static int sd_read_ssr(struct mmc *mmc)
>> +{
>> +	int err, i;
>> +	struct mmc_cmd cmd;
>> +	ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
>> +	struct mmc_data data;
>> +	int timeout = 3;
>> +	unsigned int au, eo, et, es;
>> +
>> +	cmd.cmdidx = MMC_CMD_APP_CMD;
>> +	cmd.resp_type = MMC_RSP_R1;
>> +	cmd.cmdarg = mmc->rca << 16;
>> +
>> +	err = mmc_send_cmd(mmc, &cmd, NULL);
>> +	if (err)
>> +		return err;
>> +
>> +	cmd.cmdidx = SD_CMD_APP_SD_STATUS;
>> +	cmd.resp_type = MMC_RSP_R1;
>> +	cmd.cmdarg = 0;
>> +
>> +retry_ssr:
>> +	data.dest = (char *)ssr;
>> +	data.blocksize = 64;
>> +	data.blocks = 1;
>> +	data.flags = MMC_DATA_READ;
>> +
>> +	err = mmc_send_cmd(mmc, &cmd, &data);
>> +	if (err) {
>> +		if (timeout--)
>> +			goto retry_ssr;
>> +
>> +		return err;
>> +	}
>> +
>> +	for (i = 0; i < 16; i++)
>> +		ssr[i] = be32_to_cpu(ssr[i]);
>> +
>> +	au = (ssr[2] >> 12) & 0xF;
>> +	if ((au <= 9) || (mmc->version == SD_VERSION_3)) {
>> +		mmc->ssr.au = sd_au_size[au];
>> +		es = (ssr[3] >> 24) & 0xFF;
>> +		es |= (ssr[2] & 0xFF) << 8;
>> +		et = (ssr[3] >> 18) & 0x3F;
>> +		if (es && et) {
>> +			eo = (ssr[3] >> 16) & 0x3;
>> +			mmc->ssr.erase_timeout = (et * 1000) / es;
>> +			mmc->ssr.erase_offset = eo * 1000;
>> +		}
>> +	} else {
>> +		debug("Invalid Allocation Unit Size.\n");
>> +	}
>> +
>> +	return 0;
>> +}
>> +
>>  /* frequency bases */
>>  /* divided by 10 to be nice to platforms without floating point */
>>  static const int fbase[] = {
>> @@ -1350,6 +1414,10 @@ static int mmc_startup(struct mmc *mmc)
>>  			mmc_set_bus_width(mmc, 4);
>>  		}
>>  
>> +		err = sd_read_ssr(mmc);
>> +		if (err)
>> +			return err;
>> +
>>  		if (mmc->card_caps & MMC_MODE_HS)
>>  			mmc->tran_speed = 50000000;
>>  		else
>> diff --git a/include/mmc.h b/include/mmc.h
>> index aa6d5d1..e815eb3 100644
>> --- a/include/mmc.h
>> +++ b/include/mmc.h
>> @@ -11,6 +11,7 @@
>>  #define _MMC_H_
>>  
>>  #include <linux/list.h>
>> +#include <linux/sizes.h>
>>  #include <linux/compiler.h>
>>  #include <part.h>
>>  
>> @@ -102,6 +103,7 @@
>>  #define SD_CMD_SWITCH_UHS18V		11
>>  
>>  #define SD_CMD_APP_SET_BUS_WIDTH	6
>> +#define SD_CMD_APP_SD_STATUS		13
>>  #define SD_CMD_ERASE_WR_BLK_START	32
>>  #define SD_CMD_ERASE_WR_BLK_END		33
>>  #define SD_CMD_APP_SEND_OP_COND		41
>> @@ -392,6 +394,12 @@ struct mmc_config {
>>  	unsigned char part_type;
>>  };
>>  
>> +struct sd_ssr {
>> +	unsigned int au;		/* In sectors */
>> +	unsigned int erase_timeout;	/* In milliseconds */
>> +	unsigned int erase_offset;	/* In milliseconds */
>> +};
>> +
>>  /*
>>   * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device
>>   * with mmc_get_mmc_dev().
>> @@ -426,6 +434,7 @@ struct mmc {
>>  	uint write_bl_len;
>>  	uint erase_grp_size;	/* in 512-byte sectors */
>>  	uint hc_wp_grp_size;	/* in 512-byte sectors */
>> +	struct sd_ssr	ssr;	/* SD status register */
>>  	u64 capacity;
>>  	u64 capacity_user;
>>  	u64 capacity_boot;
>> 
>

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Jaehoon Chung]

Hi Peng,

On 09/08/2016 10:42 AM, Peng Fan wrote:
> Hi Jaehoon,
> On Wed, Sep 07, 2016 at 03:52:53PM +0900, Jaehoon Chung wrote:
>> Hi Peng,
>>
>> On 09/01/2016 12:13 PM, Peng Fan wrote:
>>> Add function to read SD_STATUS information.
>>> According to the information, get erase_timeout/erase_size/erase_offset.
>>> Add a structure sd_ssr to include the erase related information.
>>
>> Sorry for late..I'm testing with your patch on my SD-card.
>> After that, I will apply yours. Before applied this, i will check more carefully for not doing previous my mistake.
> 
> The issue in the previous patch set is that linux/size.h is not included in sandbox.h.
> In this patchset, I include linux/size.h in mmc.h:)

Right, i have checked the test of building with your patch.
There is no problem..just i want to run your patch for erasing SD-card. Could you wait for one day?

Best Regards,
Jaehoon Chung

> 
> Thanks,
> Peng.
> 
>>
>> Best Regards,
>> Jaehoon Chung
>>
>>>
>>> Signed-off-by: Peng Fan <peng.fan@nxp.com>
>>> Cc: Jaehoon Chung <jh80.chung@samsung.com>
>>> Cc: Simon Glass <sjg@chromium.org>
>>> Cc: Bin Meng <bmeng.cn@gmail.com>
>>> Cc: Stefan Wahren <stefan.wahren@i2se.com>
>>> Cc: Clemens Gruber <clemens.gruber@pqgruber.com>
>>> Cc: Kever Yang <kever.yang@rock-chips.com>
>>> Cc: Eric Nelson <eric@nelint.com>
>>> Cc: Stephen Warren <swarren@nvidia.com>
>>> ---
>>>
>>> V4:
>>>  include linux/sizes.h in mmc.h to avoid build break.
>>>
>>> I dropped patch [2,3,4]/5 in V2, which is not a must in this optimization case.
>>>
>>> V3:
>>>  No change.
>>>
>>> V2:
>>>  Address Jaehoon's comments for V1
>>>  drivers/mmc/mmc.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
>>>  include/mmc.h     |  9 ++++++++
>>>  2 files changed, 77 insertions(+)
>>>
>>> diff --git a/drivers/mmc/mmc.c b/drivers/mmc/mmc.c
>>> index 43ea0bb..0312da9 100644
>>> --- a/drivers/mmc/mmc.c
>>> +++ b/drivers/mmc/mmc.c
>>> @@ -21,6 +21,14 @@
>>>  #include <div64.h>
>>>  #include "mmc_private.h"
>>>  
>>> +static const unsigned int sd_au_size[] = {
>>> +	0,		SZ_16K / 512,		SZ_32K / 512,
>>> +	SZ_64K / 512,	SZ_128K / 512,		SZ_256K / 512,
>>> +	SZ_512K / 512,	SZ_1M / 512,		SZ_2M / 512,
>>> +	SZ_4M / 512,	SZ_8M / 512,		(SZ_8M + SZ_4M) / 512,
>>> +	SZ_16M / 512,	(SZ_16M + SZ_8M) / 512,	SZ_32M / 512,	SZ_64M / 512,
>>> +};
>>> +
>>>  #ifndef CONFIG_DM_MMC_OPS
>>>  __weak int board_mmc_getwp(struct mmc *mmc)
>>>  {
>>> @@ -945,6 +953,62 @@ retry_scr:
>>>  	return 0;
>>>  }
>>>  
>>> +static int sd_read_ssr(struct mmc *mmc)
>>> +{
>>> +	int err, i;
>>> +	struct mmc_cmd cmd;
>>> +	ALLOC_CACHE_ALIGN_BUFFER(uint, ssr, 16);
>>> +	struct mmc_data data;
>>> +	int timeout = 3;
>>> +	unsigned int au, eo, et, es;
>>> +
>>> +	cmd.cmdidx = MMC_CMD_APP_CMD;
>>> +	cmd.resp_type = MMC_RSP_R1;
>>> +	cmd.cmdarg = mmc->rca << 16;
>>> +
>>> +	err = mmc_send_cmd(mmc, &cmd, NULL);
>>> +	if (err)
>>> +		return err;
>>> +
>>> +	cmd.cmdidx = SD_CMD_APP_SD_STATUS;
>>> +	cmd.resp_type = MMC_RSP_R1;
>>> +	cmd.cmdarg = 0;
>>> +
>>> +retry_ssr:
>>> +	data.dest = (char *)ssr;
>>> +	data.blocksize = 64;
>>> +	data.blocks = 1;
>>> +	data.flags = MMC_DATA_READ;
>>> +
>>> +	err = mmc_send_cmd(mmc, &cmd, &data);
>>> +	if (err) {
>>> +		if (timeout--)
>>> +			goto retry_ssr;
>>> +
>>> +		return err;
>>> +	}
>>> +
>>> +	for (i = 0; i < 16; i++)
>>> +		ssr[i] = be32_to_cpu(ssr[i]);
>>> +
>>> +	au = (ssr[2] >> 12) & 0xF;
>>> +	if ((au <= 9) || (mmc->version == SD_VERSION_3)) {
>>> +		mmc->ssr.au = sd_au_size[au];
>>> +		es = (ssr[3] >> 24) & 0xFF;
>>> +		es |= (ssr[2] & 0xFF) << 8;
>>> +		et = (ssr[3] >> 18) & 0x3F;
>>> +		if (es && et) {
>>> +			eo = (ssr[3] >> 16) & 0x3;
>>> +			mmc->ssr.erase_timeout = (et * 1000) / es;
>>> +			mmc->ssr.erase_offset = eo * 1000;
>>> +		}
>>> +	} else {
>>> +		debug("Invalid Allocation Unit Size.\n");
>>> +	}
>>> +
>>> +	return 0;
>>> +}
>>> +
>>>  /* frequency bases */
>>>  /* divided by 10 to be nice to platforms without floating point */
>>>  static const int fbase[] = {
>>> @@ -1350,6 +1414,10 @@ static int mmc_startup(struct mmc *mmc)
>>>  			mmc_set_bus_width(mmc, 4);
>>>  		}
>>>  
>>> +		err = sd_read_ssr(mmc);
>>> +		if (err)
>>> +			return err;
>>> +
>>>  		if (mmc->card_caps & MMC_MODE_HS)
>>>  			mmc->tran_speed = 50000000;
>>>  		else
>>> diff --git a/include/mmc.h b/include/mmc.h
>>> index aa6d5d1..e815eb3 100644
>>> --- a/include/mmc.h
>>> +++ b/include/mmc.h
>>> @@ -11,6 +11,7 @@
>>>  #define _MMC_H_
>>>  
>>>  #include <linux/list.h>
>>> +#include <linux/sizes.h>
>>>  #include <linux/compiler.h>
>>>  #include <part.h>
>>>  
>>> @@ -102,6 +103,7 @@
>>>  #define SD_CMD_SWITCH_UHS18V		11
>>>  
>>>  #define SD_CMD_APP_SET_BUS_WIDTH	6
>>> +#define SD_CMD_APP_SD_STATUS		13
>>>  #define SD_CMD_ERASE_WR_BLK_START	32
>>>  #define SD_CMD_ERASE_WR_BLK_END		33
>>>  #define SD_CMD_APP_SEND_OP_COND		41
>>> @@ -392,6 +394,12 @@ struct mmc_config {
>>>  	unsigned char part_type;
>>>  };
>>>  
>>> +struct sd_ssr {
>>> +	unsigned int au;		/* In sectors */
>>> +	unsigned int erase_timeout;	/* In milliseconds */
>>> +	unsigned int erase_offset;	/* In milliseconds */
>>> +};
>>> +
>>>  /*
>>>   * With CONFIG_DM_MMC enabled, struct mmc can be accessed from the MMC device
>>>   * with mmc_get_mmc_dev().
>>> @@ -426,6 +434,7 @@ struct mmc {
>>>  	uint write_bl_len;
>>>  	uint erase_grp_size;	/* in 512-byte sectors */
>>>  	uint hc_wp_grp_size;	/* in 512-byte sectors */
>>> +	struct sd_ssr	ssr;	/* SD status register */
>>>  	u64 capacity;
>>>  	u64 capacity_user;
>>>  	u64 capacity_boot;
>>>
>>
> 
> 
> 

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Peng Fan]

On Thu, Sep 08, 2016 at 10:49:53AM +0900, Jaehoon Chung wrote:
>Hi Peng,
>
>On 09/08/2016 10:42 AM, Peng Fan wrote:
>> Hi Jaehoon,
>> On Wed, Sep 07, 2016 at 03:52:53PM +0900, Jaehoon Chung wrote:
>>> Hi Peng,
>>>
>>> On 09/01/2016 12:13 PM, Peng Fan wrote:
>>>> Add function to read SD_STATUS information.
>>>> According to the information, get erase_timeout/erase_size/erase_offset.
>>>> Add a structure sd_ssr to include the erase related information.
>>>
>>> Sorry for late..I'm testing with your patch on my SD-card.
>>> After that, I will apply yours. Before applied this, i will check more carefully for not doing previous my mistake.
>> 
>> The issue in the previous patch set is that linux/size.h is not included in sandbox.h.
>> In this patchset, I include linux/size.h in mmc.h:)
>
>Right, i have checked the test of building with your patch.
>There is no problem..just i want to run your patch for erasing SD-card. Could you wait for one day?

Yeah. Ok for me :)

Thanks,
Peng.

[U-Boot] [PATCH V4 1/2] mmc: sd: extracting erase related information from sd status

[Jaehoon Chung]

Hi Peng,

On 09/08/2016 10:51 AM, Peng Fan wrote:
> On Thu, Sep 08, 2016 at 10:49:53AM +0900, Jaehoon Chung wrote:
>> Hi Peng,
>>
>> On 09/08/2016 10:42 AM, Peng Fan wrote:
>>> Hi Jaehoon,
>>> On Wed, Sep 07, 2016 at 03:52:53PM +0900, Jaehoon Chung wrote:
>>>> Hi Peng,
>>>>
>>>> On 09/01/2016 12:13 PM, Peng Fan wrote:
>>>>> Add function to read SD_STATUS information.
>>>>> According to the information, get erase_timeout/erase_size/erase_offset.
>>>>> Add a structure sd_ssr to include the erase related information.
>>>>
>>>> Sorry for late..I'm testing with your patch on my SD-card.
>>>> After that, I will apply yours. Before applied this, i will check more carefully for not doing previous my mistake.
>>>
>>> The issue in the previous patch set is that linux/size.h is not included in sandbox.h.
>>> In this patchset, I include linux/size.h in mmc.h:)
>>
>> Right, i have checked the test of building with your patch.
>> There is no problem..just i want to run your patch for erasing SD-card. Could you wait for one day?
> 
> Yeah. Ok for me :)

I have tested with your patch.. (Same command yours "time mmc erase 0x100000 0x2000")

Before applied your patch..it took 18.212 seconds

After applied your patch. 0.548 seconds. Great!

I applied on u-boot-mmc. Thanks!

> 
> Thanks,
> Peng.
> 
> 
>