ACK: [SRU][Zesty][PATCH 1/1] powerpc/perf: Fix Power9 test_adder fields

[Colin Ian King]

On 25/08/17 17:15, Joseph Salisbury wrote:
> From: Madhavan Srinivasan <maddy at linux.vnet.ibm.com>
> 
> BugLink: http://bugs.launchpad.net/bugs/1709964
> 
> Commit 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9 DD1')
> was added to restrict the use of PMC5 in Power9 DD1. Intention was to disable
> the use of PMC5 using raw event code. But instead of updating the
> power9_isa207_pmu structure (used on DD1), the commit incorrectly updated the
> power9_pmu structure. Fix it.
> 
> Fixes: 8d911904f3ce ("powerpc/perf: Add restrictions to PMC5 in power9 DD1")
> Reported-by: Shriya <shriyak at linux.vnet.ibm.com>
> Signed-off-by: Madhavan Srinivasan <maddy at linux.vnet.ibm.com>
> Tested-by: Shriya <shriyak at linux.vnet.ibm.com>
> Signed-off-by: Michael Ellerman <mpe at ellerman.id.au>
> (cherry picked from commit 8c218578fcbbbdb10416c8614658bf32e3bf1655)
> Signed-off-by: Joseph Salisbury <joseph.salisbury at canonical.com>
> ---
>  arch/powerpc/perf/power9-pmu.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/powerpc/perf/power9-pmu.c b/arch/powerpc/perf/power9-pmu.c
> index 7f65827..d44b14a 100644
> --- a/arch/powerpc/perf/power9-pmu.c
> +++ b/arch/powerpc/perf/power9-pmu.c
> @@ -402,7 +402,7 @@ static struct power_pmu power9_isa207_pmu = {
>  	.name			= "POWER9",
>  	.n_counter		= MAX_PMU_COUNTERS,
>  	.add_fields		= ISA207_ADD_FIELDS,
> -	.test_adder		= ISA207_TEST_ADDER,
> +	.test_adder		= P9_DD1_TEST_ADDER,
>  	.compute_mmcr		= isa207_compute_mmcr,
>  	.config_bhrb		= power9_config_bhrb,
>  	.bhrb_filter_map	= power9_bhrb_filter_map,
> @@ -421,7 +421,7 @@ static struct power_pmu power9_pmu = {
>  	.name			= "POWER9",
>  	.n_counter		= MAX_PMU_COUNTERS,
>  	.add_fields		= ISA207_ADD_FIELDS,
> -	.test_adder		= P9_DD1_TEST_ADDER,
> +	.test_adder		= ISA207_TEST_ADDER,
>  	.compute_mmcr		= isa207_compute_mmcr,
>  	.config_bhrb		= power9_config_bhrb,
>  	.bhrb_filter_map	= power9_bhrb_filter_map,
> 

Clean cherry pick and positive test results. Thanks Joe.

Acked-by: Colin Ian King <colin.king at canonical.com>