Re: [PATCH] mmc: core: add driver strength selection when selecting hs400es

[Adrian Hunter]

On 25/09/17 11:56, Chanho Min wrote:
> From: "hankyung.yu" <hankyung.yu@xxxxxxx>
> 
> The drive strength setting is missed and required when selecting
> hs400es. So, It is added here.
> 
> Signed-off-by: Hankyung Yu <hankyung.yu@xxxxxxx>
> Signed-off-by: Chanho Min <chanho.min@xxxxxxx>

Looks right.  I guess we should add:

Fixes: 81ac2af65793ecf ("mmc: core: implement enhanced strobe support")
Cc: stable@xxxxxxxxxxxxxxx


> ---
>  drivers/mmc/core/mmc.c | 36 +++++++++++++++++++-----------------
>  1 file changed, 19 insertions(+), 17 deletions(-)
> 
> diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
> index 07516f3..bc7586c 100644
> --- a/drivers/mmc/core/mmc.c
> +++ b/drivers/mmc/core/mmc.c
> @@ -1249,6 +1249,23 @@ out_err:
>  	return err;
>  }
>  
> +static void mmc_select_driver_type(struct mmc_card *card)
> +{
> +	int card_drv_type, drive_strength, drv_type;
> +
> +	card_drv_type = card->ext_csd.raw_driver_strength |
> +			mmc_driver_type_mask(0);
> +
> +	drive_strength = mmc_select_drive_strength(card,
> +						   card->ext_csd.hs200_max_dtr,
> +						   card_drv_type, &drv_type);
> +
> +	card->drive_strength = drive_strength;
> +
> +	if (drv_type)
> +		mmc_set_driver_type(card->host, drv_type);
> +}
> +
>  static int mmc_select_hs400es(struct mmc_card *card)
>  {
>  	struct mmc_host *host = card->host;
> @@ -1300,6 +1317,8 @@ static int mmc_select_hs400es(struct mmc_card *card)
>  		goto out_err;
>  	}
>  
> +	mmc_select_driver_type(card);
> +
>  	/* Switch card to HS400 */
>  	val = EXT_CSD_TIMING_HS400 |
>  	      card->drive_strength << EXT_CSD_DRV_STR_SHIFT;
> @@ -1333,23 +1352,6 @@ out_err:
>  	return err;
>  }
>  
> -static void mmc_select_driver_type(struct mmc_card *card)
> -{
> -	int card_drv_type, drive_strength, drv_type;
> -
> -	card_drv_type = card->ext_csd.raw_driver_strength |
> -			mmc_driver_type_mask(0);
> -
> -	drive_strength = mmc_select_drive_strength(card,
> -						   card->ext_csd.hs200_max_dtr,
> -						   card_drv_type, &drv_type);
> -
> -	card->drive_strength = drive_strength;
> -
> -	if (drv_type)
> -		mmc_set_driver_type(card->host, drv_type);
> -}
> -
>  /*
>   * For device supporting HS200 mode, the following sequence
>   * should be done before executing the tuning process.
>