From nobody Tue Feb 10 06:43:46 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) client-ip=209.85.218.48; envelope-from=philippe.mathieu.daude@gmail.com; helo=mail-ej1-f48.google.com; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail(p=none dis=none) header.from=amsat.org ARC-Seal: i=1; a=rsa-sha256; t=1611844950; cv=none; d=zohomail.com; s=zohoarc; b=XzfB6u+eFn2hvDs287bnj5fNzRbLGCKtOA9hIiyVVt4lXUtqx9uvoBVXd4JxWQb3PFB+QfLAKtKK1SrudFnsVLUuOxlpaHrewuYm66Xv5ieLoekjwlCyQlxxUiwjqsGiGi0g9haZHiKwxWPgxnt7lA6bNfn7RUaVcu6E/cuC0Yo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1611844950; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:MIME-Version:Message-ID:References:Sender:Subject:To; bh=M8+6cLNWr/uAS+TNZ6Hbe5EtuSlUEfhm1Od8LZpx7QA=; b=a+yaBKHnJ34XH66Fk9g2kXx67ks3XDwV5+s6JiX5gQhsPuvG1YTr4nmCo8EU476Ma949XIE+ZDY1QqJI6T79+XzkCV9otHMIrJUMTBHZtOcM0dHJm8LXB0SkIB5LSTx+ZgL/cPeR8PEW5rldN9H0og/HM0MMQZKuKrR7EXYh84o= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of _spf.google.com designates 209.85.218.48 as permitted sender) smtp.mailfrom=philippe.mathieu.daude@gmail.com; dmarc=fail header.from= (p=none dis=none) header.from= Received: from mail-ej1-f48.google.com (mail-ej1-f48.google.com [209.85.218.48]) by mx.zohomail.com with SMTPS id 1611844950724918.5115870848739; Thu, 28 Jan 2021 06:42:30 -0800 (PST) Received: by mail-ej1-f48.google.com with SMTP id a10so8093404ejg.10 for ; Thu, 28 Jan 2021 06:42:28 -0800 (PST) Return-Path: Return-Path: Received: from x1w.redhat.com (13.red-83-57-169.dynamicip.rima-tde.net. [83.57.169.13]) by smtp.gmail.com with ESMTPSA id g10sm2362757ejp.37.2021.01.28.06.42.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 06:42:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=M8+6cLNWr/uAS+TNZ6Hbe5EtuSlUEfhm1Od8LZpx7QA=; b=Ez2jppMXKYC1Pm4NLSeqnCEK5zPShk7o/LP/y6I6Jtim2STIzSlmsb7YvMQfnttsfb jpMWPD1Y/Dv5g/lMuH8Izoq1ZLbXxZZSwRztmsdFKBZUO15evR3KuWfpVHpRasyE7Ne9 DA/oXWFLQczXRqBJLJ1aDIXcpl14LpzOUIsQDaGHLqIdBmCMff+L7KRMi0Uq6uVyI9b3 +wrp0O6ITJ0Y1k/06UnMgpljrbaW/5gUcMaaQlTqIhU3TDX8IO2Xj0t6UHG7TXtcPvI3 XjcTcxKKltCze1IS0Tj/lyBTlIlH5CjGhJxVKQo/t947docoMRNLfR0Qu5/pIrl1Rnu2 6+sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=M8+6cLNWr/uAS+TNZ6Hbe5EtuSlUEfhm1Od8LZpx7QA=; b=PQqVi/K1qLrHwwaxzflCAEvf+8lWmnu+2hdperTTJ9A8czshRasX1Ddrx0OJdYabAZ j+54D9ZXq6Vow1HdMDPmgN25RKOFtg5Zkx2Hz2dLg1sRQpfTbM3xBmCfemUt9Mlwxh92 17gW/uINkJjzEmJNrILCw8eGskZFLT4WrdRpSjt8T2ol/beqIt7bE3Aasszwosc7ILwS yDFuQIlyqA9t6EOQCVCJzryfWESy84nV3Qipd2v30UrlfiHWn1hze7aFkMHkl6/oDgu6 beEsRBIFdkto/XSc6dKzAWMN5gC682HspUIxH1av3JA7RWKN4iegaDHnW0+c8c+a13Fw Twpw== X-Gm-Message-State: AOAM530qhZ5tET4oX4YQbSZOCVRLfkYf+KUDOzW3oFBipnox84k7jP4w tJbE0qTyKPrFjyX54Z+JDI4= X-Google-Smtp-Source: ABdhPJzB3atE4VDXUGrdYO2P/VxE34XduNNg15qvPzoCExAdpXqLlQzFuxpLgZRXuD4jxETYJWa7Xw== X-Received: by 2002:a17:906:7f8e:: with SMTP id f14mr11046445ejr.198.1611844947767; Thu, 28 Jan 2021 06:42:27 -0800 (PST) Sender: =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= From: =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Jiaxun Yang , Huacai Chen , Joe Komlodi , Aurelien Jarno , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Aleksandar Rikalo , Richard Henderson Subject: [PATCH 11/13] target/mips: Let get_physical_address() take MMUAccessType argument Date: Thu, 28 Jan 2021 15:41:23 +0100 Message-Id: <20210128144125.3696119-12-f4bug@amsat.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210128144125.3696119-1-f4bug@amsat.org> References: <20210128144125.3696119-1-f4bug@amsat.org> MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) All these functions: - mips_cpu_get_phys_page_debug() - cpu_mips_translate_address() - mips_cpu_tlb_fill() - page_table_walk_refill() - walk_directory() call get_physical_address() passing a MMUAccessType type. Let the prototype use it as argument, as it is stricter than an integer. Signed-off-by: Philippe Mathieu-Daud=C3=A9 Reviewed-by: Jiaxun Yang --- target/mips/tlb_helper.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/target/mips/tlb_helper.c b/target/mips/tlb_helper.c index 21b7d38f11c..64e89591abc 100644 --- a/target/mips/tlb_helper.c +++ b/target/mips/tlb_helper.c @@ -259,7 +259,7 @@ static int get_segctl_physical_address(CPUMIPSState *en= v, hwaddr *physical, =20 static int get_physical_address(CPUMIPSState *env, hwaddr *physical, int *prot, target_ulong real_address, - int rw, int mmu_idx) + MMUAccessType access_type, int mmu_idx) { /* User mode can only access useg/xuseg */ #if defined(TARGET_MIPS64) @@ -306,14 +306,14 @@ static int get_physical_address(CPUMIPSState *env, hw= addr *physical, segctl =3D env->CP0_SegCtl2 >> 16; } ret =3D get_segctl_physical_address(env, physical, prot, - real_address, rw, + real_address, access_type, mmu_idx, segctl, 0x3FFFFFFF); #if defined(TARGET_MIPS64) } else if (address < 0x4000000000000000ULL) { /* xuseg */ if (UX && address <=3D (0x3FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -322,7 +322,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if ((supervisor_mode || kernel_mode) && SX && address <=3D (0x7FFFFFFFFFFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -349,7 +349,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, /* Does CP0_Status.KX/SX/UX permit the access mode (am) */ if (env->CP0_Status & am_ksux[am]) { ret =3D get_seg_physical_address(env, physical, prot, - real_address, rw, + real_address, access_type, mmu_idx, am, false, env->PA= Mask, 0); } else { @@ -363,7 +363,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, if (kernel_mode && KX && address <=3D (0xFFFFFFFF7FFFFFFFULL & env->SEGMask)) { ret =3D env->tlb->map_address(env, physical, prot, - real_address, rw); + real_address, access_type); } else { ret =3D TLBRET_BADADDR; } @@ -371,17 +371,17 @@ static int get_physical_address(CPUMIPSState *env, hw= addr *physical, } else if (address < KSEG1_BASE) { /* kseg0 */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl1 >> 16, 0x1FFFFF= FF); } else if (address < KSEG2_BASE) { /* kseg1 */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl1, 0x1FFFFFFF); } else if (address < KSEG3_BASE) { /* sseg (kseg2) */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl0 >> 16, 0x1FFFFF= FF); } else { /* @@ -389,7 +389,7 @@ static int get_physical_address(CPUMIPSState *env, hwad= dr *physical, * XXX: debug segment is not emulated */ ret =3D get_segctl_physical_address(env, physical, prot, real_addr= ess, - rw, mmu_idx, + access_type, mmu_idx, env->CP0_SegCtl0, 0x1FFFFFFF); } return ret; --=20 2.26.2