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

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



The PMU unregistration in the uncore PCI sub driver is similar as the
normal PMU unregistration for a PCI device. The codes to unregister a
PCI PMU can be shared.

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

Use uncore_pci_get_dev_die_info() to replace the codes which retrieve
the socket and die informaion.

The pci_set_drvdata() is not included in uncore_pci_pmu_unregister() as
well, because the uncore PCI sub driver will not touch the private
driver data pointer of the device.

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-5-git-send-email-kan.liang@linux.intel.com
parent 16fa6431

arch/x86/events/intel/uncore.c

+25 −10
Original line number Diff line number Diff line
@@ -1137,18 +1137,38 @@ static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id 
	return ret;

}



/*

 * Unregister the PMU of a PCI device

 * @pmu: The corresponding PMU is unregistered.

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

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

 */

static void uncore_pci_pmu_unregister(struct intel_uncore_pmu *pmu,

				      int phys_id, int die)

{

	struct intel_uncore_box *box = pmu->boxes[die];



	if (WARN_ON_ONCE(phys_id != box->pci_phys_id))

		return;



	pmu->boxes[die] = NULL;

	if (atomic_dec_return(&pmu->activeboxes) == 0)

		uncore_pmu_unregister(pmu);

	uncore_box_exit(box);

	kfree(box);

}



static void uncore_pci_remove(struct pci_dev *pdev)

{

	struct intel_uncore_box *box;

	struct intel_uncore_pmu *pmu;

	int i, phys_id, die;



	phys_id = uncore_pcibus_to_physid(pdev->bus);

	if (uncore_pci_get_dev_die_info(pdev, &phys_id, &die))

		return;



	box = pci_get_drvdata(pdev);

	if (!box) {

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

					topology_phys_to_logical_pkg(phys_id);

		for (i = 0; i < UNCORE_EXTRA_PCI_DEV_MAX; i++) {

			if (uncore_extra_pci_dev[die].dev[i] == pdev) {

				uncore_extra_pci_dev[die].dev[i] = NULL;
@@ -1160,15 +1180,10 @@ static void uncore_pci_remove(struct pci_dev *pdev) 
	}



	pmu = box->pmu;

	if (WARN_ON_ONCE(phys_id != box->pci_phys_id))

		return;



	pci_set_drvdata(pdev, NULL);

	pmu->boxes[box->dieid] = NULL;

	if (atomic_dec_return(&pmu->activeboxes) == 0)

		uncore_pmu_unregister(pmu);

	uncore_box_exit(box);

	kfree(box);



	uncore_pci_pmu_unregister(pmu, phys_id, die);

}



static int __init uncore_pci_init(void)

CRA Git | Maintained and supported by SUSTech CRA and CCSE