From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42917) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bIQaM-0006bz-22 for qemu-devel@nongnu.org; Wed, 29 Jun 2016 21:16:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bIQaH-0000EL-Pr for qemu-devel@nongnu.org; Wed, 29 Jun 2016 21:16:04 -0400 Date: Thu, 30 Jun 2016 10:46:30 +1000 From: David Gibson Message-ID: <20160630004630.GO8885@voom.fritz.box> References: <1467200246-32708-1-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="acOuGx3oQeOcSZJu" Content-Disposition: inline In-Reply-To: <1467200246-32708-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v0] spapr: Restore support for 970MP and POWER8NVL CPU cores List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: qemu-devel@nongnu.org, qemu-ppc@nongnu.org, thuth@redhat.com --acOuGx3oQeOcSZJu Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Jun 29, 2016 at 05:07:26PM +0530, Bharata B Rao wrote: > Introduction of core based CPU hotplug for PowerPC sPAPR didn't > add support for 970MP and POWER8NVL based core types. Add support for > the same. >=20 > While we are here, add support for explicit specification of POWER5+_v2.1 > core type. >=20 > Signed-off-by: Bharata B Rao Applied to ppc-for-2.7, thanks. > --- > hw/ppc/spapr_cpu_core.c | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) >=20 > diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > index 2aa0dc5..e30b159 100644 > --- a/hw/ppc/spapr_cpu_core.c > +++ b/hw/ppc/spapr_cpu_core.c > @@ -337,12 +337,15 @@ static void glue(glue(spapr_cpu_core_, _fname), _in= itfn(Object *obj)) \ > core->cpu_class =3D oc; \ > } > =20 > +SPAPR_CPU_CORE_INITFN(970mp_v1.0, 970MP_v10); > +SPAPR_CPU_CORE_INITFN(970mp_v1.1, 970MP_v11); > SPAPR_CPU_CORE_INITFN(970_v2.2, 970); > SPAPR_CPU_CORE_INITFN(POWER5+_v2.1, POWER5plus); > SPAPR_CPU_CORE_INITFN(POWER7_v2.3, POWER7); > SPAPR_CPU_CORE_INITFN(POWER7+_v2.1, POWER7plus); > SPAPR_CPU_CORE_INITFN(POWER8_v2.0, POWER8); > SPAPR_CPU_CORE_INITFN(POWER8E_v2.1, POWER8E); > +SPAPR_CPU_CORE_INITFN(POWER8NVL_v1.0, POWER8NVL); > =20 > typedef struct SPAPRCoreInfo { > const char *name; > @@ -350,10 +353,19 @@ typedef struct SPAPRCoreInfo { > } SPAPRCoreInfo; > =20 > static const SPAPRCoreInfo spapr_cores[] =3D { > - /* 970 */ > + /* 970 and aliaes */ > + { .name =3D "970_v2.2", .initfn =3D spapr_cpu_core_970_initfn }, > { .name =3D "970", .initfn =3D spapr_cpu_core_970_initfn }, > =20 > - /* POWER5 */ > + /* 970MP variants and aliases */ > + { .name =3D "970MP_v1.0", .initfn =3D spapr_cpu_core_970MP_v10_initf= n }, > + { .name =3D "970mp_v1.0", .initfn =3D spapr_cpu_core_970MP_v10_initf= n }, > + { .name =3D "970MP_v1.1", .initfn =3D spapr_cpu_core_970MP_v11_initf= n }, > + { .name =3D "970mp_v1.1", .initfn =3D spapr_cpu_core_970MP_v11_initf= n }, > + { .name =3D "970mp", .initfn =3D spapr_cpu_core_970MP_v11_initfn }, > + > + /* POWER5 and aliases */ > + { .name =3D "POWER5+_v2.1", .initfn =3D spapr_cpu_core_POWER5plus_in= itfn }, > { .name =3D "POWER5+", .initfn =3D spapr_cpu_core_POWER5plus_initfn = }, > =20 > /* POWER7 and aliases */ > @@ -373,6 +385,10 @@ static const SPAPRCoreInfo spapr_cores[] =3D { > { .name =3D "POWER8E_v2.1", .initfn =3D spapr_cpu_core_POWER8E_initf= n }, > { .name =3D "POWER8E", .initfn =3D spapr_cpu_core_POWER8E_initfn }, > =20 > + /* POWER8NVL and aliases */ > + { .name =3D "POWER8NVL_v1.0", .initfn =3D spapr_cpu_core_POWER8NVL_i= nitfn }, > + { .name =3D "POWER8NVL", .initfn =3D spapr_cpu_core_POWER8NVL_initfn= }, > + > { .name =3D NULL } > }; > =20 --=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 --acOuGx3oQeOcSZJu Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJXdGvmAAoJEGw4ysog2bOSNuIP/3uGqsVal4k7CMxcknXfsgsn J3Gk60zIWs2bg6tnZ0XnZIoBsPB4cLRHzv5HfcAtAHk0mT7AXPU4blvhNMtYzFjt cODX31EkIrhQvtfaLv+789UN41v4aLfwiouBTTei6lR6aHerd02DDgYKPnbteMuz SAjNgKm6Y/nokr0r9Dy5OOXy7JkA0m2gVSfmkXNGxO7ss0mXsFdfIEv90U4dsOxP tzAn7a+wwCnVuyiTDDP69I1dqrhkpmcyM0T625043qJuaWWjxniXV8P8xVtoCTyY RRFAUZ3dv8ZoegeH1acd/D7TCkfM+Dvq8coa1sqO6nHm9ypANYUxwIVEEO/PRt92 H8IHT8D20U+BzEcoGsXVonnZbcAeUDA7hnXdb7SEsHrc9Bu6iR5Sjum0sp9cP8ns Z0hqxUTHtnrrV0ygEEbAHJYsp71bobXsuoLxD9ULtNR9MaUpgPFHIcY6uscDAdMp 9L8PmT4TecMv1TrgKg5DVTwnXVlAZZi8AZD/EHzQL4f4rCGiGNWz5OclDhly/YEW HdHgZtqjcYScrgy4YfQG+173XUkPMRWGaHtIZE/k6oh2ntOq+Y4P3XUn+f+jqc+d /Ki0Z69TjcUzgrsu1obP6DiaWmNYcZZ8VUVsJmGxCgZrJ1Vi3idE8V7R5d0LrxI5 7zNvHF7jCWEoFXJkIvNX =tC7r -----END PGP SIGNATURE----- --acOuGx3oQeOcSZJu--