Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24214449 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86, amd_nb: Export model 0x10 and later PCI id 



Add the F3 PCI id of F15h, model 0x10 to pci_ids.h and to the amd_nb
code which generates the list of northbridges on an AMD box. Shorten
define name while at it so that it fits into pci_ids.h.

Acked-by: default avatarClemens Ladisch <clemens@ladisch.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarAndreas Herrmann <andreas.herrmann3@amd.com>
Signed-off-by: default avatarBorislav Petkov <borislav.petkov@amd.com>
parent f8f5701b

arch/x86/kernel/amd_nb.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_K8_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },

	{}

};

EXPORT_SYMBOL(amd_nb_misc_ids);

drivers/hwmon/k10temp.c

+1 −4
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ static bool force; 
module_param(force, bool, 0444);

MODULE_PARM_DESC(force, "force loading on processors with erratum 319");



/* PCI-IDs for Northbridge devices not used anywhere else */

#define PCI_DEVICE_ID_AMD_15H_M10H_NB_F3	0x1403



/* CPUID function 0x80000001, ebx */

#define CPUID_PKGTYPE_MASK	0xf0000000

#define CPUID_PKGTYPE_F		0x00000000
@@ -213,7 +210,7 @@ static DEFINE_PCI_DEVICE_TABLE(k10temp_id_table) = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_11H_NB_MISC) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_NB_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },

	{}

};

MODULE_DEVICE_TABLE(pci, k10temp_id_table);

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -517,6 +517,7 @@ 
#define PCI_DEVICE_ID_AMD_11H_NB_DRAM	0x1302

#define PCI_DEVICE_ID_AMD_11H_NB_MISC	0x1303

#define PCI_DEVICE_ID_AMD_11H_NB_LINK	0x1304

#define PCI_DEVICE_ID_AMD_15H_M10H_F3	0x1403

#define PCI_DEVICE_ID_AMD_15H_NB_F0	0x1600

#define PCI_DEVICE_ID_AMD_15H_NB_F1	0x1601

#define PCI_DEVICE_ID_AMD_15H_NB_F2	0x1602