Commit 775a0eca authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_urgent_for_v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 fixes from Borislav Petkov:

 - Add a new PCI ID which belongs to a new AMD CPU family 0x1a

 - Ensure that that last level cache ID is set in all cases, in the AMD
   CPU topology parsing code, in order to prevent invalid scheduling
   domain CPU masks

* tag 'x86_urgent_for_v6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/topology/amd: Ensure that LLC ID is initialized
  x86/amd_nb: Add new PCI IDs for AMD family 0x1a
parents cf87f46f 5754ace3

arch/x86/kernel/amd_nb.c

+1 −0
Original line number Diff line number Diff line
@@ -95,6 +95,7 @@ static const struct pci_device_id amd_nb_misc_ids[] = { 
	{ 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_1AH_M70H_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI200_DF_F3) },

	{ PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_MI300_DF_F3) },

	{}

arch/x86/kernel/cpu/topology_amd.c

+7 −9
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ static bool parse_8000_001e(struct topo_scan *tscan, bool has_0xb) 
	return true;

}



static bool parse_fam10h_node_id(struct topo_scan *tscan)

static void parse_fam10h_node_id(struct topo_scan *tscan)

{

	union {

		struct {
@@ -131,19 +131,19 @@ static bool parse_fam10h_node_id(struct topo_scan *tscan) 
	} nid;



	if (!boot_cpu_has(X86_FEATURE_NODEID_MSR))

		return false;

		return;



	rdmsrl(MSR_FAM10H_NODE_ID, nid.msr);

	store_node(tscan, nid.nodes_per_pkg + 1, nid.node_id);

	tscan->c->topo.llc_id = nid.node_id;

	return true;

}



static void legacy_set_llc(struct topo_scan *tscan)

{

	unsigned int apicid = tscan->c->topo.initial_apicid;



	/* parse_8000_0008() set everything up except llc_id */

	/* If none of the parsers set LLC ID then use the die ID for it. */

	if (tscan->c->topo.llc_id == BAD_APICID)

		tscan->c->topo.llc_id = apicid >> tscan->dom_shifts[TOPO_CORE_DOMAIN];

}
@@ -187,10 +187,7 @@ static void parse_topology_amd(struct topo_scan *tscan) 
		return;



	/* Try the NODEID MSR */

	if (parse_fam10h_node_id(tscan))

		return;



	legacy_set_llc(tscan);

	parse_fam10h_node_id(tscan);

}



void cpu_parse_topology_amd(struct topo_scan *tscan)
@@ -198,6 +195,7 @@ void cpu_parse_topology_amd(struct topo_scan *tscan) 
	tscan->amd_nodes_per_pkg = 1;

	topoext_fixup(tscan);

	parse_topology_amd(tscan);

	legacy_set_llc(tscan);



	if (tscan->amd_nodes_per_pkg > 1)

		set_cpu_cap(tscan->c, X86_FEATURE_AMD_DCM);

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -580,6 +580,7 @@ 
#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_1AH_M70H_DF_F3 0x12bb

#define PCI_DEVICE_ID_AMD_MI200_DF_F3	0x14d3

#define PCI_DEVICE_ID_AMD_MI300_DF_F3	0x152b

#define PCI_DEVICE_ID_AMD_VANGOGH_USB	0x163a