diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 02:05:44 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-11-02 02:05:44 +0300 |
| commit | 40aa597c4a53f7269367d1b5298bd44afcdcf473 (patch) | |
| tree | 72e953ae571b1466930299f7e3f3bb2bf9bac587 /drivers/mmc/core/mmc.c | |
| parent | 0364249d2073c32c5214f02866999ce940bc35a2 (diff) | |
| parent | 5428a40a308f220dbbffda66cb01b212f88e9a06 (diff) | |
| download | linux-40aa597c4a53f7269367d1b5298bd44afcdcf473.tar.xz | |
Merge tag 'mmc-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc
Pull MMC updates from Ulf Hansson:
" MMC core:
- Enable host caps to be modified via debugfs to test speed-modes
- Improve random I/O writes for 4k buffers for hsq enabled hosts
MMC host:
- atmel-mci/sdhci-of-at91: Aubin Constans takes over as maintainer
- dw_mmc-starfive: Re-work tuning support
- meson-gx: Fix bogus IRQ when using CMD_CFG_ERROR
- mmci: Use peripheral flow control for the STM32 variant
- renesas,sdhi: Add support for the RZ/G3S variant
- sdhci-esdhc-imx: Optimize the manual tuning logic
- sdhci-msm: Add support for the SM8650 variant
- sdhci-npcm: Add driver to support the Nuvoton NPCM BMC variant
- sdhci-pci-gli: Add workaround to allow GL9750 to enter ASPM L1.2"
* tag 'mmc-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc: (25 commits)
dt-bindings: mmc: sdhci-msm: document the SM8650 SDHCI Controller
mmc: meson-gx: Remove setting of CMD_CFG_ERROR
MAINTAINERS: mmc: take over as maintainer of MCI & SDHCI MICROCHIP DRIVERS
mmc: jz4740: Use device_get_match_data()
mmc: sdhci-npcm: Add NPCM SDHCI driver
dt-bindings: mmc: npcm,sdhci: Document NPCM SDHCI controller
mmc: sdhci-pltfm: Make driver OF independent
mmc: sdhci-pltfm: Drop unnecessary error messages in sdhci_pltfm_init()
mmc: sdhci-pci: Switch to use acpi_evaluate_dsm_typed()
mmc: debugfs: Allow host caps to be modified
mmc: core: Always reselect card type
mmc: mmci: use peripheral flow control for STM32
mmc: vub300: replace deprecated strncpy with strscpy
memstick: jmb38x_ms: Annotate struct jmb38x_ms with __counted_by
mmc: starfive: Change tuning implementation
dt-bindings: mmc: starfive: Remove properties from required
mmc: hsq: Improve random I/O write performance for 4k buffers
mmc: core: Allow dynamical updates of the number of requests for hsq
mmc: sdhci-pci-gli: A workaround to allow GL9750 to enter ASPM L1.2
dt-bindings: mmc: renesas,sdhi: Document RZ/G3S support
...
Diffstat (limited to 'drivers/mmc/core/mmc.c')
| -rw-r--r-- | drivers/mmc/core/mmc.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c index 4a4bab9aa726..8180983bd402 100644 --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c @@ -419,7 +419,6 @@ static int mmc_decode_ext_csd(struct mmc_card *card, u8 *ext_csd) card->ext_csd.strobe_support = ext_csd[EXT_CSD_STROBE_SUPPORT]; card->ext_csd.raw_card_type = ext_csd[EXT_CSD_CARD_TYPE]; - mmc_select_card_type(card); card->ext_csd.raw_s_a_timeout = ext_csd[EXT_CSD_S_A_TIMEOUT]; card->ext_csd.raw_erase_timeout_mult = @@ -1732,6 +1731,12 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr, mmc_set_erase_size(card); } + /* + * Reselect the card type since host caps could have been changed when + * debugging even if the card is not new. + */ + mmc_select_card_type(card); + /* Enable ERASE_GRP_DEF. This bit is lost after a reset or power off. */ if (card->ext_csd.rev >= 3) { err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, |