Commit c919577e authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-urgent-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf fixes from Ingo Molnar:
 "Four Intel uncore PMU driver fixes by Zide Chen"

* tag 'perf-urgent-2026-04-12' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/uncore: Remove extra double quote mark
  perf/x86/intel/uncore: Fix die ID init and look up bugs
  perf/x86/intel/uncore: Skip discovery table for offline dies
  perf/x86/intel/uncore: Fix iounmap() leak on global_init failure
parents 8648ac81 16bcbe67

arch/x86/events/intel/uncore.c

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ int uncore_die_to_segment(int die) 
	return bus ? pci_domain_nr(bus) : -EINVAL;

}



/* Note: This API can only be used when NUMA information is available. */

int uncore_device_to_die(struct pci_dev *dev)

{

	int node = pcibus_to_node(dev->bus);

arch/x86/events/intel/uncore_discovery.c

+11 −6
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ static int __parse_discovery_table(struct uncore_discovery_domain *domain, 
	struct uncore_unit_discovery unit;

	void __iomem *io_addr;

	unsigned long size;

	int ret = 0;

	int i;



	size = UNCORE_DISCOVERY_GLOBAL_MAP_SIZE;
@@ -273,21 +274,23 @@ static int __parse_discovery_table(struct uncore_discovery_domain *domain, 


	/* Read Global Discovery State */

	memcpy_fromio(&global, io_addr, sizeof(struct uncore_global_discovery));

	iounmap(io_addr);



	if (uncore_discovery_invalid_unit(global)) {

		pr_info("Invalid Global Discovery State: 0x%llx 0x%llx 0x%llx\n",

			global.table1, global.ctl, global.table3);

		iounmap(io_addr);

		return -EINVAL;

	}

	iounmap(io_addr);



	size = (1 + global.max_units) * global.stride * 8;

	io_addr = ioremap(addr, size);

	if (!io_addr)

		return -ENOMEM;



	if (domain->global_init && domain->global_init(global.ctl))

		return -ENODEV;

	if (domain->global_init && domain->global_init(global.ctl)) {

		ret = -ENODEV;

		goto out;

	}



	/* Parsing Unit Discovery State */

	for (i = 0; i < global.max_units; i++) {
@@ -307,8 +310,10 @@ static int __parse_discovery_table(struct uncore_discovery_domain *domain, 
	}



	*parsed = true;



out:

	iounmap(io_addr);

	return 0;

	return ret;

}



static int parse_discovery_table(struct uncore_discovery_domain *domain,
@@ -366,7 +371,7 @@ static bool uncore_discovery_pci(struct uncore_discovery_domain *domain) 
				     (val & UNCORE_DISCOVERY_DVSEC2_BIR_MASK) * UNCORE_DISCOVERY_BIR_STEP;



			die = get_device_die_id(dev);

			if (die < 0)

			if ((die < 0) || (die >= uncore_max_dies()))

				continue;



			parse_discovery_table(domain, dev, die, bar_offset, &parsed);

arch/x86/events/intel/uncore_snbep.c

+30 −31
Original line number Diff line number Diff line
@@ -1459,13 +1459,7 @@ static int snbep_pci2phy_map_init(int devid, int nodeid_loc, int idmap_loc, bool 
			}



			map->pbus_to_dieid[bus] = die_id = uncore_device_to_die(ubox_dev);



			raw_spin_unlock(&pci2phy_map_lock);



			if (WARN_ON_ONCE(die_id == -1)) {

				err = -EINVAL;

				break;

			}

		}

	}
@@ -6420,7 +6414,7 @@ static void spr_update_device_location(int type_id) 


	while ((dev = pci_get_device(PCI_VENDOR_ID_INTEL, device, dev)) != NULL) {



		die = uncore_device_to_die(dev);

		die = uncore_pcibus_to_dieid(dev->bus);

		if (die < 0)

			continue;
@@ -6444,6 +6438,11 @@ static void spr_update_device_location(int type_id) 


int spr_uncore_pci_init(void)

{

	int ret = snbep_pci2phy_map_init(0x3250, SKX_CPUNODEID, SKX_GIDNIDMAP, true);



	if (ret)

		return ret;



	/*

	 * The discovery table of UPI on some SPR variant is broken,

	 * which impacts the detection of both UPI and M3UPI uncore PMON.
@@ -6935,34 +6934,34 @@ static struct freerunning_counters dmr_iio_freerunning[] = { 


static struct uncore_event_desc dmr_uncore_iio_freerunning_events[] = {

	/*  ITC Free Running Data BW counter for inbound traffic */

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port0, 0x10, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port1, 0x11, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port2, 0x12, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port3, 0x13, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port4, 0x14, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port5, 0x15, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port6, 0x16, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port7, 0x17, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port0, 0x10, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port1, 0x11, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port2, 0x12, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port3, 0x13, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port4, 0x14, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port5, 0x15, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port6, 0x16, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(inb_data_port7, 0x17, 3.814697266e-6),



	/*  ITC Free Running BW IN counters */

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port0, 0x20, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port1, 0x21, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port2, 0x22, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port3, 0x23, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port4, 0x24, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port5, 0x25, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port6, 0x26, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port7, 0x27, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port0, 0x20, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port1, 0x21, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port2, 0x22, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port3, 0x23, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port4, 0x24, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port5, 0x25, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port6, 0x26, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_in_port7, 0x27, 3.814697266e-6),



	/*  ITC Free Running BW OUT counters */

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port0, 0x30, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port1, 0x31, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port2, 0x32, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port3, 0x33, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port4, 0x34, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port5, 0x35, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port6, 0x36, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port7, 0x37, "3.814697266e-6"),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port0, 0x30, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port1, 0x31, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port2, 0x32, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port3, 0x33, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port4, 0x34, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port5, 0x35, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port6, 0x36, 3.814697266e-6),

	INTEL_UNCORE_FR_EVENT_DESC(bw_out_port7, 0x37, 3.814697266e-6),



	/* Free Running Clock Counter */

	INTEL_UNCORE_EVENT_DESC(clockticks, "event=0xff,umask=0x40"),