From patchwork Mon Jan 15 18:04:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?C=C3=A9dric_Le_Goater?= X-Patchwork-Id: 861017 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zL1V237V4z9sRm for ; Tue, 16 Jan 2018 05:05:14 +1100 (AEDT) Received: from localhost ([::1]:51815 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb98C-0001xz-HK for incoming@patchwork.ozlabs.org; Mon, 15 Jan 2018 13:05:12 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53070) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eb97O-0001v1-Oc for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:04:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eb97L-00074t-KU for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:04:22 -0500 Received: from 3.mo173.mail-out.ovh.net ([46.105.34.1]:35885) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eb97L-00073O-Ey for qemu-devel@nongnu.org; Mon, 15 Jan 2018 13:04:19 -0500 Received: from player687.ha.ovh.net (gw6.ovh.net [213.251.189.206]) by mo173.mail-out.ovh.net (Postfix) with ESMTP id 06A6797CF4 for ; Mon, 15 Jan 2018 19:04:18 +0100 (CET) Received: from zorba.kaod.org.com (LFbn-1-2226-150.w90-76.abo.wanadoo.fr [90.76.48.150]) (Authenticated sender: clg@kaod.org) by player687.ha.ovh.net (Postfix) with ESMTPSA id DA4282C00B7; Mon, 15 Jan 2018 19:04:13 +0100 (CET) From: =?utf-8?q?C=C3=A9dric_Le_Goater?= To: qemu-ppc@nongnu.org, qemu-devel@nongnu.org, David Gibson Date: Mon, 15 Jan 2018 19:04:01 +0100 Message-Id: <20180115180406.28489-2-clg@kaod.org> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20180115180406.28489-1-clg@kaod.org> References: <20180115180406.28489-1-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 17086938462924147539 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgedtuddrleekgddutdelucetufdoteggodetrfdotffvucfrrhhofhhilhgvmecuqfggjfdpvefjgfevmfevgfenuceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 46.105.34.1 Subject: [Qemu-devel] [PATCH 1/6] ppc/pnv: use POWER9 DD2 processor X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?C=C3=A9dric_Le_Goater?= Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" commit 1ed9c8af501f ("target/ppc: Add POWER9 DD2.0 model information") deprecated the POWER9 model v1.0. Signed-off-by: Cédric Le Goater --- hw/ppc/pnv.c | 2 +- tests/pnv-xscom-test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 9475e8479c37..536162b2747c 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 89fa6282d3af..a1a119c0912c 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