From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33586) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aTf6H-0007rG-JG for qemu-devel@nongnu.org; Wed, 10 Feb 2016 19:27:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aTf6G-0000Bh-D7 for qemu-devel@nongnu.org; Wed, 10 Feb 2016 19:27:13 -0500 Date: Thu, 11 Feb 2016 09:36:33 +1000 From: David Gibson Message-ID: <20160210233632.GF29288@voom.bne.redhat.com> References: <1455127752-17293-1-git-send-email-thuth@redhat.com> <1455127752-17293-3-git-send-email-thuth@redhat.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="nYySOmuH/HDX6pKp" Content-Disposition: inline In-Reply-To: <1455127752-17293-3-git-send-email-thuth@redhat.com> Subject: Re: [Qemu-devel] [PATCH 2/4] hw/ppc/spapr: Implement h_set_dabr List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Thomas Huth Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, laurent@vivier.eu --nYySOmuH/HDX6pKp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Feb 10, 2016 at 07:09:10PM +0100, Thomas Huth wrote: > According to LoPAPR, h_set_dabr should simply set DABRX to 3 > (if the register is available), and load the parameter into DABR. > If DABRX is not available, the hypervisor has to check the > "Breakpoint Translation" bit of the DABR register first. >=20 > Signed-off-by: Thomas Huth > --- > hw/ppc/spapr_hcall.c | 26 +++++++++++++++++++++----- > 1 file changed, 21 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c > index 58103ef..6b9d512 100644 > --- a/hw/ppc/spapr_hcall.c > +++ b/hw/ppc/spapr_hcall.c > @@ -38,6 +38,12 @@ static void set_spr(CPUState *cs, int spr, target_ulon= g value, > run_on_cpu(cs, do_spr_sync, &s); > } > =20 > +static bool has_spr(PowerPCCPU *cpu, int spr) > +{ > + /* We can test whether the SPR is defined by checking for a valid na= me */ > + return cpu->env.spr_cb[spr].name !=3D NULL; > +} > + > static inline bool valid_pte_index(CPUPPCState *env, target_ulong pte_in= dex) > { > /* > @@ -344,8 +350,20 @@ static target_ulong h_set_sprg0(PowerPCCPU *cpu, sPA= PRMachineState *spapr, > static target_ulong h_set_dabr(PowerPCCPU *cpu, sPAPRMachineState *spapr, > target_ulong opcode, target_ulong *args) > { > - /* FIXME: actually implement this */ > - return H_HARDWARE; > + CPUState *cs =3D CPU(cpu); > + > + if (!has_spr(cpu, SPR_DABR)) { > + return H_HARDWARE; /* DABR register not available */ > + } > + > + if (has_spr(cpu, SPR_DABRX)) { > + set_spr(cs, SPR_DABRX, 0x3, -1L); As in the previous patch, we shouldn't need the fancy run_on_cpu stuff that set_spr() uses, since this is just a cpu local register update. > + } else if (!(args[0] & 0x4)) { /* Breakpoint Translation set? */ > + return H_RESERVED_DABR; > + } > + > + set_spr(cs, SPR_DABR, args[0], -1L); > + return H_SUCCESS; > } > =20 > #define FLAGS_REGISTER_VPA 0x0000200000000000ULL > @@ -999,15 +1017,13 @@ static void hypercall_register_types(void) > /* hcall-bulk */ > spapr_register_hypercall(H_BULK_REMOVE, h_bulk_remove); > =20 > - /* hcall-dabr */ > - spapr_register_hypercall(H_SET_DABR, h_set_dabr); > - > /* hcall-splpar */ > spapr_register_hypercall(H_REGISTER_VPA, h_register_vpa); > spapr_register_hypercall(H_CEDE, h_cede); > =20 > /* processor register resource access h-calls */ > spapr_register_hypercall(H_SET_SPRG0, h_set_sprg0); > + spapr_register_hypercall(H_SET_DABR, h_set_dabr); > spapr_register_hypercall(H_SET_MODE, h_set_mode); > =20 > /* "debugger" hcalls (also used by SLOF). Note: We do -not- differen= ciate --=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 --nYySOmuH/HDX6pKp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWu8mAAAoJEGw4ysog2bOSxcQP+gODHeoxqE/C144RloM7jmlE b5OOsUjSRhoF8YJQvMnMy+D4CtNta938a+YWk/huPsyfGUV+tCbma/W5kxfS9TpC qYEarPew5taMjENCYwCITrb8XgymaRICYI+mTxjtNSrhcB14K9AJJ/DC1zxuUQAz AIiNVeBwSlzwjKnQZKiFC9vG/8+ADioC6ZrlhQrFxW10d813dqWpwdbwZ8LCbuuW s/5WsPPHb4Pek5Zpjic/X0WEcLwjN8eWyoaN3H3Egngw0+2ktSxIMz/KeQ3//dlb rGQNAuQG2U92YPlr/S+PwUGNxcsxz7cbmpJwcMN5A9KR1+vSM/7WpUoz5TZtwe8k b1czOaL8AXF1SmGDCOYsWz55CG/m3ezzaEW9OW3GxSf1ReTlWvratdmShtX3QYX9 nPQYOL/fV0/Yg3sC4yFD29pfEJ97t/4cIu1USlJyj/72+g8mZYlVG1qWWR1/0fpB KPJzYc12N24QdkTrEiDpu8mp02nkKJ1kZthmXDcEGCdwnF6XqkHs5h1Ah8B+Fsjh W/WOBlDrZYsqR6eTfIp4noIV9qHTAwh1xKg3tbUdi1A6z7Y1HbXw/dmpDr9GZcqf 8LCYPsTfsqXY6Dr/eQ6sytcX2Nf1IEb+N2wUypD5JyPcBHPIVqHyaHlqmpY8jcNC QUmy72XjOiFEH1+5AKNJ =r2t9 -----END PGP SIGNATURE----- --nYySOmuH/HDX6pKp--