[PATCH v1] drivers/perf: apple_m1: fix affinity table for event 0x96 and 0x9b

[Will Deacon]

On Thu, Jun 20, 2024 at 11:04:28AM +0800, Yangyu Chen wrote:
> Events 0x96 and 0x9b can be installed on counter 7 only. Fix this to avoid
> getting the wrong counter value.
> 
> Signed-off-by: Yangyu Chen <cyy at cyyself.name>
> ---
>  drivers/perf/apple_m1_cpu_pmu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/perf/apple_m1_cpu_pmu.c b/drivers/perf/apple_m1_cpu_pmu.c
> index f322e5ca1114..b8127e5428e1 100644
> --- a/drivers/perf/apple_m1_cpu_pmu.c
> +++ b/drivers/perf/apple_m1_cpu_pmu.c
> @@ -107,12 +107,12 @@ static const u16 m1_pmu_event_affinity[M1_PMU_PERFCTR_LAST + 1] = {
>  	[M1_PMU_PERFCTR_UNKNOWN_93]	= ONLY_5_6_7,
>  	[M1_PMU_PERFCTR_UNKNOWN_94]	= ONLY_5_6_7,
>  	[M1_PMU_PERFCTR_UNKNOWN_95]	= ONLY_5_6_7,
> -	[M1_PMU_PERFCTR_UNKNOWN_96]	= ONLY_5_6_7,
> +	[M1_PMU_PERFCTR_UNKNOWN_96]	= BIT(7),
>  	[M1_PMU_PERFCTR_UNKNOWN_97]	= BIT(7),
>  	[M1_PMU_PERFCTR_UNKNOWN_98]	= ONLY_5_6_7,
>  	[M1_PMU_PERFCTR_UNKNOWN_99]	= ONLY_5_6_7,
>  	[M1_PMU_PERFCTR_UNKNOWN_9a]	= BIT(7),
> -	[M1_PMU_PERFCTR_UNKNOWN_9b]	= ONLY_5_6_7,
> +	[M1_PMU_PERFCTR_UNKNOWN_9b]	= BIT(7),
>  	[M1_PMU_PERFCTR_UNKNOWN_9c]	= ONLY_5_6_7,
>  	[M1_PMU_PERFCTR_UNKNOWN_9f]	= BIT(7),
>  	[M1_PMU_PERFCTR_UNKNOWN_bf]	= ONLY_5_6_7,

It would be great if somebody with access to M1 hardware (and/or any
PMU insight) could Test or Ack this, please.

Cheers,

Will