From nobody Mon Feb 9 16:14:37 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1509618985530665.1386722556699; Thu, 2 Nov 2017 03:36:25 -0700 (PDT) Received: from localhost ([::1]:59562 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eACqy-00088Q-MF for importer@patchew.org; Thu, 02 Nov 2017 06:36:04 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50892) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eACph-0007PX-HH for qemu-devel@nongnu.org; Thu, 02 Nov 2017 06:34:46 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eACpe-0005Y0-DM for qemu-devel@nongnu.org; Thu, 02 Nov 2017 06:34:45 -0400 Received: from bee.antfield.fr ([188.165.75.195]:36564) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eACpe-0005WP-7H; Thu, 02 Nov 2017 06:34:42 -0400 From: Luc MICHEL To: qemu-devel@nongnu.org Date: Thu, 2 Nov 2017 11:35:59 +0100 Message-Id: <20171102103559.7382-2-luc.michel@git.antfield.fr> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20171102103559.7382-1-luc.michel@git.antfield.fr> References: <20171102103559.7382-1-luc.michel@git.antfield.fr> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 188.165.75.195 Subject: [Qemu-devel] [PATCH 1/1] target-ppc: Fix booke206 tlbwe TLB instruction X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Gibson , qemu-ppc@nongnu.org, Alexander Graf , Luc MICHEL Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" When overwritting a valid TLB entry with a new one, the previous page were not flushed in QEMU TLB, leading to incoherent mapping. This commit fixes this. Signed-off-by: Luc MICHEL --- target/ppc/mmu_helper.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/target/ppc/mmu_helper.c b/target/ppc/mmu_helper.c index 2a1f9902c9..c2c89239b4 100644 --- a/target/ppc/mmu_helper.c +++ b/target/ppc/mmu_helper.c @@ -2570,6 +2570,17 @@ void helper_booke_setpid(CPUPPCState *env, uint32_t = pidn, target_ulong pid) tlb_flush(CPU(cpu)); } =20 +static inline void flush_page(CPUPPCState *env, ppcmas_tlb_t *tlb) +{ + PowerPCCPU *cpu =3D ppc_env_get_cpu(env); + + if (booke206_tlb_to_page_size(env, tlb) =3D=3D TARGET_PAGE_SIZE) { + tlb_flush_page(CPU(cpu), tlb->mas2 & MAS2_EPN_MASK); + } else { + tlb_flush(CPU(cpu)); + } +} + void helper_booke206_tlbwe(CPUPPCState *env) { PowerPCCPU *cpu =3D ppc_env_get_cpu(env); @@ -2628,6 +2639,12 @@ void helper_booke206_tlbwe(CPUPPCState *env) if (msr_gs) { cpu_abort(CPU(cpu), "missing HV implementation\n"); } + + if (tlb->mas1 & MAS1_VALID) { + /* Invalidate the page in QEMU TLB if it was a valid entry */ + flush_page(env, tlb); + } + tlb->mas7_3 =3D ((uint64_t)env->spr[SPR_BOOKE_MAS7] << 32) | env->spr[SPR_BOOKE_MAS3]; tlb->mas1 =3D env->spr[SPR_BOOKE_MAS1]; @@ -2663,11 +2680,7 @@ void helper_booke206_tlbwe(CPUPPCState *env) tlb->mas1 &=3D ~MAS1_IPROT; } =20 - if (booke206_tlb_to_page_size(env, tlb) =3D=3D TARGET_PAGE_SIZE) { - tlb_flush_page(CPU(cpu), tlb->mas2 & MAS2_EPN_MASK); - } else { - tlb_flush(CPU(cpu)); - } + flush_page(env, tlb); } =20 static inline void booke206_tlb_to_mas(CPUPPCState *env, ppcmas_tlb_t *tlb) --=20 2.14.3