From patchwork Thu Jun 9 09:05:13 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580279 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp653589max; Thu, 9 Jun 2022 03:47:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwScgvpGS1wqCgb72CCSifMyOhU4UNADLUL4Mo5a9VYV8oChVAISUJ4rCYeQknYm6sJ3I8x X-Received: by 2002:a05:622a:2c3:b0:304:f1ac:cffe with SMTP id a3-20020a05622a02c300b00304f1accffemr14138059qtx.163.1654771654555; Thu, 09 Jun 2022 03:47:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654771654; cv=none; d=google.com; s=arc-20160816; b=HltbYjd4NHZCyxd+2q6D40MS7alPbMLATeCGogEXCJTANceAecOA+YIXn4obc0yJPX grrcDy4FLQ/VwZnt771V7No/zfgyAlRFOnY87jSats9ctgLzxEjl76N0/ms7OY/BHKBe tLe5lvsT73PqHG5haxm7cul8djCErlCNousWMhntxrvd/X4+vnBWSCxdw/zZdWPd+wVG HuuAXzh0CLK6aO8mdUxKbXcaR8l+IimZGJg4DHF0A9g+6zCPr2o3FBP/gg22qN8hhC40 fn+R+I01vOAPn2T9AaRNmeNzm6pq4cz9rUgPhnb7HKlYPQYWd78nRvWPabLAi5NjnqVh 7rpA== 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=vssipGCOqEJQNoMsGfFwc+dxYekNW1L8kP+aFic/gt8=; b=WdJinZY14XYwEg4ukTaf2Cbyqtprign8EXQCmHosZX5cdrvgIjJ2b+lsUMF5kAaSB6 8vWqWg8eYVnd8cvbBjtz1qCk3JHA/PFrJNSuyjKEJ9n9ZtxdeABvxvJw7OZqLI8IhYfJ MpKkDBXQ1dykc7mWcpgvghT3y4o2hrqcnvosq6v0omTdE1S5Q5zY1Sd7Jz/ceBDTVQM3 Vkw3Mp8PV26WDeaOvzioaIyd6eRY2r5KhSt1HOCzmsUd11TxWiYTxcO7LK4Ylg69GMkh BvmXEAQerYnom+u9uFTicu9j6HSFy2BvBdo9FivPDx/2p+3RJKDMjDxGICzcRsuJff4G kAig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=NCooA6v8; 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 k21-20020a05620a415500b006a042cb4ce7si8578013qko.8.2022.06.09.03.47.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jun 2022 03:47:34 -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=NCooA6v8; 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]:36728 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzFhO-000656-2c for patch@linaro.org; Thu, 09 Jun 2022 06:47:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39652) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE7O-0001Z2-Gg for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:21 -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 1nzE7L-0005v7-GR for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:18 -0400 Received: by mail-wr1-x429.google.com with SMTP id u8so27137454wrm.13 for ; Thu, 09 Jun 2022 02:06:15 -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=vssipGCOqEJQNoMsGfFwc+dxYekNW1L8kP+aFic/gt8=; b=NCooA6v8ACoFTIlVaviEsHeZ6x5CwA1abm6IcfTfPLbyUY/rehr6+Mky2geKX2bbTL Sw3hrEvPORH4NQLaBFL1iDIFNZFuBonXypsLlu4mx0EFTfQ7tTQsoC7pIhKf10dHUnCa B1cKJYA9+BFPewG6hJc6/y6qIMS7yk7b8i3ZPKKuDDJQm2y/fs+ZvoGkyQp21d8BtFFU swyH8niWKdIw9pw5KtmQWB4ID3RCfNXijL8qA7QCO5X77GAijPjw8MFHVrglHkVgrstn R1dXFAOcPNuR/BWlTg1KqtuNsBE4llG0rxWaVMh4aTK+SQCWE0t3wfD+F7sInfQdmzrv xVsg== 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=vssipGCOqEJQNoMsGfFwc+dxYekNW1L8kP+aFic/gt8=; b=1OCg6LVlVBHiH/0Vi7uM77hg8C/gReU0thHvtfxVYG78pK0QNEGvbqEabDPJXatiUP Jr3dbtUdRLPq5kJV4B8WWC8rBICBW0zpQnD6D9SJOLz4A/oHYM6VoLOlt2KZC+LtjYFR SjYmmZ61Rp21b6EivS9acq34AnZcyJZyUHiMVlQPHeKYE37QJ7EPrl6t9F9fKKv4l0sO RL+ogFRqWFNLV2SJA/n9L7O44LjGeD2UEhkCCJNZCZv69f1CDADb0sNWYyPK9/A0zHDW 5mcxpvMcGR40XM32BZ2zbr0WvqWT23lbUrn1wbPSq/itGa/cHGi1pRQIOza2PT3E3wFb sgcw== X-Gm-Message-State: AOAM533Mzd75FwrMpbU1s58Q5k/Gg8/oPOCQqf7lwWfxG8BclTTKkZpR RA7mg1d4ouTFTyJYHnQSwZDsMp2vBJkJMw== X-Received: by 2002:a5d:58ed:0:b0:217:dd5:7508 with SMTP id f13-20020a5d58ed000000b002170dd57508mr24330176wrd.606.1654765574388; Thu, 09 Jun 2022 02:06:14 -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.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:06:13 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 31/55] target/arm: Move regime_ttbr to ptw.c Date: Thu, 9 Jun 2022 10:05:13 +0100 Message-Id: <20220609090537.1971756-32-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-25-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.h | 1 - target/arm/helper.c | 16 ---------------- target/arm/ptw.c | 16 ++++++++++++++++ 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/target/arm/ptw.h b/target/arm/ptw.h index 3d3061a4351..ed152ddaf4e 100644 --- a/target/arm/ptw.h +++ b/target/arm/ptw.h @@ -12,7 +12,6 @@ #ifndef CONFIG_USER_ONLY bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx); -uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn); #endif /* !CONFIG_USER_ONLY */ #endif /* TARGET_ARM_PTW_H */ diff --git a/target/arm/helper.c b/target/arm/helper.c index 8deb0fa94c1..fdda87e87e2 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10475,22 +10475,6 @@ bool regime_translation_disabled(CPUARMState *env, ARMMMUIdx mmu_idx) return (regime_sctlr(env, mmu_idx) & SCTLR_M) == 0; } -/* Return the TTBR associated with this translation regime */ -uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn) -{ - if (mmu_idx == ARMMMUIdx_Stage2) { - return env->cp15.vttbr_el2; - } - if (mmu_idx == ARMMMUIdx_Stage2_S) { - return env->cp15.vsttbr_el2; - } - if (ttbrn == 0) { - return env->cp15.ttbr0_el[regime_el(env, mmu_idx)]; - } else { - return env->cp15.ttbr1_el[regime_el(env, mmu_idx)]; - } -} - /* Convert a possible stage1+2 MMU index into the appropriate * stage 1 MMU index */ diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 8db4b5edf1a..dc559e6bdfd 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -75,6 +75,22 @@ static bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx) } } +/* Return the TTBR associated with this translation regime */ +static uint64_t regime_ttbr(CPUARMState *env, ARMMMUIdx mmu_idx, int ttbrn) +{ + if (mmu_idx == ARMMMUIdx_Stage2) { + return env->cp15.vttbr_el2; + } + if (mmu_idx == ARMMMUIdx_Stage2_S) { + return env->cp15.vsttbr_el2; + } + if (ttbrn == 0) { + return env->cp15.ttbr0_el[regime_el(env, mmu_idx)]; + } else { + return env->cp15.ttbr1_el[regime_el(env, mmu_idx)]; + } +} + static bool ptw_attrs_are_device(CPUARMState *env, ARMCacheAttrs cacheattrs) { /*