6.1-stable patches

added patches:
	x86-amd_nb-add-pci-id-for-family-19h-model-78h.patch

diff --git a/queue-6.1/series b/queue-6.1/series
index 552381db959f147ac7ce6766a62a9eba0e740834..70544bcaef5cb2e8b3cb140d708ee34890330554 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -232,3 +232,4 @@ ext4-fix-invalid-free-tracking-in-ext4_xattr_move_to_block.patch
 drm-dsc-fix-dp_dsc_max_bpp_delta_-macro-values.patch
 f2fs-fix-to-do-sanity-check-on-extent-cache-correctly.patch
 f2fs-inode-fix-to-do-sanity-check-on-extent-cache-correctly.patch
+x86-amd_nb-add-pci-id-for-family-19h-model-78h.patch

diff --git a/queue-6.1/x86-amd_nb-add-pci-id-for-family-19h-model-78h.patch b/queue-6.1/x86-amd_nb-add-pci-id-for-family-19h-model-78h.patch
new file mode 100644 (file)
index 0000000..32f62b6
--- /dev/null
+++ b/queue-6.1/x86-amd_nb-add-pci-id-for-family-19h-model-78h.patch
@@ -0,0 +1,61 @@
+From 23a5b8bb022c1e071ca91b1a9c10f0ad6a0966e9 Mon Sep 17 00:00:00 2001
+From: Mario Limonciello <mario.limonciello@amd.com>
+Date: Thu, 27 Apr 2023 00:33:36 -0500
+Subject: x86/amd_nb: Add PCI ID for family 19h model 78h
+
+From: Mario Limonciello <mario.limonciello@amd.com>
+
+commit 23a5b8bb022c1e071ca91b1a9c10f0ad6a0966e9 upstream.
+
+Commit
+
+  310e782a99c7 ("platform/x86/amd: pmc: Utilize SMN index 0 for driver probe")
+
+switched to using amd_smn_read() which relies upon the misc PCI ID used
+by DF function 3 being included in a table.  The ID for model 78h is
+missing in that table, so amd_smn_read() doesn't work.
+
+Add the missing ID into amd_nb, restoring s2idle on this system.
+
+  [ bp: Simplify commit message. ]
+
+Fixes: 310e782a99c7 ("platform/x86/amd: pmc: Utilize SMN index 0 for driver probe")
+Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
+Signed-off-by: Borislav Petkov (AMD) <bp@alien8.de>
+Acked-by: Bjorn Helgaas <bhelgaas@google.com>  # pci_ids.h
+Acked-by: Guenter Roeck <linux@roeck-us.net>
+Link: https://lore.kernel.org/r/20230427053338.16653-2-mario.limonciello@amd.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kernel/amd_nb.c |    2 ++
+ include/linux/pci_ids.h  |    1 +
+ 2 files changed, 3 insertions(+)
+
+--- a/arch/x86/kernel/amd_nb.c
++++ b/arch/x86/kernel/amd_nb.c
+@@ -36,6 +36,7 @@
+ #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
+ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4
+ #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
++#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc
+ 
+ /* Protect the PCI config register pairs used for SMN. */
+ static DEFINE_MUTEX(smn_mutex);
+@@ -79,6 +80,7 @@ static const struct pci_device_id amd_nb
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
+       { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
++      { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
+       {}
+ };
+ 
+--- a/include/linux/pci_ids.h
++++ b/include/linux/pci_ids.h
+@@ -567,6 +567,7 @@
+ #define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
+ #define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3
+ #define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3
++#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
+ #define PCI_DEVICE_ID_AMD_CNB17H_F3   0x1703
+ #define PCI_DEVICE_ID_AMD_LANCE               0x2000
+ #define PCI_DEVICE_ID_AMD_LANCE_HOME  0x2001