From patchwork Tue Jun 7 20:32:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 579323 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp5491977max; Tue, 7 Jun 2022 13:37:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzJ3a+scbn9nmCwGhpIpxtAIugV19dpTheVAqzfj760IpKxM5fmy9HATiflDfya7b9N7D+0 X-Received: by 2002:ac8:5c0d:0:b0:302:a8ce:2093 with SMTP id i13-20020ac85c0d000000b00302a8ce2093mr24135731qti.653.1654634267106; Tue, 07 Jun 2022 13:37:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654634267; cv=none; d=google.com; s=arc-20160816; b=lvr7AvymbHyJZhLv4BEAsrhSadiOE14Vv+q67ssdWUi922bSHMDiYXLPXJfHjRhJ7A JIDW9zeaCBLvxXjxEhedXYRejsjtnUiaPkf+ju/LVf6tOOhb5O99xWltJf6PVP2I6uiA bOced6CCGovoriAutZRQ8osrvl3EfFIhS2iPIubyu3vzDdDgQbsepkgYkZvsMJxI+JYp e1zopT9kC80ZA8gkpljd9nCaRcA0aI7bbK2AJsD8TnEpxS4HIOn4XlVC0qKbJJKySr69 SVFQbJWvmQnfYa0EQnHGICxfMkTMyZSHpnsugB4gSXnAPt+Y6vHoLQr+4BiqSUcddegQ 28Vg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=swxajT381TgS1/Nf3oQ+qlH3g7Wj94ec884EPLSXaF4=; b=IDidSiEgFHhU0mXpJeEV2iCHKukrPacXNrG7dcRHVmGAHhQeMNkAtuR8vgUiL84wAg 6K8MwtTrTDMD3Ar0XvM/vErDWJzlW24mBZnfYnqFE30VDKnDFbJXhO/7WMVnkcXGs0o5 3bFsWOhATcjhmzg6HESGNymkkn45nY+JFSoQX91FUqHw9nrk4LyqHqwrWFhlHOUq27Bc CND6H9Nk0ZFG9QoQj74smyVkRtueDtiqTbGsSWGmoXQFhkPoZCEEWUZS7b3/t8I3M0rV uqBInKhWF4z5tsF0G1J6fHCUHeENo5Fwtr5T3loCNcv+5SbALtGPJcEj4ZAZ03TQ03Fv +ZCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n1DpIQ/L"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id n12-20020a05622a11cc00b00304fb04cb9esi1436471qtk.299.2022.06.07.13.37.47 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Jun 2022 13:37:47 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="n1DpIQ/L"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:49462 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nyfxS-0005Vq-NA for patch@linaro.org; Tue, 07 Jun 2022 16:37:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nyftB-0007RQ-Dn for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:33:21 -0400 Received: from mail-pj1-x102d.google.com ([2607:f8b0:4864:20::102d]:46970) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nyft6-0007EG-6o for qemu-devel@nongnu.org; Tue, 07 Jun 2022 16:33:21 -0400 Received: by mail-pj1-x102d.google.com with SMTP id k5-20020a17090a404500b001e8875e6242so5675660pjg.5 for ; Tue, 07 Jun 2022 13:33:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=swxajT381TgS1/Nf3oQ+qlH3g7Wj94ec884EPLSXaF4=; b=n1DpIQ/LMVvrHA7TxsZMtqrtiALLahHuP9JVkFGEowc7tRrlaYPvxF4UgSRTkYyo4a gWjC+qX4Pl3A0ZXRdO9nHtBA+4Gtmb3ELx8CKd2tWsBdoTYGABfltN7xLfMR4lAJtxf7 H61D3ix54qmq2gVqgaYmogV2ABu6odj0bir6m+yrkq1OcX7V6KhvjJ9wL7k6OZH+Qfmn 5QlpJhDmf38sLEnkIE7lgx/pAvqCY7d4Aek4hUoPcU5bL74RIdwNm5R0H4NAsp6FtNZ3 F9AQCU9H325+VFZGay/wuDOZRVFvjfc+vj29+O3u4CfBwx0MAjhWZg/oUnrsyxzFfxmy BUzw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=swxajT381TgS1/Nf3oQ+qlH3g7Wj94ec884EPLSXaF4=; b=Mk9QI3Xc7sM11hFBrzcWz2CundORfe/Lb70HFyjKHW8DpjG3Uu9UiKjwXGvMKJyU+0 2tL2LjUqiLpgEedVVlaNprCEmlUmcg+cicQLes1xIoLkk85cAdUGoqT/z7IBq3ARkgc8 1vE9irCaJfhmfJTPil/wPe0jcPQ1tQoTL0/PAVzzU3TqVIQ4ZpeXQqpqZOn/hGWXjL+4 inDKk1z2vTTAngzr90tuqpbNTpNr3jjl6WtRDL3rtCBqqu62WT7NwPhw/OBsWBBUdCAX rTZLh+r84ADQXPRvMWsTpiNIfQESQfcDV3UMqsrMq+y37fq3WMN3Sg5xepHXtMk97dws l0Rw== X-Gm-Message-State: AOAM530zgXuHZs3I81J3BdhgzZgPC6T1+8QGGSvLnhnRPA4lssuQPH2u FswXeGRigS7oMawsvFIQHXKzWj9ezJhebg== X-Received: by 2002:a17:90b:1b01:b0:1e3:421c:90f with SMTP id nu1-20020a17090b1b0100b001e3421c090fmr41869910pjb.59.1654633993906; Tue, 07 Jun 2022 13:33:13 -0700 (PDT) Received: from stoup.. ([2602:ae:1547:e101:3cf2:c634:5b19:25f6]) by smtp.gmail.com with ESMTPSA id s22-20020a17090aba1600b001d9780b7779sm4227856pjr.15.2022.06.07.13.33.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jun 2022 13:33:13 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org Subject: [PATCH v2 07/71] target/arm: Use el_is_in_host for sve_exception_el Date: Tue, 7 Jun 2022 13:32:02 -0700 Message-Id: <20220607203306.657998-8-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220607203306.657998-1-richard.henderson@linaro.org> References: <20220607203306.657998-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::102d; envelope-from=richard.henderson@linaro.org; helo=mail-pj1-x102d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The ARM pseudocode function CheckNormalSVEEnabled uses this predicate now, and I think it's a bit clearer. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/helper.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 135c3e790c..7319c91fc2 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -6180,9 +6180,7 @@ static const ARMCPRegInfo minimal_ras_reginfo[] = { int sve_exception_el(CPUARMState *env, int el) { #ifndef CONFIG_USER_ONLY - uint64_t hcr_el2 = arm_hcr_el2_eff(env); - - if (el <= 1 && (hcr_el2 & (HCR_E2H | HCR_TGE)) != (HCR_E2H | HCR_TGE)) { + if (el <= 1 && !el_is_in_host(env, el)) { switch (FIELD_EX64(env->cp15.cpacr_el1, CPACR_EL1, ZEN)) { case 1: if (el != 0) { @@ -6199,6 +6197,7 @@ int sve_exception_el(CPUARMState *env, int el) * CPTR_EL2 changes format with HCR_EL2.E2H (regardless of TGE). */ if (el <= 2) { + uint64_t hcr_el2 = arm_hcr_el2_eff(env); if (hcr_el2 & HCR_E2H) { switch (FIELD_EX64(env->cp15.cptr_el[2], CPTR_EL2, ZEN)) { case 1: