From patchwork Fri Jul 14 15:46:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 702738 Delivered-To: patch@linaro.org Received: by 2002:adf:db4e:0:b0:314:25da:8dc4 with SMTP id f14csp1162111wrj; Fri, 14 Jul 2023 08:49:53 -0700 (PDT) X-Google-Smtp-Source: APBJJlGcG4MU37bgDeLyMIth1hwPgRSaYLwJ12Mwtaae7jOOmEqiaxtwvl1cq1StRwYysOOsGCxR X-Received: by 2002:a05:620a:199c:b0:75b:23a1:d847 with SMTP id bm28-20020a05620a199c00b0075b23a1d847mr3986776qkb.9.1689349793203; Fri, 14 Jul 2023 08:49:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689349793; cv=none; d=google.com; s=arc-20160816; b=R1HjucqxKntBX9ydqzBiGpI+KZ9zzrjEiFk+nXqNBiRhcINsJJmrXxIqmR7PtJy6Zn bvKLbeZ80WysB380jAQTSeFyRlK6i9eZBuazIYE14eWpXmx7lYTw7czT/yhUOcwL7vMI cfmI9/CsGaszUOHtLHC5CqVx+ipn+pXK3s2M2j+wwWHbohHS2udE9oqG5DDNQOUeJzOK jY+DFm/ui+U6QuA2b8+gCj5X3aBKF8HDJ++CqLzm1gOY2xPaelok6IW4uV2GcKAkpxnp cM4w+p96cRdtxVgQpleWEBbMQUDgmYTGEGoDbwkcMa2KM8UsyAEBv9WQQhpOsUlxWMhX Hwsw== 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:to:from :dkim-signature; bh=q234a2QZpJLMfs9OiY+sBy9QxJhtbu9OJpiuspwmwC0=; fh=jvpdohKmRoZMO537s6xMKXXtj7EZws1LOMQI/oP4vXs=; b=DXKj7vhtGO30cn4/PnG40ZN1b1Rs4rN/lJ6zFUu5TyyrAHRSafSfmt/5Fxb6Zi92/S NhxG+UVx2Py5i5yuergBFrspidfhCv11NobOf3cYKRFV9iY7+Wk0Vd47nHYKlZF8XWbn cCwHFiA6p79GbLStV0ER5zqiL39bhT7riQRhBBwrW9FFXAljpL5kvZUv0ecWB6dOH5uT kJBRZvDAQNqgYIMnVFPyG/XozqFo/En87IhskyfobT/Pzu5Z8DSagOG+QTXWXjX5xC41 IH8Y9FnJjuVgsEA4w/22XhSmgOGwYlAg/x8q+0aZJ6IgRmX9FujhLfehfHT5vI2F05LV t4BA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=d2aC1z2Z; 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 v3-20020a05620a0f0300b00767171dcc63si4875105qkl.102.2023.07.14.08.49.53 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 14 Jul 2023 08:49:53 -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=d2aC1z2Z; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qKL0W-0007EX-Fx; Fri, 14 Jul 2023 11:47:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qKL0T-0007Bx-MK for qemu-devel@nongnu.org; Fri, 14 Jul 2023 11:46:57 -0400 Received: from mail-wr1-x436.google.com ([2a00:1450:4864:20::436]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qKL0Q-00075W-Tz for qemu-devel@nongnu.org; Fri, 14 Jul 2023 11:46:57 -0400 Received: by mail-wr1-x436.google.com with SMTP id ffacd0b85a97d-3141fa31c2bso2079794f8f.2 for ; Fri, 14 Jul 2023 08:46:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1689349613; x=1691941613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=q234a2QZpJLMfs9OiY+sBy9QxJhtbu9OJpiuspwmwC0=; b=d2aC1z2ZaBNfrHagpI5ykhHUHfLkGTs7pI7ZAVr4J6GYf+GMKRE3csszuOfAMlLI/8 WBqYtP/2M2/QAOash/c6f/XJv0e1pjdkCmHPk3xVYdwhjnijme8wlDpda+NR43ZfRSv4 45aNRH1yfc1gwv6xxPdJiVChYWt8j0eMjVmROb+atuC5KA760pZXurrRpY7AWCpBA23x XTSUqFQ0zt0hbWfK8C7lLHvEI8Eai71WTJ3HhcN6EjivEja6Fl3Bg9AsfycK2wpTlc8v szBpPiNQ2SSEUQHO2BFv6ZjvBGXv+73wA1U916TGSOzvUU3vXajomy6/qKHGCXlaXgQa 8BjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689349613; x=1691941613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=q234a2QZpJLMfs9OiY+sBy9QxJhtbu9OJpiuspwmwC0=; b=F/nH9pZGTwfGLLwgEMrzYZi3zSIJoYJqNPkxdpaccespMontQ86l/N+CvnBNVxGquo 9hYToAIg3a6eMTDSJvBYnJYwCMgty4MCWvbl0/H2sbNcHRnYSle3O1x7zRCUCZ+5JspV /Xq20hPNbRUKC8YrnUFTwFRRhuyW+UJXC7yiyzpcvGzEZe+ibm6ZhFiMiXykeE0u6wlS VCftEs7Y0viM+nQoSfSjgDZzijzFMRai5y0+Hi5PpCyApv3/TK3lIqxFVeVEUJCeBnma uPEXrEYv9tW4xXa5d8zs43A2BQWEjAth8DU4gQPBgrQLCWq8uXZfd3J4pcAx4yTUNh4M h5Aw== X-Gm-Message-State: ABy/qLYCIOqhWn0g1qQnzxcUZa94XEKpoQXgECocs9RHKn8xrPBe1m1w XAnKARXg2i9+5T5XdWqoQkITJA== X-Received: by 2002:a5d:6046:0:b0:313:ef08:c83b with SMTP id j6-20020a5d6046000000b00313ef08c83bmr4859404wrt.56.1689349613385; Fri, 14 Jul 2023 08:46:53 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id t16-20020a5d49d0000000b003143bb5ecd5sm11214025wrs.69.2023.07.14.08.46.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 14 Jul 2023 08:46:53 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Subject: [PATCH 05/14] target/arm/ptw: Pass ARMSecurityState to regime_translation_disabled() Date: Fri, 14 Jul 2023 16:46:39 +0100 Message-Id: <20230714154648.327466-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230714154648.327466-1-peter.maydell@linaro.org> References: <20230714154648.327466-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::436; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x436.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-bounces+patch=linaro.org@nongnu.org Plumb the ARMSecurityState through to regime_translation_disabled() rather than just a bool is_secure. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/ptw.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index a873fbe0239..63dd8e3cbe1 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -206,9 +206,10 @@ static uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn) /* Return true if the specified stage of address translation is disabled */ static bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx, - bool is_secure) + ARMSecuritySpace space) { uint64_t hcr_el2; + bool is_secure = arm_space_is_secure(space); if (arm_feature(env, ARM_FEATURE_M)) { switch (env->v7m.mpu_ctrl[is_secure] & @@ -2057,9 +2058,8 @@ static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t base; ARMMMUIdx mmu_idx = ptw->in_mmu_idx; bool is_user = regime_is_user(env, mmu_idx); - bool is_secure = arm_space_is_secure(ptw->in_space); - if (regime_translation_disabled(env, mmu_idx, is_secure)) { + if (regime_translation_disabled(env, mmu_idx, ptw->in_space)) { /* MPU disabled. */ result->f.phys_addr = address; result->f.prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -2231,7 +2231,7 @@ static bool get_phys_addr_pmsav7(CPUARMState *env, result->f.lg_page_size = TARGET_PAGE_BITS; result->f.prot = 0; - if (regime_translation_disabled(env, mmu_idx, secure) || + if (regime_translation_disabled(env, mmu_idx, ptw->in_space) || m_is_ppb_region(env, address)) { /* * MPU disabled or M profile PPB access: use default memory map. @@ -2475,7 +2475,8 @@ bool pmsav8_mpu_lookup(CPUARMState *env, uint32_t address, * are done in arm_v7m_load_vector(), which always does a direct * read using address_space_ldl(), rather than going via this function. */ - if (regime_translation_disabled(env, mmu_idx, secure)) { /* MPU disabled */ + if (regime_translation_disabled(env, mmu_idx, arm_secure_to_space(secure))) { + /* MPU disabled */ hit = true; } else if (m_is_ppb_region(env, address)) { hit = true; @@ -3303,7 +3304,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, */ ptw->in_mmu_idx = mmu_idx = s1_mmu_idx; if (arm_feature(env, ARM_FEATURE_EL2) && - !regime_translation_disabled(env, ARMMMUIdx_Stage2, is_secure)) { + !regime_translation_disabled(env, ARMMMUIdx_Stage2, ptw->in_space)) { return get_phys_addr_twostage(env, ptw, address, access_type, result, fi); } @@ -3362,7 +3363,7 @@ static bool get_phys_addr_nogpc(CPUARMState *env, S1Translate *ptw, /* Definitely a real MMU, not an MPU */ - if (regime_translation_disabled(env, mmu_idx, is_secure)) { + if (regime_translation_disabled(env, mmu_idx, ptw->in_space)) { return get_phys_addr_disabled(env, ptw, address, access_type, result, fi); }