From: Cédric Le Goater <clg@kaod.org>
Date: Mon, 15 Jan 2018 18:04:01 +0000 (+0100)
Subject: ppc/pnv: use POWER9 DD2 processor
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=83028a2b2871d3787e2fb55fe3e5cd2dda6cc378;p=qemu.git

ppc/pnv: use POWER9 DD2 processor

commit 1ed9c8af501f ("target/ppc: Add POWER9 DD2.0 model information")
deprecated the POWER9 model v1.0.

Signed-off-by: Cédric Le Goater <clg@kaod.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
---

diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c
index 9475e8479c..536162b274 100644
--- a/hw/ppc/pnv.c
+++ b/hw/ppc/pnv.c
@@ -759,7 +759,7 @@ static void pnv_chip_power9_class_init(ObjectClass *klass, void *data)
     PnvChipClass *k = PNV_CHIP_CLASS(klass);
 
     k->chip_type = PNV_CHIP_POWER9;
-    k->chip_cfam_id = 0x100d104980000000ull; /* P9 Nimbus DD1.0 */
+    k->chip_cfam_id = 0x220d104900008000ull; /* P9 Nimbus DD2.0 */
     k->cores_mask = POWER9_CORE_MASK;
     k->core_pir = pnv_chip_core_pir_p9;
     k->xscom_base = 0x00603fc00000000ull;
diff --git a/tests/pnv-xscom-test.c b/tests/pnv-xscom-test.c
index 89fa6282d3..a1a119c091 100644
--- a/tests/pnv-xscom-test.c
+++ b/tests/pnv-xscom-test.c
@@ -48,7 +48,7 @@ static const PnvChip pnv_chips[] = {
         .cpu_model  = "POWER9",
         .xscom_base = 0x000603fc00000000ull,
         .xscom_core_base = 0x0ull,
-        .cfam_id    = 0x100d104980000000ull,
+        .cfam_id    = 0x220d104900008000ull,
         .first_core = 0x20,
     },
 #endif