From patchwork Thu Apr 10 21:00:21 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierrick Bouvier X-Patchwork-Id: 879762 Delivered-To: patch@linaro.org Received: by 2002:a5d:4882:0:b0:38f:210b:807b with SMTP id g2csp453033wrq; Thu, 10 Apr 2025 14:02:40 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVnca8hpxV6y2+Obb92qlxps82HvSDbnz6kb5vz2NUiFQELv69j6UmFGGcjApTOJkcVvszyNg==@linaro.org X-Google-Smtp-Source: AGHT+IHDlWskQQKsbRLbSUr64oST+XY7gMTBhwW+vCTEKUJZ9TZwJD43I4BBVimvMn4Rn6bptqO2 X-Received: by 2002:a05:620a:2906:b0:7c5:5692:ee95 with SMTP id af79cd13be357-7c7af12ae32mr64638685a.51.1744318959301; Thu, 10 Apr 2025 14:02:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744318959; cv=none; d=google.com; s=arc-20240605; b=GdIri/cOizbiZg13VVgzsVZPOWHfqVZkzp/5xKohI7ORhjOHPiUcQTzAhRHiRfdw4I Ln/E+w6xOEfIeCcmHdGZLMUX4qR796TZxnXNoddc+t1JQxha54EGsKldp9cleROfaSDs jDCjSf2NGpLM+acosF7Z0SrP2HHp/vHiyNBAfKryjycGLBf7cl3690SEYL8Pdc5yXOZG nW/RxLMrV/B7ntSR7z075++z8y1FjWsy9vtMSKt6T9KM0vaWMF6LyI3xVlbNUMnbekWE 4eJrsKV7eSxwJsnP4ptukWkg7Gq0hSeC4U+Ebf8A8sejrKqPCcrcLMGy1Kc91poGbS9J k/PQ== 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:cc:to :from:dkim-signature; bh=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; fh=9zURFNcU6oIvJEyFpefuco3FFmkVuZS76K74T16TMuc=; b=JJpBS0iOxY/6FezghvbmOU/n1ORjLZFjUtl6+n9aKRVfjVeYMD6MWQ33Yb2wAxVIsQ 3tHmNxWV2ufHwxcAWdc/BQ/N7LOmkd71oVlezNhdqQjsbMNLRd/4/Q/fMFjcWw3hIYlG yF3NHRYzOv2qeUbQzYxm1UAcNHs3oKntjglugH9SMjbi+9NxLseGjs/8At1oKBoTqqI9 MOV303K2MK5G2MgIfei3Ek0XNIUrhnKq2WQ0jqTO/69A7oDv1JfdCx5tKOZOvU3uCTRF CkV9h9Dagpqn8iCTxtHnonrz4kg5uojZGFZ5RxFythcpaLugKt3EkcFw/9q9ckk+whAD /fjw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=jgMVDr2b; 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 af79cd13be357-7c7a895de5dsi168487885a.165.2025.04.10.14.02.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 10 Apr 2025 14:02:39 -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=jgMVDr2b; 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 1u2z0u-0005yt-4u; Thu, 10 Apr 2025 17:00:44 -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 1u2z0r-0005xC-GY for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:42 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1u2z0p-0001lb-Fq for qemu-devel@nongnu.org; Thu, 10 Apr 2025 17:00:41 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-224019ad9edso18111725ad.1 for ; Thu, 10 Apr 2025 14:00:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1744318838; x=1744923638; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; b=jgMVDr2bdgdohL8//DMrQBoIzFy/nWB3riBShponSud05c2Xik7TvRg2Lsmhmx71HT vIC8f9SGY1VPZ5h/EyijedNssgNrBY+zSNYHCq+gi7MsD8e93knRdmmV0inYOOcgLooc WzXKOK/rL0ibM54AVn128jVGeZdtO3UgDYyPLqIkBNL8bloNpb58ix6RlcaRH6kStryY VezNqXfP5550QG1Ox6OF24XWG3FXq3NTA79I+RTn4QewSVIp5xfE7dIs+7wuCMusbRx2 J6cFzv1brczCxJcDInhbY0BG2YHHrg6cCop2WZddNmpQdanhQy+VkoES0LZUVUSBniQw Vejg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744318838; x=1744923638; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PmeV86UWNxMTSPkNU4LeBxv7d2QnrBx0YubZlLs/qhU=; b=Au277q/OP3MVMGW+alfjW6pL2DfotXNR/5LK0KvbmOTAb2xdqCWS0pb9jHpf9xGpDL gKn/nsPbcyBq6gm+PpHNHLM2j3d86GWg9XiKDnjH7ocY68h49tCAYOICflbRHaQxaHPd /rjg8U2N5ol/HoWcY3ZCrCdo/r+dJ3ldojctQz3BsZ+TPktxTBUUMqd+Nj8SdKZh9PHJ MzDHbubiQBpXtMDwHOkajbSODieTE6pkGFej4eumSNgNSbkSPB03WVgbxI54PKNI/RSC 3hhwPqSuwiXHXvD/BAbzwU84ntKVZ7+XoNQ+d7uiv5ZhSGB6tw58GrPLeh70YT2Uj/mo Q/Aw== X-Gm-Message-State: AOJu0YxJkLr+qhNLGE1H7z1xWclqxySUQOAcUDxru9DUXduybBXUiqHJ bjwoQaI8BmjSTCGGkX8R9byMytdPygFz+KafrbIE0nqJ5AkkHvQkHLftah9oUZgh/gJBBjVMLBc Z X-Gm-Gg: ASbGncubDBwE01rHIkIb/rO5VQmXS3dDHP4oIQbiDZCk9yCk+7dBMl/jsqlRxqh072S 8IRljsKFSLICEAYNY3EzoqetwGUDkZqo+Gg9ZZU3mXdlCsTEEQ1fC75OparmVBr4123qNic2P7N YfzxI4iNs4TqGSqFWDc6ZmAgHXrKVajaA9kvC+rfuBUdwOex9De1wN7MIOYaG2nDGkenJNk6aBu 3CiPtUokjNcTc04Eg+vKEKEpZwET2Nist6UeIm+TWg90oyKCJvP+C1iMNBlfM2olYcjn61nDzqH 1MU/eyZtkayl+3rcfxzJe1ApqX4xWsbBo55iNX4UIa1MzJSLOic= X-Received: by 2002:a17:902:e5cf:b0:215:94eb:adb6 with SMTP id d9443c01a7336-22bea4efe58mr4867695ad.40.1744318838103; Thu, 10 Apr 2025 14:00:38 -0700 (PDT) Received: from pc.. ([38.39.164.180]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73bd22f82a3sm12431b3a.90.2025.04.10.14.00.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Apr 2025 14:00:37 -0700 (PDT) From: Pierrick Bouvier To: qemu-devel@nongnu.org Cc: Peter Maydell , Richard Henderson , Paolo Bonzini , philmd@linaro.org, alex.bennee@linaro.org, qemu-arm@nongnu.org, Yannis Bolliger , Pierrick Bouvier Subject: [PATCH 3/4] target/arm/ptw: extract arm_cpu_get_phys_page Date: Thu, 10 Apr 2025 14:00:21 -0700 Message-Id: <20250410210022.809905-4-pierrick.bouvier@linaro.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250410210022.809905-1-pierrick.bouvier@linaro.org> References: <20250410210022.809905-1-pierrick.bouvier@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2607:f8b0:4864:20::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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=unavailable 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 Allow to call that function easily several times in next commit. Signed-off-by: Pierrick Bouvier Reviewed-by: Philippe Mathieu-Daudé --- target/arm/ptw.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/target/arm/ptw.c b/target/arm/ptw.c index 754ef0d3a25..6ea39ee5755 100644 --- a/target/arm/ptw.c +++ b/target/arm/ptw.c @@ -3629,23 +3629,17 @@ bool get_phys_addr(CPUARMState *env, vaddr address, memop, result, fi); } -hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, - MemTxAttrs *attrs) +static hwaddr arm_cpu_get_phys_page(CPUARMState *env, vaddr addr, + MemTxAttrs *attrs, ARMMMUIdx mmu_idx) { - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; - ARMMMUIdx mmu_idx = arm_mmu_idx(env); - ARMSecuritySpace ss = arm_mmu_idx_to_security_space(env, mmu_idx); S1Translate ptw = { .in_mmu_idx = mmu_idx, - .in_space = ss, + .in_space = arm_mmu_idx_to_security_space(env, mmu_idx), .in_debug = true, }; GetPhysAddrResult res = {}; ARMMMUFaultInfo fi = {}; - bool ret; - - ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); + bool ret = get_phys_addr_gpc(env, &ptw, addr, MMU_DATA_LOAD, 0, &res, &fi); *attrs = res.f.attrs; if (ret) { @@ -3653,3 +3647,13 @@ hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, } return res.f.phys_addr; } + +hwaddr arm_cpu_get_phys_page_attrs_debug(CPUState *cs, vaddr addr, + MemTxAttrs *attrs) +{ + ARMCPU *cpu = ARM_CPU(cs); + CPUARMState *env = &cpu->env; + ARMMMUIdx mmu_idx = arm_mmu_idx(env); + + return arm_cpu_get_phys_page(env, addr, attrs, mmu_idx); +}