diff --git a/patches.kernel.org/6.3.3-239-x86-amd_nb-Add-PCI-ID-for-family-19h-model-78h.patch b/patches.kernel.org/6.3.3-239-x86-amd_nb-Add-PCI-ID-for-family-19h-model-78h.patch new file mode 100644 index 0000000..683653a --- /dev/null +++ b/patches.kernel.org/6.3.3-239-x86-amd_nb-Add-PCI-ID-for-family-19h-model-78h.patch @@ -0,0 +1,69 @@ +From: Mario Limonciello +Date: Thu, 27 Apr 2023 00:33:36 -0500 +Subject: [PATCH] x86/amd_nb: Add PCI ID for family 19h model 78h +References: bsc#1012628 +Patch-mainline: 6.3.3 +Git-commit: 23a5b8bb022c1e071ca91b1a9c10f0ad6a0966e9 + +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 +Signed-off-by: Borislav Petkov (AMD) +Acked-by: Bjorn Helgaas # pci_ids.h +Acked-by: Guenter Roeck +Link: https://lore.kernel.org/r/20230427053338.16653-2-mario.limonciello@amd.com +Signed-off-by: Greg Kroah-Hartman +Signed-off-by: Jiri Slaby +--- + arch/x86/kernel/amd_nb.c | 2 ++ + include/linux/pci_ids.h | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c +index 4266b646..7e331e8f 100644 +--- 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_misc_ids[] = { + { 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) }, + {} + }; + +diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h +index 45c3d62e..95f33dad 100644 +--- 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 +-- +2.35.3 + diff --git a/series.conf b/series.conf index 774b89d..f7308dc 100644 --- a/series.conf +++ b/series.conf @@ -972,6 +972,7 @@ patches.kernel.org/6.3.3-236-ext4-fix-lockdep-warning-when-enabling-MMP.patch patches.kernel.org/6.3.3-237-ext4-remove-a-BUG_ON-in-ext4_mb_release_group_p.patch patches.kernel.org/6.3.3-238-ext4-fix-invalid-free-tracking-in-ext4_xattr_mo.patch + patches.kernel.org/6.3.3-239-x86-amd_nb-Add-PCI-ID-for-family-19h-model-78h.patch ######################################################## # Build fixes that apply to the vanilla kernel too.