Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.12.37 Manually rebased patch: generic/hack-6.12/902-debloat_proc.patch[1] New Kconfig symbol: x86: enable MITIGATION_TSA[2] All other patches are automatically refreshed. [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.37&id=ead91de35d9cd5c4f80ec51e6020f342079170af [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.12.37&id=7a0395f6607a5d01e2b2a86355596b3f1224acbd Signed-off-by: Shiji Yang <yangshiji66@outlook.com> Link: https://github.com/openwrt/openwrt/pull/19317 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From de8f7d8e588b7e263d8028f2593cf167947eab37 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Bell <jonathan@raspberrypi.com>
|
|
Date: Mon, 8 Apr 2024 16:09:52 +0100
|
|
Subject: [PATCH] drivers: mmc: disable write-caching on Samsung 2023 model
|
|
year SD cards
|
|
|
|
Samsung EVO Plus, Pro Plus and Evo Ultimate cards of this era appear to
|
|
have a broken cache-flush implementation when operating in CQ mode.
|
|
|
|
Unfortunately the cards seem to use a separate CID name string for every
|
|
variant and capacity, so nobble the cache feature for this MANFID, OEMID
|
|
and year. Turning this off seems to have negligible impact on
|
|
random-write throughput in non-CQ mode.
|
|
|
|
Signed-off-by: Jonathan Bell <jonathan@raspberrypi.com>
|
|
---
|
|
drivers/mmc/core/card.h | 1 +
|
|
drivers/mmc/core/quirks.h | 8 ++++++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
--- a/drivers/mmc/core/card.h
|
|
+++ b/drivers/mmc/core/card.h
|
|
@@ -88,6 +88,7 @@ struct mmc_fixup {
|
|
#define CID_MANFID_GIGASTONE 0x12
|
|
#define CID_MANFID_MICRON 0x13
|
|
#define CID_MANFID_SAMSUNG 0x15
|
|
+#define CID_MANFID_SAMSUNG_SD 0x1b
|
|
#define CID_MANFID_APACER 0x27
|
|
#define CID_MANFID_SWISSBIT 0x5D
|
|
#define CID_MANFID_KINGSTON 0x70
|
|
--- a/drivers/mmc/core/quirks.h
|
|
+++ b/drivers/mmc/core/quirks.h
|
|
@@ -58,6 +58,14 @@ static const struct mmc_fixup __maybe_un
|
|
MMC_FIXUP("SD32G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
|
|
MMC_FIXUP("SD64G", 0x41, 0x3432, add_quirk, MMC_QUIRK_ERASE_BROKEN),
|
|
|
|
+ /*
|
|
+ * Samsung Pro Plus/EVO Plus/Pro Ultimate SD cards (2023) claim to cache
|
|
+ * flush OK, but become unresponsive afterwards.
|
|
+ */
|
|
+ _FIXUP_EXT(CID_NAME_ANY, CID_MANFID_SAMSUNG_SD, 0x534d, 2023, CID_MONTH_ANY,
|
|
+ 0, -1ull, SDIO_ANY_ID, SDIO_ANY_ID, add_quirk_sd,
|
|
+ MMC_QUIRK_BROKEN_SD_CACHE, EXT_CSD_REV_ANY),
|
|
+
|
|
END_FIXUP
|
|
};
|
|
|