From patchwork Fri Mar 3 14:30:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Jones X-Patchwork-Id: 9603129 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 874E4600CB for ; Fri, 3 Mar 2017 15:25:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A7FA28497 for ; Fri, 3 Mar 2017 15:25:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6F51528502; Fri, 3 Mar 2017 15:25:15 +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 2FA5328497 for ; Fri, 3 Mar 2017 15:25:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751883AbdCCPZC (ORCPT ); Fri, 3 Mar 2017 10:25:02 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58703 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751821AbdCCPY6 (ORCPT ); Fri, 3 Mar 2017 10:24:58 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 26C214E05D; Fri, 3 Mar 2017 14:31:04 +0000 (UTC) Received: from kamzik.brq.redhat.com (kamzik.brq.redhat.com [10.34.1.143]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id v23EUxGA010857; Fri, 3 Mar 2017 09:31:03 -0500 From: Andrew Jones To: kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu Cc: rkrcmar@redhat.com Subject: [PATCH kvm-unit-tests v2 2/2] arm/arm64: psci: support testing tcg Date: Fri, 3 Mar 2017 15:30:57 +0100 Message-Id: <20170303143057.27275-3-drjones@redhat.com> In-Reply-To: <20170303143057.27275-1-drjones@redhat.com> References: <20170303143057.27275-1-drjones@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.38]); Fri, 03 Mar 2017 14:31:04 +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 Signed-off-by: Andrew Jones --- arm/psci.c | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/arm/psci.c b/arm/psci.c index 86f621b4ddba..f1004339b30f 100644 --- a/arm/psci.c +++ b/arm/psci.c @@ -8,12 +8,44 @@ * This work is licensed under the terms of the GNU LGPL, version 2. */ #include +#include #include #include +static bool invalid_function_exception; + +#ifdef __arm__ +static void invalid_function_handler(struct pt_regs *regs __unused) +{ + invalid_function_exception = true; +} +#else +static void invalid_function_handler(struct pt_regs *regs, unsigned int esr __unused) +{ + invalid_function_exception = true; + regs->pc += 4; +} +#endif + +static void install_invalid_function_handler(exception_fn handler) +{ +#ifdef __arm__ + install_exception_handler(EXCPTN_UND, handler); +#else + install_exception_handler(EL1H_SYNC, ESR_EL1_EC_UNKNOWN, handler); +#endif +} + static bool psci_invalid_function(void) { - return psci_invoke(1337, 0, 0, 0) == PSCI_RET_NOT_SUPPORTED; + bool pass; + + install_invalid_function_handler(invalid_function_handler); + + pass = psci_invoke(1337, 0, 0, 0) == PSCI_RET_NOT_SUPPORTED || invalid_function_exception; + + install_invalid_function_handler(NULL); + return pass; } static int psci_affinity_info(unsigned long target_affinity, uint32_t lowest_affinity_level)