summaryrefslogtreecommitdiffstats
path: root/drivers/nvdimm/pmem.c
diff options
context:
space:
mode:
authorDan Williams <dan.j.williams@intel.com>2016-11-28 14:15:18 -0500
committerDan Williams <dan.j.williams@intel.com>2016-11-28 14:15:18 -0500
commit450c6633e874c4d38112b39647831f67b41a8067 (patch)
treeb2d9813afd5677de59c2070940796f04af3abbce /drivers/nvdimm/pmem.c
parent2d9a02744f5a2e8325fc0c3e5533593261cead0a (diff)
libnvdimm: use consistent naming for request_mem_region()
Here is an example /proc/iomem listing for a system with 2 namespaces, one in "sector" mode and one in "memory" mode: 1fc000000-2fbffffff : Persistent Memory (legacy) 1fc000000-2fbffffff : namespace1.0 340000000-34fffffff : Persistent Memory 340000000-34fffffff : btt0.1 Here is the corresponding ndctl listing: # ndctl list [ { "dev":"namespace1.0", "mode":"memory", "size":4294967296, "blockdev":"pmem1" }, { "dev":"namespace0.0", "mode":"sector", "size":267091968, "uuid":"f7594f86-badb-4592-875f-ded577da2eaf", "sector_size":4096, "blockdev":"pmem0s" } ] Notice that the ndctl listing is purely in terms of namespace devices, while the iomem listing leaks the internal "btt0.1" implementation detail. Given that ndctl requires the namespace device name to change the mode, for example: # ndctl create-namespace --reconfig=namespace0.0 --mode=raw --force ...use the namespace name in the iomem listing to keep the claiming device name consistent across different mode settings. Cc: Vishal Verma <vishal.l.verma@intel.com> Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/nvdimm/pmem.c')
-rw-r--r--drivers/nvdimm/pmem.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 42b3a8217073..34f16a17c07b 100644
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -266,7 +266,7 @@ static int pmem_attach_disk(struct device *dev,
266 dev_warn(dev, "unable to guarantee persistence of writes\n"); 266 dev_warn(dev, "unable to guarantee persistence of writes\n");
267 267
268 if (!devm_request_mem_region(dev, res->start, resource_size(res), 268 if (!devm_request_mem_region(dev, res->start, resource_size(res),
269 dev_name(dev))) { 269 dev_name(&ndns->dev))) {
270 dev_warn(dev, "could not reserve region %pR\n", res); 270 dev_warn(dev, "could not reserve region %pR\n", res);
271 return -EBUSY; 271 return -EBUSY;
272 } 272 }