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

perf/x86/intel/uncore: Disable I/O stacks to PMU mapping on ICX-D 



Current implementation of I/O stacks to PMU mapping doesn't support ICX-D.
Detect ICX-D system to disable mapping.

Fixes: 10337e95 ("perf/x86/intel/uncore: Enable I/O stacks to IIO PMON mapping on ICX")
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>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20221117122833.3103580-5-alexander.antonov@linux.intel.com
parent 65327833

arch/x86/events/intel/uncore.h

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
#include <linux/slab.h>

#include <linux/pci.h>

#include <asm/apicdef.h>

#include <asm/intel-family.h>

#include <linux/io-64-nonatomic-lo-hi.h>



#include <linux/perf_event.h>

arch/x86/events/intel/uncore_snbep.c

+5 −0
Original line number Diff line number Diff line
@@ -5226,6 +5226,11 @@ static int icx_iio_get_topology(struct intel_uncore_type *type) 


static int icx_iio_set_mapping(struct intel_uncore_type *type)

{

	/* Detect ICX-D system. This case is not supported */

	if (boot_cpu_data.x86_model == INTEL_FAM6_ICELAKE_D) {

		pmu_clear_mapping_attr(type->attr_update, &icx_iio_mapping_group);

		return -EPERM;

	}

	return pmu_iio_set_mapping(type, &icx_iio_mapping_group);

}