From nobody Thu Nov 13 20:41:59 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=fail; 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 ARC-Seal: i=1; a=rsa-sha256; t=1582587738; cv=none; d=zohomail.com; s=zohoarc; b=W4Tox6dWNTFw1ICL12e7//Vv+lLLaHkqgji8mGSVBMcMvMUCKV4cEyd95OcmPrnLe+dVa2wubJdAU8EOo5Fy7suhTTlKOPNqrbP4JIbaTHlq5Wsp3Az7NbgwYBzQP3u/ItLLKCuuSaBkfLaN9LI5TSwcoJqtghiWJoZVskhMaBo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1582587738; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=E2B99emBfHX3L98mlyFjJjnyDTn9wZDBdeZWce3QOYY=; b=HF9Edz82sTiN1CF6NeNH7xARKvTskdv9pD+s3m7bhzwtzwKSvRCsZQnXA8eBv393x4CwbE/4AY5bQb1dwv+UyDXjdmQc3BPSx2bYw98psv1JNQwnYf85cpryepQ3f0oiojXGF3U5XwEcbnli/XrTAUUKzaOZsLRdnK/x6FPBnBA= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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 1582587738853548.4801513266508; Mon, 24 Feb 2020 15:42:18 -0800 (PST) Received: from localhost ([::1]:46174 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6NMf-0006ve-BA for importer@patchew.org; Mon, 24 Feb 2020 18:42:17 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47210) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j6NIP-0006Vf-8X for qemu-devel@nongnu.org; Mon, 24 Feb 2020 18:37:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j6NIN-00088p-VD for qemu-devel@nongnu.org; Mon, 24 Feb 2020 18:37:53 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:43209) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j6NIN-00084M-Jw; Mon, 24 Feb 2020 18:37:51 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 48RJQ44LF9z9sRt; Tue, 25 Feb 2020 10:37:32 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1582587452; bh=/gYCLL/Jk6TTuPaJCqEEFdhUfEKdZ2BLlTEIKLhOQP8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KM+9D4osvKZ9PLVeJwdJMyToWJJchiXsZHtgHGxqGQD3qyzQGIm6/080bP2wUsS+/ tJKx5+kPzBAK5eUc5auoEOxUdC8w/jiZzs5dicl4qCB7Pp619aG9obD8vIBO8c/bf4 7QPbazSKfcRf/iziAgZvjhCFRRpE/1K9hRB2jOvI= From: David Gibson To: groug@kaod.org, qemu-ppc@nongnu.org, qemu-devel@nongnu.org, clg@kaod.org Subject: [PATCH v6 12/18] target/ppc: Don't store VRMA SLBE persistently Date: Tue, 25 Feb 2020 10:37:18 +1100 Message-Id: <20200224233724.46415-13-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200224233724.46415-1-david@gibson.dropbear.id.au> References: <20200224233724.46415-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2401:3900:2:1::2 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , aik@ozlabs.ru, farosas@linux.ibm.com, Mark Cave-Ayland , Igor Mammedov , paulus@samba.org, Paolo Bonzini , "Edgar E. Iglesias" , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" Currently, we construct the SLBE used for VRMA translations when the LPCR is written (which controls some bits in the SLBE), then use it later for translations. This is a bit complex and confusing - simplify it by simply constructing the SLBE directly from the LPCR when we need it. Signed-off-by: David Gibson Reviewed-by: Fabiano Rosas Reviewed-by: Greg Kurz --- target/ppc/cpu.h | 3 --- target/ppc/mmu-hash64.c | 28 ++++++---------------------- 2 files changed, 6 insertions(+), 25 deletions(-) diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index f9871b1233..5a55fb02bd 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1044,9 +1044,6 @@ struct CPUPPCState { uint32_t flags; uint64_t insns_flags; uint64_t insns_flags2; -#if defined(TARGET_PPC64) - ppc_slb_t vrma_slb; -#endif =20 int error_code; uint32_t pending_interrupts; diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index ac21c14f68..f8bf92aa2e 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -825,6 +825,7 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr = eaddr, { CPUState *cs =3D CPU(cpu); CPUPPCState *env =3D &cpu->env; + ppc_slb_t vrma_slbe; ppc_slb_t *slb; unsigned apshift; hwaddr ptex; @@ -863,8 +864,8 @@ int ppc_hash64_handle_mmu_fault(PowerPCCPU *cpu, vaddr = eaddr, } } else if (ppc_hash64_use_vrma(env)) { /* Emulated VRMA mode */ - slb =3D &env->vrma_slb; - if (!slb->sps) { + slb =3D &vrma_slbe; + if (build_vrma_slbe(cpu, slb) !=3D 0) { /* Invalid VRMA setup, machine check */ cs->exception_index =3D POWERPC_EXCP_MCHECK; env->error_code =3D 0; @@ -1012,6 +1013,7 @@ skip_slb_search: hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu, target_ulong addr) { CPUPPCState *env =3D &cpu->env; + ppc_slb_t vrma_slbe; ppc_slb_t *slb; hwaddr ptex, raddr; ppc_hash_pte64_t pte; @@ -1033,8 +1035,8 @@ hwaddr ppc_hash64_get_phys_page_debug(PowerPCCPU *cpu= , target_ulong addr) return raddr | env->spr[SPR_HRMOR]; } else if (ppc_hash64_use_vrma(env)) { /* Emulated VRMA mode */ - slb =3D &env->vrma_slb; - if (!slb->sps) { + slb =3D &vrma_slbe; + if (build_vrma_slbe(cpu, slb) !=3D 0) { return -1; } } else { @@ -1072,30 +1074,12 @@ void ppc_hash64_tlb_flush_hpte(PowerPCCPU *cpu, tar= get_ulong ptex, cpu->env.tlb_need_flush =3D TLB_NEED_GLOBAL_FLUSH | TLB_NEED_LOCAL_FLU= SH; } =20 -static void ppc_hash64_update_vrma(PowerPCCPU *cpu) -{ - CPUPPCState *env =3D &cpu->env; - ppc_slb_t *slb =3D &env->vrma_slb; - - /* Is VRMA enabled ? */ - if (ppc_hash64_use_vrma(env)) { - if (build_vrma_slbe(cpu, slb) =3D=3D 0) { - return; - } - } - - /* Otherwise, clear it to indicate error */ - slb->esid =3D slb->vsid =3D 0; - slb->sps =3D NULL; -} - void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val) { PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); CPUPPCState *env =3D &cpu->env; =20 env->spr[SPR_LPCR] =3D val & pcc->lpcr_mask; - ppc_hash64_update_vrma(cpu); } =20 void helper_store_lpcr(CPUPPCState *env, target_ulong val) --=20 2.24.1