cxl/pmem: Add support for multiple nvdimm-bridge objects

In preparation for a mocked unit test environment for CXL objects, allow
for multiple unique nvdimm-bridge objects.

For now, just allow multiple bridges to be registered. Later, when there
are multiple present, further updates are needed to
cxl_find_nvdimm_bridge() to identify which bridge is associated with
which CXL hierarchy for nvdimm registration.

Acked-by: Ben Widawsky <ben.widawsky@intel.com>
Link: https://lore.kernel.org/r/162982124325.1124374.4356765162960141442.stgit@dwillia2-desk3.amr.corp.intel.com
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

diff --git a/drivers/cxl/core/pmem.c b/drivers/cxl/core/pmem.c
index 69c97cc0d9453e69b11776c21407516d0ab69683..ec3e4c642fcaf640aad2a140fd4315c1610d7306 100644 (file)
--- a/drivers/cxl/core/pmem.c
+++ b/drivers/cxl/core/pmem.c
@@ -3,15 +3,19 @@
 
 #include <linux/device.h>
 #include <linux/slab.h>
+#include <linux/idr.h>
 #include <cxlmem.h>
 #include <cxl.h>
 
 #include "core.h"
 
+static DEFINE_IDA(cxl_nvdimm_bridge_ida);
+
 static void cxl_nvdimm_bridge_release(struct device *dev)
 {
        struct cxl_nvdimm_bridge *cxl_nvb = to_cxl_nvdimm_bridge(dev);
 
+       ida_free(&cxl_nvdimm_bridge_ida, cxl_nvb->id);
        kfree(cxl_nvb);
 }
 
@@ -35,16 +39,38 @@ struct cxl_nvdimm_bridge *to_cxl_nvdimm_bridge(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(to_cxl_nvdimm_bridge);
 
+static int match_nvdimm_bridge(struct device *dev, const void *data)
+{
+       return dev->type == &cxl_nvdimm_bridge_type;
+}
+
+struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(void)
+{
+       struct device *dev;
+
+       dev = bus_find_device(&cxl_bus_type, NULL, NULL, match_nvdimm_bridge);
+       if (!dev)
+               return NULL;
+       return to_cxl_nvdimm_bridge(dev);
+}
+EXPORT_SYMBOL_GPL(cxl_find_nvdimm_bridge);
+
 static struct cxl_nvdimm_bridge *
 cxl_nvdimm_bridge_alloc(struct cxl_port *port)
 {
        struct cxl_nvdimm_bridge *cxl_nvb;
        struct device *dev;
+       int rc;
 
        cxl_nvb = kzalloc(sizeof(*cxl_nvb), GFP_KERNEL);
        if (!cxl_nvb)
                return ERR_PTR(-ENOMEM);
 
+       rc = ida_alloc(&cxl_nvdimm_bridge_ida, GFP_KERNEL);
+       if (rc < 0)
+               goto err;
+       cxl_nvb->id = rc;
+
        dev = &cxl_nvb->dev;
        cxl_nvb->port = port;
        cxl_nvb->state = CXL_NVB_NEW;
@@ -55,6 +81,10 @@ cxl_nvdimm_bridge_alloc(struct cxl_port *port)
        dev->type = &cxl_nvdimm_bridge_type;
 
        return cxl_nvb;
+
+err:
+       kfree(cxl_nvb);
+       return ERR_PTR(rc);
 }
 
 static void unregister_nvb(void *_cxl_nvb)
@@ -100,7 +130,7 @@ struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,
                return cxl_nvb;
 
        dev = &cxl_nvb->dev;
-       rc = dev_set_name(dev, "nvdimm-bridge");
+       rc = dev_set_name(dev, "nvdimm-bridge%d", cxl_nvb->id);
        if (rc)
                goto err;
 

diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index 53927f9fa77e460392c84eb86ab53da0337e72ea..1b2e816e061ee1b9df78c627c6eb8ae1ffbeaaee 100644 (file)
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -211,6 +211,7 @@ enum cxl_nvdimm_brige_state {
 };
 
 struct cxl_nvdimm_bridge {
+       int id;
        struct device dev;
        struct cxl_port *port;
        struct nvdimm_bus *nvdimm_bus;
@@ -323,4 +324,5 @@ struct cxl_nvdimm_bridge *devm_cxl_add_nvdimm_bridge(struct device *host,
 struct cxl_nvdimm *to_cxl_nvdimm(struct device *dev);
 bool is_cxl_nvdimm(struct device *dev);
 int devm_cxl_add_nvdimm(struct device *host, struct cxl_memdev *cxlmd);
+struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(void);
 #endif /* __CXL_H__ */

diff --git a/drivers/cxl/pmem.c b/drivers/cxl/pmem.c
index 6cc76302c8f86c2923badb1447f740dcc5d33aea..743e2d2fdbb59bece5bb5e29ac91406be8e7442a 100644 (file)
--- a/drivers/cxl/pmem.c
+++ b/drivers/cxl/pmem.c
@@ -33,21 +33,6 @@ static void unregister_nvdimm(void *_cxl_nvd)
        clear_exclusive_cxl_commands(cxlm, exclusive_cmds);
 }
 
-static int match_nvdimm_bridge(struct device *dev, const void *data)
-{
-       return strcmp(dev_name(dev), "nvdimm-bridge") == 0;
-}
-
-static struct cxl_nvdimm_bridge *cxl_find_nvdimm_bridge(void)
-{
-       struct device *dev;
-
-       dev = bus_find_device(&cxl_bus_type, NULL, NULL, match_nvdimm_bridge);
-       if (!dev)
-               return NULL;
-       return to_cxl_nvdimm_bridge(dev);
-}
-
 static int cxl_nvdimm_probe(struct device *dev)
 {
        struct cxl_nvdimm *cxl_nvd = to_cxl_nvdimm(dev);