Re: [PATCH v7 5/7] libnvdimm: advertise 'call_dsm' support

Indicate to userspace that the generic 'dsm_call' capability is available for the given control device. Over time we want to deprecate the per-dsm function ioctl commands and direct everything through the generic envelope. Signed-off-by: Dan Williams <dan.j.williams(a)intel.com&gt; Signed-off-by: Jerry Hoemann <jerry.hoemann(a)hpe.com&gt; --- drivers/nvdimm/core.c | 3 +++ drivers/nvdimm/dimm_devs.c | 8 +++++++- include/linux/libnvdimm.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/drivers/nvdimm/core.c b/drivers/nvdimm/core.c index 79646d0..9b395e5 100644 --- a/drivers/nvdimm/core.c +++ b/drivers/nvdimm/core.c @@ -253,6 +253,9 @@ static ssize_t commands_show(struct device *dev, for_each_set_bit(cmd, &nd_desc->dsm_mask, BITS_PER_LONG) len += sprintf(buf + len, "%s ", nvdimm_bus_cmd_name(cmd)); + if (nd_desc->call_dsm) + len += sprintf(buf + len, "%s ", + nvdimm_bus_cmd_name(ND_CMD_CALL)); len += sprintf(buf + len, "\n"); return len; } diff --git a/drivers/nvdimm/dimm_devs.c b/drivers/nvdimm/dimm_devs.c index c56f882..89086d6 100644 --- a/drivers/nvdimm/dimm_devs.c +++ b/drivers/nvdimm/dimm_devs.c @@ -274,14 +274,20 @@ EXPORT_SYMBOL_GPL(nvdimm_provider_data); static ssize_t commands_show(struct device *dev, struct device_attribute *attr, char *buf) { + struct nvdimm_bus *nvdimm_bus = walk_to_nvdimm_bus(dev); struct nvdimm *nvdimm = to_nvdimm(dev); + struct nvdimm_bus_descriptor *nd_desc; int cmd, len = 0; - if (!nvdimm->dsm_mask) + if (!nvdimm->dsm_mask || !nvdimm_bus) return sprintf(buf, "\n"); for_each_set_bit(cmd, nvdimm->dsm_mask, BITS_PER_LONG) len += sprintf(buf + len, "%s ", nvdimm_cmd_name(cmd)); + nd_desc = nvdimm_bus->nd_desc; + if (nd_desc->call_dsm) + len += sprintf(buf + len, "%s ", + nvdimm_cmd_name(ND_CMD_CALL)); len += sprintf(buf + len, "\n"); return len; } diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h index af31d1c..458db57 100644 --- a/include/linux/libnvdimm.h +++ b/include/linux/libnvdimm.h @@ -68,6 +68,7 @@ struct nd_mapping { struct nvdimm_bus_descriptor { const struct attribute_group **attr_groups; + unsigned int call_dsm:1;