Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'x86_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Borislav Petkov:
- Add the required PCI IDs so that the generic SMN accesses provided by
amd_nb.c work for drivers which switch to them. Add a PCI device ID
to k10temp's table so that latter is loaded on such systems too
* tag 'x86_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hwmon: (k10temp) Add PCI ID for family 19, model 78h
x86/amd_nb: Add PCI ID for family 19h model 78h
+4
+2
arch/x86/kernel/amd_nb.c
+2
arch/x86/kernel/amd_nb.c
···
36
36
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e
37
37
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4
38
38
#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4
39
+
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F4 0x12fc
39
40
40
41
/* Protect the PCI config register pairs used for SMN. */
41
42
static DEFINE_MUTEX(smn_mutex);
···
80
79
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
81
80
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
82
81
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
82
+
{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
83
83
{}
84
84
};
85
85
+1
drivers/hwmon/k10temp.c
+1
drivers/hwmon/k10temp.c
···
507
507
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },
508
508
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },
509
509
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },
510
+
{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },
510
511
{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },
511
512
{}
512
513
};
+1
include/linux/pci_ids.h
+1
include/linux/pci_ids.h
···
567
567
#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d
568
568
#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F3 0x14e3
569
569
#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F3 0x14f3
570
+
#define PCI_DEVICE_ID_AMD_19H_M78H_DF_F3 0x12fb
570
571
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
571
572
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
572
573
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001