From patchwork Sun Jul 3 08:23:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 12904180 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A09C5C43334 for ; Sun, 3 Jul 2022 08:45:02 +0000 (UTC) Received: from localhost ([::1]:55148 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o7vDx-0001Mf-Nx for qemu-devel@archiver.kernel.org; Sun, 03 Jul 2022 04:45:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:52814) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o7uub-0006zR-HS for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:25:01 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]:37756) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o7uuZ-0005su-TX for qemu-devel@nongnu.org; Sun, 03 Jul 2022 04:25:01 -0400 Received: by mail-pf1-x42a.google.com with SMTP id w185so2638240pfb.4 for ; Sun, 03 Jul 2022 01:24:59 -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=BdrXyYuvZwqHVq9JTmbUhOhUUmR+wJ0WR8LQ9U+RKOA=; b=Aq+1NYolkM7YqfsNWkBP5uhP9NiFd3m3rRT7VBlrZPl/vTHYovAF4ht6Vajl0cO+IK ED4A+7+2Fn2YNhwwZ5BcDkKv4HhwiAjWulISzKDbjEYgRh35M03WAJEgYsloPyXw/JIy BV4/p+7pE3o0uLJ10w2HwT+xWqHQxVoG/HguqULigv0cwNIYska90nHo2fWI3jGc6wRQ R+6uKTfaB5grPY84AtGYeK6nTnVJnjkEOUX/g5Jp3zDsopZdzFWj7Z1CaYy61t+LbF+t +97KEuWYkV4czPL7oX7K1Yoxy8pyRXzCKbc/GqOw5+w1ThS+KpMbEXNnjlJQI/fV1dtd w8kQ== 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=BdrXyYuvZwqHVq9JTmbUhOhUUmR+wJ0WR8LQ9U+RKOA=; b=a1VwbvD479lWCfY1csxnNo29zbyXY/Jd44BYkO4nkjqjLj+28en1aId+8wLuf4PwuR WEH/bebTXLcbMg6kFLwPNS2va/CJSKIz86cjexiuo4KQnQH0Zp/iLr2CxCFOqnAPuLql T2VfwHbOpZRwHxxaPrCmbj7qXk468zj50TEZqlhkvk22H5+8hTq7K+URbDn/V97BuCfi 2uNt862/oP8hFJQo9U1cBElSHnMb3k+K7lroMU/HDW7LN1po1mxiiqRymuRo6/dnYiyL DyNUsouH2f2W7TIqgbYEpjS0FJQclyDcza1jth6kShofJ6HVf8B8/GCdgqajigkmPuNX 4+1w== X-Gm-Message-State: AJIora9KmKyCPzYpBltopm5WqntoTHChV49CMzhNc2IHUrFXIjxninvt lXvsV0qKc9lGEPfyrBkHTpr678Kf5cfyhW0w X-Google-Smtp-Source: AGRyM1tcpOTiE37zqLNIdPa0pxFNefxl1WN1MLuMC9xj7Nb6CHl6+nJEsQIA4CrkANnccVhZ4P2KCA== X-Received: by 2002:a63:cf18:0:b0:40d:5506:df97 with SMTP id j24-20020a63cf18000000b0040d5506df97mr19590146pgg.43.1656836698632; Sun, 03 Jul 2022 01:24:58 -0700 (PDT) Received: from stoup.. ([122.255.60.245]) by smtp.gmail.com with ESMTPSA id im22-20020a170902bb1600b0016a3f9e528asm13569112plb.57.2022.07.03.01.24.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Jul 2022 01:24:57 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org Subject: [PATCH 11/62] target/arm: Use GetPhysAddrResult in get_phys_addr_v6 Date: Sun, 3 Jul 2022 13:53:28 +0530 Message-Id: <20220703082419.770989-12-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::42a; envelope-from=richard.henderson@linaro.org; helo=mail-pf1-x42a.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+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Richard Henderson Reviewed-by: Alex Bennée --- target/arm/ptw.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 5e79c9be98..d70c9120fc 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -532,8 +532,7 @@ do_fault: static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, MMUAccessType access_type, ARMMMUIdx mmu_idx, - hwaddr *phys_ptr, MemTxAttrs *attrs, int *prot, - target_ulong *page_size, ARMMMUFaultInfo *fi) + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) { ARMCPU *cpu = env_archcpu(env); int level = 1; @@ -593,11 +592,11 @@ static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, phys_addr = (desc & 0xff000000) | (address & 0x00ffffff); phys_addr |= (uint64_t)extract32(desc, 20, 4) << 32; phys_addr |= (uint64_t)extract32(desc, 5, 4) << 36; - *page_size = 0x1000000; + result->page_size = 0x1000000; } else { /* Section. */ phys_addr = (desc & 0xfff00000) | (address & 0x000fffff); - *page_size = 0x100000; + result->page_size = 0x100000; } ap = ((desc >> 10) & 3) | ((desc >> 13) & 4); xn = desc & (1 << 4); @@ -623,12 +622,12 @@ static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, case 1: /* 64k page. */ phys_addr = (desc & 0xffff0000) | (address & 0xffff); xn = desc & (1 << 15); - *page_size = 0x10000; + result->page_size = 0x10000; break; case 2: case 3: /* 4k page. */ phys_addr = (desc & 0xfffff000) | (address & 0xfff); xn = desc & 1; - *page_size = 0x1000; + result->page_size = 0x1000; break; default: /* Never happens, but compiler isn't smart enough to tell. */ @@ -636,7 +635,7 @@ static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, } } if (domain_prot == 3) { - *prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; + result->prot = PAGE_READ | PAGE_WRITE | PAGE_EXEC; } else { if (pxn && !regime_is_user(env, mmu_idx)) { xn = 1; @@ -654,14 +653,14 @@ static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, fi->type = ARMFault_AccessFlag; goto do_fault; } - *prot = simple_ap_to_rw_prot(env, mmu_idx, ap >> 1); + result->prot = simple_ap_to_rw_prot(env, mmu_idx, ap >> 1); } else { - *prot = ap_to_rw_prot(env, mmu_idx, ap, domain_prot); + result->prot = ap_to_rw_prot(env, mmu_idx, ap, domain_prot); } - if (*prot && !xn) { - *prot |= PAGE_EXEC; + if (result->prot && !xn) { + result->prot |= PAGE_EXEC; } - if (!(*prot & (1 << access_type))) { + if (!(result->prot & (1 << access_type))) { /* Access permission fault. */ fi->type = ARMFault_Permission; goto do_fault; @@ -672,9 +671,9 @@ static bool get_phys_addr_v6(CPUARMState *env, uint32_t address, * the CPU doesn't support TZ or this is a non-secure translation * regime, because the attribute will already be non-secure. */ - attrs->secure = false; + result->attrs.secure = false; } - *phys_ptr = phys_addr; + result->phys = phys_addr; return false; do_fault: fi->domain = domain; @@ -2512,8 +2511,7 @@ bool get_phys_addr(CPUARMState *env, target_ulong address, result, fi); } else if (regime_sctlr(env, mmu_idx) & SCTLR_XP) { return get_phys_addr_v6(env, address, access_type, mmu_idx, - &result->phys, &result->attrs, - &result->prot, &result->page_size, fi); + result, fi); } else { return get_phys_addr_v5(env, address, access_type, mmu_idx, &result->phys, &result->prot,