Commit 664525b2 authored by Dan Williams's avatar Dan Williams

device-dax: Auto-bind device after successful new_id

The typical 'new_id' attribute behavior is to immediately attach a
device to its driver after a new device-id is added. Implement this
behavior for the dax bus.
Reported-by: default avatarAlexander Duyck <alexander.h.duyck@linux.intel.com>
Reported-by: default avatarBrice Goglin <Brice.Goglin@inria.fr>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 8fc5c735
...@@ -57,8 +57,13 @@ static int dax_match_id(struct dax_device_driver *dax_drv, struct device *dev) ...@@ -57,8 +57,13 @@ static int dax_match_id(struct dax_device_driver *dax_drv, struct device *dev)
return match; return match;
} }
enum id_action {
ID_REMOVE,
ID_ADD,
};
static ssize_t do_id_store(struct device_driver *drv, const char *buf, static ssize_t do_id_store(struct device_driver *drv, const char *buf,
size_t count, bool add) size_t count, enum id_action action)
{ {
struct dax_device_driver *dax_drv = to_dax_drv(drv); struct dax_device_driver *dax_drv = to_dax_drv(drv);
unsigned int region_id, id; unsigned int region_id, id;
...@@ -77,7 +82,7 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf, ...@@ -77,7 +82,7 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf,
mutex_lock(&dax_bus_lock); mutex_lock(&dax_bus_lock);
dax_id = __dax_match_id(dax_drv, buf); dax_id = __dax_match_id(dax_drv, buf);
if (!dax_id) { if (!dax_id) {
if (add) { if (action == ID_ADD) {
dax_id = kzalloc(sizeof(*dax_id), GFP_KERNEL); dax_id = kzalloc(sizeof(*dax_id), GFP_KERNEL);
if (dax_id) { if (dax_id) {
strncpy(dax_id->dev_name, buf, DAX_NAME_LEN); strncpy(dax_id->dev_name, buf, DAX_NAME_LEN);
...@@ -86,26 +91,33 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf, ...@@ -86,26 +91,33 @@ static ssize_t do_id_store(struct device_driver *drv, const char *buf,
rc = -ENOMEM; rc = -ENOMEM;
} else } else
/* nothing to remove */; /* nothing to remove */;
} else if (!add) { } else if (action == ID_REMOVE) {
list_del(&dax_id->list); list_del(&dax_id->list);
kfree(dax_id); kfree(dax_id);
} else } else
/* dax_id already added */; /* dax_id already added */;
mutex_unlock(&dax_bus_lock); mutex_unlock(&dax_bus_lock);
if (rc < 0)
return rc;
if (action == ID_ADD)
rc = driver_attach(drv);
if (rc)
return rc; return rc;
return count;
} }
static ssize_t new_id_store(struct device_driver *drv, const char *buf, static ssize_t new_id_store(struct device_driver *drv, const char *buf,
size_t count) size_t count)
{ {
return do_id_store(drv, buf, count, true); return do_id_store(drv, buf, count, ID_ADD);
} }
static DRIVER_ATTR_WO(new_id); static DRIVER_ATTR_WO(new_id);
static ssize_t remove_id_store(struct device_driver *drv, const char *buf, static ssize_t remove_id_store(struct device_driver *drv, const char *buf,
size_t count) size_t count)
{ {
return do_id_store(drv, buf, count, false); return do_id_store(drv, buf, count, ID_REMOVE);
} }
static DRIVER_ATTR_WO(remove_id); static DRIVER_ATTR_WO(remove_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment