From: Kenny Root <[email protected]>
From: Kenny Root <[email protected]>
Factor out region registration for 'reg' node. A follow-up change will
use of_pmem_register_region() to handle memory-region nodes too.
Signed-off-by: Kenny Root <[email protected]>
Signed-off-by: Alistair Delva <[email protected]>
Reviewed-by: "Oliver O'Halloran" <[email protected]>
Cc: Rob Herring <[email protected]>
Cc: Dan Williams <[email protected]>
Cc: Vishal Verma <[email protected]>
Cc: Dave Jiang <[email protected]>
Cc: Ira Weiny <[email protected]>
Cc: [email protected]
Cc: [email protected]
Cc: [email protected]
---
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
On Sun, Feb 23, 2020 at 06:08:13PM -0800, Alistair Delva wrote:
> From: Kenny Root <[email protected]>
>
> From: Kenny Root <[email protected]>
>
> 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 <[email protected]>
>
> Signed-off-by: Kenny Root <[email protected]>
> Signed-off-by: Alistair Delva <[email protected]>
> Reviewed-by: "Oliver O'Halloran" <[email protected]>
> Cc: Rob Herring <[email protected]>
> Cc: Dan Williams <[email protected]>
> Cc: Vishal Verma <[email protected]>
> Cc: Dave Jiang <[email protected]>
> Cc: Ira Weiny <[email protected]>
> Cc: [email protected]
> Cc: [email protected]
> Cc: [email protected]
> ---
> 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
>