From mboxrd@z Thu Jan  1 00:00:00 1970
From: Christoffer Dall <christoffer.dall@linaro.org>
Subject: Re: [PATCH] arm64: KVM: export demux regids as KVM_REG_ARM64
Date: Fri, 4 Jul 2014 03:13:02 -0700
Message-ID: <20140704101302.GD20451@cbox>
References: <1404229993-14522-1-git-send-email-alex.bennee@linaro.org>
 <53B2DA42.40604@arm.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: QUOTED-PRINTABLE
Cc: Alex =?iso-8859-1?Q?Benn=E9e?= <alex.bennee@linaro.org>,
	"kvmarm@lists.cs.columbia.edu" <kvmarm@lists.cs.columbia.edu>,
	"linux-arm-kernel@lists.infradead.org"
	<linux-arm-kernel@lists.infradead.org>,
	"kvm@vger.kernel.org" <kvm@vger.kernel.org>,
	Gleb Natapov <gleb@kernel.org>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Catalin Marinas <Catalin.Marinas@arm.com>,
	Will Deacon <Will.Deacon@arm.com>,
	open list <linux-kernel@vger.kernel.org>
To: Marc Zyngier <marc.zyngier@arm.com>
Return-path: <linux-kernel-owner@vger.kernel.org>
Content-Disposition: inline
In-Reply-To: <53B2DA42.40604@arm.com>
Sender: linux-kernel-owner@vger.kernel.org
List-Id: kvm.vger.kernel.org

On Tue, Jul 01, 2014 at 04:56:50PM +0100, Marc Zyngier wrote:
> On 01/07/14 16:53, Alex Benn=E9e wrote:
> > I suspect this is a -ECUTPASTE fault from the initial implementatio=
n. If
> > we don't declare the register ID to be KVM_REG_ARM64 the KVM_GET_ON=
E_REG
> > implementation kvm_arm_get_reg() returns -EINVAL and hilarity ensue=
s.
> >=20
> > The kvm/api.txt document describes all arm64 registers as starting =
with
> > 0x60xx... (i.e KVM_REG_ARM64).
> >=20
> > Signed-off-by: Alex Benn=E9e <alex.bennee@linaro.org>
> > Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
> > ---
> >  arch/arm64/kvm/sys_regs.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >=20
> > diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c
> > index 0324458..5ee99e4 100644
> > --- a/arch/arm64/kvm/sys_regs.c
> > +++ b/arch/arm64/kvm/sys_regs.c
> > @@ -962,7 +962,7 @@ static unsigned int num_demux_regs(void)
> > =20
> >  static int write_demux_regids(u64 __user *uindices)
> >  {
> > -	u64 val =3D KVM_REG_ARM | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX;
> > +	u64 val =3D KVM_REG_ARM64 | KVM_REG_SIZE_U32 | KVM_REG_ARM_DEMUX;
> >  	unsigned int i;
> > =20
> >  	val |=3D KVM_REG_ARM_DEMUX_ID_CCSIDR;
> >=20
>=20
> -EBROWNPAPERBAG.
>=20
> Acked-by: Marc Zyngier <marc.zyngier@arm.com>
>=20
Applied to kvmarm/master,

thanks.