From patchwork Wed May 24 16:08:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 9746353 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id DAD526032B for ; Wed, 24 May 2017 16:08:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9344289B6 for ; Wed, 24 May 2017 16:08:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BDCB3289BC; Wed, 24 May 2017 16:08:59 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 72898289B6 for ; Wed, 24 May 2017 16:08:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1030546AbdEXQIz (ORCPT ); Wed, 24 May 2017 12:08:55 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44456 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1030540AbdEXQIp (ORCPT ); Wed, 24 May 2017 12:08:45 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 8C796448D80 for ; Wed, 24 May 2017 16:08:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 8C796448D80 Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx05.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=drjones@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 8C796448D80 Received: from kamzik.brq.redhat.com (kamzik.brq.redhat.com [10.34.1.143]) by smtp.corp.redhat.com (Postfix) with ESMTP id C135991722; Wed, 24 May 2017 16:08:43 +0000 (UTC) From: Andrew Jones To: kvm@vger.kernel.org Cc: pbonzini@redhat.com, rkrcmar@redhat.com, lvivier@redhat.com, thuth@redhat.com Subject: [PATCH kvm-unit-tests 8/8] arm/arm64: apply errata framework to unsafe cpu-on test Date: Wed, 24 May 2017 18:08:18 +0200 Message-Id: <20170524160818.4326-9-drjones@redhat.com> In-Reply-To: <20170524160818.4326-1-drjones@redhat.com> References: <20170524160818.4326-1-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.29]); Wed, 24 May 2017 16:08:45 +0000 (UTC) Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 f1004339b30f..4d64261920c8 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 @@ -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 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 #---------------:-----------------------:--------------------------------------