From nobody Thu Nov 13 19:25:44 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1582078723974536.8762794770435; Tue, 18 Feb 2020 18:18:43 -0800 (PST) Received: from localhost ([::1]:44468 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4Ewk-0001sk-Ug for importer@patchew.org; Tue, 18 Feb 2020 21:18:42 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42975) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1j4EsV-0003zd-ND for qemu-devel@nongnu.org; Tue, 18 Feb 2020 21:14:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1j4EsU-00013D-IW for qemu-devel@nongnu.org; Tue, 18 Feb 2020 21:14:19 -0500 Received: from ozlabs.org ([203.11.71.1]:42787) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1j4EsU-0000zq-7h; Tue, 18 Feb 2020 21:14:18 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 48Mh9f5y62z9sSK; Wed, 19 Feb 2020 13:14:14 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1582078454; bh=F2U5x3dbNaGmFLGpb0lnsCTLpoaZH6AWJ+h6b/7MS5o=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=m28U2BbhbY9LVfc131O+YJB2DfvYavw53kIdDdDmR7h3tYjvz2IjmVc0tFgdwNxfs UXWdZMXhasKQMxSMS45MMZS2JxU2F4OaX7OPpRLXdVMxah9UJHMZ0zUb6Hp4cW8kR4 3CrrV+o8K9ifWhCNFW2Nxbe1Z8ocAAbtrCn6Iwxo= From: David Gibson To: groug@kaod.org, clg@kaod.org, philmd@redhat.com, qemu-devel@nongnu.org Subject: [PATCH v4 05/12] spapr, ppc: Remove VPM0/RMLS hacks for POWER9 Date: Wed, 19 Feb 2020 13:14:02 +1100 Message-Id: <20200219021409.21332-6-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200219021409.21332-1-david@gibson.dropbear.id.au> References: <20200219021409.21332-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 203.11.71.1 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: Laurent Vivier , qemu-ppc@nongnu.org, Thomas Huth , Xiao Guangrong , "Michael S. Tsirkin" , aik@ozlabs.ru, Mark Cave-Ayland , paulus@samba.org, Paolo Bonzini , Igor Mammedov , "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" For the "pseries" machine, we use "virtual hypervisor" mode where we only model the CPU in non-hypervisor privileged mode. This means that we need guest physical addresses within the modelled cpu to be treated as absolute physical addresses. We used to do that by clearing LPCR[VPM0] and setting LPCR[RMLS] to a high limit so that the old offset based translation for guest mode applied, which does what we need. However, POWER9 has removed support for that translation mode, which meant we had some ugly hacks to keep it working. We now explicitly handle this sort of translation for virtual hypervisor mode, so the hacks aren't necessary. We don't need to set VPM0 and RMLS from the machine type code - they're now ignored in vhyp mode. On the cpu side we don't need to allow LPCR[RMLS] to be set on POWER9 in vhyp mode - that was only there to allow the hack on the machine side. Signed-off-by: David Gibson Reviewed-by: C=C3=A9dric Le Goater --- hw/ppc/spapr_cpu_core.c | 6 +----- target/ppc/mmu-hash64.c | 8 -------- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c index d09125d9af..ea5e11f1d9 100644 --- a/hw/ppc/spapr_cpu_core.c +++ b/hw/ppc/spapr_cpu_core.c @@ -58,14 +58,10 @@ static void spapr_reset_vcpu(PowerPCCPU *cpu) * we don't get spurious wakups before an RTAS start-cpu call. * For the same reason, set PSSCR_EC. */ - lpcr &=3D ~(LPCR_VPM0 | LPCR_VPM1 | LPCR_ISL | LPCR_KBV | pcc->lpcr_pm= ); + lpcr &=3D ~(LPCR_VPM1 | LPCR_ISL | LPCR_KBV | pcc->lpcr_pm); lpcr |=3D LPCR_LPES0 | LPCR_LPES1; env->spr[SPR_PSSCR] |=3D PSSCR_EC; =20 - /* Set RMLS to the max (ie, 16G) */ - lpcr &=3D ~LPCR_RMLS; - lpcr |=3D 1ull << LPCR_RMLS_SHIFT; - ppc_store_lpcr(cpu, lpcr); =20 /* Set a full AMOR so guest can use the AMR as it sees fit */ diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c index 6b3c214879..2d54f065d9 100644 --- a/target/ppc/mmu-hash64.c +++ b/target/ppc/mmu-hash64.c @@ -1126,14 +1126,6 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong va= l) (LPCR_PECE_L_MASK & (LPCR_PDEE | LPCR_HDEE | LPCR_EE= E | LPCR_DEE | LPCR_OEE)) | LPCR_MER | LPCR_GTSE | LPCR_= TC | LPCR_HEIC | LPCR_LPES0 | LPCR_HVICE | LPCR_HDICE); - /* - * If we have a virtual hypervisor, we need to bring back RMLS. It - * doesn't exist on an actual P9 but that's all we know how to - * configure with softmmu at the moment - */ - if (cpu->vhyp) { - lpcr |=3D (val & LPCR_RMLS); - } break; default: g_assert_not_reached(); --=20 2.24.1