From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Jones Subject: [PATCH kvm-unit-tests v3 9/9] arm/arm64: apply errata framework to unsafe cpu-on test Date: Tue, 13 Jun 2017 13:54:51 +0200 Message-ID: <20170613115451.6240-10-drjones@redhat.com> References: <20170613115451.6240-1-drjones@redhat.com> Cc: rkrcmar@redhat.com, pbonzini@redhat.com, lvivier@redhat.com, thuth@redhat.com To: kvm@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:38018 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752515AbdFMLzN (ORCPT ); Tue, 13 Jun 2017 07:55:13 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0779530312C for ; Tue, 13 Jun 2017 11:55:13 +0000 (UTC) In-Reply-To: <20170613115451.6240-1-drjones@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: With the unsafe subtest guarded by an erratum we no longer need nodefault. Signed-off-by: Andrew Jones --- 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 +#include #include #include #include @@ -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