From nobody Sat Feb 7 08:23:19 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=reject dis=none) header.from=linux.ibm.com ARC-Seal: i=1; a=rsa-sha256; t=1768921372; cv=none; d=zohomail.com; s=zohoarc; b=V+icy8M+e6+ftCoNlrqirW1RPYiqip5o39M2ImUrOvHWxoaxZv93UY0Iq+heb8/CbQCFeZLylKEpH94o79J68wLTUydpEPzPZKcOoOZUcM8ja8XUAqxUctNV0YURrWuXt3bU1JZjTBYWwgl9xHGLI+d5atvFQIe8LMO6egRVtP4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1768921372; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=XHmLxOhq1Zu+hS6McA0MmCedUN2tXbkUoMUdSkhSSPw=; b=gpOcpmDCtHEsqtGwZk4ldPazIhat6FB3AGP+TectlQrnhtSOcHzcuaH+INnR60tcy0vx3zGECPD8VeOKt+WXRbymVmxmJHWBB9rvkR4cWGs5jeaaoQJMviD40u0cYP7dSmaxDO2OWWTmAHskk8q3FwADB5G3Ap8EPC6+XZDJsPo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=reject dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 17689213728879.594589353132392; Tue, 20 Jan 2026 07:02:52 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1viDEw-0008BL-Ok; Tue, 20 Jan 2026 10:01:54 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1viDEs-00086U-Ip; Tue, 20 Jan 2026 10:01:51 -0500 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1viDEq-0002Og-HV; Tue, 20 Jan 2026 10:01:50 -0500 Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 60KEkhA0019532; Tue, 20 Jan 2026 15:01:46 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4br255xce1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jan 2026 15:01:46 +0000 (GMT) Received: from m0356517.ppops.net (m0356517.ppops.net [127.0.0.1]) by pps.reinject (8.18.1.12/8.18.0.8) with ESMTP id 60KEvGXg007239; Tue, 20 Jan 2026 15:01:46 GMT Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4br255xcdv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jan 2026 15:01:46 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.2/8.18.1.2) with ESMTP id 60KEjB3i006415; Tue, 20 Jan 2026 15:01:45 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4brqf1d7qh-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 20 Jan 2026 15:01:45 +0000 Received: from smtpav02.wdc07v.mail.ibm.com (smtpav02.wdc07v.mail.ibm.com [10.39.53.229]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 60KF1hau13632132 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 20 Jan 2026 15:01:43 GMT Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 804A35805D; Tue, 20 Jan 2026 15:01:43 +0000 (GMT) Received: from smtpav02.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9B60158058; Tue, 20 Jan 2026 15:01:42 +0000 (GMT) Received: from gfwr532.rchland.ibm.com (unknown [9.10.239.133]) by smtpav02.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 20 Jan 2026 15:01:42 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:message-id:mime-version :subject:to; s=pp1; bh=XHmLxOhq1Zu+hS6McA0MmCedUN2tXbkUoMUdSkhSS Pw=; b=DnFq6+c7kYJjZccrqYDayTBJFAiVMspzG30qw4qxBDFxgCI99uk9pd98O a/WGIOA+QsrHqg/tpelfxi0rDWmlV0MFuJEwqrHm+yJAjOh/zs0KRWVzb5CSPNpA 0zGXAQ2ycH5hUPTKwLSvzfjS4bHA+gpnbfw9KCjF3++Yz1lyAB1cmom6mmsZLVig u3F3yHZHQ8MssGhG0ihLURjJhuvrUf6bCeqnS8pdwEblKUep6Ow/ZYunLF5jl/DP YUJWOhYxDfOjBoPeyuU5sYJ3OTCTSDidhJfp/1ZI0rpIeGnleK7mENNGZpFgltks UJdhsJt66zhzfP9F102rcsqo9Xlbg== From: Caleb Schlossin To: qemu-devel@nongnu.org Cc: qemu-ppc@nongnu.org, npiggin@gmail.com, adityag@linux.ibm.com, milesg@linux.ibm.com, rathc@linux.ibm.com, fbarrat@linux.ibm.com, chalapathi.v@linux.ibm.com, harshpb@linux.ibm.com, calebs@linux.ibm.com Subject: [PATCH v2] ppc/pnv: Add a nest MMU model Date: Tue, 20 Jan 2026 09:01:39 -0600 Message-ID: <20260120150139.714805-1-calebs@linux.ibm.com> X-Mailer: git-send-email 2.47.3 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwMTIwMDEyMyBTYWx0ZWRfX4cZArcDVOt7V wcWiN6Ito5CsPtnTCaCK02jFmZH3KkSBy6Y86zifE/fyduAbo5EG/TIXIrH8m0HR+86m2RKWky9 3NdN3AsGS6G1xQvcaAdqN9ckPKjKyyYg55NB9gEM2wXpNBhKioQEAmTGBGmtco/3Wmvy3CLc/3W z3aT9KIBk5JsD/GBKe4DoVQcNnFlXxT+xNYz/CjDliu/Ttc2qEGsMl6QeLr+dJ/rB/3WOWUxvhl jmDIGy1HDow4xKgfMD8O7RXkG0M4EqfdXuJh1Vpp+CEvQWws2vdpZpDfIzynYUMiINFut4WQGyx HcigqUiWE8YpX86NNhKqtrBW7oO2nHxo92jCG+OrA2oT29klvZ4lE6qnqFW1TcrjgxWNdfYffTZ MSasdzRL7eek/YvOyhooMM7qB6LikPp2h5jRJQ8XZ7wFjn3rWn7/24oHKzaoE0AnbMqffvQDQMK mJ0egp6v7haKqOyjxWw== X-Authority-Analysis: v=2.4 cv=BpSQAIX5 c=1 sm=1 tr=0 ts=696f98da cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=vUbySO9Y5rIA:10 a=VkNPw1HP01LnGYTKEx00:22 a=VnNF1IyMAAAA:8 a=r03UDPAKYrhx904b1scA:9 X-Proofpoint-GUID: D4sTnvmJTVSC8aad11vLod5xAQOHSmGE X-Proofpoint-ORIG-GUID: nVJxE8WVVzA2MHzQue2r3Qe2Gfg4fvIZ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1121,Hydra:6.1.20,FMLib:17.12.100.49 definitions=2026-01-20_04,2026-01-20_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 clxscore=1015 adultscore=0 phishscore=0 malwarescore=0 impostorscore=0 suspectscore=0 priorityscore=1501 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.19.0-2601150000 definitions=main-2601200123 Received-SPF: pass (zohomail.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; Received-SPF: pass (zohomail.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; Received-SPF: pass client-ip=148.163.156.1; envelope-from=calebs@linux.ibm.com; helo=mx0a-001b2d01.pphosted.com X-Spam_score_int: -26 X-Spam_score: -2.7 X-Spam_bar: -- X-Spam_report: (-2.7 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @ibm.com) X-ZM-MESSAGEID: 1768921373721158500 Content-Type: text/plain; charset="utf-8" The nest MMU is used for translations needed by I/O subsystems on Power10. The nest is the shared, on-chip infrastructure that connects CPU cores, memory controllers, and I/O. This patch sets up a basic skeleton with its xscom area, mapping both needed xscom regions. Support required for PowerVM bringup. Use Power9 property for device tree to allow OPAL to work with Power9 and Power10. Reviewed-by: Chalapathi V Reviewed-by: Glenn Miles Signed-off-by: Frederic Barrat Signed-off-by: Chalapathi V Signed-off-by: Caleb Schlossin Reviewed-by: Aditya Gupta --- hw/ppc/meson.build | 1 + hw/ppc/pnv.c | 20 ++++++ hw/ppc/pnv_nmmu.c | 132 +++++++++++++++++++++++++++++++++++++ include/hw/ppc/pnv_chip.h | 3 + include/hw/ppc/pnv_nmmu.h | 28 ++++++++ include/hw/ppc/pnv_xscom.h | 4 ++ 6 files changed, 188 insertions(+) create mode 100644 hw/ppc/pnv_nmmu.c create mode 100644 include/hw/ppc/pnv_nmmu.h diff --git a/hw/ppc/meson.build b/hw/ppc/meson.build index f7dac87a2a..69e2fc34c4 100644 --- a/hw/ppc/meson.build +++ b/hw/ppc/meson.build @@ -56,6 +56,7 @@ ppc_ss.add(when: 'CONFIG_POWERNV', if_true: files( 'pnv_pnor.c', 'pnv_nest_pervasive.c', 'pnv_n1_chiplet.c', + 'pnv_nmmu.c' )) # PowerPC 4xx boards ppc_ss.add(when: 'CONFIG_PPC405', if_true: files( diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index 1513575b8f..f5cc44c407 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -2196,6 +2196,11 @@ static void pnv_chip_power10_instance_init(Object *o= bj) TYPE_PNV_PHB5_PEC); } =20 + for (i =3D 0; i < PNV10_CHIP_MAX_NMMU; i++) { + object_initialize_child(obj, "nmmu[*]", &chip10->nmmu[i], + TYPE_PNV_NMMU); + } + for (i =3D 0; i < pcc->i2c_num_engines; i++) { object_initialize_child(obj, "i2c[*]", &chip10->i2c[i], TYPE_PNV_I= 2C); } @@ -2410,6 +2415,21 @@ static void pnv_chip_power10_realize(DeviceState *de= v, Error **errp) pnv_xscom_add_subregion(chip, PNV10_XSCOM_N1_PB_SCOM_ES_BASE, &chip10->n1_chiplet.xscom_pb_es_mr); =20 + /* nest0/1 MMU */ + for (i =3D 0; i < PNV10_CHIP_MAX_NMMU; i++) { + object_property_set_int(OBJECT(&chip10->nmmu[i]), "nmmu_id", + i , &error_fatal); + object_property_set_link(OBJECT(&chip10->nmmu[i]), "chip", + OBJECT(chip), &error_abort); + if (!qdev_realize(DEVICE(&chip10->nmmu[i]), NULL, errp)) { + return; + } + } + pnv_xscom_add_subregion(chip, PNV10_XSCOM_NEST0_MMU_BASE, + &chip10->nmmu[0].xscom_regs); + pnv_xscom_add_subregion(chip, PNV10_XSCOM_NEST1_MMU_BASE, + &chip10->nmmu[1].xscom_regs); + /* PHBs */ pnv_chip_power10_phb_realize(chip, &local_err); if (local_err) { diff --git a/hw/ppc/pnv_nmmu.c b/hw/ppc/pnv_nmmu.c new file mode 100644 index 0000000000..c1b00bac89 --- /dev/null +++ b/hw/ppc/pnv_nmmu.c @@ -0,0 +1,132 @@ +/* + * QEMU PowerPC nest MMU model + * + * Copyright (c) 2025, IBM Corporation. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#include "qemu/osdep.h" +#include "qemu/log.h" +#include "hw/core/qdev-properties.h" + +#include "hw/ppc/pnv.h" +#include "hw/ppc/pnv_xscom.h" +#include "hw/ppc/pnv_nmmu.h" +#include "hw/ppc/fdt.h" + +#include + +#define NMMU_XLAT_CTL_PTCR 0xb + +static uint64_t pnv_nmmu_xscom_read(void *opaque, hwaddr addr, unsigned si= ze) +{ + PnvNMMU *nmmu =3D PNV_NMMU(opaque); + int reg =3D addr >> 3; + uint64_t val; + + if (reg =3D=3D NMMU_XLAT_CTL_PTCR) { + val =3D nmmu->ptcr; + } else { + val =3D 0xffffffffffffffffull; + qemu_log_mask(LOG_UNIMP, "nMMU: xscom read at 0x%" PRIx32 "\n", re= g); + } + return val; +} + +static void pnv_nmmu_xscom_write(void *opaque, hwaddr addr, + uint64_t val, unsigned size) +{ + PnvNMMU *nmmu =3D PNV_NMMU(opaque); + int reg =3D addr >> 3; + + if (reg =3D=3D NMMU_XLAT_CTL_PTCR) { + nmmu->ptcr =3D val; + } else { + qemu_log_mask(LOG_UNIMP, "nMMU: xscom write at 0x%" PRIx32 "\n", r= eg); + } +} + +static const MemoryRegionOps pnv_nmmu_xscom_ops =3D { + .read =3D pnv_nmmu_xscom_read, + .write =3D pnv_nmmu_xscom_write, + .valid.min_access_size =3D 8, + .valid.max_access_size =3D 8, + .impl.min_access_size =3D 8, + .impl.max_access_size =3D 8, + .endianness =3D DEVICE_BIG_ENDIAN, +}; + +static void pnv_nmmu_realize(DeviceState *dev, Error **errp) +{ + PnvNMMU *nmmu =3D PNV_NMMU(dev); + + assert(nmmu->chip); + + /* NMMU xscom region */ + pnv_xscom_region_init(&nmmu->xscom_regs, OBJECT(nmmu), + &pnv_nmmu_xscom_ops, nmmu, + "xscom-nmmu", + PNV10_XSCOM_NMMU_SIZE); +} + +static int pnv_nmmu_dt_xscom(PnvXScomInterface *dev, void *fdt, + int offset) +{ + PnvNMMU *nmmu =3D PNV_NMMU(dev); + char *name; + int nmmu_offset; + const char compat[] =3D "ibm,power9-nest-mmu"; + uint32_t nmmu_pcba =3D PNV10_XSCOM_NEST0_MMU_BASE + nmmu->nmmu_id * 0x= 1000000; + uint32_t reg[2] =3D { + cpu_to_be32(nmmu_pcba), + cpu_to_be32(PNV10_XSCOM_NMMU_SIZE) + }; + + name =3D g_strdup_printf("nmmu@%x", nmmu_pcba); + nmmu_offset =3D fdt_add_subnode(fdt, offset, name); + _FDT(nmmu_offset); + g_free(name); + + _FDT(fdt_setprop(fdt, nmmu_offset, "reg", reg, sizeof(reg))); + _FDT(fdt_setprop(fdt, nmmu_offset, "compatible", compat, sizeof(compat= ))); + return 0; +} + +static const Property pnv_nmmu_properties[] =3D { + DEFINE_PROP_UINT32("nmmu_id", PnvNMMU, nmmu_id, 0), + DEFINE_PROP_LINK("chip", PnvNMMU, chip, TYPE_PNV_CHIP, PnvChip *), +}; + +static void pnv_nmmu_class_init(ObjectClass *klass, const void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(klass); + PnvXScomInterfaceClass *xscomc =3D PNV_XSCOM_INTERFACE_CLASS(klass); + + xscomc->dt_xscom =3D pnv_nmmu_dt_xscom; + + dc->desc =3D "PowerNV nest MMU"; + dc->realize =3D pnv_nmmu_realize; + device_class_set_props(dc, pnv_nmmu_properties); +} + +static const TypeInfo pnv_nmmu_info =3D { + .name =3D TYPE_PNV_NMMU, + .parent =3D TYPE_DEVICE, + .instance_size =3D sizeof(PnvNMMU), + .class_init =3D pnv_nmmu_class_init, + .interfaces =3D (InterfaceInfo[]) { + { TYPE_PNV_XSCOM_INTERFACE }, + { } + } +}; + +static void pnv_nmmu_register_types(void) +{ + type_register_static(&pnv_nmmu_info); +} + +type_init(pnv_nmmu_register_types); diff --git a/include/hw/ppc/pnv_chip.h b/include/hw/ppc/pnv_chip.h index ea47c97dd3..8ef75fdcca 100644 --- a/include/hw/ppc/pnv_chip.h +++ b/include/hw/ppc/pnv_chip.h @@ -7,6 +7,7 @@ #include "hw/ppc/pnv_core.h" #include "hw/ppc/pnv_homer.h" #include "hw/ppc/pnv_n1_chiplet.h" +#include "hw/ppc/pnv_nmmu.h" #include "hw/ssi/pnv_spi.h" #include "hw/ppc/pnv_lpc.h" #include "hw/ppc/pnv_occ.h" @@ -126,6 +127,8 @@ struct Pnv10Chip { PnvN1Chiplet n1_chiplet; #define PNV10_CHIP_MAX_PIB_SPIC 6 PnvSpi pib_spic[PNV10_CHIP_MAX_PIB_SPIC]; +#define PNV10_CHIP_MAX_NMMU 2 + PnvNMMU nmmu[PNV10_CHIP_MAX_NMMU]; =20 uint32_t nr_quads; PnvQuad *quads; diff --git a/include/hw/ppc/pnv_nmmu.h b/include/hw/ppc/pnv_nmmu.h new file mode 100644 index 0000000000..d3ba46ecf4 --- /dev/null +++ b/include/hw/ppc/pnv_nmmu.h @@ -0,0 +1,28 @@ +/* + * QEMU PowerPC nest MMU model + * + * Copyright (c) 2025, IBM Corporation. + * + * SPDX-License-Identifier: GPL-2.0-or-later + * + * This code is licensed under the GPL version 2 or later. See the + * COPYING file in the top-level directory. + */ + +#ifndef PPC_PNV_NMMU_H +#define PPC_PNV_NMMU_H + +#define TYPE_PNV_NMMU "pnv-nmmu" +#define PNV_NMMU(obj) OBJECT_CHECK(PnvNMMU, (obj), TYPE_PNV_NMMU) + +typedef struct PnvNMMU { + DeviceState parent; + + struct PnvChip *chip; + + MemoryRegion xscom_regs; + uint32_t nmmu_id; + uint64_t ptcr; +} PnvNMMU; + +#endif /*PPC_PNV_NMMU_H */ diff --git a/include/hw/ppc/pnv_xscom.h b/include/hw/ppc/pnv_xscom.h index 610b075a27..6dab803d1f 100644 --- a/include/hw/ppc/pnv_xscom.h +++ b/include/hw/ppc/pnv_xscom.h @@ -196,6 +196,10 @@ struct PnvXScomInterfaceClass { #define PNV10_XSCOM_N1_PB_SCOM_ES_BASE 0x3011300 #define PNV10_XSCOM_N1_PB_SCOM_ES_SIZE 0x100 =20 +#define PNV10_XSCOM_NEST0_MMU_BASE 0x2010c40 +#define PNV10_XSCOM_NEST1_MMU_BASE 0x3010c40 +#define PNV10_XSCOM_NMMU_SIZE 0x20 + #define PNV10_XSCOM_PEC_NEST_BASE 0x3011800 /* index goes downwards ... */ #define PNV10_XSCOM_PEC_NEST_SIZE 0x100 =20 --=20 2.47.3