diff mbox series

[v2,2/3] mmc: let the host side can find card type during card init process

Message ID 20221221112853.789675-3-haibo.chen@nxp.com (mailing list archive)
State New, archived
Headers show
Series fix the sdio device DATA/CMD CRC and Timeout issue after tuning | expand

Commit Message

Bough Chen Dec. 21, 2022, 11:28 a.m. UTC 
From: Haibo Chen <haibo.chen@nxp.com>

During the card init, the host side sometimes may need to distinguish
the card type to handle accordingly. So need to give host->card value
earlier.

Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
---
 drivers/mmc/core/mmc.c  |  9 +++++----
 drivers/mmc/core/sd.c   |  7 +++++--
 drivers/mmc/core/sdio.c | 10 ++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

Comments

Adrian Hunter Dec. 21, 2022, 2:20 p.m. UTC | #1 
On 21/12/22 13:28, haibo.chen@nxp.com wrote:
> From: Haibo Chen <haibo.chen@nxp.com>
> 
> During the card init, the host side sometimes may need to distinguish
> the card type to handle accordingly. So need to give host->card value
> earlier.

Did you consider making use of the ->init_card() host op?

> 
> Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
> ---
>  drivers/mmc/core/mmc.c  |  9 +++++----
>  drivers/mmc/core/sd.c   |  7 +++++--
>  drivers/mmc/core/sdio.c | 10 ++++++----
>  3 files changed, 16 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 89cd48fcec79..63de76a51be3 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -1658,6 +1658,8 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>  			goto err;
>  		}
>  
> +		host->card = card;
> +
>  		card->ocr = ocr;
>  		card->type = MMC_TYPE_MMC;
>  		card->rca = 1;
> @@ -1926,14 +1928,13 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
>  		goto free_card;
>  	}
>  
> -	if (!oldcard)
> -		host->card = card;
> -
>  	return 0;
>  
>  free_card:
> -	if (!oldcard)
> +	if (!oldcard) {
>  		mmc_remove_card(card);
> +		host->card = NULL;
> +	}
>  err:
>  	return err;
>  }
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
> index 72b664ed90cf..147b188b916e 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -1431,6 +1431,8 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
>  		if (IS_ERR(card))
>  			return PTR_ERR(card);
>  
> +		host->card = card;
> +
>  		card->ocr = ocr;
>  		card->type = MMC_TYPE_SD;
>  		memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
> @@ -1563,12 +1565,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
>  		goto free_card;
>  	}
>  
> -	host->card = card;
>  	return 0;
>  
>  free_card:
> -	if (!oldcard)
> +	if (!oldcard) {
>  		mmc_remove_card(card);
> +		host->card = NULL;
> +	}
>  
>  	return err;
>  }
> diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
> index f64b9ac76a5c..5bcf4ada4738 100644
> --- a/drivers/mmc/core/sdio.c
> +++ b/drivers/mmc/core/sdio.c
> @@ -699,6 +699,9 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
>  	if (IS_ERR(card))
>  		return PTR_ERR(card);
>  
> +	if (!oldcard)
> +		host->card = card;
> +
>  	if ((rocr & R4_MEMORY_PRESENT) &&
>  	    mmc_sd_get_cid(host, ocr & rocr, card->raw_cid, NULL) == 0) {
>  		card->type = MMC_TYPE_SD_COMBO;
> @@ -800,8 +803,6 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
>  
>  		if (oldcard)
>  			mmc_remove_card(card);
> -		else
> -			host->card = card;
>  
>  		return 0;
>  	}
> @@ -898,14 +899,15 @@ static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
>  		goto remove;
>  	}
>  
> -	host->card = card;
>  	return 0;
>  
>  mismatch:
>  	pr_debug("%s: Perhaps the card was replaced\n", mmc_hostname(host));
>  remove:
> -	if (oldcard != card)
> +	if (oldcard != card) {
>  		mmc_remove_card(card);
> +		host->card = NULL;
> +	}
>  	return err;
>  }
>
Bough Chen Dec. 22, 2022, 2:22 a.m. UTC | #2 
> -----Original Message-----
> From: Adrian Hunter <adrian.hunter@intel.com>
> Sent: 2022年12月21日 22:20
> To: Bough Chen <haibo.chen@nxp.com>
> Cc: shawnguo@kernel.org; s.hauer@pengutronix.de; kernel@pengutronix.de;
> festevam@gmail.com; dl-linux-imx <linux-imx@nxp.com>;
> linux-mmc@vger.kernel.org; kgroeneveld@lenbrook.com;
> ulf.hansson@linaro.org
> Subject: Re: [PATCH v2 2/3] mmc: let the host side can find card type during
> card init process
> 
> On 21/12/22 13:28, haibo.chen@nxp.com wrote:
> > From: Haibo Chen <haibo.chen@nxp.com>
> >
> > During the card init, the host side sometimes may need to distinguish
> > the card type to handle accordingly. So need to give host->card value
> > earlier.
> 
> Did you consider making use of the ->init_card() host op?

