From patchwork Sun Jul 3 08:23:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 586822 Delivered-To: patch@linaro.org Received: by 2002:a05:7000:5036:0:0:0:0 with SMTP id e22csp2921886mab; Sun, 3 Jul 2022 01:51:44 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vAPMbtzCla7Yx9zqWv+x/e0leiFMtTpQoUMwc9eCwBLbZJq6BCq9svQZKuQM7ZqFi6VGCE X-Received: by 2002:a25:9904:0:b0:66e:2b64:763 with SMTP id z4-20020a259904000000b0066e2b640763mr5268942ybn.210.1656838304125; Sun, 03 Jul 2022 01:51:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656838304; cv=none; d=google.com; s=arc-20160816; b=NQngXOLpeDl3RUfhOmUCfiRUOJAg+d22rK7bpuqcevPlTEICKSxUp/HK3AxOkcgdkP QXdYmVLrChdGUnz0Wek5GzgHTes40kdBj5uIu4XOr1h8A4sZu4WCl+8k2vxIaWmAOC0H NzuGx7v3jaB2iv4Y5ChyOFqk7JNATAbSUFps+xwLRxhT7i/wdHMkV/UkzWi1hHWUOEfu k79IBkJaGBqXtdLyHkC6WkHlGWi+XHy67TS/m7FD8HHroJ5mGES25a5zOKC4zH5JmTxN r1ngfAd4d7DS8KiRJSvK0CSVRqPW3cwj1QTjXZWpTrl3dKTJ4DPUl26LvqL1Jy0lB+4q D+bQ== 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=TKxPLdADuP+9Wny++zRwM0SIOJMxWQvaLP+5vkpY9No=; b=G5Bz5vmgUcPPtQBwIepWzjRwWXbrTDkFvVaKt75vAfKxcvXLRiiiB8W3bXFgoHrWFb I1yQApZ1NzKjBugym3alsunrwuMy81FgddA0JOIuCLYUNKz0zXZZd0VQ2Q0jKnUBlmng KcI0zo8H57EAmep389osnrC3ciMsCnJz49U0nS6xDs0hwZ1g3sFAdJKXYaC0hlndHaUF L7k8ajus23JHd7DtLLed+CHzXlBJh9HZ/uflOJF3RqUpDPpxtguxJmDIIkkE971psPYc 4NlNqUusGXbEVb96xF0kqwKSzbz4YjxlbrgPv7Mdw4Jow+bE9oJmsSbFek+IZiFN4HNQ BQQg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=b9pIIYQV; 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 204-20020a2500d5000000b0066923f29543si33581003yba.642.2022.07.03.01.51.44 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sun, 03 Jul 2022 01:51:44 -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=b9pIIYQV; 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]:43712 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7vKR-0004Sf-KT for patch@linaro.org; Sun, 03 Jul 2022 04:51:43 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:53418) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7uvI-00086b-0C for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:25:44 -0400 Received: from mail-pg1-x52d.google.com ([2607:f8b0:4864:20::52d]:38471) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7uvG-00068N-Jn for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:25:43 -0400 Received: by mail-pg1-x52d.google.com with SMTP id e132so6255407pgc.5 for ; Sun, 03 Jul 2022 01:25:42 -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=TKxPLdADuP+9Wny++zRwM0SIOJMxWQvaLP+5vkpY9No=; b=b9pIIYQVgizkZFuPY7R9iz9m/b+NrgzmZ13vHVVS1TsFeblNOzZUnMY0ZDo6Yx11ZY +zawq54DqhU0UpYE7UJNEIX5qzT3OH3zUZChIOto8r67ocyLmd27UtWokh8Ly5eZytD/ mGtr1ozqLKHRCbhNsZWdjroa8RrXH6cYoxClTAFktP6Wy4HjF9aZiEPAqW0O/FLR2uA0 F2us+XTTpPpIp7Xl/iA9ITbNCAv6WFgWQFwrot6ffgefOfDpSvN5ulqAY1uHNBWCuYny Yb6g3fWRs3y2DzvL1w3R+K01GfCWpo0mDvO/WsClzv1j1r3juTqwSSisoLrbtpPopO8l W98w== 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=TKxPLdADuP+9Wny++zRwM0SIOJMxWQvaLP+5vkpY9No=; b=zqwvg5m2Qma23mDY6NOccuzM/0XMKbH0DAUIL6m5DeuEtAl8beRnyKRtpBakxcYbvP saNA8WBsMp5DzYrlrd+7XyzjZXWIONKLLtS3gOxstXudKFTpPY7ZygABjzxXpspHbJuH TBKk30Ki1bdyGb7uvfRgJr+2QuuhBJfmHp6N1AkwRN/RW7PelBo+x8/Bea1Roh5QoWOD 7D4fgcqXlNiWEY2bNqfTTSZwhzMtLmgg7ugmMdnO+iiPPjEGn+mNmP+SU+wB84GxS+lH xdMwDRhF1EhQaQw8AKKv8TRhHHYrjjJPCDkAQ21puTT4M0ZcPt8zshQjzK2x/dDJqCPb I36Q== X-Gm-Message-State: AJIora+S0gSjqWZ9kEBYwszOUP+WtaLutzpQVJdUpFUWOGqnQCQoDLbH oYfjyb38siRzDtdjgUw+2nXPJXngOwAnMPLM X-Received: by 2002:a63:4759:0:b0:412:434a:1192 with SMTP id w25-20020a634759000000b00412434a1192mr75732pgk.602.1656836741856; Sun, 03 Jul 2022 01:25:41 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id im22-20020a170902bb1600b0016a3f9e528asm13569112plb.57.2022.07.03.01.25.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 01:25:41 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 25/62] target/arm: Add is_secure parameter to get_phys_addr_pmsav7 Date: Sun, 3 Jul 2022 13:53:42 +0530 Message-Id: <20220703082419.770989-26-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220703082419.770989-1-richard.henderson@linaro.org> References: <20220703082419.770989-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::52d; envelope-from=richard.henderson@linaro.org; helo=mail-pg1-x52d.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" Remove the use of regime_is_secure from get_phys_addr_pmsav7 Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- target/arm/ptw.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index b883826643..33fa8f094b 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1506,12 +1506,11 @@ static bool pmsav7_use_background_region(ARMCPU *cpu, ARMMMUIdx mmu_idx, static bool get_phys_addr_pmsav7(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, + bool secure, GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { ARMCPU *cpu = env_archcpu(env); int n; - bool secure = regime_is_secure(env, mmu_idx); bool is_user = regime_is_user(env, mmu_idx); result->phys = address; @@ -2411,7 +2410,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, } else if (arm_feature(env, ARM_FEATURE_V7)) { /* PMSAv7 */ ret = get_phys_addr_pmsav7(env, address, access_type, mmu_idx, - result, fi); + is_secure, result, fi); } else { /* Pre-v7 MPU */ ret = get_phys_addr_pmsav5(env, address, access_type, mmu_idx,