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=-13.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 C7C1EC433ED for ; Mon, 19 Apr 2021 04:55:06 +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 3B87261077 for ; Mon, 19 Apr 2021 04:55:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3B87261077 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=gibson.dropbear.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:38644 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lYLw9-0005OG-4C for qemu-devel@archiver.kernel.org; Mon, 19 Apr 2021 00:55:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58818) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYLvB-0004VH-KI; Mon, 19 Apr 2021 00:54:05 -0400 Received: from bilbo.ozlabs.org ([2401:3900:2:1::2]:44035 helo=ozlabs.org) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lYLv9-0003Ne-7t; Mon, 19 Apr 2021 00:54:05 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 4FNvbn620Gz9vGS; Mon, 19 Apr 2021 14:53:57 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1618808037; bh=w8w/Una9oTYFSRCztOk/A2HhBtupl3pZZIKnl5xDCZE=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=Fh5wZyMuInOcnJE9nCOf3udTitwttN847nVSMu6pdkv7DkprlaIRn85UsSuf4jrKx 4NTIODyQy8Lfa3GTXs3Fs+dCFDMBxiZN22otpwjkKURqsoMV7dHaU8PKaUu/q6dHkJ BIBKOf+L1qbxVn/YWTLtwwC9lHMgda8agPEGyMJQ= Date: Mon, 19 Apr 2021 14:47:12 +1000 From: David Gibson To: Ravi Bangoria Subject: Re: [PATCH v5 2/3] ppc: Rename current DAWR macros and variables Message-ID: References: <20210412114433.129702-1-ravi.bangoria@linux.ibm.com> <20210412114433.129702-3-ravi.bangoria@linux.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="uKhbdfvihr3S9uQx" Content-Disposition: inline In-Reply-To: <20210412114433.129702-3-ravi.bangoria@linux.ibm.com> Received-SPF: pass client-ip=2401:3900:2:1::2; envelope-from=dgibson@ozlabs.org; helo=ozlabs.org X-Spam_score_int: -17 X-Spam_score: -1.8 X-Spam_bar: - X-Spam_report: (-1.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HEADER_FROM_DIFFERENT_DOMAINS=0.249, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action 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: qemu-ppc@nongnu.org, mikey@neuling.org, kvm@vger.kernel.org, mst@redhat.com, mpe@ellerman.id.au, cohuck@redhat.com, qemu-devel@nongnu.org, groug@kaod.org, paulus@samba.org, clg@kaod.org, pbonzini@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --uKhbdfvihr3S9uQx Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Mon, Apr 12, 2021 at 05:14:32PM +0530, Ravi Bangoria wrote: > Power10 is introducing second DAWR. Use real register names (with > suffix 0) from ISA for current macros and variables used by Qemu. >=20 > One exception to this is KVM_REG_PPC_DAWR[X]. This is from kernel > uapi header and thus not changed in kernel as well as Qemu. >=20 > Signed-off-by: Ravi Bangoria > Reviewed-by: Greg Kurz > Reviewed-by: David Gibson This stands independently of the other patches, so I've applied it to ppc-f= or-6.1. > --- > include/hw/ppc/spapr.h | 2 +- > target/ppc/cpu.h | 4 ++-- > target/ppc/translate_init.c.inc | 4 ++-- > 3 files changed, 5 insertions(+), 5 deletions(-) >=20 > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index bf7cab7a2c..5f90bb26d5 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -363,7 +363,7 @@ struct SpaprMachineState { > =20 > /* Values for 2nd argument to H_SET_MODE */ > #define H_SET_MODE_RESOURCE_SET_CIABR 1 > -#define H_SET_MODE_RESOURCE_SET_DAWR 2 > +#define H_SET_MODE_RESOURCE_SET_DAWR0 2 > #define H_SET_MODE_RESOURCE_ADDR_TRANS_MODE 3 > #define H_SET_MODE_RESOURCE_LE 4 > =20 > diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h > index e73416da68..cd02d65303 100644 > --- a/target/ppc/cpu.h > +++ b/target/ppc/cpu.h > @@ -1459,10 +1459,10 @@ typedef PowerPCCPU ArchCPU; > #define SPR_MPC_BAR (0x09F) > #define SPR_PSPB (0x09F) > #define SPR_DPDES (0x0B0) > -#define SPR_DAWR (0x0B4) > +#define SPR_DAWR0 (0x0B4) > #define SPR_RPR (0x0BA) > #define SPR_CIABR (0x0BB) > -#define SPR_DAWRX (0x0BC) > +#define SPR_DAWRX0 (0x0BC) > #define SPR_HFSCR (0x0BE) > #define SPR_VRSAVE (0x100) > #define SPR_USPRG0 (0x100) > diff --git a/target/ppc/translate_init.c.inc b/target/ppc/translate_init.= c.inc > index c03a7c4f52..879e6df217 100644 > --- a/target/ppc/translate_init.c.inc > +++ b/target/ppc/translate_init.c.inc > @@ -7748,12 +7748,12 @@ static void gen_spr_book3s_dbg(CPUPPCState *env) > =20 > static void gen_spr_book3s_207_dbg(CPUPPCState *env) > { > - spr_register_kvm_hv(env, SPR_DAWR, "DAWR", > + spr_register_kvm_hv(env, SPR_DAWR0, "DAWR0", > SPR_NOACCESS, SPR_NOACCESS, > SPR_NOACCESS, SPR_NOACCESS, > &spr_read_generic, &spr_write_generic, > KVM_REG_PPC_DAWR, 0x00000000); > - spr_register_kvm_hv(env, SPR_DAWRX, "DAWRX", > + spr_register_kvm_hv(env, SPR_DAWRX0, "DAWRX0", > SPR_NOACCESS, SPR_NOACCESS, > SPR_NOACCESS, SPR_NOACCESS, > &spr_read_generic, &spr_write_generic, --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --uKhbdfvihr3S9uQx Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEdfRlhq5hpmzETofcbDjKyiDZs5IFAmB9C1AACgkQbDjKyiDZ s5Ib1BAAl3mnY3gtl1SjsG9umEhO9nqR1kJZAJGsP25qrQGs2WubfgWnqKKa5gOz PhbCiZLUIb7aLc9en2pQDH5ZztA/UjbeS63u3EngGPRgBIQ0UWqyoUg2SVmLcI00 brmgd9/Hm4rGwaMtcijoRDWFTvIVpstm46VcfpXc36jEcTfBsNEqD41A8+sTTt1K tP0/COUrSKnuR1E6Bs45x0Mpa3i6nw6QNTYQnOFbm6WuSa83A57gxRnxKjKkWjWu mOUei/oUgN2Z+OMnK1HnqrfoNT1DLwkOG2AsAaso+Zv9Y10TOjkAHcX3hvCL71Sy 6qAUs1pph1MIideMkmBsjhmKo77Y16Ba7K0T+3KcfEjxGBf8mo1Fc8KTVZdX/3bz QKael58ipjOqIJus1EymrQuO1gOPqrMNncHruv0qOTWYHZmINqfBHKs6zWMAl7O8 pIaQr+RHncB7alv7dmOHqmSyp2x5ohp6+5fL0rM1QhkGlB3T1hC5I07se1uKIOJp vJ/GQJdLqojQ6zmckD3sJe7hNEk6i2FVSOg9zs9BisaZF2EoTXnah9bk6kjmqWN3 Wvis+ooTyNCy+WORLKpxCMf57kVyFK1ref0svvsidYtOuEtQmBiH8cFG9aZcXzo6 2NDGVNxsjmVbWQclsjtAx3pQJXc2h9bfQ885uoVZcKKfScAoPNM= =Fj6p -----END PGP SIGNATURE----- --uKhbdfvihr3S9uQx--