From nobody Mon Feb 9 18:45:23 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.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 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1552208317313294.79374527551613; Sun, 10 Mar 2019 00:58:37 -0800 (PST) Received: from localhost ([127.0.0.1]:42182 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2uHx-0002sn-4P for importer@patchew.org; Sun, 10 Mar 2019 04:58:33 -0400 Received: from eggs.gnu.org ([209.51.188.92]:43008) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h2toU-0001Lc-A4 for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:28:07 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h2toT-0001YU-0J for qemu-devel@nongnu.org; Sun, 10 Mar 2019 04:28:06 -0400 Received: from ozlabs.org ([203.11.71.1]:41013) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1h2toP-0001IM-NN; Sun, 10 Mar 2019 04:28:03 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 44HDqq02yjz9sPL; Sun, 10 Mar 2019 19:27:16 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1552206439; bh=Ie5zM0oVpXB+FEJVG1zsQ1KBzBG/ZFo4e+xPEjNQdsY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VkSSr8VmffVMzECNR5aHsfUdUs596aW0MkxLRHRNaL7ISqwYWKah6ZxByIqckacJ0 RF0ITMpElXIQSem/QgPdV+FkgDGso8eBxPpqZpJ7yDrMYPmbhkv8x0+A39o3KQnXXb +MAo4vfYfcLaEZr9s+qytxINpFxSEJT7PluoLLj4= From: David Gibson To: peter.maydell@linaro.org Date: Sun, 10 Mar 2019 19:26:30 +1100 Message-Id: <20190310082703.1245-28-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190310082703.1245-1-david@gibson.dropbear.id.au> References: <20190310082703.1245-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] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 27/60] ppc/pnv: introduce a new dt_populate() operation to the chip model 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, groug@kaod.org, qemu-devel@nongnu.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) Content-Type: text/plain; charset="utf-8" From: C=C3=A9dric Le Goater The POWER9 and POWER8 processors have a different set of devices and a different device tree layout. Signed-off-by: C=C3=A9dric Le Goater Message-Id: <20190306085032.15744-8-clg@kaod.org> Signed-off-by: David Gibson --- hw/ppc/pnv.c | 27 +++++++++++++++++++++++++-- include/hw/ppc/pnv.h | 1 + 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index a7ec76dbd6..087541a91a 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -267,7 +267,7 @@ static void pnv_dt_icp(PnvChip *chip, void *fdt, uint32= _t pir, g_free(reg); } =20 -static void pnv_dt_chip(PnvChip *chip, void *fdt) +static void pnv_chip_power8_dt_populate(PnvChip *chip, void *fdt) { const char *typename =3D pnv_chip_core_typename(chip); size_t typesize =3D object_type_get_instance_size(typename); @@ -289,6 +289,25 @@ static void pnv_dt_chip(PnvChip *chip, void *fdt) } } =20 +static void pnv_chip_power9_dt_populate(PnvChip *chip, void *fdt) +{ + const char *typename =3D pnv_chip_core_typename(chip); + size_t typesize =3D object_type_get_instance_size(typename); + int i; + + pnv_dt_xscom(chip, fdt, 0); + + for (i =3D 0; i < chip->nr_cores; i++) { + PnvCore *pnv_core =3D PNV_CORE(chip->cores + i * typesize); + + pnv_dt_core(chip, pnv_core, fdt); + } + + if (chip->ram_size) { + pnv_dt_memory(fdt, chip->chip_id, chip->ram_start, chip->ram_size); + } +} + static void pnv_dt_rtc(ISADevice *d, void *fdt, int lpc_off) { uint32_t io_base =3D d->ioport_id; @@ -474,7 +493,7 @@ static void *pnv_dt_create(MachineState *machine) =20 /* Populate device tree for each chip */ for (i =3D 0; i < pnv->num_chips; i++) { - pnv_dt_chip(pnv->chips[i], fdt); + PNV_CHIP_GET_CLASS(pnv->chips[i])->dt_populate(pnv->chips[i], fdt); } =20 /* Populate ISA devices on chip 0 */ @@ -858,6 +877,7 @@ static void pnv_chip_power8e_class_init(ObjectClass *kl= ass, void *data) k->core_pir =3D pnv_chip_core_pir_p8; k->intc_create =3D pnv_chip_power8_intc_create; k->isa_create =3D pnv_chip_power8_isa_create; + k->dt_populate =3D pnv_chip_power8_dt_populate; k->xscom_base =3D 0x003fc0000000000ull; dc->desc =3D "PowerNV Chip POWER8E"; =20 @@ -876,6 +896,7 @@ static void pnv_chip_power8_class_init(ObjectClass *kla= ss, void *data) k->core_pir =3D pnv_chip_core_pir_p8; k->intc_create =3D pnv_chip_power8_intc_create; k->isa_create =3D pnv_chip_power8_isa_create; + k->dt_populate =3D pnv_chip_power8_dt_populate; k->xscom_base =3D 0x003fc0000000000ull; dc->desc =3D "PowerNV Chip POWER8"; =20 @@ -894,6 +915,7 @@ static void pnv_chip_power8nvl_class_init(ObjectClass *= klass, void *data) k->core_pir =3D pnv_chip_core_pir_p8; k->intc_create =3D pnv_chip_power8_intc_create; k->isa_create =3D pnv_chip_power8nvl_isa_create; + k->dt_populate =3D pnv_chip_power8_dt_populate; k->xscom_base =3D 0x003fc0000000000ull; dc->desc =3D "PowerNV Chip POWER8NVL"; =20 @@ -954,6 +976,7 @@ static void pnv_chip_power9_class_init(ObjectClass *kla= ss, void *data) k->core_pir =3D pnv_chip_core_pir_p9; k->intc_create =3D pnv_chip_power9_intc_create; k->isa_create =3D pnv_chip_power9_isa_create; + k->dt_populate =3D pnv_chip_power9_dt_populate; k->xscom_base =3D 0x00603fc00000000ull; dc->desc =3D "PowerNV Chip POWER9"; =20 diff --git a/include/hw/ppc/pnv.h b/include/hw/ppc/pnv.h index ebbb3d0e9a..fa9ec50fd5 100644 --- a/include/hw/ppc/pnv.h +++ b/include/hw/ppc/pnv.h @@ -102,6 +102,7 @@ typedef struct PnvChipClass { uint32_t (*core_pir)(PnvChip *chip, uint32_t core_id); void (*intc_create)(PnvChip *chip, PowerPCCPU *cpu, Error **errp); ISABus *(*isa_create)(PnvChip *chip, Error **errp); + void (*dt_populate)(PnvChip *chip, void *fdt); } PnvChipClass; =20 #define PNV_CHIP_TYPE_SUFFIX "-" TYPE_PNV_CHIP --=20 2.20.1