From nobody Sat Nov 15 12:32:24 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1753407632064654.6447777833029; Thu, 24 Jul 2025 18:40:32 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uf7Q9-0003QI-6T; Thu, 24 Jul 2025 21:40:25 -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 1uf7Ov-0001bW-Im for qemu-devel@nongnu.org; Thu, 24 Jul 2025 21:39:09 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uf7Ot-0002qu-Dp for qemu-devel@nongnu.org; Thu, 24 Jul 2025 21:39:09 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8AxlnDo34JokJAxAQ--.34107S3; Fri, 25 Jul 2025 09:37:44 +0800 (CST) Received: from localhost.localdomain (unknown [10.2.5.213]) by front1 (Coremail) with SMTP id qMiowJCxdOTk34Joz5wlAA--.62171S11; Fri, 25 Jul 2025 09:37:44 +0800 (CST) From: Bibo Mao To: Song Gao Cc: Jiaxun Yang , qemu-devel@nongnu.org Subject: [PATCH v3 09/17] target/loongarch: Add parameter mmu_context with loongarch_get_addr_from_tlb Date: Fri, 25 Jul 2025 09:37:31 +0800 Message-Id: <20250725013739.994437-10-maobibo@loongson.cn> X-Mailer: git-send-email 2.39.3 In-Reply-To: <20250725013739.994437-1-maobibo@loongson.cn> References: <20250725013739.994437-1-maobibo@loongson.cn> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-CM-TRANSID: qMiowJCxdOTk34Joz5wlAA--.62171S11 X-CM-SenderInfo: xpdruxter6z05rqj20fqof0/ X-Coremail-Antispam: 1Uk129KBjDUn29KB7ZKAUJUUUUU529EdanIXcx71UUUUU7KY7 ZEXasCq-sGcSsGvfJ3UbIjqfuFe4nvWSU5nxnvy29KBjDU0xBIdaVrnUUvcSsGvfC2Kfnx nUUI43ZEXa7xR_UUUUUUUUU== Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=114.242.206.163; envelope-from=maobibo@loongson.cn; helo=mail.loongson.cn X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1753407633730116600 Content-Type: text/plain; charset="utf-8" With function loongarch_get_addr_from_tlb(), parameter mmu_context is added and remove parameter physical and prot. Signed-off-by: Bibo Mao --- target/loongarch/cpu_helper.c | 7 +++++-- target/loongarch/tcg/tcg_loongarch.h | 4 ++-- target/loongarch/tcg/tlb_helper.c | 16 ++++------------ 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c index a26bb8b11b..1e97687e1f 100644 --- a/target/loongarch/cpu_helper.c +++ b/target/loongarch/cpu_helper.c @@ -174,9 +174,12 @@ static int loongarch_map_address(CPULoongArchState *en= v, hwaddr *physical, =20 context.vaddr =3D address; if (tcg_enabled()) { - ret =3D loongarch_get_addr_from_tlb(env, physical, prot, address, - access_type, mmu_idx); + ret =3D loongarch_get_addr_from_tlb(env, &context, access_type, mm= u_idx); if (ret !=3D TLBRET_NOMATCH) { + if (ret =3D=3D TLBRET_MATCH) { + *physical =3D context.physical; + *prot =3D context.prot; + } return ret; } } diff --git a/target/loongarch/tcg/tcg_loongarch.h b/target/loongarch/tcg/tc= g_loongarch.h index fd4e116022..a27d77c5ba 100644 --- a/target/loongarch/tcg/tcg_loongarch.h +++ b/target/loongarch/tcg/tcg_loongarch.h @@ -7,6 +7,7 @@ #ifndef TARGET_LOONGARCH_TCG_LOONGARCH_H #define TARGET_LOONGARCH_TCG_LOONGARCH_H #include "cpu.h" +#include "cpu-mmu.h" =20 void loongarch_csr_translate_init(void); =20 @@ -14,8 +15,7 @@ bool loongarch_cpu_tlb_fill(CPUState *cs, vaddr address, = int size, MMUAccessType access_type, int mmu_idx, bool probe, uintptr_t retaddr); =20 -int loongarch_get_addr_from_tlb(CPULoongArchState *env, hwaddr *physical, - int *prot, target_ulong address, +int loongarch_get_addr_from_tlb(CPULoongArchState *env, mmu_context *conte= xt, MMUAccessType access_type, int mmu_idx); =20 #endif /* TARGET_LOONGARCH_TCG_LOONGARCH_H */ diff --git a/target/loongarch/tcg/tlb_helper.c b/target/loongarch/tcg/tlb_h= elper.c index 460e7c00c5..a875ac251e 100644 --- a/target/loongarch/tcg/tlb_helper.c +++ b/target/loongarch/tcg/tlb_helper.c @@ -666,23 +666,15 @@ static int loongarch_map_tlb_entry(CPULoongArchState = *env, mmu_context *context, return loongarch_check_pte(env, context, access_type, mmu_idx); } =20 -int loongarch_get_addr_from_tlb(CPULoongArchState *env, hwaddr *physical, - int *prot, target_ulong address, +int loongarch_get_addr_from_tlb(CPULoongArchState *env, mmu_context *conte= xt, MMUAccessType access_type, int mmu_idx) { int index, match; - mmu_context context; =20 - context.vaddr =3D address; - match =3D loongarch_tlb_search(env, address, &index); + match =3D loongarch_tlb_search(env, context->vaddr, &index); if (match) { - match =3D loongarch_map_tlb_entry(env, &context, - access_type, index, mmu_idx); - if (match =3D=3D TLBRET_MATCH) { - *physical =3D context.physical; - *prot =3D context.prot; - } - return match; + return loongarch_map_tlb_entry(env, context, + access_type, index, mmu_idx); } =20 return TLBRET_NOMATCH; --=20 2.39.3