]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
selftests/powerpc: Purge extra count_pmc() calls of ebb selftests
authorDesnes A. Nunes do Rosario <desnesn@linux.ibm.com>
Fri, 26 Jun 2020 16:47:37 +0000 (13:47 -0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 3 Sep 2020 09:19:24 +0000 (11:19 +0200)
commit535f69f4217178fd64c03b7b3c1421cfaf3d6e10
tree081ec2e54fdd143bd45ab242791908b9f448a402
parentf515dc79ef81b21e4745bcc79a056a29b8f4c06d
selftests/powerpc: Purge extra count_pmc() calls of ebb selftests

[ Upstream commit 3337bf41e0dd70b4064cdf60acdfcdc2d050066c ]

An extra count on ebb_state.stats.pmc_count[PMC_INDEX(pmc)] is being per-
formed when count_pmc() is used to reset PMCs on a few selftests. This
extra pmc_count can occasionally invalidate results, such as the ones from
cycles_test shown hereafter. The ebb_check_count() failed with an above
the upper limit error due to the extra value on ebb_state.stats.pmc_count.

Furthermore, this extra count is also indicated by extra PMC1 trace_log on
the output of the cycle test (as well as on pmc56_overflow_test):

==========
   ...
   [21]: counter = 8
   [22]: register SPRN_MMCR0 = 0x0000000080000080
   [23]: register SPRN_PMC1  = 0x0000000080000004
   [24]: counter = 9
   [25]: register SPRN_MMCR0 = 0x0000000080000080
   [26]: register SPRN_PMC1  = 0x0000000080000004
   [27]: counter = 10
   [28]: register SPRN_MMCR0 = 0x0000000080000080
   [29]: register SPRN_PMC1  = 0x0000000080000004
>> [30]: register SPRN_PMC1  = 0x000000004000051e
PMC1 count (0x280000546) above upper limit 0x2800003e8 (+0x15e)
[FAIL] Test FAILED on line 52
failure: cycles
==========

Signed-off-by: Desnes A. Nunes do Rosario <desnesn@linux.ibm.com>
Tested-by: Sachin Sant <sachinp@linux.vnet.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200626164737.21943-1-desnesn@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/testing/selftests/powerpc/pmu/ebb/back_to_back_ebbs_test.c
tools/testing/selftests/powerpc/pmu/ebb/cycles_test.c
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_freeze_test.c
tools/testing/selftests/powerpc/pmu/ebb/cycles_with_mmcr2_test.c
tools/testing/selftests/powerpc/pmu/ebb/ebb.c
tools/testing/selftests/powerpc/pmu/ebb/ebb_on_willing_child_test.c
tools/testing/selftests/powerpc/pmu/ebb/lost_exception_test.c
tools/testing/selftests/powerpc/pmu/ebb/multi_counter_test.c
tools/testing/selftests/powerpc/pmu/ebb/multi_ebb_procs_test.c
tools/testing/selftests/powerpc/pmu/ebb/pmae_handling_test.c
tools/testing/selftests/powerpc/pmu/ebb/pmc56_overflow_test.c