From nobody Sun Nov 9 17:52:09 2025 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; 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; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1551189787589966.8661981136246; Tue, 26 Feb 2019 06:03:07 -0800 (PST) Received: from localhost ([127.0.0.1]:55846 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gydK4-00013x-FQ for importer@patchew.org; Tue, 26 Feb 2019 09:03:04 -0500 Received: from eggs.gnu.org ([209.51.188.92]:47947) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gyd9X-00015r-VB for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:52:14 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gyd9X-0007v3-1U for qemu-devel@nongnu.org; Tue, 26 Feb 2019 08:52:11 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57220) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gyd9P-0007hF-VM; Tue, 26 Feb 2019 08:52:04 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id E3325C01DDFD; Tue, 26 Feb 2019 13:51:52 +0000 (UTC) Received: from laptop.redhat.com (ovpn-116-102.ams2.redhat.com [10.36.116.102]) by smtp.corp.redhat.com (Postfix) with ESMTP id 33D935E1B0; Tue, 26 Feb 2019 13:51:45 +0000 (UTC) From: Eric Auger To: eric.auger.pro@gmail.com, eric.auger@redhat.com, qemu-devel@nongnu.org, qemu-arm@nongnu.org, peter.maydell@linaro.org, shameerali.kolothum.thodi@huawei.com, imammedo@redhat.com, david@redhat.com Date: Tue, 26 Feb 2019 14:50:13 +0100 Message-Id: <20190226135014.31854-18-eric.auger@redhat.com> In-Reply-To: <20190226135014.31854-1-eric.auger@redhat.com> References: <20190226135014.31854-1-eric.auger@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Tue, 26 Feb 2019 13:51:53 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH v8 17/18] hw/arm/boot: Expose the pmem nodes in the DT 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: pbonzini@redhat.com, drjones@redhat.com, dgilbert@redhat.com, david@gibson.dropbear.id.au Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" In case of NV-DIMM slots, let's add /pmem DT nodes. Signed-off-by: Eric Auger --- v6 -> v7 - does the same rework as for fdt_add_memory_node --- hw/arm/boot.c | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/hw/arm/boot.c b/hw/arm/boot.c index 4caaf91583..45e29b7b4a 100644 --- a/hw/arm/boot.c +++ b/hw/arm/boot.c @@ -450,6 +450,32 @@ out: return ret; } =20 +static int fdt_add_pmem_node(void *fdt, uint32_t acells, hwaddr mem_base, + uint32_t scells, hwaddr mem_len, + int numa_node_id) +{ + char *nodename; + int ret; + + nodename =3D g_strdup_printf("/pmem@%" PRIx64, mem_base); + qemu_fdt_add_subnode(fdt, nodename); + qemu_fdt_setprop_string(fdt, nodename, "compatible", "pmem-region"); + ret =3D qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", acells, mem= _base, + scells, mem_len); + if (ret < 0) { + goto out; + } + + /* only set the NUMA ID if it is specified */ + if (numa_node_id >=3D 0) { + ret =3D qemu_fdt_setprop_cell(fdt, nodename, + "numa-node-id", numa_node_id); + } +out: + g_free(nodename); + return ret; +} + static void fdt_add_psci_node(void *fdt) { uint32_t cpu_suspend_fn; @@ -546,6 +572,20 @@ static int fdt_add_hotpluggable_memory_nodes(void *fdt, } break; } + case MEMORY_DEVICE_INFO_KIND_NVDIMM: + { + PCDIMMDeviceInfo *di =3D mi->u.nvdimm.data; + + ret =3D fdt_add_pmem_node(fdt, acells, di->addr, + scells, di->size, di->node); + if (ret) { + fprintf(stderr, + "couldn't add NVDIMM /memory@%"PRIx64" node\n", + di->addr); + goto out; + } + break; + } default: fprintf(stderr, "%s memory nodes are not yet supported\n", MemoryDeviceInfoKind_str(mi->type)); --=20 2.20.1