android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "mmc: Add quirk MMC_QUIRK_BROKEN_CACHE_FLUSH for Micron eMMC Q2J54A"

Browse Source 
This reverts commit 51dcd20a4a which is
commit ed9009ad300c0f15a3ecfe9613547b1962bde02c upstream.

It breaks the current Android ABI, and if needed, can be brought back in an
abi-safe way in the future.

Bug: 161946584
Change-Id: I3ad21a32875dc77bd655c6a788ca1e2dee924f93
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
This commit is contained in:
Greg Kroah-Hartman 2023-12-11 12:27:47 +00:00
parent dcea2ba909
commit 8a7ce2ee18
5 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -280,8 +280,4 @@ static inline int mmc_card_broken_sd_cache(const struct mmc_card *c)
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

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

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

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

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

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

@ -298,9 +298,7 @@ struct mmc_card {
#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_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 */
unsigned int erase_size; /* erase size in sectors */