From: Kan Liang <kan.liang@linux.intel.com>

Date: Mon, 14 Sep 2020 07:34:15 -0700

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

Git-commit: fe6507338d635f283e9618b5eaa35f503a8c375b

Patch-mainline: v5.10-rc1

References: jsc#SLE-13340

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: Kan Liang <kan.liang@linux.intel.com>

Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>

Link: https://lkml.kernel.org/r/1600094060-82746-2-git-send-email-kan.liang@linux.intel.com

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 arch/x86/events/intel/uncore.c | 31 +++++++++++++++++++++++--------

 1 file changed, 23 insertions(+), 8 deletions(-)

diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c

index d5c6d3b340c5..e14b03f99949 100644

--- a/arch/x86/events/intel/uncore.c

+++ b/arch/x86/events/intel/uncore.c

@@ -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);