mm/memremap_pages: support multiple ranges per invocation

[platform/kernel/linux-rpi.git] / drivers / nvdimm / pmem.c

diff --git a/drivers/nvdimm/pmem.c b/drivers/nvdimm/pmem.c
index 5c6939e..875076b 100644 (file)
--- a/drivers/nvdimm/pmem.c
+++ b/drivers/nvdimm/pmem.c
@@ -281,7 +281,6 @@ static const struct block_device_operations pmem_fops = {
        .owner =                THIS_MODULE,
        .submit_bio =           pmem_submit_bio,
        .rw_page =              pmem_rw_page,
-       .revalidate_disk =      nvdimm_revalidate_disk,
 };
 
 static int pmem_dax_zero_page_range(struct dax_device *dax_dev, pgoff_t pgoff,
@@ -376,7 +375,7 @@ static int pmem_attach_disk(struct device *dev,
        struct nd_region *nd_region = to_nd_region(dev->parent);
        int nid = dev_to_node(dev), fua;
        struct resource *res = &nsio->res;
-       struct resource bb_res;
+       struct range bb_range;
        struct nd_pfn *nd_pfn = NULL;
        struct dax_device *dax_dev;
        struct nd_pfn_sb *pfn_sb;
@@ -435,24 +434,27 @@ static int pmem_attach_disk(struct device *dev,
                pfn_sb = nd_pfn->pfn_sb;
                pmem->data_offset = le64_to_cpu(pfn_sb->dataoff);
                pmem->pfn_pad = resource_size(res) -
-                       resource_size(&pmem->pgmap.res);
+                       range_len(&pmem->pgmap.range);
                pmem->pfn_flags |= PFN_MAP;
-               memcpy(&bb_res, &pmem->pgmap.res, sizeof(bb_res));
-               bb_res.start += pmem->data_offset;
+               bb_range = pmem->pgmap.range;
+               bb_range.start += pmem->data_offset;
        } else if (pmem_should_map_pages(dev)) {
-               memcpy(&pmem->pgmap.res, &nsio->res, sizeof(pmem->pgmap.res));
+               pmem->pgmap.range.start = res->start;
+               pmem->pgmap.range.end = res->end;
+               pmem->pgmap.nr_range = 1;
                pmem->pgmap.type = MEMORY_DEVICE_FS_DAX;
                pmem->pgmap.ops = &fsdax_pagemap_ops;
                addr = devm_memremap_pages(dev, &pmem->pgmap);
                pmem->pfn_flags |= PFN_MAP;
-               memcpy(&bb_res, &pmem->pgmap.res, sizeof(bb_res));
+               bb_range = pmem->pgmap.range;
        } else {
                if (devm_add_action_or_reset(dev, pmem_release_queue,
                                        &pmem->pgmap))
                        return -ENOMEM;
                addr = devm_memremap(dev, pmem->phys_addr,
                                pmem->size, ARCH_MEMREMAP_PMEM);
-               memcpy(&bb_res, &nsio->res, sizeof(bb_res));
+               bb_range.start =  res->start;
+               bb_range.end = res->end;
        }
 
        if (IS_ERR(addr))
@@ -476,13 +478,12 @@ static int pmem_attach_disk(struct device *dev,
        disk->queue             = q;
        disk->flags             = GENHD_FL_EXT_DEVT;
        disk->private_data      = pmem;
-       disk->queue->backing_dev_info->capabilities |= BDI_CAP_SYNCHRONOUS_IO;
        nvdimm_namespace_disk_name(ndns, disk->disk_name);
        set_capacity(disk, (pmem->size - pmem->pfn_pad - pmem->data_offset)
                        / 512);
        if (devm_init_badblocks(dev, &pmem->bb))
                return -ENOMEM;
-       nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_res);
+       nvdimm_badblocks_populate(nd_region, &pmem->bb, &bb_range);
        disk->bb = &pmem->bb;
 
        if (is_nvdimm_sync(nd_region))
@@ -501,7 +502,7 @@ static int pmem_attach_disk(struct device *dev,
        if (devm_add_action_or_reset(dev, pmem_release_disk, pmem))
                return -ENOMEM;
 
-       revalidate_disk(disk);
+       nvdimm_check_and_set_ro(disk);
 
        pmem->bb_state = sysfs_get_dirent(disk_to_dev(disk)->kobj.sd,
                                          "badblocks");
@@ -593,8 +594,8 @@ static void nd_pmem_notify(struct device *dev, enum nvdimm_event event)
        resource_size_t offset = 0, end_trunc = 0;
        struct nd_namespace_common *ndns;
        struct nd_namespace_io *nsio;
-       struct resource res;
        struct badblocks *bb;
+       struct range range;
        struct kernfs_node *bb_state;
 
        if (event != NVDIMM_REVALIDATE_POISON)
@@ -630,9 +631,9 @@ static void nd_pmem_notify(struct device *dev, enum nvdimm_event event)
                nsio = to_nd_namespace_io(&ndns->dev);
        }
 
-       res.start = nsio->res.start + offset;
-       res.end = nsio->res.end - end_trunc;
-       nvdimm_badblocks_populate(nd_region, bb, &res);
+       range.start = nsio->res.start + offset;
+       range.end = nsio->res.end - end_trunc;
+       nvdimm_badblocks_populate(nd_region, bb, &range);
        if (bb_state)
                sysfs_notify_dirent(bb_state);
 }