[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v4 15/16] hw/arm/boot: Expose the pmem nodes in the DT
From: |
Eric Auger |
Subject: |
[Qemu-devel] [RFC v4 15/16] hw/arm/boot: Expose the pmem nodes in the DT |
Date: |
Thu, 18 Oct 2018 16:30:41 +0200 |
In case of NV-DIMM slots, let's add /pmem DT nodes.
Signed-off-by: Eric Auger <address@hidden>
---
hw/arm/boot.c | 33 ++++++++++++++++++++++++++++++++-
1 file changed, 32 insertions(+), 1 deletion(-)
diff --git a/hw/arm/boot.c b/hw/arm/boot.c
index 81d621ce14..50acf0abd4 100644
--- a/hw/arm/boot.c
+++ b/hw/arm/boot.c
@@ -444,6 +444,36 @@ out:
return ret;
}
+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 = NULL;
+ int ret;
+
+ nodename = g_strdup_printf("/address@hidden" PRIx64, mem_base);
+ qemu_fdt_add_subnode(fdt, nodename);
+ qemu_fdt_setprop_string(fdt, nodename, "compatible", "pmem-region");
+ ret = qemu_fdt_setprop_sized_cells(fdt, nodename, "reg", acells, mem_base,
+ scells, mem_len);
+ if (ret < 0) {
+ fprintf(stderr, "couldn't set %s/reg\n", nodename);
+ goto out;
+ }
+ if (numa_node_id < 0) {
+ goto out;
+ }
+
+ ret = qemu_fdt_setprop_cell(fdt, nodename, "numa-node-id", numa_node_id);
+ if (ret < 0) {
+ fprintf(stderr, "couldn't set %s/numa-node-id\n", nodename);
+ }
+
+out:
+ g_free(nodename);
+ return ret;
+}
+
static void fdt_add_psci_node(void *fdt)
{
uint32_t cpu_suspend_fn;
@@ -531,7 +561,8 @@ static int fdt_add_hotpluggable_memory_nodes(void *fdt,
di = !is_nvdimm ? mi->u.dimm.data : mi->u.nvdimm.data;
if (is_nvdimm) {
- ret = -ENOENT; /* NV-DIMM not yet supported */
+ ret = fdt_add_pmem_node(fdt, acells, di->addr,
+ scells, di->size, di->node);
} else {
ret = fdt_add_memory_node(fdt, acells, di->addr,
scells, di->size, di->node);
--
2.17.1
- [Qemu-devel] [RFC v4 08/16] hw/arm/virt: Allocate device_memory, (continued)
- [Qemu-devel] [RFC v4 08/16] hw/arm/virt: Allocate device_memory, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 07/16] hw/arm/virt: Implement kvm_type function for 3.2 machine, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 09/16] hw/arm/virt: Add memory hotplug framework, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 10/16] hw/arm/boot: Expose the PC-DIMM nodes in the DT, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 12/16] hw/arm/virt-acpi-build: Add PC-DIMM in SRAT, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 11/16] acpi: move build_srat_hotpluggable_memory to generic ACPI source, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 13/16] nvdimm: use configurable ACPI IO base and size, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 15/16] hw/arm/boot: Expose the pmem nodes in the DT,
Eric Auger <=
- [Qemu-devel] [RFC v4 14/16] hw/arm/virt: Add nvdimm hot-plug infrastructure, Eric Auger, 2018/10/18
- [Qemu-devel] [RFC v4 16/16] hw/arm/virt: Add nvdimm and nvdimm-persistence options, Eric Auger, 2018/10/18