* [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration
@ 2020-02-24 2:08 Alistair Delva
2020-02-24 2:08 ` [PATCH v2 2/3] libnvdimm/of_pmem: handle memory-region in DT Alistair Delva
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Alistair Delva @ 2020-02-24 2:08 UTC (permalink / raw)
To: linux-kernel
Cc: Kenny Root, Oliver O'Halloran, Rob Herring, Dan Williams,
Vishal Verma, Dave Jiang, Ira Weiny, devicetree, linux-nvdimm,
kernel-team
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.
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 2/3] libnvdimm/of_pmem: handle memory-region in DT
2020-02-24 2:08 [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Alistair Delva
@ 2020-02-24 2:08 ` Alistair Delva
2020-02-24 2:08 ` [PATCH v2 3/3] dt-bindings: pmem-region: Document memory-region Alistair Delva
2020-02-24 22:49 ` [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Ira Weiny
2 siblings, 0 replies; 4+ messages in thread
From: Alistair Delva @ 2020-02-24 2:08 UTC (permalink / raw)
To: linux-kernel
Cc: Kenny Root, Oliver O'Halloran, Rob Herring, Dan Williams,
Vishal Verma, Dave Jiang, Ira Weiny, devicetree, linux-nvdimm,
kernel-team
From: Kenny Root <kroot@google.com>
From: Kenny Root <kroot@google.com>
Add support for parsing the 'memory-region' DT property in addition to
the 'reg' DT property. This enables use cases where the pmem region is
not in I/O address space or dedicated memory (e.g. a bootloader
carveout).
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 | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/drivers/nvdimm/of_pmem.c b/drivers/nvdimm/of_pmem.c
index fdf54494e8c9..cff47cc5fc4a 100644
--- a/drivers/nvdimm/of_pmem.c
+++ b/drivers/nvdimm/of_pmem.c
@@ -49,11 +49,12 @@ static void of_pmem_register_region(struct platform_device *pdev,
static int of_pmem_region_probe(struct platform_device *pdev)
{
+ struct device_node *mr_np, *np;
struct of_pmem_private *priv;
- struct device_node *np;
struct nvdimm_bus *bus;
+ struct resource res;
bool is_volatile;
- int i;
+ int i, ret;
np = dev_of_node(&pdev->dev);
if (!np)
@@ -83,6 +84,21 @@ static int of_pmem_region_probe(struct platform_device *pdev)
is_volatile);
}
+ i = 0;
+ while ((mr_np = of_parse_phandle(np, "memory-region", i++))) {
+ ret = of_address_to_resource(mr_np, 0, &res);
+ if (ret) {
+ dev_warn(
+ &pdev->dev,
+ "Unable to acquire memory-region from %pOF: %d\n",
+ mr_np, ret);
+ } else {
+ of_pmem_register_region(pdev, bus, np, &res,
+ is_volatile);
+ }
+ of_node_put(mr_np);
+ }
+
return 0;
}
--
2.25.0.265.gbab2e86ba0-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH v2 3/3] dt-bindings: pmem-region: Document memory-region
2020-02-24 2:08 [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Alistair Delva
2020-02-24 2:08 ` [PATCH v2 2/3] libnvdimm/of_pmem: handle memory-region in DT Alistair Delva
@ 2020-02-24 2:08 ` Alistair Delva
2020-02-24 22:49 ` [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Ira Weiny
2 siblings, 0 replies; 4+ messages in thread
From: Alistair Delva @ 2020-02-24 2:08 UTC (permalink / raw)
To: linux-kernel
Cc: Kenny Root, Oliver O'Halloran, Rob Herring, Dan Williams,
Vishal Verma, Dave Jiang, Ira Weiny, devicetree, linux-nvdimm,
kernel-team
From: Kenny Root <kroot@google.com>
From: Kenny Root <kroot@google.com>
Add documentation and example for memory-region in pmem.
Signed-off-by: Kenny Root <kroot@google.com>
Signed-off-by: Alistair Delva <adelva@google.com>
Cc: "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
---
.../devicetree/bindings/pmem/pmem-region.txt | 29 +++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/Documentation/devicetree/bindings/pmem/pmem-region.txt b/Documentation/devicetree/bindings/pmem/pmem-region.txt
index 5cfa4f016a00..0ec87bd034e0 100644
--- a/Documentation/devicetree/bindings/pmem/pmem-region.txt
+++ b/Documentation/devicetree/bindings/pmem/pmem-region.txt
@@ -29,6 +29,18 @@ Required properties:
in a separate device node. Having multiple address ranges in a
node implies no special relationship between the two ranges.
+ This property may be replaced or supplemented with a
+ memory-region property. Only one of reg or memory-region
+ properties is required.
+
+ - memory-region:
+ Reference to the reserved memory node. The reserved memory
+ node should be defined as per the bindings in
+ reserved-memory.txt
+
+ This property may be replaced or supplemented with a reg
+ property. Only one of reg or memory-region is required.
+
Optional properties:
- Any relevant NUMA assocativity properties for the target platform.
@@ -63,3 +75,20 @@ Examples:
volatile;
};
+
+ /*
+ * This example uses a reserved-memory entry instead of
+ * specifying the memory region directly in the node.
+ */
+
+ reserved-memory {
+ pmem_1: pmem@5000 {
+ no-map;
+ reg = <0x00005000 0x00001000>;
+ };
+ };
+
+ pmem@1 {
+ compatible = "pmem-region";
+ memory-region = <&pmem_1>;
+ };
--
2.25.0.265.gbab2e86ba0-goog
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration
2020-02-24 2:08 [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Alistair Delva
2020-02-24 2:08 ` [PATCH v2 2/3] libnvdimm/of_pmem: handle memory-region in DT Alistair Delva
2020-02-24 2:08 ` [PATCH v2 3/3] dt-bindings: pmem-region: Document memory-region Alistair Delva
@ 2020-02-24 22:49 ` Ira Weiny
2 siblings, 0 replies; 4+ messages in thread
From: Ira Weiny @ 2020-02-24 22:49 UTC (permalink / raw)
To: Alistair Delva
Cc: linux-kernel, Kenny Root, Oliver O'Halloran, Rob Herring,
Dan Williams, Vishal Verma, Dave Jiang, devicetree, linux-nvdimm,
kernel-team
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
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-24 22:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-24 2:08 [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Alistair Delva
2020-02-24 2:08 ` [PATCH v2 2/3] libnvdimm/of_pmem: handle memory-region in DT Alistair Delva
2020-02-24 2:08 ` [PATCH v2 3/3] dt-bindings: pmem-region: Document memory-region Alistair Delva
2020-02-24 22:49 ` [PATCH v2 1/3] libnvdimm/of_pmem: factor out region registration Ira Weiny
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).