Merge tag 'topic/drm-misc-2016-05-04' of git://anongit.freedesktop.org/drm-intel...

[deliverable/linux.git] / include / linux / libnvdimm.h

diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index bed40dff0e86999b5c39c82ebadc29f25e0060ec..833867b9ddc28a702834874072441403518133d5 100644 (file)
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -26,9 +26,8 @@ enum {
 
        /* need to set a limit somewhere, but yes, this is likely overkill */
        ND_IOCTL_MAX_BUFLEN = SZ_4M,
-       ND_CMD_MAX_ELEM = 4,
+       ND_CMD_MAX_ELEM = 5,
        ND_CMD_MAX_ENVELOPE = 16,
-       ND_CMD_ARS_STATUS_MAX = SZ_4K,
        ND_MAX_MAPPINGS = 32,
 
        /* region flag indicating to direct-map persistent memory by default */
@@ -49,7 +48,7 @@ struct nvdimm;
 struct nvdimm_bus_descriptor;
 typedef int (*ndctl_fn)(struct nvdimm_bus_descriptor *nd_desc,
                struct nvdimm *nvdimm, unsigned int cmd, void *buf,
-               unsigned int buf_len);
+               unsigned int buf_len, int *cmd_rc);
 
 struct nd_namespace_label;
 struct nvdimm_drvdata;
@@ -72,6 +71,9 @@ struct nvdimm_bus_descriptor {
        unsigned long dsm_mask;
        char *provider_name;
        ndctl_fn ndctl;
+       int (*flush_probe)(struct nvdimm_bus_descriptor *nd_desc);
+       int (*clear_to_send)(struct nvdimm_bus_descriptor *nd_desc,
+                       struct nvdimm *nvdimm, unsigned int cmd);
 };
 
 struct nd_cmd_desc {