With the unsafe subtest guarded by an erratum we no longer need
nodefault.
Signed-off-by: Andrew Jones <drjones@xxxxxxxxxx>
---
arm/psci.c | 7 ++++++-
arm/unittests.cfg | 2 +-
errata.txt | 1 +
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/arm/psci.c b/arm/psci.c
index 4e6bc58dbe42..5cb4d5c7c233 100644
--- a/arm/psci.c
+++ b/arm/psci.c
@@ -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>
@@ -135,7 +136,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
diff --git a/arm/unittests.cfg b/arm/unittests.cfg
index 4fc90eef91db..73a2419fefe6 100644
--- a/arm/unittests.cfg
+++ b/arm/unittests.cfg
@@ -108,4 +108,4 @@ groups = gic
[psci]
file = psci.flat
smp = $MAX_SMP
-groups = nodefault,psci
+groups = psci
diff --git a/errata.txt b/errata.txt
index 682d7aa067b9..5608a308ce7c 100644
--- a/errata.txt
+++ b/errata.txt
@@ -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
#---------------:-----------------------:--------------------------------------
--
2.9.4
