mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 02:30:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: core: Add SD card quirk for broken discard

Browse source 
Some SD-cards from Sandisk that are SDA-6.0 compliant reports they supports
discard, while they actually don't. This might cause mk2fs to fail while
trying to format the card and revert it to a read-only mode.

To fix this problem, let's add a card quirk (MMC_QUIRK_BROKEN_SD_DISCARD)
to indicate that we shall fall-back to use the legacy erase command
instead.

Signed-off-by: Avri Altman <avri.altman@wdc.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20220928095744.16455-1-avri.altman@wdc.com
[Ulf: Updated the commit message]
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Avri Altman 2022-09-28 12:57:44 +03:00 committed by Ulf Hansson
parent 833477fce7
commit 07d2872bf4
4 changed files with 18 additions and 1 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/mmc/core/block.c
View file

@ -1140,8 +1140,12 @@ static void mmc_blk_issue_discard_rq(struct mmc_queue *mq, struct request *req)
{ {
struct mmc_blk_data *md = mq->blkdata; struct mmc_blk_data *md = mq->blkdata;
struct mmc_card *card = md->queue.card; struct mmc_card *card = md->queue.card;
unsigned int arg = card->erase_arg;
mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, card->erase_arg); if (mmc_card_broken_sd_discard(card))
arg = SD_ERASE_ARG;
mmc_blk_issue_erase_rq(mq, req, MMC_BLK_DISCARD, arg);
} }
static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq, static void mmc_blk_issue_secdiscard_rq(struct mmc_queue *mq,

6
drivers/mmc/core/card.h
View file

@ -73,6 +73,7 @@ struct mmc_fixup {
#define EXT_CSD_REV_ANY (-1u) #define EXT_CSD_REV_ANY (-1u)
#define CID_MANFID_SANDISK 0x2 #define CID_MANFID_SANDISK 0x2
#define CID_MANFID_SANDISK_SD 0x3
#define CID_MANFID_ATP 0x9 #define CID_MANFID_ATP 0x9
#define CID_MANFID_TOSHIBA 0x11 #define CID_MANFID_TOSHIBA 0x11
#define CID_MANFID_MICRON 0x13 #define CID_MANFID_MICRON 0x13
@ -258,4 +259,9 @@ static inline int mmc_card_broken_hpi(const struct mmc_card *c)
return c->quirks & MMC_QUIRK_BROKEN_HPI; return c->quirks & MMC_QUIRK_BROKEN_HPI;
} }
static inline int mmc_card_broken_sd_discard(const struct mmc_card *c)
{
return c->quirks & MMC_QUIRK_BROKEN_SD_DISCARD;
}
#endif #endif

6
drivers/mmc/core/quirks.h
View file

@ -100,6 +100,12 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc, MMC_FIXUP("V10016", CID_MANFID_KINGSTON, CID_OEMID_ANY, add_quirk_mmc,
MMC_QUIRK_TRIM_BROKEN), MMC_QUIRK_TRIM_BROKEN),
/*
* Some SD cards reports discard support while they don't
*/
MMC_FIXUP(CID_NAME_ANY, CID_MANFID_SANDISK_SD, 0x5344, add_quirk_sd,
MMC_QUIRK_BROKEN_SD_DISCARD),
END_FIXUP END_FIXUP
}; };

1
include/linux/mmc/card.h
View file

@ -293,6 +293,7 @@ struct mmc_card {
#define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */ #define MMC_QUIRK_BROKEN_IRQ_POLLING (1<<11) /* Polling SDIO_CCCR_INTx could create a fake interrupt */
#define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */ #define MMC_QUIRK_TRIM_BROKEN (1<<12) /* Skip trim */
#define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */ #define MMC_QUIRK_BROKEN_HPI (1<<13) /* Disable broken HPI support */
#define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
bool reenable_cmdq; /* Re-enable Command Queue */ bool reenable_cmdq; /* Re-enable Command Queue */