All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v3] mmc: core: Add default timeout value for CMD6.
@ 2011-09-08  7:17 Seungwon Jeon
  2011-09-21 17:45 ` Chris Ball
  0 siblings, 1 reply; 3+ messages in thread
From: Seungwon Jeon @ 2011-09-08  7:17 UTC (permalink / raw)
  To: linux-mmc; +Cc: cjb, linux-samsung-soc, kgene.kim, dh.han, Seungwon Jeon

EXT_CSD[248] includes the default maximum timeout for CMD6.
This field is added at eMMC4.5 Spec. And it can be used for default
timeout except for some operations which don't define the timeout(i.e.
background operation, sanitize, flush cache) in eMMC4.5 Spec.

Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
---
 drivers/mmc/core/mmc.c   |   19 +++++++++++++++----
 include/linux/mmc/card.h |    1 +
 include/linux/mmc/mmc.h  |    1 +
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 5700b1c..a72d879 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -410,6 +410,15 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
 	else
 		card->erased_byte = 0x0;

+	if (card->ext_csd.rev >= 6)
+		card->ext_csd.generic_cmd6_time = 10 *
+			ext_csd[EXT_CSD_GENERIC_CMD6_TIME];
+	else
+		card->ext_csd.generic_cmd6_time = 0;
+
 out:
 	return err;
 }
@@ -668,7 +677,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 	 */
 	if (card->ext_csd.enhanced_area_en) {
 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-				 EXT_CSD_ERASE_GROUP_DEF, 1, 0);
+				 EXT_CSD_ERASE_GROUP_DEF, 1,
+				 card->ext_csd.generic_cmd6_time);

 		if (err && err != -EBADMSG)
 			goto free_card;
@@ -711,7 +721,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 	if ((card->ext_csd.hs_max_dtr != 0) &&
 		(host->caps & MMC_CAP_MMC_HIGHSPEED)) {
 		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
-				 EXT_CSD_HS_TIMING, 1, 0);
+				 EXT_CSD_HS_TIMING, 1,
+				 card->ext_csd.generic_cmd6_time);
 		if (err && err != -EBADMSG)
 			goto free_card;

@@ -783,7 +794,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
 					 EXT_CSD_BUS_WIDTH,
 					 ext_csd_bits[idx][0],
-					 0);
+					 card->ext_csd.generic_cmd6_time);
 			if (!err) {
 				mmc_set_bus_width(card->host, bus_width);

@@ -806,7 +817,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
 			err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
 					 EXT_CSD_BUS_WIDTH,
 					 ext_csd_bits[idx][1],
-					 0);
+					 card->ext_csd.generic_cmd6_time);
 		}
 		if (err) {
 			printk(KERN_WARNING "%s: switch to bus width %d ddr %d "
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index b460fc2..b713abf 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -52,6 +52,7 @@ struct mmc_ext_csd {
 	u8			part_config;
 	unsigned int		part_time;		/* Units: ms */
 	unsigned int		sa_timeout;		/* Units: 100ns */
+	unsigned int		generic_cmd6_time;	/* Units: 10ms */
 	unsigned int		hs_max_dtr;
 	unsigned int		sectors;
 	unsigned int		card_type;
diff --git a/include/linux/mmc/mmc.h b/include/linux/mmc/mmc.h
index 5a794cb..e869f00 100644
--- a/include/linux/mmc/mmc.h
+++ b/include/linux/mmc/mmc.h
@@ -293,6 +293,7 @@ struct _mmc_csd {
 #define EXT_CSD_SEC_ERASE_MULT		230	/* RO */
 #define EXT_CSD_SEC_FEATURE_SUPPORT	231	/* RO */
 #define EXT_CSD_TRIM_MULT		232	/* RO */
+#define EXT_CSD_GENERIC_CMD6_TIME	248	/* RO */

 /*
  * EXT_CSD field definitions
--
1.7.0.4

^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH v3] mmc: core: Add default timeout value for CMD6.
  2011-09-08  7:17 [PATCH v3] mmc: core: Add default timeout value for CMD6 Seungwon Jeon
@ 2011-09-21 17:45 ` Chris Ball
  2011-09-22  2:15   ` Seungwon Jeon
  0 siblings, 1 reply; 3+ messages in thread
From: Chris Ball @ 2011-09-21 17:45 UTC (permalink / raw)
  To: Seungwon Jeon; +Cc: linux-mmc, linux-samsung-soc, kgene.kim, dh.han

Hi,

On Thu, Sep 08 2011, Seungwon Jeon wrote:
> EXT_CSD[248] includes the default maximum timeout for CMD6.
> This field is added at eMMC4.5 Spec. And it can be used for default
> timeout except for some operations which don't define the timeout(i.e.
> background operation, sanitize, flush cache) in eMMC4.5 Spec.
>
> Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
> ---
>  drivers/mmc/core/mmc.c   |   19 +++++++++++++++----
>  include/linux/mmc/card.h |    1 +
>  include/linux/mmc/mmc.h  |    1 +
>  3 files changed, 17 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 5700b1c..a72d879 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -410,6 +410,15 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
>  	else
>  		card->erased_byte = 0x0;
>
> +	if (card->ext_csd.rev >= 6)
> +		card->ext_csd.generic_cmd6_time = 10 *
> +			ext_csd[EXT_CSD_GENERIC_CMD6_TIME];
> +	else
> +		card->ext_csd.generic_cmd6_time = 0;
> +
>  out:
>  	return err;
>  }
> @@ -668,7 +677,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>  	 */

The patch is corrupt at this point:

patching file drivers/mmc/core/mmc.c
patch: **** malformed patch at line 39: @@ -668,7 +677,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,

- Chris.
-- 
Chris Ball   <cjb@laptop.org>   <http://printf.net/>
One Laptop Per Child

^ permalink raw reply	[flat|nested] 3+ messages in thread
* RE: [PATCH v3] mmc: core: Add default timeout value for CMD6.
  2011-09-21 17:45 ` Chris Ball
