From nobody Tue Feb 10 19:50:17 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1593142403; cv=none; d=zohomail.com; s=zohoarc; b=Etsr6bkxD29RS73zvqre5+1opUaW4fo2fgg1I7Er794LLdHdpk2Yx96KrS/ijDSwzYcKpHEqCK8yS7c1YvmITf7Vff/nlgrFjzOq7YLolX/HfzmL5T8x5k6si+jYAjZzLkIEqOQiuOMXoF+wiNfOiHku0SsiBysJznYKNPibRp4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1593142403; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=UZWgT5KzsbdnnIQS6h1nh35owoxC0Bf2W5wbwlUKiR4=; b=kwpptLI3iOcp2J2q/BvMredP2GEPZuMWb89ChJTd+saOH1fPIE/7XWplFFrZMu50vl833SbcCK3S5XLlvitLMxh87wbbJoRxQb4Y6rzRwwkcxa4c+FKJ26V+FGuE9+OhVMUuBB/0oObeo6WCluEYWb6iLwCV8Oepo5AMniEcGEo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159314240392271.13656111313253; Thu, 25 Jun 2020 20:33:23 -0700 (PDT) Received: from localhost ([::1]:57840 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jof7C-00026u-GM for importer@patchew.org; Thu, 25 Jun 2020 23:33:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jof5k-0007gd-Ca for qemu-devel@nongnu.org; Thu, 25 Jun 2020 23:31:52 -0400 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]:41145) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jof5i-0001hw-Rz for qemu-devel@nongnu.org; Thu, 25 Jun 2020 23:31:52 -0400 Received: by mail-pf1-x441.google.com with SMTP id q17so4053070pfu.8 for ; Thu, 25 Jun 2020 20:31:50 -0700 (PDT) Received: from localhost.localdomain (174-21-143-238.tukw.qwest.net. [174.21.143.238]) by smtp.gmail.com with ESMTPSA id y27sm1605256pgc.56.2020.06.25.20.31.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 25 Jun 2020 20:31:48 -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=UZWgT5KzsbdnnIQS6h1nh35owoxC0Bf2W5wbwlUKiR4=; b=umlJJTd80Zwe+YUzQlau5Iu6kwFEOCcslmhxU/MxyCJwjb9dBAMEYRyfZyld4F9CzB IP1jUasoKi7T6uyI3bJ3i4FpTSkC/fj4IDNMdWM8oR5fgymCahj/ebfpKTOQjNp4FALJ aWAdoJye91pQctFbRIq7Lx3Nx8K4zut9sNtyV2rrckswz1kgE2WMVEjuptlDmYaxxFq1 rwDAT3guU4GHQSOdH7N0d6ZvvOsxVCp9Te/jyxD2mYNTBZbgNmhFGN+dgS4TKY6w8Pvh hMIY/UDpKv+q02Ed2rfFlAuERPz2QcLFLAumXWdRQ5vy2LwZRG8nOamolYaQrsB3rWPK bvWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=UZWgT5KzsbdnnIQS6h1nh35owoxC0Bf2W5wbwlUKiR4=; b=hIeD40cu3HkMtTte0T3hrfVJ3IwP6ZNmCtqDS6mXC4dGa/98w9kqlKiO2pQ6Pa+euL KeNvuSGjbpdOkUNGRMOzs8gCRxIqh/tB0uVuGb/s2kvdJlgW8uiXs1vsD2ql6q0Hfe76 o6Z9G9FS8fbjzpV1PHfv98GH5TPdUZ0UbwJbAgXX84Eis0psJLh2yh5UPVSKT4z9p3VC kBGAFL6/oufg9Y6Tzz8Re7Otl3R/TO6uEL1RFc3YMEGKoeL8i1VR2ZEbgn9Hl0ZN6dpr n6A3pSX7E0xWXQPS/CMJMOBY6pXutF4N4ikIo8VnsC8rh3YMiQKJY9/+GN9e/WwkA2sQ GuqA== X-Gm-Message-State: AOAM530dyHvPxl81vgwGmZT3UCuEx/mWTgA4PQqZt44GK38rJvwV0UxG CUIqBBXhltxyTjhWRjyg4LsidjLHGOU= X-Google-Smtp-Source: ABdhPJzRU2VjstwHQwKIlPfOlHeUQnX7olz54QMtR514+mLmSnyMshzH3uqwOKfdx3vs4l9Yi1/84g== X-Received: by 2002:a63:7cf:: with SMTP id 198mr894357pgh.309.1593142309227; Thu, 25 Jun 2020 20:31:49 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Subject: [PATCH v9 02/46] target/arm: Improve masking of SCR RES0 bits Date: Thu, 25 Jun 2020 20:31:00 -0700 Message-Id: <20200626033144.790098-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200626033144.790098-1-richard.henderson@linaro.org> References: <20200626033144.790098-1-richard.henderson@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::441; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x441.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, qemu-arm@nongnu.org, david.spickett@linaro.org, steplong@quicinc.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Protect reads of aa64 id registers with ARM_CP_STATE_AA64. Use this as a simpler test than arm_el_is_aa64, since EL3 cannot change mode. Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson --- target/arm/helper.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/arm/helper.c b/target/arm/helper.c index 972a766730..a29f0a28d8 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -2011,9 +2011,16 @@ static void scr_write(CPUARMState *env, const ARMCPR= egInfo *ri, uint64_t value) uint32_t valid_mask =3D 0x3fff; ARMCPU *cpu =3D env_archcpu(env); =20 - if (arm_el_is_aa64(env, 3)) { + if (ri->state =3D=3D ARM_CP_STATE_AA64) { value |=3D SCR_FW | SCR_AW; /* these two bits are RES1. */ valid_mask &=3D ~SCR_NET; + + if (cpu_isar_feature(aa64_lor, cpu)) { + valid_mask |=3D SCR_TLOR; + } + if (cpu_isar_feature(aa64_pauth, cpu)) { + valid_mask |=3D SCR_API | SCR_APK; + } } else { valid_mask &=3D ~(SCR_RW | SCR_ST); } @@ -2032,12 +2039,6 @@ static void scr_write(CPUARMState *env, const ARMCPR= egInfo *ri, uint64_t value) valid_mask &=3D ~SCR_SMD; } } - if (cpu_isar_feature(aa64_lor, cpu)) { - valid_mask |=3D SCR_TLOR; - } - if (cpu_isar_feature(aa64_pauth, cpu)) { - valid_mask |=3D SCR_API | SCR_APK; - } =20 /* Clear all-context RES0 bits. */ value &=3D valid_mask; --=20 2.25.1