From patchwork Mon Aug 22 15:26:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 599119 Delivered-To: patch@linaro.org Received: by 2002:a05:6918:5e84:b0:d4:ea33:5523 with SMTP id nd4csp1792190ysb; Mon, 22 Aug 2022 08:29:34 -0700 (PDT) X-Google-Smtp-Source: AA6agR7EHjJHfku0Fsb/7ldbyHCn1QU9aNbz8KEQ93dda1pRct6vv77A5d0tO9fWBNrPIdXMdhJb X-Received: by 2002:a05:620a:d83:b0:6bc:2562:94b with SMTP id q3-20020a05620a0d8300b006bc2562094bmr2069070qkl.152.1661182174378; Mon, 22 Aug 2022 08:29:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661182174; cv=none; d=google.com; s=arc-20160816; b=zItfIgNiLID1P55bEKxs6fUMJd/go0HgyIVGyEvH4XJigT8bkplymNc9iDYINvJl3W DVo1vgC5l7Cdr1ZMs7u9ATnJRRcjS0Sd4DrUleUyDZiH3UZpc4j5ZU8SSjQThUMH+UMq 4KEsTb6DVo2mv41318NclxD3l04jxjgwsuJvRuZMragvJw5Y/yxdSDenZugKywykwoKe PB2NwpufMYAhfKVVhIRDncNA52U8hzr3LeaGjiBok2Z+R3cExkr6Uy3s20tPXnrhOYVO Ho4Dr7tKeYMtchocZT38DiqXeEXOpkBM00y3kBDguTng90c4//7nECV1WiPWLUrvuzm1 dukw== 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=J5SoQylTtJu5qfrohns44hEwW2yRQ/CAKj0/Q0ls+dE=; b=fMhHA3HrXhRYTGtMA/Zp/hnaGWzI+wqUBT6p3Z7JpjnAK0T09vKAvHSSqatjJz83K1 9T02GFEMW1vGen+RwEh2Yo+5uH7IZ2WAmv0hgRCVYk5nKh3bwZM1uQILmzpZij/lqFQQ hPAoCTymuJU3+C1uZnOxBFOnlwkPL6yfzoVu30oxiWMoiq6u01nYcDVmoA9Xqs2iFdtE BZfGEPgsFtRqsaq66D6vFCvwx7ftzSKvOADM0InIqGD5QA02/kypIGKCLgb/WJlSQZlo cYI5aLSON6sLFACxKPKDHTaeE1CR2g6WD307RBS6L3Cr3/7fjgbgukj8wG1MnQ1lg047 jw+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=cNMGG2mV; 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 br14-20020a05622a1e0e00b0033f83e2d723si4555964qtb.291.2022.08.22.08.29.34 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Aug 2022 08:29: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=cNMGG2mV; 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]:40838 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oQ9Mr-0000vt-Ti for patch@linaro.org; Mon, 22 Aug 2022 11:29:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:48568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oQ9LB-000735-6z for qemu-devel@nongnu.org; Mon, 22 Aug 2022 11:27:49 -0400 Received: from mail-pl1-x62e.google.com ([2607:f8b0:4864:20::62e]:40941) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oQ9L9-0000f0-Gy for qemu-devel@nongnu.org; Mon, 22 Aug 2022 11:27:48 -0400 Received: by mail-pl1-x62e.google.com with SMTP id x23so10230618pll.7 for ; Mon, 22 Aug 2022 08:27:47 -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:cc:to:from:from:to:cc; bh=J5SoQylTtJu5qfrohns44hEwW2yRQ/CAKj0/Q0ls+dE=; b=cNMGG2mVmMqt/RMikdzproCU901gaWsITpCQoomHArQanf0RtCOkGguhoPMyDRD/gA ckI5SeSGB4U96IC3oENNp2vPqkntLbknK8fIsXgWypcW6fslYDGRnRHSa4TrDTLZUBfh lTvZ71Fv8cNXyUNddYR8JuKIhfWrisIolr/uFnx1kWJcnabEXbmZPSJ7v8PbVUp5ukbw OQMElfz5Fj/4Q25VD4qupAhDrW5Xg4LaUJ2Mnn52Sw+cSnsfyRGqeC5PdGbfCOUHxQvG EUj7bwO/pcVDwh7NbllHwx+SawoUvurC0vWO7VSGJtUu2hjwvacFWH/7VojJlljskHxk M3dw== 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:cc:to:from:x-gm-message-state:from:to:cc; bh=J5SoQylTtJu5qfrohns44hEwW2yRQ/CAKj0/Q0ls+dE=; b=Phuy/27olRXQ8Pv7lmkDQJRXxaocPqzCWqfUMBso5fiWFahMyDwwmCW3u5eXRqvmNv sZpCoRZiWhZy2KsvuEXRkbGKpkhaCRF9OkDWOmsfLWp12YPmUyYXQ6ZwIRrwRB/DwMaN JvqoZhAVV197HTNU2PqwkuxuuAShtU6QCN4Ik0vzNMuGSoyMUiWB4pM9NKtPxrO0PjnR 4GBMS5Cy3ffl8rqMepVXfa7w3K0tWE8FS1XBOxx1tPcM2EmO02+Svpah58LO7NQ2fJ72 GJw4ZqrDLzscUfzG4d2C4RbO3SskrgTaVnVjs8tTsI41COhqGKMp5eT0wrpYV5o1yVir RPWQ== X-Gm-Message-State: ACgBeo0niqSTHNz5qPSUcCn5cIg498JJnS295Cd5JCuOShnzRiiwIMfk J4fN2IwlfBt+s0x2Fs2scnwGzPR9G7vrqw== X-Received: by 2002:a17:90b:4d8d:b0:1fb:2e53:5079 with SMTP id oj13-20020a17090b4d8d00b001fb2e535079mr6033723pjb.175.1661182065921; Mon, 22 Aug 2022 08:27:45 -0700 (PDT) Received: from stoup.. ([71.212.157.236]) by smtp.gmail.com with ESMTPSA id q7-20020a17090311c700b0016bffc59718sm8665222plh.58.2022.08.22.08.27.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 22 Aug 2022 08:27:45 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Cc: qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= Subject: [PATCH v2 04/66] target/arm: Use GetPhysAddrResult in get_phys_addr_v6 Date: Mon, 22 Aug 2022 08:26:39 -0700 Message-Id: <20220822152741.1617527-5-richard.henderson@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220822152741.1617527-1-richard.henderson@linaro.org> References: <20220822152741.1617527-1-richard.henderson@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::62e; envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x62e.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" Reviewed-by: Alex Bennée Signed-off-by: Richard Henderson Reviewed-by: Peter Maydell --- 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 4f248f6266..4961bc2f9f 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -536,8 +536,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; @@ -597,11 +596,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); @@ -627,12 +626,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. */ @@ -640,7 +639,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; @@ -658,14 +657,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; @@ -676,9 +675,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; @@ -2516,8 +2515,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,