@ 2011-09-22  2:15   ` Seungwon Jeon
  0 siblings, 0 replies; 3+ messages in thread
From: Seungwon Jeon @ 2011-09-22  2:15 UTC (permalink / raw)
  To: 'Chris Ball'; +Cc: linux-mmc, linux-samsung-soc, kgene.kim, dh.han

Hi Chris Ball,

Chris Ball wrote:
> Hi,
> 
> On Thu, Sep 08 2011, Seungwon Jeon wrote:
> > EXT_CSD[248] includes the default maximum timeout for CMD6.
> > This field is added at eMMC4.5 Spec. And it can be used for default
> > timeout except for some operations which don't define the timeout(i.e.
> > background operation, sanitize, flush cache) in eMMC4.5 Spec.
> >
> > Signed-off-by: Seungwon Jeon <tgih.jun@samsung.com>
> > ---
> >  drivers/mmc/core/mmc.c   |   19 +++++++++++++++----
> >  include/linux/mmc/card.h |    1 +
> >  include/linux/mmc/mmc.h  |    1 +
> >  3 files changed, 17 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> > index 5700b1c..a72d879 100644
> > --- a/drivers/mmc/core/mmc.c
> > +++ b/drivers/mmc/core/mmc.c
> > @@ -410,6 +410,15 @@ static int mmc_read_ext_csd(struct mmc_card *card,
> u8 *ext_csd)
> >  	else
> >  		card->erased_byte = 0x0;
> >
> > +	if (card->ext_csd.rev >= 6)
> > +		card->ext_csd.generic_cmd6_time = 10 *
> > +			ext_csd[EXT_CSD_GENERIC_CMD6_TIME];
> > +	else
> > +		card->ext_csd.generic_cmd6_time = 0;
> > +
> >  out:
> >  	return err;
> >  }
> > @@ -668,7 +677,8 @@ static int mmc_init_card(struct mmc_host *host, u32
> ocr,
> >  	 */
> 
> The patch is corrupt at this point:
> 
> patching file drivers/mmc/core/mmc.c
> patch: **** malformed patch at line 39: @@ -668,7 +677,8 @@ static int
> mmc_init_card(struct mmc_host *host, u32 ocr,
Oops.
It's mistake. I'll resend.
> 
> - Chris.
> --
> Chris Ball   <cjb@laptop.org>   <http://printf.net/>
> One Laptop Per Child
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-09-22  2:15 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-09-08  7:17 [PATCH v3] mmc: core: Add default timeout value for CMD6 Seungwon Jeon
2011-09-21 17:45 ` Chris Ball
2011-09-22  2:15   ` Seungwon Jeon

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.