From patchwork Thu Jun 9 09:04:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580266 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp631107max; Thu, 9 Jun 2022 03:12:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy5zJ/Mt4PLtUNuh6SNv1ZQQoA+ywQVWtcw/YKQpKvBUZsAbQmEgVWO4I4j6t1y7E1QI+kS X-Received: by 2002:ac8:7d88:0:b0:304:ec4a:91b5 with SMTP id c8-20020ac87d88000000b00304ec4a91b5mr16750846qtd.500.1654769570905; Thu, 09 Jun 2022 03:12:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654769570; cv=none; d=google.com; s=arc-20160816; b=oMOlQ1pr5ZStKYfSX0Yx/RpAcTxZ0u1tlC3tavsElZ7D6c7lWQFXjDmWslZTiBDvd2 9r1gyNjt0Kc6vjqjZCGcGlUYUV65tqkrCDufe59MhalTkB8CN8m+R4tlFWEBbdwsCAQz IGJzFVGWqBMfIOefhvnMQ05OqudvyKmoIGHbDTpUzoYmXK2+o/ztKQWoNjcjSUelgYVT 35vd5B0E2ZM9100zQfH9ZzavKh8Rgkkt3iOGE5DnLAV3JRabKtbpjmskgdHvKH7Bi0ow JELopi/7P8m04LvmJEVVnaV1tYogfvELWNX+yeRqrjLqjK8Wy9Tl3QRKFtj3WnXm2vdy sp2w== 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=EUZ/tNvP5WO5oV5qgdTYHUfZb+lkPxFhWBi0KRDzQ54=; b=hlp6bVsL94q5n8VfSesjG/BiquAzuO8GBsASWG3fP2A+ZWSsc177f80WmbgMagLbkI t+Gx4IaRgIxnddioQf1kXb18FctZAbFajeRpDfbP/RdwxRSiUBZHBxRhf0viDxD577p6 hopuHbzsK4ShXE9VPwCTq2G4e8IDfWvQ+bVhRrFoGuruWNhtRGdoQyJhEMF1NOkbUVWh 2WHbLy+DXX1tBNob5MIQN0xqYvnf7L+YKXgBFT+LB1tTotiqOzfGyF/+FsEVjig+Zkmm Lds/W9tFsVxsikRZHL7jt6VKq09olZ0YqnXkJPjd0rvH0+9HCSyj+FwjT9Mbiherd+T1 fKrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=OpoQr7bA; 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 ib13-20020a0562141c8d00b004646640422csi12639679qvb.593.2022.06.09.03.12.50 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jun 2022 03:12:50 -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=OpoQr7bA; 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]:58734 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzF9m-00061a-F5 for patch@linaro.org; Thu, 09 Jun 2022 06:12:50 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39406) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE78-0001Xj-DK for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:06 -0400 Received: from mail-wr1-x429.google.com ([2a00:1450:4864:20::429]:46807) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzE76-0005v7-GQ for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:02 -0400 Received: by mail-wr1-x429.google.com with SMTP id u8so27137454wrm.13 for ; Thu, 09 Jun 2022 02:05:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=EUZ/tNvP5WO5oV5qgdTYHUfZb+lkPxFhWBi0KRDzQ54=; b=OpoQr7bAeWcoudBuNJFoIyB0bBeEnTOXTh5O2Oo/GSnqeByeknfak96HCpU5qNLrVa mCNy+IMhwcj5NUs5vs2VD/bBNlIEM7k197t+JGt2fd9jEoqbDYhYlTV7hOoq6B83WuAt 26NCs/NVhF7VW2un4XXQT2A53kyhtXtmDxV0//YhxpEPYDNw/9f+ca3WUrzp49jyufLX EhYgNP/4ScZlFjVd8KD7pViHdwyh8YNQuPvH0k3+lf6U6GViuiKpn+Kb+9iivTfXbIZE DUZQEvqnJ7GbHUkJGppHZfynaeNRsUB+1L9PoBFJUXgSQ2QQ4ivF/R9FtMdQ6yS5KWIW /0gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=EUZ/tNvP5WO5oV5qgdTYHUfZb+lkPxFhWBi0KRDzQ54=; b=ZLAp3AJX/4h3k0bb1ToU+9rOeT20QUyXFKg0/aurqQ5HV4fj38PJFYy7ZwnxzoPnQX nCBVQMJS52spn+gamLBvnU7GiGSfi8grZVm62YGbV2j7Scfc7bGNuk9qgoueuTfzNdx6 MtEyN+ZTGfz5WfeH+uFTRLutltVhbcIcN0t3DzhCmZ72CT98/N24up7UlE44GhM4IOWQ Sag6HgrnQ+CfIwUO+uOysnK8CpTgPBrQFOvFe6mdAz4Dz8X3JJ2sKKig2JHB7dh4969z 01IehT9T4Kh6ysnFtExhTSRtyJMoiqzqRFrJcnhyAltqBQ97IWNwH3dl2jlBpz/TPOWK fCBQ== X-Gm-Message-State: AOAM530U5h4xuGZMQPMOqgfbD86kegzVkdQwrW+A+3GX+V2rBebkhzy4 4sIBtJBelf+j4ZeI/Y0et2EvtdCLhjY3ng== X-Received: by 2002:a5d:620b:0:b0:210:11d9:770 with SMTP id y11-20020a5d620b000000b0021011d90770mr37269450wru.11.1654765559590; Thu, 09 Jun 2022 02:05:59 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id c13-20020adffb0d000000b002183cf9cd69sm11349796wrr.15.2022.06.09.02.05.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:05:59 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 17/55] target/arm: Move pmsav7_use_background_region to ptw.c Date: Thu, 9 Jun 2022 10:04:59 +0100 Message-Id: <20220609090537.1971756-18-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220609090537.1971756-1-peter.maydell@linaro.org> References: <20220609090537.1971756-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::429; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x429.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" From: Richard Henderson Signed-off-by: Richard Henderson Message-id: 20220604040607.269301-11-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.h | 2 -- target/arm/helper.c | 19 ------------------- target/arm/ptw.c | 21 +++++++++++++++++++++ 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/target/arm/ptw.h b/target/arm/ptw.h index 8d2e2397147..d2d27119082 100644 --- a/target/arm/ptw.h +++ b/target/arm/ptw.h @@ -36,8 +36,6 @@ simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap) bool m_is_ppb_region(CPUARMState *env, uint32_t address); bool m_is_system_region(CPUARMState *env, uint32_t address); -bool pmsav7_use_background_region(ARMCPU *cpu, ARMMMUIdx mmu_idx, bool is_user); - bool get_phys_addr_lpae(CPUARMState *env, uint64_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, bool s1_is_el0, diff --git a/target/arm/helper.c b/target/arm/helper.c index cb23413d8e5..62e48f0925c 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -11678,25 +11678,6 @@ do_fault: return true; } -bool pmsav7_use_background_region(ARMCPU *cpu, ARMMMUIdx mmu_idx, bool is_user) -{ - /* Return true if we should use the default memory map as a - * "background" region if there are no hits against any MPU regions. - */ - CPUARMState *env = &cpu->env; - - if (is_user) { - return false; - } - - if (arm_feature(env, ARM_FEATURE_M)) { - return env->v7m.mpu_ctrl[regime_is_secure(env, mmu_idx)] - & R_V7M_MPU_CTRL_PRIVDEFENA_MASK; - } else { - return regime_sctlr(env, mmu_idx) & SCTLR_BR; - } -} - bool m_is_ppb_region(CPUARMState *env, uint32_t address) { /* True if address is in the M profile PPB region 0xe0000000 - 0xe00fffff */ diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 989e783cce9..b82638b5a06 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -415,6 +415,27 @@ static void get_phys_addr_pmsav7_default(CPUARMState *env, ARMMMUIdx mmu_idx, } } +static bool pmsav7_use_background_region(ARMCPU *cpu, ARMMMUIdx mmu_idx, + bool is_user) +{ + /* + * Return true if we should use the default memory map as a + * "background" region if there are no hits against any MPU regions. + */ + CPUARMState *env = &cpu->env; + + if (is_user) { + return false; + } + + if (arm_feature(env, ARM_FEATURE_M)) { + return env->v7m.mpu_ctrl[regime_is_secure(env, mmu_idx)] + & R_V7M_MPU_CTRL_PRIVDEFENA_MASK; + } else { + return regime_sctlr(env, mmu_idx) & SCTLR_BR; + } +} + static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, hwaddr *phys_ptr, int *prot,