NothingOSS/android_kernel_msm-6.1_nothing_sm7635
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

mmc: Add quirk MMC_QUIRK_BROKEN_CACHE_FLUSH for Micron eMMC Q2J54A

Browse source 
commit ed9009ad300c0f15a3ecfe9613547b1962bde02c upstream.

Micron MTFC4GACAJCN eMMC supports cache but requires that flush cache
operation be allowed only after a write has occurred. Otherwise, the
cache flush command or subsequent commands will time out.

Signed-off-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Rafael Beims <rafael.beims@toradex.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20231030224809.59245-1-beanhuo@iokpp.de
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Bean Huo 2023-10-30 23:48:09 +01:00 • committed by Greg Kroah-Hartman
parent 07d425242e
commit 51dcd20a4a
5 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2404,8 +2404,10 @@ enum mmc_issued mmc_blk_mq_issue_rq(struct mmc_queue *mq, struct request *req)
} }
ret = mmc_blk_cqe_issue_flush(mq, req); ret = mmc_blk_cqe_issue_flush(mq, req);
break; break;
case REQ_OP_READ:
case REQ_OP_WRITE: case REQ_OP_WRITE:
card->written_flag = true;
fallthrough;
case REQ_OP_READ:
if (host->cqe_enabled) if (host->cqe_enabled)
ret = mmc_blk_cqe_issue_rw_rq(mq, req); ret = mmc_blk_cqe_issue_rw_rq(mq, req);
else else

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

@ -280,4 +280,8 @@ static inline int mmc_card_broken_sd_cache(const struct mmc_card *c)
return c->quirks & MMC_QUIRK_BROKEN_SD_CACHE; return c->quirks & MMC_QUIRK_BROKEN_SD_CACHE;
} }
static inline int mmc_card_broken_cache_flush(const struct mmc_card *c)
{
return c->quirks & MMC_QUIRK_BROKEN_CACHE_FLUSH;
}
#endif #endif

8
drivers/mmc/core/mmc.c
View file

@ -2081,13 +2081,17 @@ static int _mmc_flush_cache(struct mmc_host *host)
{ {
int err = 0; int err = 0;
if (mmc_card_broken_cache_flush(host->card) && !host->card->written_flag)
return 0;
if (_mmc_cache_enabled(host)) { if (_mmc_cache_enabled(host)) {
err = mmc_switch(host->card, EXT_CSD_CMD_SET_NORMAL, err = mmc_switch(host->card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_FLUSH_CACHE, 1, EXT_CSD_FLUSH_CACHE, 1,
CACHE_FLUSH_TIMEOUT_MS); CACHE_FLUSH_TIMEOUT_MS);
if (err) if (err)
pr_err("%s: cache flush error %d\n", pr_err("%s: cache flush error %d\n", mmc_hostname(host), err);
mmc_hostname(host), err); else
host->card->written_flag = false;
} }
return err; return err;

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

@ -117,11 +117,12 @@ static const struct mmc_fixup __maybe_unused mmc_blk_fixups[] = {
MMC_QUIRK_TRIM_BROKEN), MMC_QUIRK_TRIM_BROKEN),
/* /*
* Micron MTFC4GACAJCN-1M advertises TRIM but it does not seems to * Micron MTFC4GACAJCN-1M supports TRIM but does not appear to support
* support being used to offload WRITE_ZEROES. * WRITE_ZEROES offloading. It also supports caching, but the cache can
* only be flushed after a write has occurred.
*/ */
MMC_FIXUP("Q2J54A", CID_MANFID_MICRON, 0x014e, add_quirk_mmc, MMC_FIXUP("Q2J54A", CID_MANFID_MICRON, 0x014e, add_quirk_mmc,
MMC_QUIRK_TRIM_BROKEN), MMC_QUIRK_TRIM_BROKEN | MMC_QUIRK_BROKEN_CACHE_FLUSH),
/* /*
* Some SD cards reports discard support while they don't * Some SD cards reports discard support while they don't

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

@ -295,7 +295,9 @@ struct mmc_card {
#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 */ #define MMC_QUIRK_BROKEN_SD_DISCARD (1<<14) /* Disable broken SD discard support */
#define MMC_QUIRK_BROKEN_SD_CACHE (1<<15) /* Disable broken SD cache support */ #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 */
bool written_flag; /* Indicates eMMC has been written since power on */
bool reenable_cmdq; /* Re-enable Command Queue */ bool reenable_cmdq; /* Re-enable Command Queue */
unsigned int erase_size; /* erase size in sectors */ unsigned int erase_size; /* erase size in sectors */