Wow, a very good suggestion, I will have a try, thanks!

Best Regards
Haibo Chen
> 
> >
> > Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
> > ---
> >  drivers/mmc/core/mmc.c  |  9 +++++----
> >  drivers/mmc/core/sd.c   |  7 +++++--
> >  drivers/mmc/core/sdio.c | 10 ++++++----
> >  3 files changed, 16 insertions(+), 10 deletions(-)
> >
> > diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index
> > 89cd48fcec79..63de76a51be3 100644
> > --- a/drivers/mmc/core/mmc.c
> > +++ b/drivers/mmc/core/mmc.c
> > @@ -1658,6 +1658,8 @@ static int mmc_init_card(struct mmc_host *host,
> u32 ocr,
> >  			goto err;
> >  		}
> >
> > +		host->card = card;
> > +
> >  		card->ocr = ocr;
> >  		card->type = MMC_TYPE_MMC;
> >  		card->rca = 1;
> > @@ -1926,14 +1928,13 @@ static int mmc_init_card(struct mmc_host
> *host, u32 ocr,
> >  		goto free_card;
> >  	}
> >
> > -	if (!oldcard)
> > -		host->card = card;
> > -
> >  	return 0;
> >
> >  free_card:
> > -	if (!oldcard)
> > +	if (!oldcard) {
> >  		mmc_remove_card(card);
> > +		host->card = NULL;
> > +	}
> >  err:
> >  	return err;
> >  }
> > diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index
> > 72b664ed90cf..147b188b916e 100644
> > --- a/drivers/mmc/core/sd.c
> > +++ b/drivers/mmc/core/sd.c
> > @@ -1431,6 +1431,8 @@ static int mmc_sd_init_card(struct mmc_host
> *host, u32 ocr,
> >  		if (IS_ERR(card))
> >  			return PTR_ERR(card);
> >
> > +		host->card = card;
> > +
> >  		card->ocr = ocr;
> >  		card->type = MMC_TYPE_SD;
> >  		memcpy(card->raw_cid, cid, sizeof(card->raw_cid)); @@ -1563,12
> > +1565,13 @@ static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
> >  		goto free_card;
> >  	}
> >
> > -	host->card = card;
> >  	return 0;
> >
> >  free_card:
> > -	if (!oldcard)
> > +	if (!oldcard) {
> >  		mmc_remove_card(card);
> > +		host->card = NULL;
> > +	}
> >
> >  	return err;
> >  }
> > diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c index
> > f64b9ac76a5c..5bcf4ada4738 100644
> > --- a/drivers/mmc/core/sdio.c
> > +++ b/drivers/mmc/core/sdio.c
> > @@ -699,6 +699,9 @@ static int mmc_sdio_init_card(struct mmc_host
> *host, u32 ocr,
> >  	if (IS_ERR(card))
> >  		return PTR_ERR(card);
> >
> > +	if (!oldcard)
> > +		host->card = card;
> > +
> >  	if ((rocr & R4_MEMORY_PRESENT) &&
> >  	    mmc_sd_get_cid(host, ocr & rocr, card->raw_cid, NULL) == 0) {
> >  		card->type = MMC_TYPE_SD_COMBO;
> > @@ -800,8 +803,6 @@ static int mmc_sdio_init_card(struct mmc_host
> > *host, u32 ocr,
> >
> >  		if (oldcard)
> >  			mmc_remove_card(card);
> > -		else
> > -			host->card = card;
> >
> >  		return 0;
> >  	}
> > @@ -898,14 +899,15 @@ static int mmc_sdio_init_card(struct mmc_host
> *host, u32 ocr,
> >  		goto remove;
> >  	}
> >
> > -	host->card = card;
> >  	return 0;
> >
> >  mismatch:
> >  	pr_debug("%s: Perhaps the card was replaced\n", mmc_hostname(host));
> >  remove:
> > -	if (oldcard != card)
> > +	if (oldcard != card) {
> >  		mmc_remove_card(card);
> > +		host->card = NULL;
> > +	}
> >  	return err;
> >  }
> >
diff mbox series

Patch

diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 89cd48fcec79..63de76a51be3 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1658,6 +1658,8 @@  static int mmc_init_card(struct mmc_host *host, u32 ocr,
 			goto err;
 		}
 
+		host->card = card;
+
 		card->ocr = ocr;
 		card->type = MMC_TYPE_MMC;
 		card->rca = 1;
@@ -1926,14 +1928,13 @@  static int mmc_init_card(struct mmc_host *host, u32 ocr,
 		goto free_card;
 	}
 
-	if (!oldcard)
-		host->card = card;
-
 	return 0;
 
 free_card:
-	if (!oldcard)
+	if (!oldcard) {
 		mmc_remove_card(card);
+		host->card = NULL;
+	}
 err:
 	return err;
 }
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
index 72b664ed90cf..147b188b916e 100644
--- a/drivers/mmc/core/sd.c
+++ b/drivers/mmc/core/sd.c
@@ -1431,6 +1431,8 @@  static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
 		if (IS_ERR(card))
 			return PTR_ERR(card);
 
