Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next

2 files changed, 15 insertions, 21 deletions

diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index b519e137b9b7..f4947fda11e7 100644
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -50,23 +50,6 @@ typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,
                 struct nvdimm *nvdimm, unsigned int cmd, void *buf,
                 unsigned int buf_len, int *cmd_rc);
 
-struct nd_namespace_label;
-struct nvdimm_drvdata;
-
-struct nd_mapping {
-        struct nvdimm *nvdimm;
-        struct nd_namespace_label **labels;
-        u64 start;
-        u64 size;
-        /*
-         * @ndd is for private use at region enable / disable time for
-         * get_ndd() + put_ndd(), all other nd_mapping to ndd
-         * conversions use to_ndd() which respects enabled state of the
-         * nvdimm.
-         */
-        struct nvdimm_drvdata *ndd;
-};
-
 struct nvdimm_bus_descriptor {
         const struct attribute_group **attr_groups;
         unsigned long cmd_mask;
@@ -89,9 +72,15 @@ struct nd_interleave_set {
         u64 cookie;
 };
 
+struct nd_mapping_desc {
+        struct nvdimm *nvdimm;
+        u64 start;
+        u64 size;
+};
+
 struct nd_region_desc {
         struct resource *res;
-        struct nd_mapping *nd_mapping;
+        struct nd_mapping_desc *mapping;
         u16 num_mappings;
         const struct attribute_group **attr_groups;
         struct nd_interleave_set *nd_set;
@@ -129,6 +118,8 @@ static inline struct nd_blk_region_desc *to_blk_region_desc(
 }
 
 int nvdimm_bus_add_poison(struct nvdimm_bus *nvdimm_bus, u64 addr, u64 length);
+void nvdimm_clear_from_poison_list(struct nvdimm_bus *nvdimm_bus,
+                phys_addr_t start, unsigned int len);
 struct nvdimm_bus *nvdimm_bus_register(struct device *parent,
                 struct nvdimm_bus_descriptor *nfit_desc);
 void nvdimm_bus_unregister(struct nvdimm_bus *nvdimm_bus);
@@ -139,6 +130,7 @@ struct nd_blk_region *to_nd_blk_region(struct device *dev);
 struct nvdimm_bus_descriptor *to_nd_desc(struct nvdimm_bus *nvdimm_bus);
 struct device *to_nvdimm_bus_dev(struct nvdimm_bus *nvdimm_bus);
 const char *nvdimm_name(struct nvdimm *nvdimm);
+struct kobject *nvdimm_kobj(struct nvdimm *nvdimm);
 unsigned long nvdimm_cmd_mask(struct nvdimm *nvdimm);
 void *nvdimm_provider_data(struct nvdimm *nvdimm);
 struct nvdimm *nvdimm_create(struct nvdimm_bus *nvdimm_bus, void *provider_data,
diff --git a/include/linux/nd.h b/include/linux/nd.h
index f1ea426d6a5e..fa66aeed441a 100644
--- a/include/linux/nd.h
+++ b/include/linux/nd.h
@@ -77,11 +77,13 @@ struct nd_namespace_io {
  * @nsio: device and system physical address range to drive
  * @alt_name: namespace name supplied in the dimm label
  * @uuid: namespace name supplied in the dimm label
+ * @id: ida allocated id
  */
 struct nd_namespace_pmem {
         struct nd_namespace_io nsio;
         char *alt_name;
         u8 *uuid;
+        int id;
 };
 
 /**
@@ -105,19 +107,19 @@ struct nd_namespace_blk {
         struct resource **res;
 };
 
-static inline struct nd_namespace_io *to_nd_namespace_io(struct device *dev)
+static inline struct nd_namespace_io *to_nd_namespace_io(const struct device *dev)
 {
         return container_of(dev, struct nd_namespace_io, common.dev);
 }
 
-static inline struct nd_namespace_pmem *to_nd_namespace_pmem(struct device *dev)
+static inline struct nd_namespace_pmem *to_nd_namespace_pmem(const struct device *dev)
 {
         struct nd_namespace_io *nsio = to_nd_namespace_io(dev);
 
         return container_of(nsio, struct nd_namespace_pmem, nsio);
 }
 
-static inline struct nd_namespace_blk *to_nd_namespace_blk(struct device *dev)
+static inline struct nd_namespace_blk *to_nd_namespace_blk(const struct device *dev)
 {
         return container_of(dev, struct nd_namespace_blk, common.dev);
 }