mirror of
https://github.com/torvalds/linux
synced 2024-10-07 11:53:31 +00:00
mmc: core: Always reselect card type
We want to allow host caps to be changed dynamically via debugfs, so for these to have an effect, ensure that the card type reselection is always applied even if the card is old. Signed-off-by: Vincent Whitchurch <vincent.whitchurch@axis.com> Link: https://lore.kernel.org/r/20230929-mmc-caps-v2-1-11a4c2d94f15@axis.com Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
parent
44ac5e9158
commit
6fff35f033
|
@ -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,
|
||||
|
|
Loading…
Reference in a new issue