Commit 98b1783d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull misc x86 updates from Borislav Petkov:

 - Add a bunch of PCI IDs for new AMD CPUs and use them in k10temp

 - Free the pmem platform device on the registration error path

* tag 'x86_misc_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  hwmon: (k10temp): Add support for new family 17h and 19h models
  x86/amd_nb: Add AMD PCI IDs for SMN communication
  x86/pmem: Fix platform-device leak in error path
parents 42efa5e3 d906fa73

arch/x86/kernel/amd_nb.c

+13 −0
Original line number Diff line number Diff line
@@ -19,17 +19,23 @@ 
#define PCI_DEVICE_ID_AMD_17H_M10H_ROOT	0x15d0

#define PCI_DEVICE_ID_AMD_17H_M30H_ROOT	0x1480

#define PCI_DEVICE_ID_AMD_17H_M60H_ROOT	0x1630

#define PCI_DEVICE_ID_AMD_17H_MA0H_ROOT	0x14b5

#define PCI_DEVICE_ID_AMD_19H_M10H_ROOT	0x14a4

#define PCI_DEVICE_ID_AMD_19H_M60H_ROOT	0x14d8

#define PCI_DEVICE_ID_AMD_19H_M70H_ROOT	0x14e8

#define PCI_DEVICE_ID_AMD_17H_DF_F4	0x1464

#define PCI_DEVICE_ID_AMD_17H_M10H_DF_F4 0x15ec

#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F4 0x1494

#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F4 0x144c

#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F4 0x1444

#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4 0x1728

#define PCI_DEVICE_ID_AMD_19H_DF_F4	0x1654

#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F4 0x14b1

#define PCI_DEVICE_ID_AMD_19H_M40H_ROOT	0x14b5

#define PCI_DEVICE_ID_AMD_19H_M40H_DF_F4 0x167d

#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F4 0x166e

#define PCI_DEVICE_ID_AMD_19H_M60H_DF_F4 0x14e4

#define PCI_DEVICE_ID_AMD_19H_M70H_DF_F4 0x14f4



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

static DEFINE_MUTEX(smn_mutex);
@@ -41,8 +47,11 @@ static const struct pci_device_id amd_root_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_ROOT) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_ROOT) },

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

	{}

};
@@ -61,12 +70,15 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M10H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_CNB17H_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },

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

	{}

};
@@ -81,6 +93,7 @@ static const struct pci_device_id amd_nb_link_ids[] = { 
	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F4) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F4) },

arch/x86/kernel/pmem.c

+6 −1
Original line number Diff line number Diff line
@@ -27,6 +27,11 @@ static __init int register_e820_pmem(void) 
	 * simply here to trigger the module to load on demand.

	 */

	pdev = platform_device_alloc("e820_pmem", -1);

	return platform_device_add(pdev);



	rc = platform_device_add(pdev);

	if (rc)

		platform_device_put(pdev);



	return rc;

}

device_initcall(register_e820_pmem);

drivers/hwmon/k10temp.c

+12 −0
Original line number Diff line number Diff line
@@ -428,6 +428,10 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
			data->ccd_offset = 0x154;

			k10temp_get_ccd_support(pdev, data, 8);

			break;

		case 0xa0 ... 0xaf:

			data->ccd_offset = 0x300;

			k10temp_get_ccd_support(pdev, data, 8);

			break;

		}

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

		data->temp_adjust_mask = ZEN_CUR_TEMP_RANGE_SEL_MASK;
@@ -445,6 +449,11 @@ static int k10temp_probe(struct pci_dev *pdev, const struct pci_device_id *id) 
			data->ccd_offset = 0x300;

			k10temp_get_ccd_support(pdev, data, 8);

			break;

		case 0x60 ... 0x6f:

		case 0x70 ... 0x7f:

			data->ccd_offset = 0x308;

			k10temp_get_ccd_support(pdev, data, 8);

			break;

		case 0x10 ... 0x1f:

		case 0xa0 ... 0xaf:

			data->ccd_offset = 0x300;
@@ -489,10 +498,13 @@ static const struct pci_device_id k10temp_id_table[] = { 
	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M30H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M60H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_M70H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M10H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M40H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M50H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M60H_DF_F3) },

	{ PCI_VDEVICE(AMD, PCI_DEVICE_ID_AMD_19H_M70H_DF_F3) },

	{ PCI_VDEVICE(HYGON, PCI_DEVICE_ID_AMD_17H_DF_F3) },

	{}

};

include/linux/pci_ids.h

+3 −0
Original line number Diff line number Diff line
@@ -556,10 +556,13 @@ 
#define PCI_DEVICE_ID_AMD_17H_M30H_DF_F3 0x1493

#define PCI_DEVICE_ID_AMD_17H_M60H_DF_F3 0x144b

#define PCI_DEVICE_ID_AMD_17H_M70H_DF_F3 0x1443

#define PCI_DEVICE_ID_AMD_17H_MA0H_DF_F3 0x1727

#define PCI_DEVICE_ID_AMD_19H_DF_F3	0x1653

#define PCI_DEVICE_ID_AMD_19H_M10H_DF_F3 0x14b0

#define PCI_DEVICE_ID_AMD_19H_M40H_DF_F3 0x167c

#define PCI_DEVICE_ID_AMD_19H_M50H_DF_F3 0x166d

#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_CNB17H_F3	0x1703

#define PCI_DEVICE_ID_AMD_LANCE		0x2000

#define PCI_DEVICE_ID_AMD_LANCE_HOME	0x2001