diff options
| author |  Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
| 2019-06-07 12:14:07 +0530 |
|---|---|---|
| committer |  Michael Ellerman <mpe@ellerman.id.au>
| 2019-07-05 00:35:15 +1000 |
| commit | 2a0ffbd4789b25cd5a80bfd8f3d28fb629eae1a7 (patch) | |
| tree | b0980124366b3332f462debf8a690e9dd1d51594 /arch/powerpc/platforms | |
| parent | powerpc/mm/nvdimm: Add an informative message if we fail to allocate altmap b... (diff) | |
| download | linux-2a0ffbd4789b25cd5a80bfd8f3d28fb629eae1a7.tar.gz linux-2a0ffbd4789b25cd5a80bfd8f3d28fb629eae1a7.tar.bz2 linux-2a0ffbd4789b25cd5a80bfd8f3d28fb629eae1a7.zip | |
powerpc/pseries/scm: Mark the region volatile if cache flush not required
The device tree node is documented as below:
“ibm,cache-flush-required”:
property name indicates Cache Flush Required for this Persistent Memory Segment to persist memory
prop-encoded-array: None, this is a name only property.
Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/platforms')
| -rw-r--r-- | arch/powerpc/platforms/pseries/papr_scm.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/papr_scm.c b/arch/powerpc/platforms/pseries/papr_scm.c index 96c53b23e58f..0176ce66673f 100644 --- a/arch/powerpc/platforms/pseries/papr_scm.c +++ b/arch/powerpc/platforms/pseries/papr_scm.c @@ -28,6 +28,7 @@ struct papr_scm_priv { uint64_t blocks; uint64_t block_size; int metadata_size; + bool is_volatile; uint64_t bound_addr; @@ -248,7 +249,10 @@ static int papr_scm_nvdimm_init(struct papr_scm_priv *p) ndr_desc.nd_set = &p->nd_set; set_bit(ND_REGION_PAGEMAP, &ndr_desc.flags); - p->region = nvdimm_pmem_region_create(p->bus, &ndr_desc); + if (p->is_volatile) + p->region = nvdimm_volatile_region_create(p->bus, &ndr_desc); + else + p->region = nvdimm_pmem_region_create(p->bus, &ndr_desc); if (!p->region) { dev_err(dev, "Error registering region %pR from %pOF\n", ndr_desc.res, p->dn); @@ -293,6 +297,7 @@ static int papr_scm_probe(struct platform_device *pdev) return -ENODEV; } + p = kzalloc(sizeof(*p), GFP_KERNEL); if (!p) return -ENOMEM; @@ -304,6 +309,7 @@ static int papr_scm_probe(struct platform_device *pdev) p->drc_index = drc_index; p->block_size = block_size; p->blocks = blocks; + p->is_volatile = !of_property_read_bool(dn, "ibm,cache-flush-required"); /* We just need to ensure that set cookies are unique across */ uuid_parse(uuid_str, (uuid_t *) uuid); |