From: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
The socket and die information is required when probing the platform
device.
Factor out the codes to get the socket and die information from a BUS
number into a separate function. The function will be used later.
There is no functional change.
Signed-off-by: Kan Liang <kan.liang@xxxxxxxxxxxxxxx>
---
arch/x86/events/intel/uncore.c | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/arch/x86/events/intel/uncore.c b/arch/x86/events/intel/uncore.c
index d5c6d3b..0651ab7 100644
--- a/arch/x86/events/intel/uncore.c
+++ b/arch/x86/events/intel/uncore.c
@@ -988,6 +988,20 @@ uncore_types_init(struct intel_uncore_type **types, bool setid)
return 0;
}
+static int uncore_pci_get_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 +1012,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_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);
--
2.7.4
