From: Greg Kroah-Hartman Date: Wed, 15 Nov 2023 19:02:46 +0000 (-0500) Subject: 5.15-stable patches X-Git-Tag: v4.14.330~22 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3beb30df1d6500af896674f08cf3d0f416d42504;p=thirdparty%2Fkernel%2Fstable-queue.git 5.15-stable patches added patches: revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch --- diff --git a/queue-5.15/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch b/queue-5.15/revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch new file mode 100644 index 00000000000..90784d3fe40 --- /dev/null +++ b/queue-5.15/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 +@@ -96,7 +96,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.15/series b/queue-5.15/series index d3ac0c01e10..d591fdf1168 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -263,4 +263,6 @@ 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 tracing-kprobes-fix-the-order-of-argument-descriptio.patch +x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch +revert-mmc-core-capture-correct-oemid-bits-for-emmc-cards.patch btrfs-use-u64-for-buffer-sizes-in-the-tree-search-io.patch diff --git a/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch b/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch new file mode 100644 index 00000000000..9ce2f21b41f --- /dev/null +++ b/queue-5.15/x86-amd_nb-use-family-19h-models-60h-7fh-function-4-ids.patch @@ -0,0 +1,41 @@ +From 2a565258b3f4bbdc7a3c09cd02082cb286a7bffc Mon Sep 17 00:00:00 2001 +From: Yazen Ghannam +Date: Thu, 3 Aug 2023 10:04:30 -0500 +Subject: x86/amd_nb: Use Family 19h Models 60h-7Fh Function 4 IDs + +From: Yazen Ghannam + +commit 2a565258b3f4bbdc7a3c09cd02082cb286a7bffc upstream. + +Three PCI IDs for DF Function 4 were defined but not used. + +Add them to the "link" list. + +Fixes: f8faf3496633 ("x86/amd_nb: Add AMD PCI IDs for SMN communication") +Fixes: 23a5b8bb022c ("x86/amd_nb: Add PCI ID for family 19h model 78h") +Signed-off-by: Yazen Ghannam +Signed-off-by: Ingo Molnar +Cc: stable@vger.kernel.org +Link: https://lore.kernel.org/r/20230803150430.3542854-1-yazen.ghannam@amd.com +Signed-off-by: Greg Kroah-Hartman +--- + arch/x86/kernel/amd_nb.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c +index 10c2a3c9114e..43238ac2e845 100644 +--- a/arch/x86/kernel/amd_nb.c ++++ b/arch/x86/kernel/amd_nb.c +@@ -116,6 +116,9 @@ static const struct pci_device_id amd_nb_link_ids[] = { + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F4) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F4) }, ++ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) }, + { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) }, +-- +2.42.1 +