From patchwork Thu Sep 22 16:35:16 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 608228 Delivered-To: patch@linaro.org Received: by 2002:a17:522:c983:b0:460:3032:e3c4 with SMTP id kr3csp460504pvb; Thu, 22 Sep 2022 10:04:04 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5IuUEZQLOiHbknMwpcgc/JaJz4MgBF/J5Y9yElXsSXdNxb/ixwg1kDgew+xQg2LmtjNnbW X-Received: by 2002:ac8:5a15:0:b0:35d:ef5:811a with SMTP id n21-20020ac85a15000000b0035d0ef5811amr3580998qta.667.1663866243823; Thu, 22 Sep 2022 10:04:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1663866243; cv=none; d=google.com; s=arc-20160816; b=beWmdcy1S4hpIc8ttvNkBGWPIhVlydLH88zT3Jn7m16pUenjHlkJFUBqQNPD3UjmnD HDET6r5gTYuUFNu95/2/ip4QXNt74f7QfmkvpJrHh/DWMh78I+pcqLZqOAfb0jCqoiFZ 8+i+DgREUBaCSbC7FpKnMPAYLwPcPCb1DJvtnDCFBVu6TgqVSguMeqt0pPmB3PuIEpKD Ltb3LWiAusoPiulHg0k5QJqQWQy/kSskX+c06tu4fPyd8B0Lt2zg73e3guWgzd12gPex u/qAipvvEqBp6j0NvztDqlsrViZUQEt8TJLLz8QaJmG4wsbIp7ou9HmyE1oaVypXnuQf GyGA== 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=aCTJbIT8uO+HceBgWHPJKhsRADhgD74hU3NYWDoWeL4=; b=Lq5xr8+vF51Bc2gB6sxknQP4NZmKSfGp/iZrvRHoP/8K4bskLg+LBAVOYCFmfk88yJ ZPYpdqLHkqSZWypIuk4G6Zxfzw7EP+YQGt9G4DVaTVpfzyQAoqyG8V86vQVBHInaX60u yG3JYPHuc+Os2xtfRr4g7KkBP1/WBCTY24lIgJA2neCBroIj1u+kowLVgN/sCwpjPRU6 AFeNrVhA80ArGqnKfNJnv93symcsOIo1g3I7EolW5WPkcTpcYrWHlBfLo92wG4oUVlVJ rJzJs9arNJQXDuijDA9NAAhDIDE4cIaDQCnrNVwbvWPRmv5AourEtXTKKlBQG1D0PB/4 zYXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=KviiahCs; 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 dv6-20020ad44ee6000000b004ad653e3924si818778qvb.192.2022.09.22.10.04.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 22 Sep 2022 10:04:03 -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=KviiahCs; 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]:38124 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1obPcJ-0004xm-AD for patch@linaro.org; Thu, 22 Sep 2022 13:04:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:41188) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1obPB8-0002C8-MC for qemu-devel@nongnu.org; Thu, 22 Sep 2022 12:36:10 -0400 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:50853) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1obPB2-0005Np-3p for qemu-devel@nongnu.org; Thu, 22 Sep 2022 12:35:53 -0400 Received: by mail-wm1-x334.google.com with SMTP id ay36so7182552wmb.0 for ; Thu, 22 Sep 2022 09:35:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date; bh=aCTJbIT8uO+HceBgWHPJKhsRADhgD74hU3NYWDoWeL4=; b=KviiahCsT9elya7/QG2Ndv9rakhOxG4zyjAYDzP2xOvz1lfDgrhrzUpPn0peSgtaxQ yc4jTGCIj7VPhIkk+7anSv/VIy2oLVpoT4Rwp1aDwO5NBcMbnGoCe4cTKId08lfcgA9T tknHRX6AhlMmFlQEELZRDrkAiGq/OCzTDQg0NA5MRKRjMOkfDtyjwclQ4t42lTsnUQLQ PidfEYSk0UCkzItZw7cMhKHgOTJRJ7Y0sxy27ftSvLaV07A0F3Hizbsmqz4iE8p710/D 3Pd4+lBkmv20LwTizKg+KBIJ6ivrr2a/t6QblV8F57fPA1y5j/tcmxblV2YZZ9B1Ni/9 0t5g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date; bh=aCTJbIT8uO+HceBgWHPJKhsRADhgD74hU3NYWDoWeL4=; b=L3b7xt16eYKugM/6M57IlhRBuDGl6m1CVyud3CKiw3o9wpnS1OTfG0AEeoBW563V9y 8//3cITMyuJdoAk2+R1zyAJnL8shF/ajh+/Aj2/6mLigaKLq9lAzqH41di8DI2N63ii0 bFjtRlFlNgWPk5blLSO7MZXnAsY0eWPK0tzxQSSYxnTQ9Kbz1mA4bFsROkNDUj0tchMp f2+tnjIhPoG3BhG/WjRaGJIJuK1Gugf1MQgV20X9UTW0N5ZpkiwdUUqh4+eibt2lJL9x D/Chir4a38R+k4ow8CZ8+jB8a6pU4V7kbKNJcfJLPrO7MKuyaryGaCDDvAfsglasmgwU p+pQ== X-Gm-Message-State: ACrzQf3TddaHg0N2l9XZ4sQ4H3lXGCe6dc1kjFCt+ZDA61vswwl/RDRP eAsPr2O+OxuE0jaa0nFG7myJK+FoG6x34A== X-Received: by 2002:a05:600c:350f:b0:3b4:c5f2:4295 with SMTP id h15-20020a05600c350f00b003b4c5f24295mr3098059wmq.200.1663864551125; Thu, 22 Sep 2022 09:35:51 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id iw1-20020a05600c54c100b003b3401f1e24sm6452599wmb.28.2022.09.22.09.35.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Sep 2022 09:35:50 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 19/39] target/arm: Add is_secure parameter to get_phys_addr_pmsav5 Date: Thu, 22 Sep 2022 17:35:16 +0100 Message-Id: <20220922163536.1096175-20-peter.maydell@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220922163536.1096175-1-peter.maydell@linaro.org> References: <20220922163536.1096175-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::334; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x334.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 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 Remove the use of regime_is_secure from get_phys_addr_pmsav5. Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Message-id: 20220822152741.1617527-21-richard.henderson@linaro.org Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- target/arm/ptw.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 1e81eefa47a..2ddfc028abb 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -1349,7 +1349,7 @@ do_fault: static bool get_phys_addr_pmsav5(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, + bool is_secure, GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { int n; @@ -2421,7 +2421,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, } else { /* Pre-v7 MPU */ ret = get_phys_addr_pmsav5(env, address, access_type, mmu_idx, - result, fi); + is_secure, result, fi); } qemu_log_mask(CPU_LOG_MMU, "PMSA MPU lookup for %s at 0x%08" PRIx32 " mmu_idx %u -> %s (prot %c%c%c)\n",