From patchwork Thu Jun 9 09:05:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580274 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp647463max; Thu, 9 Jun 2022 03:37:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwzszcwRCOcxbkuxS4jDSgNQ74IPPuYBMGPViUORqGZ/5/ihd/i+3yL0qX1T6fuFFHkWdVi X-Received: by 2002:a05:622a:487:b0:304:fbfc:9933 with SMTP id p7-20020a05622a048700b00304fbfc9933mr10051168qtx.682.1654771034684; Thu, 09 Jun 2022 03:37:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654771034; cv=none; d=google.com; s=arc-20160816; b=CxsGrO4OBCdzUSe0URiyjrURBHI/sZ5b1peKxkX54827YqAmQqfiRcEM77zzdRdwKu 8um/aHyw4gNmyATiLsPCLvD0dkHwtKT3a8ge5Uk3+sapYlswhV6cLdCunOH7D7vnvB0a pFwfiszd+jalxNtRIyctmgg0gg3Ud3VlZWJVtzMPC8Hcb+CFAaNA+qBumeguzkaW6XjL szQM7wxtSxs5eGZd6j51MMIRWVlYh8VprneJawVcSxXjhn4TrA09j4L5z9u62Da8aZPq uCiOMXQ+tYs6v6STqaz3Mn89r83IG+FjREIVUkjbQGFP87Til1iVeiLvVKKGYw75hjAR MX4Q== 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=TD1PLdCagSw5QrlgIXtULFKaHs2aOf+o891C3P6EsSQ=; b=FJ+uqtnVVCKeuO79UwBSN63JWYKAx9zq1kC5m5eBar+zQPLloqtpvuMJjmSRjS47f3 5pgcf4dIwYrcSURnrSi6JZXjZbd8ThKeddyxmDF+UIRstKmmBJatbJ0VezdcZ4AvMlMz 0RofjVBE/RjZZ5dPCz4bpspcNtXRBFvYwZpnanv4xbMrvzQPmpXe5pf3lt3zynS6O9a4 sfnXQbDUfC36RcFtxV01insURWMkSdkx3WYBPZU0K+EzM6Jh1ba/Jw5PEWRlQkPrCHi3 df4YYsxfckRr7txKqPPBpCH19tNNae4I7Gpu/qa/ofglZ9kNGgfwsC9v5QJGBivHOGNs vPEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=j0TKzAGA; 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 z12-20020ac87f8c000000b00305105719dfsi424009qtj.274.2022.06.09.03.37.14 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jun 2022 03:37:14 -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=j0TKzAGA; 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]:47646 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzFXO-0002N8-5v for patch@linaro.org; Thu, 09 Jun 2022 06:37:14 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39514) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE7J-0001Yd-9E for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:18 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:36485) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzE7B-00062j-TP for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:13 -0400 Received: by mail-wr1-x431.google.com with SMTP id o8so3625311wro.3 for ; Thu, 09 Jun 2022 02:06:03 -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=TD1PLdCagSw5QrlgIXtULFKaHs2aOf+o891C3P6EsSQ=; b=j0TKzAGApZF0gBczopLtY9dfGeA9G24MSE6bd8q5WZ9INxwNEVAHb5ZlHlb2uZSqHj xW1dEkkQxA+Pjpn70kE4930ySQsmj784eZdX+9zKcXbkdX/J+oCGP9yJh0Jb+45U5TTd WdhYRBxT3V4ciMpAf6zssDYCn7jV/+D9RgMISVu/oEMzucugWVu5h/Ky5/0WneE2jTrW W/cuOa38nylOvpZomInaEHjnRMisNcMmEnj8K/uaOavJjm+n8y2neZesFlE5owAEICKM LBEXaSGXb1MDMxfHiTT0ljY951MvQ5suLAYj2wdHM72wWc64YfjbpRy6Ti+xu3To5MUG uiww== 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=TD1PLdCagSw5QrlgIXtULFKaHs2aOf+o891C3P6EsSQ=; b=jpTvf9PzjDHsdzThD/XiMOZpdDeiulno3TZE1H4C6MRG+NQizpEY+4eL3FGwefpK+g Rxij+Btq+NKaD4UcSjDwATUjZbvgwT+EPfCeVvUqQeEeDAJ62AvYL8PLh7JbrnG1noGe PRaEs6JWBtQId042Dpq35AjM4Z2OFg46cTH5rKMqM7VN6wWAy1kIh5UshSNRCVk+Bd+H q81MD0DIwBK7BkEv5LtA0BxUdGDrDZGn+HSTCMj/P31tEI7KfBZgJrdH+MON+tQmM0L1 OGuuXm+hRRpCQ4l+wfBtaeufAAwNT9LAkw8jvlWwp1/ZGr2LBU31N8QVr1tmS4eNL8rX 4E3w== X-Gm-Message-State: AOAM530srhmuhIoHuvzbt5NCdmqvyIbeQ+XJhW277+KOubwL7wjBSitY y9TxyUhnUWD+UPLOPpwuNK/7TEE8hUR5yA== X-Received: by 2002:a05:6000:184f:b0:218:555e:6b69 with SMTP id c15-20020a056000184f00b00218555e6b69mr11528701wri.562.1654765562794; Thu, 09 Jun 2022 02:06:02 -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.06.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:06:02 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 20/55] target/arm: Move get_level1_table_address to ptw.c Date: Thu, 9 Jun 2022 10:05:02 +0100 Message-Id: <20220609090537.1971756-21-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::431; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x431.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-14-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.h | 4 ++-- target/arm/helper.c | 26 +------------------------- target/arm/ptw.c | 23 +++++++++++++++++++++++ 3 files changed, 26 insertions(+), 27 deletions(-) diff --git a/target/arm/ptw.h b/target/arm/ptw.h index 6c47a575991..dd6fb93f336 100644 --- a/target/arm/ptw.h +++ b/target/arm/ptw.h @@ -18,11 +18,11 @@ uint64_t arm_ldq_ptw(CPUState *cs, hwaddr addr, bool is_secure, bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx); bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx); +uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn); + ARMCacheAttrs combine_cacheattrs(CPUARMState *env, ARMCacheAttrs s1, ARMCacheAttrs s2); -bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx, - uint32_t *table, uint32_t address); int ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap, int domain_prot); int simple_ap_to_rw_prot_is_user(int ap, bool is_user); diff --git a/target/arm/helper.c b/target/arm/helper.c index d2ef12346b6..a144cb26413 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10482,8 +10482,7 @@ static inline bool regime_translation_big_endian(CPUARMState *env, } /* Return the TTBR associated with this translation regime */ -static inline uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, - int ttbrn) +uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn) { if (mmu_idx == ARMMMUIdx_Stage2) { return env->cp15.vttbr_el2; @@ -10774,29 +10773,6 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64, return prot_rw | PAGE_EXEC; } -bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx, - uint32_t *table, uint32_t address) -{ - /* Note that we can only get here for an AArch32 PL0/PL1 lookup */ - TCR *tcr = regime_tcr(env, mmu_idx); - - if (address & tcr->mask) { - if (tcr->raw_tcr & TTBCR_PD1) { - /* Translation table walk disabled for TTBR1 */ - return false; - } - *table = regime_ttbr(env, mmu_idx, 1) & 0xffffc000; - } else { - if (tcr->raw_tcr & TTBCR_PD0) { - /* Translation table walk disabled for TTBR0 */ - return false; - } - *table = regime_ttbr(env, mmu_idx, 0) & tcr->base_mask; - } - *table |= (address >> 18) & 0x3ffc; - return true; -} - static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs) { /* diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 32ba2e5e8bf..5737a3976b8 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -15,6 +15,29 @@ #include "ptw.h" +static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx, + uint32_t *table, uint32_t address) +{ + /* Note that we can only get here for an AArch32 PL0/PL1 lookup */ + TCR *tcr = regime_tcr(env, mmu_idx); + + if (address & tcr->mask) { + if (tcr->raw_tcr & TTBCR_PD1) { + /* Translation table walk disabled for TTBR1 */ + return false; + } + *table = regime_ttbr(env, mmu_idx, 1) & 0xffffc000; + } else { + if (tcr->raw_tcr & TTBCR_PD0) { + /* Translation table walk disabled for TTBR0 */ + return false; + } + *table = regime_ttbr(env, mmu_idx, 0) & tcr->base_mask; + } + *table |= (address >> 18) & 0x3ffc; + return true; +} + static bool get_phys_addr_v5(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, hwaddr *phys_ptr, int *prot,