Skip to content

Commit 23a5b8b

Browse files
superm1bp3tk0v
authored andcommitted
x86/amd_nb: Add PCI ID for family 19h model 78h
Commit 310e782 ("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: 310e782 ("platform/x86/amd: pmc: Utilize SMN index 0 for driver probe") Signed-off-by: Mario Limonciello <[email protected]> Signed-off-by: Borislav Petkov (AMD) <[email protected]> Acked-by: Bjorn Helgaas <[email protected]> # pci_ids.h Acked-by: Guenter Roeck <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent ac9a786 commit 23a5b8b

File tree

2 files changed

+3
-0
lines changed

2 files changed

+3
-0
lines changed

arch/x86/kernel/amd_nb.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
3737
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4
3838
#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
39+
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc
3940

4041
/* Protect the PCI config register pairs used for SMN. */
4142
static DEFINE_MUTEX(smn_mutex);
@@ -79,6 +80,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = {
7980
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
8081
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
8182
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
83+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
8284
{}
8385
};
8486

include/linux/pci_ids.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -567,6 +567,7 @@
567567
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
568568
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3
569569
#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3
570+
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
570571
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
571572
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
572573
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001

0 commit comments

Comments
 (0)