From nobody Tue Oct 28 01:56:28 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1516156518888966.6959020171719; Tue, 16 Jan 2018 18:35:18 -0800 (PST) Received: from localhost ([::1]:55896 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebdZN-0006NT-3K for importer@patchew.org; Tue, 16 Jan 2018 21:35:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45712) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ebdQM-0007rp-Vm for qemu-devel@nongnu.org; Tue, 16 Jan 2018 21:26:00 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ebdQL-0001Mq-Eo for qemu-devel@nongnu.org; Tue, 16 Jan 2018 21:25:58 -0500 Received: from ozlabs.org ([103.22.144.67]:45935) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1ebdQK-0001KD-NF; Tue, 16 Jan 2018 21:25:57 -0500 Received: by ozlabs.org (Postfix, from userid 1007) id 3zLrY85ZQmz9t3k; Wed, 17 Jan 2018 13:25:46 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1516155948; bh=CJ9ovP0VUxjhqYT/nzyN5pPuWNBOKVyOLe0E8MHfkPU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=APG2wm8FmDxRDDfl61To5NiweZqH9Sr+AP/iqGwjBqW143L278qVw+dlHHSHXKJpf R5a3vRVBsSVjgQlurTq6cWbjuc8puH45xIdB8QbPp+jYXNlNpKsLOzGwUpPXkVfuyp yEsqKGzyV0tiLE/a4sTlJB4jMZDIc6Rw850EJ5p8= From: David Gibson To: peter.maydell@linaro.org Date: Wed, 17 Jan 2018 13:25:20 +1100 Message-Id: <20180117022525.31767-18-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180117022525.31767-1-david@gibson.dropbear.id.au> References: <20180117022525.31767-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 17/22] ppc/pnv: change core mask for POWER9 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: lvivier@redhat.com, surajjs@au1.ibm.com, joserz@linux.vnet.ibm.com, qemu-devel@nongnu.org, groug@kaod.org, qemu-ppc@nongnu.org, =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater When addressed by XSCOM, the first core has the 0x20 chiplet ID but the CPU PIR can start at 0x0. Signed-off-by: C=C3=A9dric Le Goater Signed-off-by: David Gibson --- hw/ppc/pnv.c | 4 ++-- tests/pnv-xscom-test.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 536162b274..f9591cd41d 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -707,9 +707,9 @@ static uint32_t pnv_chip_core_pir_p9(PnvChip *chip, uin= t32_t core_id) #define POWER8_CORE_MASK (0x7e7eull) =20 /* - * POWER9 has 24 cores, ids starting at 0x20 + * POWER9 has 24 cores, ids starting at 0x0 */ -#define POWER9_CORE_MASK (0xffffff00000000ull) +#define POWER9_CORE_MASK (0xffffffffffffffull) =20 static void pnv_chip_power8e_class_init(ObjectClass *klass, void *data) { diff --git a/tests/pnv-xscom-test.c b/tests/pnv-xscom-test.c index a1a119c091..9d545c4718 100644 --- a/tests/pnv-xscom-test.c +++ b/tests/pnv-xscom-test.c @@ -49,7 +49,7 @@ static const PnvChip pnv_chips[] =3D { .xscom_base =3D 0x000603fc00000000ull, .xscom_core_base =3D 0x0ull, .cfam_id =3D 0x220d104900008000ull, - .first_core =3D 0x20, + .first_core =3D 0x0, }, #endif }; --=20 2.14.3