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

Commit dedf7dce authored by Woods, Brian's avatar Woods, Brian Committed by Borislav Petkov
Browse files

hwmon/k10temp, x86/amd_nb: Consolidate shared device IDs 



Consolidate shared PCI_DEVICE_IDs that were scattered through k10temp
and amd_nb, and move them into pci_ids.

Signed-off-by: default avatarBrian Woods <brian.woods@amd.com>
Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
CC: Bjorn Helgaas <bhelgaas@google.com>
CC: Clemens Ladisch <clemens@ladisch.de>
CC: "H. Peter Anvin" <hpa@zytor.com>
CC: Ingo Molnar <mingo@redhat.com>
CC: Jean Delvare <jdelvare@suse.com>
CC: Jia Zhang <qianyue.zj@alibaba-inc.com>
CC: <linux-hwmon@vger.kernel.org>
CC: <linux-pci@vger.kernel.org>
CC: Pu Wen <puwen@hygon.cn>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: x86-ml <x86@kernel.org>
Link: http://lkml.kernel.org/r/20181106200754.60722-2-brian.woods@amd.com
parent 65102238

arch/x86/kernel/amd_nb.c

+1 −2
Original line number Diff line number Diff line
@@ -11,13 +11,12 @@ 
#include <linux/errno.h>

#include <linux/export.h>

#include <linux/spinlock.h>

#include <linux/pci_ids.h>

#include <asm/amd_nb.h>



#define PCI_DEVICE_ID_AMD_17H_ROOT	0x1450

#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT	0x15d0

#define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463

#define PCI_DEVICE_ID_AMD_17H_DF_F4	0x1464

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec



/* Protect the PCI config register pairs used for SMN and DF indirect access. */

drivers/hwmon/k10temp.c

+1 −8
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/init.h>

#include <linux/module.h>

#include <linux/pci.h>

#include <linux/pci_ids.h>

#include <asm/amd_nb.h>

#include <asm/processor.h>
@@ -41,14 +42,6 @@ static DEFINE_MUTEX(nb_smu_ind_mutex); 
#define PCI_DEVICE_ID_AMD_15H_M70H_NB_F3	0x15b3

#endif



#ifndef PCI_DEVICE_ID_AMD_17H_DF_F3

#define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463

#endif



#ifndef PCI_DEVICE_ID_AMD_17H_M10H_DF_F3

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3	0x15eb

#endif



/* CPUID function 0x80000001, ebx */

#define CPUID_PKGTYPE_MASK	0xf0000000

#define CPUID_PKGTYPE_F		0x00000000

include/linux/pci_ids.h

+2 −0
Original line number Diff line number Diff line
@@ -545,6 +545,8 @@ 
#define PCI_DEVICE_ID_AMD_16H_NB_F4	0x1534

#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F3 0x1583

#define PCI_DEVICE_ID_AMD_16H_M30H_NB_F4 0x1584

#define PCI_DEVICE_ID_AMD_17H_DF_F3	0x1463

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F3 0x15eb

#define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000

#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001