+		host->card = card;
+
 		card->ocr = ocr;
 		card->type = MMC_TYPE_SD;
 		memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
@@ -1563,12 +1565,13 @@  static int mmc_sd_init_card(struct mmc_host *host, u32 ocr,
 		goto free_card;
 	}
 
-	host->card = card;
 	return 0;
 
 free_card:
-	if (!oldcard)
+	if (!oldcard) {
 		mmc_remove_card(card);
+		host->card = NULL;
+	}
 
 	return err;
 }
diff --git a/drivers/mmc/core/sdio.c b/drivers/mmc/core/sdio.c
index f64b9ac76a5c..5bcf4ada4738 100644
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
@@ -699,6 +699,9 @@  static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 	if (IS_ERR(card))
 		return PTR_ERR(card);
 
+	if (!oldcard)
+		host->card = card;
+
 	if ((rocr & R4_MEMORY_PRESENT) &&
 	    mmc_sd_get_cid(host, ocr & rocr, card->raw_cid, NULL) == 0) {
 		card->type = MMC_TYPE_SD_COMBO;
@@ -800,8 +803,6 @@  static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 
 		if (oldcard)
 			mmc_remove_card(card);
-		else
-			host->card = card;
 
 		return 0;
 	}
@@ -898,14 +899,15 @@  static int mmc_sdio_init_card(struct mmc_host *host, u32 ocr,
 		goto remove;
 	}
 
-	host->card = card;
 	return 0;
 
 mismatch:
 	pr_debug("%s: Perhaps the card was replaced\n", mmc_hostname(host));
 remove:
-	if (oldcard != card)
+	if (oldcard != card) {
 		mmc_remove_card(card);
+		host->card = NULL;
+	}
 	return err;
 }