Commit fe650733 authored by Kan Liang's avatar Kan Liang Committed by Peter Zijlstra
Browse files

perf/x86/intel/uncore: Factor out uncore_pci_get_dev_die_info() 



The socket and die information is required to register/unregister a PMU
in the uncore PCI sub driver. The codes, which get the socket and die
information from a BUS number, can be shared.

Factor out uncore_pci_get_dev_die_info(), which will be used later.

There is no functional change.

Signed-off-by: default avatarKan Liang <kan.liang@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/1600094060-82746-2-git-send-email-kan.liang@linux.intel.com
parent 9ed9647d

arch/x86/events/intel/uncore.c

+23 −8
Original line number Diff line number Diff line
@@ -988,6 +988,26 @@ uncore_types_init(struct intel_uncore_type **types, bool setid) 
	return 0;

}



/*

 * Get the die information of a PCI device.

 * @pdev: The PCI device.

 * @phys_id: The physical socket id which the device maps to.

 * @die: The die id which the device maps to.

 */

static int uncore_pci_get_dev_die_info(struct pci_dev *pdev,

				       int *phys_id, int *die)

{

	*phys_id = uncore_pcibus_to_physid(pdev->bus);

	if (*phys_id < 0)

		return -ENODEV;



	*die = (topology_max_die_per_package() > 1) ? *phys_id :

				topology_phys_to_logical_pkg(*phys_id);

	if (*die < 0)

		return -EINVAL;



	return 0;

}

/*

 * add a pci uncore device

 */
@@ -998,14 +1018,9 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	struct intel_uncore_box *box;

	int phys_id, die, ret;



	phys_id = uncore_pcibus_to_physid(pdev->bus);

	if (phys_id < 0)

		return -ENODEV;



	die = (topology_max_die_per_package() > 1) ? phys_id :

					topology_phys_to_logical_pkg(phys_id);

	if (die < 0)

		return -EINVAL;

	ret = uncore_pci_get_dev_die_info(pdev, &phys_id, &die);

	if (ret)

		return ret;



	if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) {

		int idx = UNCORE_PCI_DEV_IDX(id->driver_data);

CRA Git | Maintained and supported by SUSTech CRA and CCSE