| Message ID | 20200224020815.139570-1-adelva@google.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] libnvdimm/of_pmem: factor out region registration | expand |
On Sun, Feb 23, 2020 at 06:08:13PM -0800, Alistair Delva wrote: > From: Kenny Root <kroot@google.com> > > From: Kenny Root <kroot@google.com> > > Factor out region registration for 'reg' node. A follow-up change will > use of_pmem_register_region() to handle memory-region nodes too. Thanks! Reviewed-by: Ira Weiny <ira.weiny@intel.com> > > Signed-off-by: Kenny Root <kroot@google.com> > Signed-off-by: Alistair Delva <adelva@google.com> > Reviewed-by: "Oliver O'Halloran" <oohall@gmail.com> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Dan Williams <dan.j.williams@intel.com> > Cc: Vishal Verma <vishal.l.verma@intel.com> > Cc: Dave Jiang <dave.jiang@intel.com> > Cc: Ira Weiny <ira.weiny@intel.com> > Cc: devicetree@vger.kernel.org > Cc: linux-nvdimm@lists.01.org > Cc: kernel-team@android.com > --- > drivers/nvdimm/of_pmem.c | 60 +++++++++++++++++++++++----------------- > 1 file changed, 35 insertions(+), 25 deletions(-) > > diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c > index 8224d1431ea9..fdf54494e8c9 100644 > --- a/drivers/nvdimm/of_pmem.c > +++ b/drivers/nvdimm/of_pmem.c > @@ -14,6 +14,39 @@ struct of_pmem_private { > struct nvdimm_bus *bus; > }; > > +static void of_pmem_register_region(struct platform_device *pdev, > + struct nvdimm_bus *bus, > + struct device_node *np, > + struct resource *res, bool is_volatile) > +{ > + struct nd_region_desc ndr_desc; > + struct nd_region *region; > + > + /* > + * NB: libnvdimm copies the data from ndr_desc into it's own > + * structures so passing a stack pointer is fine. > + */ > + memset(&ndr_desc, 0, sizeof(ndr_desc)); > + ndr_desc.numa_node = dev_to_node(&pdev->dev); > + ndr_desc.target_node = ndr_desc.numa_node; > + ndr_desc.res = res; > + ndr_desc.of_node = np; > + set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); > + > + if (is_volatile) > + region = nvdimm_volatile_region_create(bus, &ndr_desc); > + else > + region = nvdimm_pmem_region_create(bus, &ndr_desc); > + > + if (!region) > + dev_warn(&pdev->dev, > + "Unable to register region %pR from %pOF\n", > + ndr_desc.res, np); > + else > + dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", > + ndr_desc.res, np); > +} > + > static int of_pmem_region_probe(struct platform_device *pdev) > { > struct of_pmem_private *priv; > @@ -46,31 +79,8 @@ static int of_pmem_region_probe(struct platform_device *pdev) > is_volatile ? "volatile" : "non-volatile", np); > > for (i = 0; i < pdev->num_resources; i++) { > - struct nd_region_desc ndr_desc; > - struct nd_region *region; > - > - /* > - * NB: libnvdimm copies the data from ndr_desc into it's own > - * structures so passing a stack pointer is fine. > - */ > - memset(&ndr_desc, 0, sizeof(ndr_desc)); > - ndr_desc.numa_node = dev_to_node(&pdev->dev); > - ndr_desc.target_node = ndr_desc.numa_node; > - ndr_desc.res = &pdev->resource[i]; > - ndr_desc.of_node = np; > - set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); > - > - if (is_volatile) > - region = nvdimm_volatile_region_create(bus, &ndr_desc); > - else > - region = nvdimm_pmem_region_create(bus, &ndr_desc); > - > - if (!region) > - dev_warn(&pdev->dev, "Unable to register region %pR from %pOF\n", > - ndr_desc.res, np); > - else > - dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", > - ndr_desc.res, np); > + of_pmem_register_region(pdev, bus, np, &pdev->resource[i], > + is_volatile); > } > > return 0; > -- > 2.25.0.265.gbab2e86ba0-goog >
diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c index 8224d1431ea9..fdf54494e8c9 100644 --- a/drivers/nvdimm/of_pmem.c +++ b/drivers/nvdimm/of_pmem.c @@ -14,6 +14,39 @@ struct of_pmem_private { struct nvdimm_bus *bus; }; +static void of_pmem_register_region(struct platform_device *pdev, + struct nvdimm_bus *bus, + struct device_node *np, + struct resource *res, bool is_volatile) +{ + struct nd_region_desc ndr_desc; + struct nd_region *region; + + /* + * NB: libnvdimm copies the data from ndr_desc into it's own + * structures so passing a stack pointer is fine. + */ + memset(&ndr_desc, 0, sizeof(ndr_desc)); + ndr_desc.numa_node = dev_to_node(&pdev->dev); + ndr_desc.target_node = ndr_desc.numa_node; + ndr_desc.res = res; + ndr_desc.of_node = np; + set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); + + if (is_volatile) + region = nvdimm_volatile_region_create(bus, &ndr_desc); + else + region = nvdimm_pmem_region_create(bus, &ndr_desc); + + if (!region) + dev_warn(&pdev->dev, + "Unable to register region %pR from %pOF\n", + ndr_desc.res, np); + else + dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", + ndr_desc.res, np); +} + static int of_pmem_region_probe(struct platform_device *pdev) { struct of_pmem_private *priv; @@ -46,31 +79,8 @@ static int of_pmem_region_probe(struct platform_device *pdev) is_volatile ? "volatile" : "non-volatile", np); for (i = 0; i < pdev->num_resources; i++) { - struct nd_region_desc ndr_desc; - struct nd_region *region; - - /* - * NB: libnvdimm copies the data from ndr_desc into it's own - * structures so passing a stack pointer is fine. - */ - memset(&ndr_desc, 0, sizeof(ndr_desc)); - ndr_desc.numa_node = dev_to_node(&pdev->dev); - ndr_desc.target_node = ndr_desc.numa_node; - ndr_desc.res = &pdev->resource[i]; - ndr_desc.of_node = np; - set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); - - if (is_volatile) - region = nvdimm_volatile_region_create(bus, &ndr_desc); - else - region = nvdimm_pmem_region_create(bus, &ndr_desc); - - if (!region) - dev_warn(&pdev->dev, "Unable to register region %pR from %pOF\n", - ndr_desc.res, np); - else - dev_dbg(&pdev->dev, "Registered region %pR from %pOF\n", - ndr_desc.res, np); + of_pmem_register_region(pdev, bus, np, &pdev->resource[i], + is_volatile); } return 0;