On Tue, Jul 04, 2017 at 10:56:56AM +0200, Laurent Vivier wrote: > On 04/07/2017 10:51, Greg Kurz wrote: > > On Tue, 4 Jul 2017 09:42:33 +0200 > > Thomas Huth <th...@redhat.com> wrote: > > > >> On 03.07.2017 15:14, Laurent Vivier wrote: > >>> CPU_POWERPC_POWER9_DD1 is 0x004E0100, so this is the POWER9 v1.0. > >>> > >>> When we run qemu on a POWER9 DD1 host, we must use either > >>> "-cpu host" or "-cpu POWER9", but in the latter case it fails with > >>> > >>> Unable to find sPAPR CPU Core definition > >>> > >>> because POWER9 DD1 doesn't appear in the list of known CPUs. > >>> > >>> This patch fixes this by defining POWER9_v1.0 with POWER9 DD1 > >>> PVR instead of CPU_POWERPC_POWER9_BASE. It also adds POWER_v2.0 > >>> with POWER9 DD2 PVR to avoid to trigger kernel POWER9 DD1 workaround > >>> in TCG mode. > >>> > >>> Signed-off-by: Laurent Vivier <lviv...@redhat.com> > >>> --- > >>> hw/ppc/spapr_cpu_core.c | 5 ++++- > >>> target/ppc/cpu-models.c | 6 ++++-- > >>> target/ppc/cpu-models.h | 1 + > >>> 3 files changed, 9 insertions(+), 3 deletions(-) > >>> > >>> diff --git a/hw/ppc/spapr_cpu_core.c b/hw/ppc/spapr_cpu_core.c > >>> index 9fb896b..00918a5 100644 > >>> --- a/hw/ppc/spapr_cpu_core.c > >>> +++ b/hw/ppc/spapr_cpu_core.c > >>> @@ -249,8 +249,11 @@ static const char *spapr_core_models[] = { > >>> /* POWER8NVL */ > >>> "POWER8NVL_v1.0", > >>> > >>> - /* POWER9 */ > >>> + /* POWER9 DD1 */ > >>> "POWER9_v1.0", > >>> + > >>> + /* POWER9 DD2 */ > >>> + "POWER9_v2.0", > >> > >> In case you re-spin, what about a more compact listing: > >> > >> /* POWER9 */ > >> "POWER9_v1.0", > >> "POWER9_v2.0", > >> > >> ? > >> > > > > I second that but anyway: > > > > Reviewed-by: Greg Kurz <gr...@kaod.org> > > > >> Anyway, patch looks good to me, so: > >> > >> Reviewed-by: Thomas Huth <th...@redhat.com> > > > > I agree, but as I was focused on the problem with "-cpu POWER9" I forgot > to update the first patch.
Ok, we can do that as a follow up. I think it would also be good to add a comment saying which of the DD2 variants that PVR is for. Optionally, we could add PVRs for the other variants. I don't think it matters which variant we point the POWER9 alias at. -- 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
signature.asc
Description: PGP signature