Commit 24dfc390 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 perf fixes from Borislav Petkov:

 - Fix Broadwell Xeon's stepping in the PEBS isolation table of CPUs

 - Fix a panic when initializing perf uncore machinery on Haswell and
   Broadwell servers

* tag 'perf_urgent_for_v5.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/kvm: Fix Broadwell Xeon stepping in isolation_ucodes[]
  perf/x86/intel/uncore: Remove uncore extra PCI dev HSWEP_PCI_PCU_3
parents 0146da0d 4b2f1e59

arch/x86/events/intel/core.c

+1 −1
Original line number Diff line number Diff line
@@ -4516,7 +4516,7 @@ static const struct x86_cpu_desc isolation_ucodes[] = { 
	INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,		 3, 0x07000009),

	INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,		 4, 0x0f000009),

	INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_D,		 5, 0x0e000002),

	INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X,		 2, 0x0b000014),

	INTEL_CPU_DESC(INTEL_FAM6_BROADWELL_X,		 1, 0x0b000014),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 3, 0x00000021),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 4, 0x00000000),

	INTEL_CPU_DESC(INTEL_FAM6_SKYLAKE_X,		 5, 0x00000000),

arch/x86/events/intel/uncore_snbep.c

+26 −35
Original line number Diff line number Diff line
@@ -1159,7 +1159,6 @@ enum { 
	SNBEP_PCI_QPI_PORT0_FILTER,

	SNBEP_PCI_QPI_PORT1_FILTER,

	BDX_PCI_QPI_PORT2_FILTER,

	HSWEP_PCI_PCU_3,

};



static int snbep_qpi_hw_config(struct intel_uncore_box *box, struct perf_event *event)
@@ -2857,22 +2856,33 @@ static struct intel_uncore_type *hswep_msr_uncores[] = { 
	NULL,

};



void hswep_uncore_cpu_init(void)

#define HSWEP_PCU_DID			0x2fc0

#define HSWEP_PCU_CAPID4_OFFET		0x94

#define hswep_get_chop(_cap)		(((_cap) >> 6) & 0x3)



static bool hswep_has_limit_sbox(unsigned int device)

{

	int pkg = boot_cpu_data.logical_proc_id;

	struct pci_dev *dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, NULL);

	u32 capid4;



	if (!dev)

		return false;



	pci_read_config_dword(dev, HSWEP_PCU_CAPID4_OFFET, &capid4);

	if (!hswep_get_chop(capid4))

		return true;



	return false;

}



void hswep_uncore_cpu_init(void)

{

	if (hswep_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)

		hswep_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;



	/* Detect 6-8 core systems with only two SBOXes */

	if (uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3]) {

		u32 capid4;



		pci_read_config_dword(uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3],

				      0x94, &capid4);

		if (((capid4 >> 6) & 0x3) == 0)

	if (hswep_has_limit_sbox(HSWEP_PCU_DID))

		hswep_uncore_sbox.num_boxes = 2;

	}



	uncore_msr_uncores = hswep_msr_uncores;

}
@@ -3135,11 +3145,6 @@ static const struct pci_device_id hswep_uncore_pci_ids[] = { 
		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   SNBEP_PCI_QPI_PORT1_FILTER),

	},

	{ /* PCU.3 (for Capability registers) */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x2fc0),

		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   HSWEP_PCI_PCU_3),

	},

	{ /* end: all zeroes */ }

};
@@ -3231,27 +3236,18 @@ static struct event_constraint bdx_uncore_pcu_constraints[] = { 
	EVENT_CONSTRAINT_END

};



#define BDX_PCU_DID			0x6fc0



void bdx_uncore_cpu_init(void)

{

	int pkg = topology_phys_to_logical_pkg(boot_cpu_data.phys_proc_id);



	if (bdx_uncore_cbox.num_boxes > boot_cpu_data.x86_max_cores)

		bdx_uncore_cbox.num_boxes = boot_cpu_data.x86_max_cores;

	uncore_msr_uncores = bdx_msr_uncores;



	/* BDX-DE doesn't have SBOX */

	if (boot_cpu_data.x86_model == 86) {

		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;

	/* Detect systems with no SBOXes */

	} else if (uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3]) {

		struct pci_dev *pdev;

		u32 capid4;

	if ((boot_cpu_data.x86_model == 86) || hswep_has_limit_sbox(BDX_PCU_DID))

		uncore_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;



		pdev = uncore_extra_pci_dev[pkg].dev[HSWEP_PCI_PCU_3];

		pci_read_config_dword(pdev, 0x94, &capid4);

		if (((capid4 >> 6) & 0x3) == 0)

			bdx_msr_uncores[BDX_MSR_UNCORE_SBOX] = NULL;

	}

	hswep_uncore_pcu.constraints = bdx_uncore_pcu_constraints;

}
@@ -3472,11 +3468,6 @@ static const struct pci_device_id bdx_uncore_pci_ids[] = { 
		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   BDX_PCI_QPI_PORT2_FILTER),

	},

	{ /* PCU.3 (for Capability registers) */

		PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x6fc0),

		.driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,

						   HSWEP_PCI_PCU_3),

	},

	{ /* end: all zeroes */ }

};