From 4ba7b4981a51df7a48c939bc0665f33df1f52a1e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 15 Nov 2023 14:02:02 -0500 Subject: [PATCH] 5.4-stable patches added patches: revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch --- ...re-correct-oemid-bits-for-emmc-cards.patch | 43 +++++++++++++++++++ queue-5.4/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-5.4/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch diff --git a/queue-5.4/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch b/queue-5.4/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch new file mode 100644 index 00000000000..1fe172bd8d1 --- /dev/null +++ b/queue-5.4/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch @@ -0,0 +1,43 @@ +From 421b605edb1ce611dee06cf6fd9a1c1f2fd85ad0 Mon Sep 17 00:00:00 2001 +From: Dominique Martinet +Date: Fri, 3 Nov 2023 09:42:20 +0900 +Subject: Revert "mmc: core: Capture correct oemid-bits for eMMC cards" + +From: Dominique Martinet + +commit 421b605edb1ce611dee06cf6fd9a1c1f2fd85ad0 upstream. + +This reverts commit 84ee19bffc9306128cd0f1c650e89767079efeff. + +The commit above made quirks with an OEMID fail to be applied, as they +were checking card->cid.oemid for the full 16 bits defined in MMC_FIXUP +macros but the field would only contain the bottom 8 bits. + +eMMC v5.1A might have bogus values in OEMID's higher bits so another fix +will be made, but it has been decided to revert this until that is ready. + +Fixes: 84ee19bffc93 ("mmc: core: Capture correct oemid-bits for eMMC cards") +Link: https://lkml.kernel.org/r/ZToJsSLHr8RnuTHz@codewreck.org +Link: https://lkml.kernel.org/r/CAPDyKFqkKibcXnwjnhc3+W1iJBHLeqQ9BpcZrSwhW2u9K2oUtg@mail.gmail.com +Signed-off-by: Dominique Martinet +Cc: stable@vger.kernel.org +Cc: Alex Fetters +Reviewed-by: Avri Altman +Link: https://lore.kernel.org/r/20231103004220.1666641-1-asmadeus@codewreck.org +Signed-off-by: Ulf Hansson +Signed-off-by: Greg Kroah-Hartman +--- + drivers/mmc/core/mmc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/mmc/core/mmc.c ++++ b/drivers/mmc/core/mmc.c +@@ -95,7 +95,7 @@ static int mmc_decode_cid(struct mmc_car + case 3: /* MMC v3.1 - v3.3 */ + case 4: /* MMC v4 */ + card->cid.manfid = UNSTUFF_BITS(resp, 120, 8); +- card->cid.oemid = UNSTUFF_BITS(resp, 104, 8); ++ card->cid.oemid = UNSTUFF_BITS(resp, 104, 16); + card->cid.prod_name[0] = UNSTUFF_BITS(resp, 96, 8); + card->cid.prod_name[1] = UNSTUFF_BITS(resp, 88, 8); + card->cid.prod_name[2] = UNSTUFF_BITS(resp, 80, 8); diff --git a/queue-5.4/series b/queue-5.4/series index 2ade113cf2e..d81c88cddf8 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -128,4 +128,5 @@ spi-spi-zynq-qspi-add-spi-mem-to-driver-kconfig-depe.patch fbdev-imsttfb-fix-error-path-of-imsttfb_probe.patch fbdev-imsttfb-fix-a-resource-leak-in-probe.patch fbdev-fsl-diu-fb-mark-wr_reg_wa-static.patch +revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch btrfs-use-u64-for-buffer-sizes-in-the-tree-search-io.patch -- 2.47.3