@@ -8,6 +8,7 @@
* This work is licensed under the terms of the GNU LGPL, version 2.
*/
#include <libcflat.h>
+#include <errata.h>
#include <asm/processor.h>
#include <asm/smp.h>
#include <asm/psci.h>
@@ -136,7 +137,11 @@ int main(void)
report("invalid-function", psci_invalid_function());
report("affinity-info-on", psci_affinity_info_on());
report("affinity-info-off", psci_affinity_info_off());
- report("cpu-on", psci_cpu_on_test());
+
+ if (ERRATA(6c7a5dce22b3))
+ report("cpu-on", psci_cpu_on_test());
+ else
+ report_skip("Skipping unsafe cpu-on test. Set ERRATA_6c7a5dce22b3=y to enable.");
done:
#if 0
@@ -108,4 +108,4 @@ groups = gic
[psci]
file = psci.flat
smp = $MAX_SMP
-groups = nodefault,psci
+groups = psci
@@ -3,4 +3,5 @@
# 12 hex digits : version :
#---------------:-----------------------:--------------------------------------
9e3f7a296940 : 4.9 : arm64: KVM: pmu: Fix AArch32 cycle counter access
+6c7a5dce22b3 : 4.12 : KVM: arm/arm64: fix races in kvm_psci_vcpu_on
#---------------:-----------------------:--------------------------------------
With the unsafe subtest guarded by an erratum we no longer need nodefault. Signed-off-by: Andrew Jones <drjones@redhat.com> --- arm/psci.c | 7 ++++++- arm/unittests.cfg | 2 +- errata.txt | 1 + 3 files changed, 8 insertions(+), 2 deletions(-)