From patchwork Tue May 6 14:41:46 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 887843 Delivered-To: patch@linaro.org Received: by 2002:a5d:430f:0:b0:38f:210b:807b with SMTP id h15csp2590775wrq; Tue, 6 May 2025 07:54:00 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXFnJKl4cVZc9xuc6ugoCELsoHAAir2VPTEfG7Q1o3rl1+4Tu8s6a83/M3qgpAZ0dsy8eIWqg==@linaro.org X-Google-Smtp-Source: AGHT+IHKNfFrSGhOG3FlphGrikj0+BDDG9jypfi+0VVnOfYmNb8VOTCiSxd4wz+EeeWm55e/CJ1j X-Received: by 2002:a05:622a:14e:b0:476:9e28:ce49 with SMTP id d75a77b69052e-490f31687c8mr57386551cf.43.1746543240043; Tue, 06 May 2025 07:54:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1746543240; cv=none; d=google.com; s=arc-20240605; b=D7lpf/l05p70e8HqPFnQ6qADdOvlhCISLfJqS3X+C9P7DwppRCpLNJcyME8aWgTPFO zbLxsvmSupzsS2q2Kj/Wk65fIg6UTKDIpByc8e3bsmTwME5XaE7WpI023VHXzjPyzfBv obhfu28cBqJpeJE+xM6DpYPhKXqgPFW5aDXRaGzArkwWDkA4nm3BXjMRNBtAszrmqYjR 0hbDnarKiALifBIE85za4pGNWrnP1pLXluwXBZfeWJoFC6+gKuPwAv1h8Zd4l7tkfJi8 8ki8E7mPhTSIADqm/czDC5TDfWEEIjmtbIAeVNCYZWOnsjHGPLiEVmjCP1xgMy5aNNpR oZRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=fC2jHBKYRTTEkxoTmwp/d2cTCTjTywdh1MWSbq8eZlTUL60/XT51OKvUSK4XUDACkt hsojPRjAd/EJGFen9ctglCP5qQ5l89iy6tL4QQE0fZYgN2Ewy2olItC2dmI7natklhbL l0GTiX4TD0a9kDDEi59Q2NaiX5QJaKISzFlQLsfnRo7b4QhsjhyTqeNkqwC4BAueCpJE In6rwUfpS6QEohHCNUOf9arf2MiRHQNBTMwdwQhb4O7f3aeP6uElZwRv58V4ih/WPz6p 6r9Hr+aYkYAMd0ZTdEKYepZWlc959DvyIL57axcqBhebWHfMTeS1Gw4Ww5vQ0P0Kfum3 uxzQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Zyi5WTfn; 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; dara=neutral header.i=@linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id d75a77b69052e-48b98e09dbcsi111912721cf.587.2025.05.06.07.53.59 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 06 May 2025 07:54:00 -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=Zyi5WTfn; 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; dara=neutral header.i=@linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uCJXX-0003p1-38; Tue, 06 May 2025 10:44:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1uCJV5-0001Sc-AG for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:32 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uCJV2-00025h-LV for qemu-devel@nongnu.org; Tue, 06 May 2025 10:42:26 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-43cfba466b2so48970045e9.3 for ; Tue, 06 May 2025 07:42:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1746542541; x=1747147341; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; b=Zyi5WTfniajaBpCXH/FETnfGyDigmWcwN786Yoo8tPMiQbajeRJUjPwH7he9hQt5/A MFFAf05hh9+vLcKisnLOXf/9GiXyfJDYYx6MJbHJNSaX6zhZ2hwBc5In3otCR0/A+QR9 LFDuzK3HuaVK8voaph/tXvChPbhoYFltb7bmPO1Sik2hMeJb8M99rxUyS1FX/zeYCwbZ nv2hMNuR1x+fh5492B5Y0NIkQiZzS1n+9YbhRKRiCylvAshzbiZW7UQwMOzZ7YFqSXaN OHthF+Wl2nRZ44n6mbOgHx6RDXA3t7dUt2h4+CbBWd0m6KJCybab8MBFBop1g6PWVlLn GW3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746542541; x=1747147341; 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:message-id:reply-to; bh=VckgnWFHcXJaFRW3+b8g4WIpqvkRRSf9OGC46J//Dr8=; b=qjzWZsKkF9lO0K/oeOOQZPJLtifEccNu7UQEdZopxjdS9Vi4cPRnu/7H9Z3mPOHDiV FPP5bB+jljID1U7dz64nEtBz6dwokhaf98dWSbRSsptK8Ex4PQFohNlhaGBIpI4wsX42 nDQCeRyJOVFeDo+TJYX2WUJNZ258PPn7XemsqcsTAbZ9OpLOda2Qamv2ACfML+JOhbsW NLY5c0rDOGQfTQHKJHpg+WTGZxJQl6DhZeD7TA5yE8QpQOH045Kw94xlBzfcoqvNrrz5 OX49CRRc0ASzJJ0B0D8LLpcmmGQVGrnN0JG6u5vkEBXJu+JuVtxSCr4vIZDOhV/C/1av 4cuA== X-Gm-Message-State: AOJu0YyfQFsVv4+DYhCm6TG902UgL9zfSbnOlIm14ZI3MdQ0SdOLIMob qpBoI80RVDiKIctNLM5BQfsqmpiKNY1mef5ERY4Q7v9px4Wqk8w7JUvdyUaRbCvLh2xBB4/+BDz 0 X-Gm-Gg: ASbGncvFYzJBeMZEVO2PW1IwstAlOT0wFKEElv8kdjiEooKE3BnKIBjNfQ8sQ+u/Tpz tgV2TDsS+zZ9JjCDjD7+Y97KaMXgAO1vb47Ax3Su7XJGmuTduswZ/opArdasiCbqSfH5DJ8kPuT IkqxwAgR/06gJzchygtz0PgFqwZT+dB2NB0MltgIa5VcAnrmmACIk+R7B5Bb3f/USh76J1K1/Sf kT413RbYN1WcxmYar5bbOPmW7vGBiS/IZLh6TuyFUXZ+udFxpUw1jmW5aOp/PBVNrq5sdHmlSt/ D7PAP4QPYVikYvjJIzc1EVttz2CB9k85uJqmblnoOw5qfI4= X-Received: by 2002:a05:600c:4690:b0:43d:762:e0c4 with SMTP id 5b1f17b1804b1-441d054c744mr33025205e9.27.1746542541347; Tue, 06 May 2025 07:42:21 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-441b89edfc2sm169603435e9.20.2025.05.06.07.42.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 07:42:20 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/32] target/arm/ptw: extract arm_mmu_idx_to_security_space Date: Tue, 6 May 2025 15:41:46 +0100 Message-ID: <20250506144214.1221450-5-peter.maydell@linaro.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250506144214.1221450-1-peter.maydell@linaro.org> References: <20250506144214.1221450-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32d.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-bounces+patch=linaro.org@nongnu.org From: Pierrick Bouvier We'll reuse this function later. Reviewed-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Signed-off-by: Pierrick Bouvier Message-id: 20250414153027.1486719-2-pierrick.bouvier@linaro.org Signed-off-by: Peter Maydell --- target/arm/ptw.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index e0e82ae507f..bdb4de7c047 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3551,13 +3551,9 @@ bool get_phys_addr_with_space_nogpc(CPUARMState *env, vaddr address, memop, result, fi); } -bool get_phys_addr(CPUARMState *env, vaddr address, - MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, - GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +static ARMSecuritySpace +arm_mmu_idx_to_security_space(CPUARMState *env, ARMMMUIdx mmu_idx) { - S1Translate ptw = { - .in_mmu_idx = mmu_idx, - }; ARMSecuritySpace ss; switch (mmu_idx) { @@ -3618,7 +3614,18 @@ bool get_phys_addr(CPUARMState *env, vaddr address, g_assert_not_reached(); } - ptw.in_space = ss; + return ss; +} + +bool get_phys_addr(CPUARMState *env, vaddr address, + MMUAccessType access_type, MemOp memop, ARMMMUIdx mmu_idx, + GetPhysAddrResult *result, ARMMMUFaultInfo *fi) +{ + S1Translate ptw = { + .in_mmu_idx = mmu_idx, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), + }; + return get_phys_addr_gpc(env, &ptw, address, access_type, memop, result, fi); }