From: Erick Shepherd erick.shepherd@ni.com
[ Upstream commit 9510b38dc0ba358c93cbf5ee7c28820afb85937b ]
Adds the MMC_QUIRK_NO_UHS_DDR50_TUNING quirk and updates mmc_execute_tuning() to return 0 if that quirk is set. This fixes an issue on certain Swissbit SD cards that do not support DDR50 tuning where tuning requests caused I/O errors to be thrown.
Signed-off-by: Erick Shepherd erick.shepherd@ni.com Acked-by: Adrian Hunter adrian.hunter@intel.com Link: https://lore.kernel.org/r/20250331221337.1414534-1-erick.shepherd@ni.com Signed-off-by: Ulf Hansson ulf.hansson@linaro.org Signed-off-by: Sasha Levin sashal@kernel.org ---
**YES** This commit should be backported to stable kernel trees. Here's my detailed analysis: ## Bug Fix Classification This is clearly a **bugfix**, not a new feature. The commit fixes I/O errors that occur on specific Swissbit SD cards when DDR50 tuning is attempted. The commit message explicitly states: "This fixes an issue on certain Swissbit SD cards that do not support DDR50 tuning where tuning requests caused I/O errors to be thrown." ## Code Change Analysis ### 1. **Minimal and Targeted Changes** The changes are very focused and follow established kernel patterns: - **New quirk flag**: `MMC_QUIRK_NO_UHS_DDR50_TUNING (1<<18)` in `include/linux/mmc/card.h` - **Helper function**: `mmc_card_no_uhs_ddr50_tuning()` in `drivers/mmc/core/card.h` - **Specific card targeting**: Only affects Swissbit cards (manufacturer ID 0x5D) with specific model/date criteria - **Logic refactoring**: Extracts tuning decision into `mmc_sd_use_tuning()` function ### 2. **Low Risk Implementation** The implementation uses the existing MMC quirk infrastructure, which is well-tested: - Follows the same pattern as Similar Commit #2 (marked YES for backport) - Uses standard `_FIXUP_EXT()` macro with precise card identification - Only affects the specific problematic cards, leaving all others unchanged ### 3. **Controlled Scope** The quirk is highly specific: ```c _FIXUP_EXT("0016G", CID_MANFID_SWISSBIT, 0x5342, 2019, 1, 0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd, MMC_QUIRK_NO_UHS_DDR50_TUNING, EXT_CSD_REV_ANY), ``` This targets only Swissbit cards with model "0016G", OEM ID 0x5342, manufactured in January 2019. ## Comparison with Similar Commits This commit closely matches **Similar Commit #2** (YES for backport), which also: - Adds quirk handling for specific hardware issues - Makes minimal, contained changes - Fixes real user-facing problems - Uses existing infrastructure Unlike **Similar Commit #1** (NO for backport), this commit: - Fixes an existing bug rather than adding new functionality - Doesn't introduce new interfaces or capabilities - Has minimal risk of regression ## User Impact Without this fix, affected Swissbit SD cards would be **unusable** due to I/O errors during tuning. This represents a significant hardware compatibility issue that makes the cards completely non-functional on affected systems. ## Stable Tree Criteria Compliance ✅ **Important bugfix**: Fixes I/O errors on specific hardware ✅ **Minimal risk**: Uses established quirk infrastructure ✅ **No architectural changes**: Follows existing patterns ✅ **Contained scope**: Only affects specific problematic cards ✅ **No new features**: Pure hardware compatibility fix The commit follows the stable tree rule that quirks for hardware compatibility issues are generally acceptable for backporting when they fix real problems with minimal risk.
drivers/mmc/core/card.h | 6 ++++++ drivers/mmc/core/quirks.h | 10 ++++++++++ drivers/mmc/core/sd.c | 32 ++++++++++++++++++++++++-------- include/linux/mmc/card.h | 1 + 4 files changed, 41 insertions(+), 8 deletions(-)
diff --git a/drivers/mmc/core/card.h b/drivers/mmc/core/card.h index 8476754b1b170..fe0b2fa3bb89d 100644 --- a/drivers/mmc/core/card.h +++ b/drivers/mmc/core/card.h @@ -86,6 +86,7 @@ struct mmc_fixup { #define CID_MANFID_MICRON 0x13 #define CID_MANFID_SAMSUNG 0x15 #define CID_MANFID_APACER 0x27 +#define CID_MANFID_SWISSBIT 0x5D #define CID_MANFID_KINGSTON 0x70 #define CID_MANFID_HYNIX 0x90 #define CID_MANFID_KINGSTON_SD 0x9F @@ -291,4 +292,9 @@ static inline int mmc_card_broken_sd_poweroff_notify(const struct mmc_card *c) return c->quirks & MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY; }
+static inline int mmc_card_no_uhs_ddr50_tuning(const struct mmc_card *c) +{ + return c->quirks & MMC_QUIRK_NO_UHS_DDR50_TUNING; +} + #endif diff --git a/drivers/mmc/core/quirks.h b/drivers/mmc/core/quirks.h index 12c90b567ce38..d05f220fdeee3 100644 --- a/drivers/mmc/core/quirks.h +++ b/drivers/mmc/core/quirks.h @@ -34,6 +34,16 @@ static const struct mmc_fixup __maybe_unused mmc_sd_fixups[] = { MMC_QUIRK_BROKEN_SD_CACHE | MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY, EXT_CSD_REV_ANY),
+ /* + * Swissbit series S46-u cards throw I/O errors during tuning requests + * after the initial tuning request expectedly times out. This has + * only been observed on cards manufactured on 01/2019 that are using + * Bay Trail host controllers. + */ + _FIXUP_EXT("0016G", CID_MANFID_SWISSBIT, 0x5342, 2019, 1, + 0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd, + MMC_QUIRK_NO_UHS_DDR50_TUNING, EXT_CSD_REV_ANY), + END_FIXUP };
diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 819af50ae175c..557c4ee1e2770 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -618,6 +618,29 @@ static int sd_set_current_limit(struct mmc_card *card, u8 *status) return 0; }
+/* + * Determine if the card should tune or not. + */ +static bool mmc_sd_use_tuning(struct mmc_card *card) +{ + /* + * SPI mode doesn't define CMD19 and tuning is only valid for SDR50 and + * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104. + */ + if (mmc_host_is_spi(card->host)) + return false; + + switch (card->host->ios.timing) { + case MMC_TIMING_UHS_SDR50: + case MMC_TIMING_UHS_SDR104: + return true; + case MMC_TIMING_UHS_DDR50: + return !mmc_card_no_uhs_ddr50_tuning(card); + } + + return false; +} + /* * UHS-I specific initialization procedure */ @@ -661,14 +684,7 @@ static int mmc_sd_init_uhs_card(struct mmc_card *card) if (err) goto out;
- /* - * SPI mode doesn't define CMD19 and tuning is only valid for SDR50 and - * SDR104 mode SD-cards. Note that tuning is mandatory for SDR104. - */ - if (!mmc_host_is_spi(card->host) && - (card->host->ios.timing == MMC_TIMING_UHS_SDR50 || - card->host->ios.timing == MMC_TIMING_UHS_DDR50 || - card->host->ios.timing == MMC_TIMING_UHS_SDR104)) { + if (mmc_sd_use_tuning(card)) { err = mmc_execute_tuning(card);
/* diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h index afa575e362a47..7c6da19fff9f0 100644 --- a/include/linux/mmc/card.h +++ b/include/linux/mmc/card.h @@ -297,6 +297,7 @@ struct mmc_card { #define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */ #define MMC_QUIRK_BROKEN_CACHE_FLUSH (1<<16) /* Don't flush cache until the write has occurred */ #define MMC_QUIRK_BROKEN_SD_POWEROFF_NOTIFY (1<<17) /* Disable broken SD poweroff notify support */ +#define MMC_QUIRK_NO_UHS_DDR50_TUNING (1<<18) /* Disable DDR50 tuning */
bool written_flag; /* Indicates eMMC has been written since power on */ bool reenable_cmdq; /* Re-enable Command Queue */