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 1753407600914325.7025028783762; Thu, 24 Jul 2025 18:40:00 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uf7PD-0001m5-8N; Thu, 24 Jul 2025 21:39:27 -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 1uf7Nh-0000ku-CE for qemu-devel@nongnu.org; Thu, 24 Jul 2025 21:37:53 -0400 Received: from mail.loongson.cn ([114.242.206.163]) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uf7Nd-0002b8-7l for qemu-devel@nongnu.org; Thu, 24 Jul 2025 21:37:53 -0400 Received: from loongson.cn (unknown [10.2.5.213]) by gateway (Coremail) with SMTP id _____8Bxjazo34JokZAxAQ--.1129S3; 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--.62171S12; 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 10/17] target/loongarch: Add parameter mmu_context with loongarch_map_address Date: Fri, 25 Jul 2025 09:37:32 +0800 Message-Id: <20250725013739.994437-11-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--.62171S12 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: 1753407604312116600 Content-Type: text/plain; charset="utf-8" With function loongarch_map_address(), parameter mmu_context is added and remove parameter address, prot and address. Signed-off-by: Bibo Mao --- target/loongarch/cpu_helper.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/target/loongarch/cpu_helper.c b/target/loongarch/cpu_helper.c index 1e97687e1f..6abd7aa152 100644 --- a/target/loongarch/cpu_helper.c +++ b/target/loongarch/cpu_helper.c @@ -164,22 +164,15 @@ static int loongarch_page_table_walker(CPULoongArchSt= ate *env, return loongarch_check_pte(env, context, access_type, mmu_idx); } =20 -static int loongarch_map_address(CPULoongArchState *env, hwaddr *physical, - int *prot, target_ulong address, +static int loongarch_map_address(CPULoongArchState *env, mmu_context *cont= ext, MMUAccessType access_type, int mmu_idx, int is_debug) { int ret; - mmu_context context; =20 - context.vaddr =3D address; if (tcg_enabled()) { - ret =3D loongarch_get_addr_from_tlb(env, &context, access_type, mm= u_idx); + ret =3D loongarch_get_addr_from_tlb(env, context, access_type, mmu= _idx); if (ret !=3D TLBRET_NOMATCH) { - if (ret =3D=3D TLBRET_MATCH) { - *physical =3D context.physical; - *prot =3D context.prot; - } return ret; } } @@ -190,7 +183,7 @@ static int loongarch_map_address(CPULoongArchState *env= , hwaddr *physical, * legal mapping, even if the mapping is not yet in TLB. return 0 = if * there is a valid map, else none zero. */ - return loongarch_page_table_walker(env, &context, access_type, mmu= _idx); + return loongarch_page_table_walker(env, context, access_type, mmu_= idx); } =20 return TLBRET_NOMATCH; @@ -218,8 +211,11 @@ int get_physical_address(CPULoongArchState *env, hwadd= r *physical, int64_t addr_high; uint8_t da =3D FIELD_EX64(env->CSR_CRMD, CSR_CRMD, DA); uint8_t pg =3D FIELD_EX64(env->CSR_CRMD, CSR_CRMD, PG); + mmu_context context; + int ret; =20 /* Check PG and DA */ + context.vaddr =3D address; if (da & !pg) { *physical =3D address & TARGET_PHYS_MASK; *prot =3D PAGE_READ | PAGE_WRITE | PAGE_EXEC; @@ -253,8 +249,12 @@ int get_physical_address(CPULoongArchState *env, hwadd= r *physical, } =20 /* Mapped address */ - return loongarch_map_address(env, physical, prot, address, - access_type, mmu_idx, is_debug); + ret =3D loongarch_map_address(env, &context, access_type, mmu_idx, is_= debug); + if (ret =3D=3D TLBRET_MATCH) { + *physical =3D context.physical; + *prot =3D context.prot; + } + return ret; } =20 hwaddr loongarch_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) --=20 2.39.3