| Message ID | 162204278956.219.9061511386011411578.stgit@cc493db1e665 (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | spapr: nvdimm: Fix the persistent-memory root node name in device tree | expand |
On Wed, May 26, 2021 at 11:27:15AM -0400, Shivaprasad G Bhat wrote: > The FDT code is adding the pmem root node by name "persistent-memory" > which should have been "ibm,persistent-memory". > > The linux fetches the device tree nodes by type and it has been working > correctly as the type is correct. If someone searches by its intended > name it would fail, so fix that. > > Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> > Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com> Applied to ppc-for-6.1, thanks. > --- > hw/ppc/spapr_nvdimm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c > index 252204e25f..d7a4a0a051 100644 > --- a/hw/ppc/spapr_nvdimm.c > +++ b/hw/ppc/spapr_nvdimm.c > @@ -163,11 +163,11 @@ int spapr_pmem_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr, > > void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt) > { > - int offset = fdt_subnode_offset(fdt, 0, "persistent-memory"); > + int offset = fdt_subnode_offset(fdt, 0, "ibm,persistent-memory"); > GSList *iter, *nvdimms = nvdimm_get_device_list(); > > if (offset < 0) { > - offset = fdt_add_subnode(fdt, 0, "persistent-memory"); > + offset = fdt_add_subnode(fdt, 0, "ibm,persistent-memory"); > _FDT(offset); > _FDT((fdt_setprop_cell(fdt, offset, "#address-cells", 0x1))); > _FDT((fdt_setprop_cell(fdt, offset, "#size-cells", 0x0))); > >
diff --git a/hw/ppc/spapr_nvdimm.c b/hw/ppc/spapr_nvdimm.c index 252204e25f..d7a4a0a051 100644 --- a/hw/ppc/spapr_nvdimm.c +++ b/hw/ppc/spapr_nvdimm.c @@ -163,11 +163,11 @@ int spapr_pmem_dt_populate(SpaprDrc *drc, SpaprMachineState *spapr, void spapr_dt_persistent_memory(SpaprMachineState *spapr, void *fdt) { - int offset = fdt_subnode_offset(fdt, 0, "persistent-memory"); + int offset = fdt_subnode_offset(fdt, 0, "ibm,persistent-memory"); GSList *iter, *nvdimms = nvdimm_get_device_list(); if (offset < 0) { - offset = fdt_add_subnode(fdt, 0, "persistent-memory"); + offset = fdt_add_subnode(fdt, 0, "ibm,persistent-memory"); _FDT(offset); _FDT((fdt_setprop_cell(fdt, offset, "#address-cells", 0x1))); _FDT((fdt_setprop_cell(fdt, offset, "#size-cells", 0x0)));
The FDT code is adding the pmem root node by name "persistent-memory" which should have been "ibm,persistent-memory". The linux fetches the device tree nodes by type and it has been working correctly as the type is correct. If someone searches by its intended name it would fail, so fix that. Reported-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com> Signed-off-by: Shivaprasad G Bhat <sbhat@linux.ibm.com> --- hw/ppc/spapr_nvdimm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)