From patchwork Thu Jun 9 09:05:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 580259 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5806:0:0:0:0 with SMTP id j6csp619815max; Thu, 9 Jun 2022 02:58:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwB8UeopYvcL3guzXuTjgQkMNSlNNCmA7zSFsDpqNfnKrcv0rgkY1WnmwSa6I+z73MHzBCM X-Received: by 2002:a05:6214:2a88:b0:464:463a:7a7c with SMTP id jr8-20020a0562142a8800b00464463a7a7cmr28213959qvb.127.1654768701461; Thu, 09 Jun 2022 02:58:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1654768701; cv=none; d=google.com; s=arc-20160816; b=QHa1zy9+kourkMPZ4i6vz7TSoxA8l/AeUxPMj8E78fB/f4hJVCsEgL+vw3OcySAMl6 IpVPaW2rJtj/aLSWziDYERPgx6cwnnv2oOT3nMZk64K+fSYqceKmYYG7R2AwtjG/Cnsd D0EkSOwnQSFQ4sBuHDkM6RvHuBT2A56qQIJxJwQi5SePK9vPz40Rjhd9RnNdZC3AaJjc fTOGRs9E46wNJ1+juhHbqqWfO9kjMcr477Vuz6ongfapMWDhyaxrjfqOVwGBVwdHZasB NnjuQCzZspe5tkg71G2s3It9/VjDk8CUcekXy6vp57DkHL4tpuOAFGq3yrqdRrjQNtkR i3eA== 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=rd6uuNfniFNZ5ZxqrHQJZxW1BzKlfPz7FzEjKvWSCtE=; b=eGcVqubhAXIkxo4caTis1GiGqpbmRx9nPBI9LRRMYqXXz8H2Nyxa6V+LNJ4+f/H2Po dQzfBNxOkoYYXGgCjnc4Uf64Z7OLjwNDFEEIWmoQtuKaWItQJRcucccbLJx43Aata0fp XW272Df9EoYNEvF8IbH8crhB5XmaoQeacH4Ll1JVExjgwxMVK21ulEUJqCSV4FaEon/9 t/+uD+P6ortbKS1mxOBKtaBqKP3ggjotZA32iSSISZwWDXIVKCsZ7BWmRobJKZYB7X+s Ohxx/vWigfKWi4kVnMGwxxKoGrlJPXNNXbtu6lJQw3Ie/E+IBIufhcIWt1Do6HQZboxW mRmw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Ll+e0oo1; 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 gs15-20020a056214226f00b0046427d2c730si12197122qvb.222.2022.06.09.02.58.21 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 09 Jun 2022 02:58:21 -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=Ll+e0oo1; 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]:42984 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nzEvk-0002Lq-Ri for patch@linaro.org; Thu, 09 Jun 2022 05:58:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:39646) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nzE7O-0001Yz-Ba for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:21 -0400 Received: from mail-wr1-x42c.google.com ([2a00:1450:4864:20::42c]:36483) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nzE7J-00063j-W3 for qemu-devel@nongnu.org; Thu, 09 Jun 2022 05:06:17 -0400 Received: by mail-wr1-x42c.google.com with SMTP id o8so3625877wro.3 for ; Thu, 09 Jun 2022 02:06:13 -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=rd6uuNfniFNZ5ZxqrHQJZxW1BzKlfPz7FzEjKvWSCtE=; b=Ll+e0oo1jaPvSjSMft05R2FgQe3K2SnfuIImWHyZwiGxoMJItgjYQBROhhOjGG2nqn AYV20Mecjp7DyZRGA+/isTvkovKsTKB2zGYEQMqiN6H67gesoqkMHpUDC+Pw/OkwkapN ZfXMWvvMbTBc0MQ4PQUT12AwQeE4Z1nyfrRbKX84CTq1saP8XfQk51qY7pqFCbwPI/ir Tj2YQHTzfMDzDZqAl2COkOBq+YfvQDjlQuYWaT8cQ2SFu1P1VIkCdTx38I0Fim5bTpvX KOgeyetWNZ+I74gpv53TzEBFr873f70mRJvnVfpajNdlR1k6jrz4U6+43ds11rudXd+9 Ji9A== 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=rd6uuNfniFNZ5ZxqrHQJZxW1BzKlfPz7FzEjKvWSCtE=; b=UjQR4uSY0ruf7oMwEV6UyvqmyqDtCkkXVh6lvDrHevG02iuzVQu1u05kRvR5DuBnOX AJaPJfCWQAUW/poTa1k+CRh2BRQ/lxdo33eGKioDcUVUvVS3QtzDlynDCvlCiLSxZlwR RdX17nrIgVmJE6hgTm080WtxC4F1A8iyWZEM2cBEULV6//IVMY2uGQzC3mPJZyBeyDsQ FYwrkPVywU4sd6nV9caTC8AtFLuh2wrV6lVcbYzuYWWwBet7vcrfFioFTCm9LM3xDlvz 9Qkq6qUrlJSQRKzHNp238xCMhNG3BkuwnTmUMA8d/lYPOnEJwVcQm4kXOwmXtDTC+TaZ Pywg== X-Gm-Message-State: AOAM531CEgXAnhSJl3ArALCPrP4jYh4Lelb3G2OQ4PXleX2YuJv3RScy JkG4XHUq3ssku2XXMlxEF8vvyvzAgZ7cNw== X-Received: by 2002:adf:f90f:0:b0:20e:5fd4:5d06 with SMTP id b15-20020adff90f000000b0020e5fd45d06mr37551453wrr.371.1654765572394; Thu, 09 Jun 2022 02:06:12 -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.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Jun 2022 02:06:11 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 29/55] target/arm: Move ap_to_tw_prot etc to ptw.c Date: Thu, 9 Jun 2022 10:05:11 +0100 Message-Id: <20220609090537.1971756-30-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::42c; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x42c.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-23-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.h | 10 ------ target/arm/helper.c | 77 ------------------------------------------ target/arm/ptw.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 81 insertions(+), 87 deletions(-) diff --git a/target/arm/ptw.h b/target/arm/ptw.h index 9314fb4d23c..85ad5767944 100644 --- a/target/arm/ptw.h +++ b/target/arm/ptw.h @@ -15,15 +15,5 @@ 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); -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); - -static inline int -simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap) -{ - return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx)); -} - #endif /* !CONFIG_USER_ONLY */ #endif /* TARGET_ARM_PTW_H */ diff --git a/target/arm/helper.c b/target/arm/helper.c index f61f1da61e4..e894afcb491 100644 --- a/target/arm/helper.c +++ b/target/arm/helper.c @@ -10537,83 +10537,6 @@ bool regime_is_user(CPUARMState *env, ARMMMUIdx mmu_idx) g_assert_not_reached(); } } - -/* Translate section/page access permissions to page - * R/W protection flags - * - * @env: CPUARMState - * @mmu_idx: MMU index indicating required translation regime - * @ap: The 3-bit access permissions (AP[2:0]) - * @domain_prot: The 2-bit domain access permissions - */ -int ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap, int domain_prot) -{ - bool is_user = regime_is_user(env, mmu_idx); - - if (domain_prot == 3) { - return PAGE_READ | PAGE_WRITE; - } - - switch (ap) { - case 0: - if (arm_feature(env, ARM_FEATURE_V7)) { - return 0; - } - switch (regime_sctlr(env, mmu_idx) & (SCTLR_S | SCTLR_R)) { - case SCTLR_S: - return is_user ? 0 : PAGE_READ; - case SCTLR_R: - return PAGE_READ; - default: - return 0; - } - case 1: - return is_user ? 0 : PAGE_READ | PAGE_WRITE; - case 2: - if (is_user) { - return PAGE_READ; - } else { - return PAGE_READ | PAGE_WRITE; - } - case 3: - return PAGE_READ | PAGE_WRITE; - case 4: /* Reserved. */ - return 0; - case 5: - return is_user ? 0 : PAGE_READ; - case 6: - return PAGE_READ; - case 7: - if (!arm_feature(env, ARM_FEATURE_V6K)) { - return 0; - } - return PAGE_READ; - default: - g_assert_not_reached(); - } -} - -/* Translate section/page access permissions to page - * R/W protection flags. - * - * @ap: The 2-bit simple AP (AP[2:1]) - * @is_user: TRUE if accessing from PL0 - */ -int simple_ap_to_rw_prot_is_user(int ap, bool is_user) -{ - switch (ap) { - case 0: - return is_user ? 0 : PAGE_READ | PAGE_WRITE; - case 1: - return PAGE_READ | PAGE_WRITE; - case 2: - return is_user ? 0 : PAGE_READ; - case 3: - return PAGE_READ; - default: - g_assert_not_reached(); - } -} #endif /* !CONFIG_USER_ONLY */ int aa64_va_parameter_tbi(uint64_t tcr, ARMMMUIdx mmu_idx) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 427813ea563..9ab77c39980 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -211,6 +211,87 @@ static bool get_level1_table_address(CPUARMState *env, ARMMMUIdx mmu_idx, return true; } +/* + * Translate section/page access permissions to page R/W protection flags + * @env: CPUARMState + * @mmu_idx: MMU index indicating required translation regime + * @ap: The 3-bit access permissions (AP[2:0]) + * @domain_prot: The 2-bit domain access permissions + */ +static int ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, + int ap, int domain_prot) +{ + bool is_user = regime_is_user(env, mmu_idx); + + if (domain_prot == 3) { + return PAGE_READ | PAGE_WRITE; + } + + switch (ap) { + case 0: + if (arm_feature(env, ARM_FEATURE_V7)) { + return 0; + } + switch (regime_sctlr(env, mmu_idx) & (SCTLR_S | SCTLR_R)) { + case SCTLR_S: + return is_user ? 0 : PAGE_READ; + case SCTLR_R: + return PAGE_READ; + default: + return 0; + } + case 1: + return is_user ? 0 : PAGE_READ | PAGE_WRITE; + case 2: + if (is_user) { + return PAGE_READ; + } else { + return PAGE_READ | PAGE_WRITE; + } + case 3: + return PAGE_READ | PAGE_WRITE; + case 4: /* Reserved. */ + return 0; + case 5: + return is_user ? 0 : PAGE_READ; + case 6: + return PAGE_READ; + case 7: + if (!arm_feature(env, ARM_FEATURE_V6K)) { + return 0; + } + return PAGE_READ; + default: + g_assert_not_reached(); + } +} + +/* + * Translate section/page access permissions to page R/W protection flags. + * @ap: The 2-bit simple AP (AP[2:1]) + * @is_user: TRUE if accessing from PL0 + */ +static int simple_ap_to_rw_prot_is_user(int ap, bool is_user) +{ + switch (ap) { + case 0: + return is_user ? 0 : PAGE_READ | PAGE_WRITE; + case 1: + return PAGE_READ | PAGE_WRITE; + case 2: + return is_user ? 0 : PAGE_READ; + case 3: + return PAGE_READ; + default: + g_assert_not_reached(); + } +} + +static int simple_ap_to_rw_prot(CPUARMState *env, ARMMMUIdx mmu_idx, int ap) +{ + return simple_ap_to_rw_prot_is_user(ap, regime_is_user(env, mmu_idx)); +} + static bool get_phys_addr_v5(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, hwaddr *phys_ptr, int *prot,