[PATCH] powerpc/perf: Fix Power9 test_adder field

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[PATCH] powerpc/perf: Fix Power9 test_adder field

Madhavan Srinivasan
Commit 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9 DD1')
was added to restrict the use of PMC5 in Power9 DD1. Intend is to diable
the use of PMC5 using raw event code. Commit instead of updating "power9_isa207_pmu"
structure, updated "power9_pmu" structure. Patch to fix the same.

Fixes: 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9 DD1')
Reported-by: Shriya <[hidden email]>
Signed-off-by: Madhavan Srinivasan <[hidden email]>
---
 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 018f8e90ac35..bb28e1a41257 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,
--
2.7.4

Reply | Threaded
Open this post in threaded view
|

Re: [PATCH] powerpc/perf: Fix Power9 test_adder field

shriyak
On 2017-05-26 13:38, Madhavan Srinivasan wrote:

> Commit 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9
> DD1')
> was added to restrict the use of PMC5 in Power9 DD1. Intend is to
> diable
> the use of PMC5 using raw event code. Commit instead of updating
> "power9_isa207_pmu"
> structure, updated "power9_pmu" structure. Patch to fix the same.
>
> Fixes: 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9
> DD1')
> Reported-by: Shriya <[hidden email]>
> Signed-off-by: Madhavan Srinivasan <[hidden email]>
> ---
>  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 018f8e90ac35..bb28e1a41257 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,

Tested-by: Shriya <[hidden email]>

Reply | Threaded
Open this post in threaded view
|

Re: powerpc/perf: Fix Power9 test_adder field

Michael Ellerman-3
In reply to this post by Madhavan Srinivasan
On Fri, 2017-05-26 at 08:08:27 UTC, Madhavan Srinivasan wrote:
> Commit 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9 DD1')
> was added to restrict the use of PMC5 in Power9 DD1. Intend is to diable
> the use of PMC5 using raw event code. Commit instead of updating "power9_isa207_pmu"
> structure, updated "power9_pmu" structure. Patch to fix the same.
>
> Fixes: 8d911904f3ce4 ('powerpc/perf: Add restrictions to PMC5 in power9 DD1')
> Reported-by: Shriya <[hidden email]>
> Signed-off-by: Madhavan Srinivasan <[hidden email]>
> Tested-by: Shriya <[hidden email]>

Applied to powerpc fixes, thanks.

https://git.kernel.org/powerpc/c/8c218578fcbbbdb10416c8614658bf

cheers