Commit 7e5e832c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_misc_for_v6.6_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 updates from Borislav Petkov:

 - Add PCI device IDs for a new AMD family 0x1a CPUs and use them in the
   respective drivers

 - Update HPE Superdome Flex maintainers list

* tag 'x86_misc_for_v6.6_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/uv: Update HPE Superdome Flex Maintainers
  EDAC/amd64: Add support for AMD family 1Ah models 00h-1Fh and 40h-4Fh
  hwmon: (k10temp) Add thermal support for AMD Family 1Ah-based models
  x86/amd_nb: Add PCI IDs for AMD Family 1Ah-based models
parents bd9e99f7 1393bc8c

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -19285,7 +19285,6 @@ F: drivers/misc/sgi-gru/ 
SGI XP/XPC/XPNET DRIVER

M:	Robin Holt <robinmholt@gmail.com>

M:	Steve Wahl <steve.wahl@hpe.com>

R:	Mike Travis <mike.travis@hpe.com>

S:	Maintained

F:	drivers/misc/sgi-xp/








@@ -23182,7 +23181,8 @@ F:	arch/x86/platform















X86 PLATFORM UV HPE SUPERDOME FLEX









M:	Steve Wahl <steve.wahl@hpe.com>









R:	Mike Travis <mike.travis@hpe.com>









R:	Justin Ernst <justin.ernst@hpe.com>









R:	Kyle Meyer <kyle.meyer@hpe.com>









R:	Dimitri Sivanich <dimitri.sivanich@hpe.com>









R:	Russ Anderson <russ.anderson@hpe.com>









S:	Supported

























arch/x86/kernel/amd_nb.c



+8
−0






























Original line number
Diff line number
Diff line







@@ -24,6 +24,8 @@







#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT		0x14b5









#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT		0x14d8









#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT		0x14e8









#define PCI_DEVICE_ID_AMD_1AH_M00H_ROOT		0x153a









#define PCI_DEVICE_ID_AMD_1AH_M20H_ROOT		0x1507









#define PCI_DEVICE_ID_AMD_MI200_ROOT		0x14bb



















#define PCI_DEVICE_ID_AMD_17H_DF_F4		0x1464








@@ -39,6 +41,7 @@







#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









#define PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4	0x12c4









#define PCI_DEVICE_ID_AMD_MI200_DF_F4		0x14d4



















/* Protect the PCI config register pairs used for SMN. */








@@ -56,6 +59,8 @@ static const struct pci_device_id amd_root_ids[] = {







	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_ROOT) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M60H_ROOT) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M70H_ROOT) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_ROOT) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_ROOT) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_ROOT) },









	{}









};








@@ -85,6 +90,8 @@ static const struct pci_device_id amd_nb_misc_ids[] = {







	{ 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) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },









	{}









};








@@ -106,6 +113,7 @@ static const struct pci_device_id amd_nb_link_ids[] = {







	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F4) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F4) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F4) },









	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F4) },









	{}









};
































drivers/edac/amd64_edac.c



+15
−0






























Original line number
Diff line number
Diff line







@@ -4150,6 +4150,20 @@ static int per_family_init(struct amd64_pvt *pvt)







		}









		break;



















	case 0x1A:









		switch (pvt->model) {









		case 0x00 ... 0x1f:









			pvt->ctl_name           = "F1Ah";









			pvt->max_mcs            = 12;









			pvt->flags.zn_regs_v2   = 1;









			break;









		case 0x40 ... 0x4f:









			pvt->ctl_name           = "F1Ah_M40h";









			pvt->flags.zn_regs_v2   = 1;









			break;









		}









		break;



















	default:









		amd64_err("Unsupported family!\n");









		return -ENODEV;








@@ -4344,6 +4358,7 @@ static const struct x86_cpu_id amd64_cpuids[] = {







	X86_MATCH_VENDOR_FAM(AMD,	0x17, NULL),









	X86_MATCH_VENDOR_FAM(HYGON,	0x18, NULL),









	X86_MATCH_VENDOR_FAM(AMD,	0x19, NULL),









	X86_MATCH_VENDOR_FAM(AMD,	0x1A, NULL),









	{ }









};









MODULE_DEVICE_TABLE(x86cpu, amd64_cpuids);
































drivers/hwmon/k10temp.c



+7
−1






























Original line number
Diff line number
Diff line







@@ -65,7 +65,7 @@ static DEFINE_MUTEX(nb_smu_ind_mutex);







#define F15H_M60H_HARDWARE_TEMP_CTRL_OFFSET	0xd8200c64









#define F15H_M60H_REPORTED_TEMP_CTRL_OFFSET	0xd8200ca4



















/* Common for Zen CPU families (Family 17h and 18h and 19h) */









/* Common for Zen CPU families (Family 17h and 18h and 19h and 1Ah) */









#define ZEN_REPORTED_TEMP_CTRL_BASE		0x00059800



















#define ZEN_CCD_TEMP(offset, x)			(ZEN_REPORTED_TEMP_CTRL_BASE + \








@@ -475,6 +475,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id)







			k10temp_get_ccd_support(pdev, data, 12);









			break;









		}









	} else if (boot_cpu_data.x86 == 0x1a) {









		data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;









		data->read_tempreg = read_tempreg_nb_zen;









		data->is_zen = true;









	} else {









		data->read_htcreg = read_htcreg_pci;









		data->read_tempreg = read_tempreg_pci;








@@ -521,6 +525,8 @@ static const struct pci_device_id k10temp_id_table[] = {







	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },









	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },









	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M78H_DF_F3) },









	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M00H_DF_F3) },









	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3) },









	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },









	{}









};
































include/linux/pci_ids.h



+2
−0






























Original line number
Diff line number
Diff line







@@ -576,6 +576,8 @@







#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_1AH_M00H_DF_F3 0x12c3









#define PCI_DEVICE_ID_AMD_1AH_M20H_DF_F3 0x16fb









#define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3









#define PCI_DEVICE_ID_AMD_CNB17H_F3	0x1703









#define PCI_DEVICE_ID_AMD_LANCE		0x2000