nvdimm.lists.linux.dev archive mirror
 help / color / mirror / Atom feed
* [PATCH] spapr: nvdimm: Fix the persistent-memory root node name in device tree
@ 2021-05-26 15:27 Shivaprasad G Bhat
  2021-05-27  1:09 ` David Gibson
  0 siblings, 1 reply; 2+ messages in thread
From: Shivaprasad G Bhat @ 2021-05-26 15:27 UTC (permalink / raw)
  To: david, groug, qemu-ppc; +Cc: qemu-devel, aneesh.kumar, nvdimm

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(-)

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)));



^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [PATCH] spapr: nvdimm: Fix the persistent-memory root node name in device tree
  2021-05-26 15:27 [PATCH] spapr: nvdimm: Fix the persistent-memory root node name in device tree Shivaprasad G Bhat
@ 2021-05-27  1:09 ` David Gibson
  0 siblings, 0 replies; 2+ messages in thread
From: David Gibson @ 2021-05-27  1:09 UTC (permalink / raw)
  To: Shivaprasad G Bhat; +Cc: groug, qemu-ppc, qemu-devel, aneesh.kumar, nvdimm

[-- Attachment #1: Type: text/plain, Size: 1731 bytes --]

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)));
> 
> 

-- 
David Gibson			| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au	| minimalist, thank you.  NOT _the_ _other_
				| _way_ _around_!
http://www.ozlabs.org/~dgibson

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2021-05-27  1:48 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-26 15:27 [PATCH] spapr: nvdimm: Fix the persistent-memory root node name in device tree Shivaprasad G Bhat
2021-05-27  1:09 ` David Gibson

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).