xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf/x86/intel/uncore: Generalize I/O stacks to PMON mapping procedure

Browse Source 
[ Upstream commit f471fac77b41a2573c7b677ef790bf18a0e64195 ]

Currently I/O stacks to IIO PMON mapping is available on Skylake servers
only and need to make code more general to easily enable further platforms.
So, introduce get_topology() callback in struct intel_uncore_type which
allows to move common code to separate function and make mapping procedure
more general.

Signed-off-by: Alexander Antonov <alexander.antonov@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
Link: https://lkml.kernel.org/r/20210426131614.16205-2-alexander.antonov@linux.intel.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Alexander Antonov
2021-04-26 16:16:12 +03:00
committed by Greg Kroah-Hartman
parent 9620f8a5c7
commit 53d24a9592
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86/events/intel/uncore.h
View File

@@ -84,6 +84,7 @@ struct intel_uncore_type {
/* /*
* Optional callbacks for managing mapping of Uncore units to PMONs * Optional callbacks for managing mapping of Uncore units to PMONs
*/ */
int (*get_topology)(struct intel_uncore_type *type);
int (*set_mapping)(struct intel_uncore_type *type); int (*set_mapping)(struct intel_uncore_type *type);
void (*cleanup_mapping)(struct intel_uncore_type *type); void (*cleanup_mapping)(struct intel_uncore_type *type);
}; };

28
arch/x86/events/intel/uncore_snbep.c
View File

@@ -3643,12 +3643,19 @@ static inline u8 skx_iio_stack(struct intel_uncore_pmu *pmu, int die)
} }
static umode_t static umode_t
skx_iio_mapping_visible(struct kobject *kobj, struct attribute *attr, int die) pmu_iio_mapping_visible(struct kobject *kobj, struct attribute *attr,
int die, int zero_bus_pmu)
{ {
struct intel_uncore_pmu *pmu = dev_to_uncore_pmu(kobj_to_dev(kobj)); struct intel_uncore_pmu *pmu = dev_to_uncore_pmu(kobj_to_dev(kobj));
/* Root bus 0x00 is valid only for die 0 AND pmu_idx = 0. */ return (!skx_iio_stack(pmu, die) && pmu->pmu_idx != zero_bus_pmu) ? 0 : attr->mode;
return (!skx_iio_stack(pmu, die) && pmu->pmu_idx) ? 0 : attr->mode; }
static umode_t
skx_iio_mapping_visible(struct kobject *kobj, struct attribute *attr, int die)
{
/* Root bus 0x00 is valid only for pmu_idx = 0. */
return pmu_iio_mapping_visible(kobj, attr, die, 0);
} }
static ssize_t skx_iio_mapping_show(struct device *dev, static ssize_t skx_iio_mapping_show(struct device *dev,
@@ -3740,7 +3747,8 @@ static const struct attribute_group *skx_iio_attr_update[] = {
NULL, NULL,
}; };
static int skx_iio_set_mapping(struct intel_uncore_type *type) static int
pmu_iio_set_mapping(struct intel_uncore_type *type, struct attribute_group *ag)
{ {
char buf[64]; char buf[64];
int ret; int ret;
@@ -3748,8 +3756,8 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
struct attribute **attrs = NULL; struct attribute **attrs = NULL;
struct dev_ext_attribute *eas = NULL; struct dev_ext_attribute *eas = NULL;
ret = skx_iio_get_topology(type); ret = type->get_topology(type);
if (ret) if (ret < 0)
goto clear_attr_update; goto clear_attr_update;
ret = -ENOMEM; ret = -ENOMEM;
@@ -3775,7 +3783,7 @@ static int skx_iio_set_mapping(struct intel_uncore_type *type)
eas[die].var = (void *)die; eas[die].var = (void *)die;
attrs[die] = &eas[die].attr.attr; attrs[die] = &eas[die].attr.attr;
} }
skx_iio_mapping_group.attrs = attrs; ag->attrs = attrs;
return 0; return 0;
err: err:
@@ -3791,6 +3799,11 @@ clear_attr_update:
return ret; return ret;
} }
static int skx_iio_set_mapping(struct intel_uncore_type *type)
{
return pmu_iio_set_mapping(type, &skx_iio_mapping_group);
}
static void skx_iio_cleanup_mapping(struct intel_uncore_type *type) static void skx_iio_cleanup_mapping(struct intel_uncore_type *type)
{ {
struct attribute **attr = skx_iio_mapping_group.attrs; struct attribute **attr = skx_iio_mapping_group.attrs;
@@ -3821,6 +3834,7 @@ static struct intel_uncore_type skx_uncore_iio = {
.ops = &skx_uncore_iio_ops, .ops = &skx_uncore_iio_ops,
.format_group = &skx_uncore_iio_format_group, .format_group = &skx_uncore_iio_format_group,
.attr_update = skx_iio_attr_update, .attr_update = skx_iio_attr_update,
.get_topology = skx_iio_get_topology,
.set_mapping = skx_iio_set_mapping, .set_mapping = skx_iio_set_mapping,
.cleanup_mapping = skx_iio_cleanup_mapping, .cleanup_mapping = skx_iio_cleanup_mapping,
}; };