From patchwork Thu Jul 14 13:22: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: 590383 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5817:0:0:0:0 with SMTP id j23csp1581349max; Thu, 14 Jul 2022 06:32:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sZi2r3F6acfQ1SmFquGG3fOpmH0W84/maGBvmnyzN4XLkBLy73+TAb84doQGtH0FdZhRtd X-Received: by 2002:a0c:df0c:0:b0:472:fbf6:7ab4 with SMTP id g12-20020a0cdf0c000000b00472fbf67ab4mr7503856qvl.30.1657805577419; Thu, 14 Jul 2022 06:32:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657805577; cv=none; d=google.com; s=arc-20160816; b=kyKe/xs5o3dNdEtc+doR0VjPBo3lcCL4yLfBr2W7tVlNnX68cawDwius0tgCd7f5hv ZKZOdx6IoNFgUXB9vs2pgSeilUcoc9VXvYPvI/xK04p6DAX2aJz7TFQ3WpyXvGd1WmdW gl47u8YjjbeNMSkLLTkCXslv9TNtHVOBvvT0sCwTvqcxusgs4wf6VlwAgbrF6teut8zc dr9GmoeaBf9wyG4jg3iUogUzgLgZUEUvuNdnVr49URZV7NfckvXYTBILgJjm8EmRBcid jqJsfGdVc0/SmPRsSghzfCNv1b8o+Y13Pq+91rdXJyvtUvDtskrrm5mUD6LX76mBvUpR 5GPw== 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=8lzArpcOjZMSjl2m0I/x5eGooz1zUQPNck3NBcXjI1Q=; b=CBMUVssNpsJLowwzPkmpvt9uPJDF4eWDz2BVBfPqW+ra0isOlXCRBW2flWjNPrMn1v UBx3CajzQW0/x36tdmdfYem5qjDQlVP7qvkgFG2GUsFISWZrar5zZCwiqkj/cXzNw1PX GVuQvv1dlwLbIx59dNlkv+bjYYjxchpNHud9PzLp15LXRhy/tQooHuVYhsZmyUiTbnlX WNebLOa38tB7xb/VaSVPjFW4cVIrAJgclQhzbcXGk7If0mgoOQRvVraO1Q0OTREVgCq/ lmei/AeB/pt8YdX0whFbx3XuHrS69cMQg4ltp78Mfl++8Wauqxc6zTviDUWXpgLOKlFM 10vg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=BrjAqag8; 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 bl7-20020a05622a244700b0031ece085783si1040255qtb.20.2022.07.14.06.32.57 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 14 Jul 2022 06:32:57 -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=BrjAqag8; 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]:42540 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oByxc-0000l6-Ub for patch@linaro.org; Thu, 14 Jul 2022 09:32:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45846) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oByoC-0002F8-6L for qemu-devel@nongnu.org; Thu, 14 Jul 2022 09:23:12 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:52028) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oByo9-0004oW-Qt for qemu-devel@nongnu.org; Thu, 14 Jul 2022 09:23:11 -0400 Received: by mail-wm1-x335.google.com with SMTP id ay25so1042546wmb.1 for ; Thu, 14 Jul 2022 06:23:09 -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=8lzArpcOjZMSjl2m0I/x5eGooz1zUQPNck3NBcXjI1Q=; b=BrjAqag8TfFNwDzjmNFumQ1LZsQKKQxNXdNLUcOPxo3ikfcVsnyPrrvXI48DZoW9I7 F7dPUeBpLgJbz+qdd+yhFvkw6+mrQ9sNMFLJ6P21mKtAHF6/GxT5lbUkyivqDiTpeOBi TzJD9Us0kxNRkz7KST5IU67ljwV8Pkof1gNF/9fsKF+TIh2rjm9YT9woULMvC4giMhXm P+k8v9jI6jLozWyF4+y2/vbDUqinGYBXfuIheRn6BybhQp3QtqKEIOSsHrfI4TIEDStp uAbdvnIDCkGDw2UKEBThIsFVyIt0Ly1zFnHgEqnoGKBWLYEn3vi6p7g7JWiIcvbI/00K Hzpw== 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=8lzArpcOjZMSjl2m0I/x5eGooz1zUQPNck3NBcXjI1Q=; b=qwOE6AkSBFrmdK901Hi/PZ1XZursXEhe6S28GucwcCgC4EiWSocLJ218soX4rv2cQi 2pMpA4/9ey8jnHu6OPbjk0P65pOut7ifLN0kgDXWZAG7YI8u4h+vggw1jrlyDEpeCaw9 i/cyVjLE5nhQVWmd9Cm8B/mrP6A4KpP0YU7QhDMhYHyKbgit5NSf+eboSlDr0dInA+XM d+156Jhx4/dyjWP3xxs255zrxTkuaWz7BS1/dCr7q8nrLRdmN1eACYvPOWqPDMQ92odt +B05Mu4TeJMgbUnJ7Tdb+pEoCVO2NrEBjnQ5FlmZarc0xDjoVOaRjSzJRuKVAsnes/zh PXrQ== X-Gm-Message-State: AJIora+sQoR3W82Pw1j7ziQnLmAwFWTz0G5uQsqtH9c5MveBA6FVWBWa t1oyrgqvPmF7iMXP4dmyHofbpg== X-Received: by 2002:a1c:4487:0:b0:3a2:fb76:7981 with SMTP id r129-20020a1c4487000000b003a2fb767981mr8703283wma.98.1657804988565; Thu, 14 Jul 2022 06:23:08 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id k11-20020a7bc40b000000b0039c5cecf206sm1925079wmi.4.2022.07.14.06.23.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Jul 2022 06:23:08 -0700 (PDT) From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: Idan Horowitz Subject: [PATCH 3/7] target/arm: Fold regime_tcr() and regime_tcr_value() together Date: Thu, 14 Jul 2022 14:22:59 +0100 Message-Id: <20220714132303.1287193-4-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220714132303.1287193-1-peter.maydell@linaro.org> References: <20220714132303.1287193-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x335.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 only caller of regime_tcr() is now regime_tcr_value(); fold the two together, and use the shorter and more natural 'regime_tcr' name for the new function. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson --- target/arm/internals.h | 16 +++++----------- target/arm/helper.c | 6 +++--- target/arm/ptw.c | 6 +++--- target/arm/tlb_helper.c | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) diff --git a/target/arm/internals.h b/target/arm/internals.h index fa046124fa8..0a1eb20afce 100644 --- a/target/arm/internals.h +++ b/target/arm/internals.h @@ -777,26 +777,20 @@ static inline uint64_t regime_sctlr(CPUARMState *env, ARMMMUIdx mmu_idx) return env->cp15.sctlr_el[regime_el(env, mmu_idx)]; } -/* Return the TCR controlling this translation regime */ -static inline TCR *regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx) +/* Return the value of the TCR controlling this translation regime */ +static inline uint64_t regime_tcr(CPUARMState *env, ARMMMUIdx mmu_idx) { if (mmu_idx == ARMMMUIdx_Stage2) { - return &env->cp15.vtcr_el2; + return env->cp15.vtcr_el2.raw_tcr; } if (mmu_idx == ARMMMUIdx_Stage2_S) { /* * Note: Secure stage 2 nominally shares fields from VTCR_EL2, but * those are not currently used by QEMU, so just return VSTCR_EL2. */ - return &env->cp15.vstcr_el2; + return env->cp15.vstcr_el2.raw_tcr; } - return &env->cp15.tcr_el[regime_el(env, mmu_idx)]; -} - -/* Return the raw value of the TCR controlling this translation regime */ -static inline uint64_t regime_tcr_value(CPUARMState *env, ARMMMUIdx mmu_idx) -{ - return regime_tcr(env, mmu_idx)->raw_tcr; + return env->cp15.tcr_el[regime_el(env, mmu_idx)].raw_tcr; } /** diff --git a/target/arm/helper.c b/target/arm/helper.c index b45c81c714c..3d4317c4c85 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -4216,7 +4216,7 @@ static int vae1_tlbmask(CPUARMState *env) static int tlbbits_for_regime(CPUARMState *env, ARMMMUIdx mmu_idx, uint64_t addr) { - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); int tbi = aa64_va_parameter_tbi(tcr, mmu_idx); int select = extract64(addr, 55, 1); @@ -10158,7 +10158,7 @@ static int aa64_va_parameter_tcma(uint64_t tcr, ARMMMUIdx mmu_idx) ARMVAParameters aa64_va_parameters(CPUARMState *env, uint64_t va, ARMMMUIdx mmu_idx, bool data) { - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); bool epd, hpd, using16k, using64k, tsz_oob, ds; int select, tsz, tbi, max_tsz, min_tsz, ps, sh; ARMCPU *cpu = env_archcpu(env); @@ -10849,7 +10849,7 @@ static CPUARMTBFlags rebuild_hflags_a64(CPUARMState *env, int el, int fp_el, { CPUARMTBFlags flags = {}; ARMMMUIdx stage1 = stage_1_mmu_idx(mmu_idx); - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); uint64_t sctlr; int tbii, tbid; diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 16226d14233..e9959848d88 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -315,7 +315,7 @@ 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 */ - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); int maskshift = extract32(tcr, 0, 3); uint32_t mask = ~(((uint32_t)0xffffffffu) >> maskshift); uint32_t base_mask; @@ -824,7 +824,7 @@ static int get_S1prot(CPUARMState *env, ARMMMUIdx mmu_idx, bool is_aa64, static ARMVAParameters aa32_va_parameters(CPUARMState *env, uint32_t va, ARMMMUIdx mmu_idx) { - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); uint32_t el = regime_el(env, mmu_idx); int select, tsz; bool epd, hpd; @@ -998,7 +998,7 @@ static bool get_phys_addr_lpae(CPUARMState *env, uint64_t address, uint32_t attrs; int32_t stride; int addrsize, inputsize, outputsize; - uint64_t tcr = regime_tcr_value(env, mmu_idx); + uint64_t tcr = regime_tcr(env, mmu_idx); int ap, ns, xn, pxn; uint32_t el = regime_el(env, mmu_idx); uint64_t descaddrmask; diff --git a/target/arm/tlb_helper.c b/target/arm/tlb_helper.c index a2f87a5042d..5a709eab56f 100644 --- a/target/arm/tlb_helper.c +++ b/target/arm/tlb_helper.c @@ -20,7 +20,7 @@ bool regime_using_lpae_format(CPUARMState *env, ARMMMUIdx mmu_idx) return true; } if (arm_feature(env, ARM_FEATURE_LPAE) - && (regime_tcr_value(env, mmu_idx) & TTBCR_EAE)) { + && (regime_tcr(env, mmu_idx) & TTBCR_EAE)) { return true; } return false;