From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5DEE4C33C8C for ; Tue, 7 Jan 2020 17:37:36 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 33F3320848 for ; Tue, 7 Jan 2020 17:37:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 33F3320848 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54052 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iosnO-0005EC-Uj for qemu-devel@archiver.kernel.org; Tue, 07 Jan 2020 12:37:34 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:37257) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iosmi-0004io-De for qemu-devel@nongnu.org; Tue, 07 Jan 2020 12:36:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iosmg-0007RI-V5 for qemu-devel@nongnu.org; Tue, 07 Jan 2020 12:36:52 -0500 Received: from 1.mo4.mail-out.ovh.net ([178.33.248.196]:42741) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iosmg-0007Pc-Od for qemu-devel@nongnu.org; Tue, 07 Jan 2020 12:36:50 -0500 Received: from player779.ha.ovh.net (unknown [10.108.54.34]) by mo4.mail-out.ovh.net (Postfix) with ESMTP id 64EBD21DA51 for ; Tue, 7 Jan 2020 18:36:48 +0100 (CET) Received: from kaod.org (deibp9eh1--blueice1n4.emea.ibm.com [195.212.29.166]) (Authenticated sender: groug@kaod.org) by player779.ha.ovh.net (Postfix) with ESMTPSA id 93E15DED0369; Tue, 7 Jan 2020 17:36:40 +0000 (UTC) Date: Tue, 7 Jan 2020 18:36:38 +0100 From: Greg Kurz To: David Gibson Subject: Re: [PATCH v2 02/10] ppc: Remove stub of PPC970 HID4 implementation Message-ID: <20200107183638.1c84f172@bahia.lan> In-Reply-To: <20200107183215.09ce18c6@bahia.lan> References: <20200107044827.471355-1-david@gibson.dropbear.id.au> <20200107044827.471355-3-david@gibson.dropbear.id.au> <20200107183215.09ce18c6@bahia.lan> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Ovh-Tracer-Id: 13956655246261983718 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedufedrvdehhedgtdejucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecuhedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmnecujfgurhepfffhvffukfgjfhfogggtgfesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecukfhppedtrddtrddtrddtpdduleehrddvuddvrddvledrudeiieenucfrrghrrghmpehmohguvgepshhmthhpqdhouhhtpdhhvghlohepphhlrgihvghrjeejledrhhgrrdhovhhhrdhnvghtpdhinhgvtheptddrtddrtddrtddpmhgrihhlfhhrohhmpehgrhhouhhgsehkrghougdrohhrghdprhgtphhtthhopehqvghmuhdquggvvhgvlhesnhhonhhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 178.33.248.196 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, qemu-devel@nongnu.org, paulus@samba.org, clg@kaod.org, qemu-ppc@nongnu.org, philmd@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Tue, 7 Jan 2020 18:32:15 +0100 Greg Kurz wrote: > On Tue, 7 Jan 2020 15:48:19 +1100 > David Gibson wrote: > > > The PowerPC 970 CPU was a cut-down POWER4, which had hypervisor capability. > > However, it can be (and often was) strapped into "Apple mode", where the > > hypervisor capabilities were disabled (essentially putting it always in > > hypervisor mode). Isn't it supervisor mode instead of hypervisor mode ? > > > > That's actually the only mode of the 970 we support in qemu, and we're > > unlikely to change that any time soon. However, we do have a partial > > implementation of the 970's HID4 register which affects things only > > relevant for hypervisor mode. > > > > That stub is also really ugly, since it attempts to duplicate the effects > > of HID4 by re-encoding it into the LPCR register used in newer CPUs, but > > in a really confusing way. > > > > Just get rid of it. > > > > Signed-off-by: David Gibson > > --- > > Reviewed-by: Greg Kurz > > > target/ppc/mmu-hash64.c | 28 +--------------------------- > > target/ppc/translate_init.inc.c | 17 ++++++----------- > > 2 files changed, 7 insertions(+), 38 deletions(-) > > > > diff --git a/target/ppc/mmu-hash64.c b/target/ppc/mmu-hash64.c > > index da8966ccf5..a881876647 100644 > > --- a/target/ppc/mmu-hash64.c > > +++ b/target/ppc/mmu-hash64.c > > @@ -1091,33 +1091,6 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val) > > > > /* Filter out bits */ > > switch (env->mmu_model) { > > - case POWERPC_MMU_64B: /* 970 */ > > - if (val & 0x40) { > > - lpcr |= LPCR_LPES0; > > - } > > - if (val & 0x8000000000000000ull) { > > - lpcr |= LPCR_LPES1; > > - } > > - if (val & 0x20) { > > - lpcr |= (0x4ull << LPCR_RMLS_SHIFT); > > - } > > - if (val & 0x4000000000000000ull) { > > - lpcr |= (0x2ull << LPCR_RMLS_SHIFT); > > - } > > - if (val & 0x2000000000000000ull) { > > - lpcr |= (0x1ull << LPCR_RMLS_SHIFT); > > - } > > - env->spr[SPR_RMOR] = ((lpcr >> 41) & 0xffffull) << 26; > > - > > - /* > > - * XXX We could also write LPID from HID4 here > > - * but since we don't tag any translation on it > > - * it doesn't actually matter > > - * > > - * XXX For proper emulation of 970 we also need > > - * to dig HRMOR out of HID5 > > - */ > > - break; > > case POWERPC_MMU_2_03: /* P5p */ > > lpcr = val & (LPCR_RMLS | LPCR_ILE | > > LPCR_LPES0 | LPCR_LPES1 | > > @@ -1154,6 +1127,7 @@ void ppc_store_lpcr(PowerPCCPU *cpu, target_ulong val) > > } > > break; > > default: > > + g_assert_not_reached(); > > ; > > } > > env->spr[SPR_LPCR] = lpcr; > > diff --git a/target/ppc/translate_init.inc.c b/target/ppc/translate_init.inc.c > > index d33d65dff7..436d0d5a51 100644 > > --- a/target/ppc/translate_init.inc.c > > +++ b/target/ppc/translate_init.inc.c > > @@ -7884,25 +7884,20 @@ static void spr_write_lpcr(DisasContext *ctx, int sprn, int gprn) > > { > > gen_helper_store_lpcr(cpu_env, cpu_gpr[gprn]); > > } > > - > > -static void spr_write_970_hid4(DisasContext *ctx, int sprn, int gprn) > > -{ > > -#if defined(TARGET_PPC64) > > - spr_write_generic(ctx, sprn, gprn); > > - gen_helper_store_lpcr(cpu_env, cpu_gpr[gprn]); > > -#endif > > -} > > - > > #endif /* !defined(CONFIG_USER_ONLY) */ > > > > static void gen_spr_970_lpar(CPUPPCState *env) > > { > > #if !defined(CONFIG_USER_ONLY) > > /* Logical partitionning */ > > - /* PPC970: HID4 is effectively the LPCR */ > > + /* PPC970: HID4 covers things later controlled by the LPCR and > > + * RMOR in later CPUs, but with a different encoding. We only > > + * support the 970 in "Apple mode" which has all hypervisor > > + * facilities disabled by strapping, so we can basically just > > + * ignore it */ > > spr_register(env, SPR_970_HID4, "HID4", > > SPR_NOACCESS, SPR_NOACCESS, > > - &spr_read_generic, &spr_write_970_hid4, > > + &spr_read_generic, &spr_write_generic, > > 0x00000000); > > #endif > > } > >