Commit 07813e2a authored by Alexander Antonov's avatar Alexander Antonov Committed by Peter Zijlstra
Browse files

perf/x86/intel/uncore: Generalize get_topology() for SKX PMUs 



Factor out a generic code from skx_iio_get_topology() to skx_pmu_get_topology()
to avoid code duplication. This code will be used by get_topology() procedure
for SKX UPI PMUs in the further patch.

Signed-off-by: default avatarAlexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: default avatarKan Liang <kan.liang@linux.intel.com>
Link: https://lore.kernel.org/r/20221117122833.3103580-6-alexander.antonov@linux.intel.com
parent efe06270

arch/x86/events/intel/uncore_snbep.c

+28 −10
Original line number Diff line number Diff line
@@ -3837,14 +3837,14 @@ static void pmu_free_topology(struct intel_uncore_type *type) 
	}

}



static int skx_iio_get_topology(struct intel_uncore_type *type)

static int skx_pmu_get_topology(struct intel_uncore_type *type,

				 int (*topology_cb)(struct intel_uncore_type*, int, int, u64))

{

	int die, ret = -EPERM;

	u64 configuration;

	int idx;

	u64 cpu_bus_msr;



	for (die = 0; die < uncore_max_dies(); die++) {

		ret = skx_msr_cpu_bus_read(die_to_cpu(die), &configuration);

		ret = skx_msr_cpu_bus_read(die_to_cpu(die), &cpu_bus_msr);

		if (ret)

			break;
@@ -3852,15 +3852,33 @@ static int skx_iio_get_topology(struct intel_uncore_type *type) 
		if (ret < 0)

			break;



		ret = topology_cb(type, ret, die, cpu_bus_msr);

		if (ret)

			break;

	}



	return ret;

}



static int skx_iio_topology_cb(struct intel_uncore_type *type, int segment,

				int die, u64 cpu_bus_msr)

{

	int idx;

	struct intel_uncore_topology *t;



	for (idx = 0; idx < type->num_boxes; idx++) {

			type->topology[die][idx].pmu_idx = idx;

			type->topology[die][idx].iio->segment = ret;

			type->topology[die][idx].iio->pci_bus_no =

				(configuration >> (idx * BUS_NUM_STRIDE)) & 0xff;

		t = &type->topology[die][idx];

		t->pmu_idx = idx;

		t->iio->segment = segment;

		t->iio->pci_bus_no = (cpu_bus_msr >> (idx * BUS_NUM_STRIDE)) & 0xff;

	}



	return 0;

}



	return ret;

static int skx_iio_get_topology(struct intel_uncore_type *type)

{

	return skx_pmu_get_topology(type, skx_iio_topology_cb);

}



static struct attribute_group skx_iio_mapping_group = {