From patchwork Wed Aug 31 16:34:12 2016 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: 664602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3sPWJJ0CQlz9s4n for ; Thu, 1 Sep 2016 02:37:20 +1000 (AEST) Received: from localhost ([::1]:55035 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8Vp-0000EI-UB for incoming@patchwork.ozlabs.org; Wed, 31 Aug 2016 12:37:18 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:52758) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8UO-0007Gj-1p for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:35:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bf8UM-0002pf-Uv for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:35:48 -0400 Received: from 1.mo53.mail-out.ovh.net ([178.32.108.164]:34413) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bf8UM-0002pW-Os for qemu-devel@nongnu.org; Wed, 31 Aug 2016 12:35:46 -0400 Received: from player159.ha.ovh.net (b9.ovh.net [213.186.33.59]) by mo53.mail-out.ovh.net (Postfix) with ESMTP id 41DAC43D32 for ; Wed, 31 Aug 2016 18:35:46 +0200 (CEST) Received: from hermes.kaod.org.com (LFbn-1-2234-107.w90-76.abo.wanadoo.fr [90.76.55.107]) (Authenticated sender: clg@kaod.org) by player159.ha.ovh.net (Postfix) with ESMTPSA id E0E7648008E; Wed, 31 Aug 2016 18:35:39 +0200 (CEST) From: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= To: qemu-ppc@nongnu.org Date: Wed, 31 Aug 2016 18:34:12 +0200 Message-Id: <1472661255-20160-5-git-send-email-clg@kaod.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1472661255-20160-1-git-send-email-clg@kaod.org> References: <1472661255-20160-1-git-send-email-clg@kaod.org> MIME-Version: 1.0 X-Ovh-Tracer-Id: 531987707186482003 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrfeeluddrgeelgddtfeculddtuddrfeeltddrtddtmdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmd X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 178.32.108.164 Subject: [Qemu-devel] [PATCH v2 4/7] ppc/pnv: add a core mask to PnvChip 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: Alexander Graf , qemu-devel@nongnu.org, Cedric Le Goater , David Gibson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will be used to build real HW ids for the cores and enforce some limits on the available cores per chip. Signed-off-by: Cédric Le Goater --- hw/ppc/pnv.c | 27 +++++++++++++++++++++++++++ include/hw/ppc/pnv.h | 2 ++ 2 files changed, 29 insertions(+) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index a6e7f66b2c0a..b6efb5e3ef07 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -236,6 +236,27 @@ static void ppc_powernv_init(MachineState *machine) g_free(chip_typename); } +/* Allowed core identifiers on a POWER8 Processor Chip : + * + * + * EX1 - Venice only + * EX2 - Venice only + * EX3 - Venice only + * EX4 + * EX5 + * EX6 + * + * EX9 - Venice only + * EX10 - Venice only + * EX11 - Venice only + * EX12 + * EX13 + * EX14 + * + */ +#define POWER8E_CORE_MASK (~0xffff8f8f) +#define POWER8_CORE_MASK (~0xffff8181) + static void pnv_chip_power8nvl_realize(PnvChip *chip, Error **errp) { ; @@ -250,6 +271,8 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *klass, void *data) k->cpu_model = "POWER8NVL"; k->chip_type = PNV_CHIP_P8NVL; k->chip_f000f = 0x120d304980000000ull; + k->cores_max = 12; + k->cores_mask = POWER8_CORE_MASK; dc->desc = "PowerNV Chip POWER8NVL"; } @@ -274,6 +297,8 @@ static void pnv_chip_power8_class_init(ObjectClass *klass, void *data) k->cpu_model = "POWER8"; k->chip_type = PNV_CHIP_P8; k->chip_f000f = 0x220ea04980000000ull; + k->cores_max = 12; + k->cores_mask = POWER8_CORE_MASK; dc->desc = "PowerNV Chip POWER8"; } @@ -298,6 +323,8 @@ static void pnv_chip_power8e_class_init(ObjectClass *klass, void *data) k->cpu_model = "POWER8E"; k->chip_type = PNV_CHIP_P8E; k->chip_f000f = 0x221ef04980000000ull; + k->cores_max = 6; + k->cores_mask = POWER8E_CORE_MASK; dc->desc = "PowerNV Chip POWER8E"; } diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index bc6e1f80096b..987bc70245a7 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -49,6 +49,8 @@ typedef struct PnvChipClass { /*< private >*/ SysBusDeviceClass parent_class; /*< public >*/ + uint32_t cores_max; + uint32_t cores_mask; const char *cpu_model; PnvChipType chip_type; uint64_t chip_f000f;