Re: [PATCH v2] mmc: core: apply SD quirks earlier during probe

[Dragan Simic <dsimic@manjaro.org>]

Hello Keita,

On 2024-08-21 01:06, Keita Aihara wrote:
> From: Jonathan Bell <jonathan@raspberrypi.com>
> 
> Applying MMC_QUIRK_BROKEN_SD_CACHE is broken, as the card's SD quirks
> are referenced in sd_parse_ext_reg_perf() prior to the quirks being
> initialized in mmc_blk_probe().
> 
> Split this out into a SD-specific list of quirks and apply in
> mmc_sd_init_card() instead.
> 
> Fixes: c467c8f08185 ("mmc: Add MMC_QUIRK_BROKEN_SD_CACHE for Kingston
> Canvas Go Plus from 11/2019")
> Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
> Co-developed-by: Keita Aihara <keita.aihara@sony.com>
> Signed-off-by: Keita Aihara <keita.aihara@sony.com>

Looking good to me.  This fix allows sd_read_ext_regs() to have the
available information for not assigning the SD_EXT_PERF_CACHE as one
of the (un)supported features, which in turn allows mmc_sd_init_card()
to properly skip execution of sd_enable_cache().

Reviewed-by: Dragan Simic <dsimic@manjaro.org>

> ---
>  drivers/mmc/core/quirks.h | 22 +++++++++++++---------
>  drivers/mmc/core/sd.c     |  4 ++++
>  2 files changed, 17 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h
> index cca71867bc4a..92905fc46436 100644
> --- a/drivers/mmc/core/quirks.h
> +++ b/drivers/mmc/core/quirks.h
> @@ -15,6 +15,19 @@
> 
>  #include "card.h"
> 
> +static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] = {
> +	/*
> +	 * Kingston Canvas Go! Plus microSD cards never finish SD cache 
> flush.
> +	 * This has so far only been observed on cards from 11/2019, while 
> new
> +	 * cards from 2023/05 do not exhibit this behavior.
> +	 */
> +	_FIXUP_EXT("SD64G", CID_MANFID_KINGSTON_SD, 0x5449, 2019, 11,
> +		   0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd,
> +		   MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY),
> +
> +	END_FIXUP
> +};
> +
>  static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
>  #define INAND_CMD38_ARG_EXT_CSD  113
>  #define INAND_CMD38_ARG_ERASE    0x00
> @@ -53,15 +66,6 @@ static const struct mmc_fixup __maybe_unused
> mmc_blk_fixups[] = {
>  	MMC_FIXUP("MMC32G", CID_MANFID_TOSHIBA, CID_OEMID_ANY, add_quirk_mmc,
>  		  MMC_QUIRK_BLK_NO_CMD23),
> 
> -	/*
> -	 * Kingston Canvas Go! Plus microSD cards never finish SD cache 
> flush.
> -	 * This has so far only been observed on cards from 11/2019, while 
> new
> -	 * cards from 2023/05 do not exhibit this behavior.
> -	 */
> -	_FIXUP_EXT("SD64G", CID_MANFID_KINGSTON_SD, 0x5449, 2019, 11,
> -		   0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd,
> -		   MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY),
> -
>  	/*
>  	 * Some SD cards lockup while using CMD23 multiblock transfers.
>  	 */
> diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c
> index 1c8148cdda50..ee37ad14e79e 100644
> --- a/drivers/mmc/core/sd.c
> +++ b/drivers/mmc/core/sd.c
> @@ -26,6 +26,7 @@
>  #include "host.h"
>  #include "bus.h"
>  #include "mmc_ops.h"
> +#include "quirks.h"
>  #include "sd.h"
>  #include "sd_ops.h"
> 
> @@ -1475,6 +1476,9 @@ static int mmc_sd_init_card(struct mmc_host
> *host, u32 ocr,
>  			goto free_card;
>  	}
> 
> +	/* Apply quirks prior to card setup */
> +	mmc_fixup_device(card, mmc_sd_fixups);
> +
>  	err = mmc_sd_setup_card(host, card, oldcard != NULL);
>  	if (err)
>  		goto free_card;
> --
> 2.43.2