mei: restrict dma ring support to hbm version 2.1

Only a firmware with version 2.1 and above supports dma ring feature.

Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/misc/mei/debugfs.c b/drivers/misc/mei/debugfs.c
index c815da91089c79a98f3313cb7440a904dcf87b91..7b5df8fd6c5ad84dff00d5f580af0f0b6d7daca2 100644 (file)
--- a/drivers/misc/mei/debugfs.c
+++ b/drivers/misc/mei/debugfs.c
@@ -183,6 +183,8 @@ static ssize_t mei_dbgfs_read_devstate(struct file *fp, char __user *ubuf,
                                 dev->hbm_f_fa_supported);
                pos += scnprintf(buf + pos, bufsz - pos, "\tOS: %01d\n",
                                 dev->hbm_f_os_supported);
+               pos += scnprintf(buf + pos, bufsz - pos, "\tDR: %01d\n",
+                                dev->hbm_f_dr_supported);
        }
 
        pos += scnprintf(buf + pos, bufsz - pos, "pg:  %s, %s\n",

diff --git a/drivers/misc/mei/hbm.c b/drivers/misc/mei/hbm.c
index b0086c4aefe4b3d4f9b145ecb13caae76eff76cc..09e233d4c0de386eab9ea2f2ce178dedf4ebb480 100644 (file)
--- a/drivers/misc/mei/hbm.c
+++ b/drivers/misc/mei/hbm.c
@@ -1007,6 +1007,12 @@ static void mei_hbm_config_features(struct mei_device *dev)
        /* OS ver message Support */
        if (dev->version.major_version >= HBM_MAJOR_VERSION_OS)
                dev->hbm_f_os_supported = 1;
+
+       /* DMA Ring Support */
+       if (dev->version.major_version > HBM_MAJOR_VERSION_DR ||
+           (dev->version.major_version == HBM_MAJOR_VERSION_DR &&
+            dev->version.minor_version >= HBM_MINOR_VERSION_DR))
+               dev->hbm_f_dr_supported = 1;
 }
 
 /**

diff --git a/drivers/misc/mei/hw.h b/drivers/misc/mei/hw.h
index 5fb8844a6db54c75928c014ffe1e12ccefb53369..65655925791ab330b51a2d66b36c2fd7ac1cc05c 100644 (file)
--- a/drivers/misc/mei/hw.h
+++ b/drivers/misc/mei/hw.h
@@ -80,6 +80,12 @@
 #define HBM_MINOR_VERSION_OS               0
 #define HBM_MAJOR_VERSION_OS               2
 
+/*
+ * MEI version with dma ring support
+ */
+#define HBM_MINOR_VERSION_DR               1
+#define HBM_MAJOR_VERSION_DR               2
+
 /* Host bus message command opcode */
 #define MEI_HBM_CMD_OP_MSK                  0x7f
 /* Host bus message command RESPONSE */

diff --git a/drivers/misc/mei/mei_dev.h b/drivers/misc/mei/mei_dev.h
index 975afaa38a66ce1787b972d5dbdc43bb4a7175f2..377397e1b5a5bfd08f1a02a39ceeef3ffe3b6d03 100644 (file)
--- a/drivers/misc/mei/mei_dev.h
+++ b/drivers/misc/mei/mei_dev.h
@@ -418,6 +418,7 @@ struct mei_fw_version {
  * @hbm_f_fa_supported  : hbm feature fixed address client
  * @hbm_f_ie_supported  : hbm feature immediate reply to enum request
  * @hbm_f_os_supported  : hbm feature support OS ver message
+ * @hbm_f_dr_supported  : hbm feature dma ring supported
  *
  * @fw_ver : FW versions
  *
@@ -495,6 +496,7 @@ struct mei_device {
        unsigned int hbm_f_fa_supported:1;
        unsigned int hbm_f_ie_supported:1;
        unsigned int hbm_f_os_supported:1;
+       unsigned int hbm_f_dr_supported:1;
 
        struct mei_fw_version fw_ver[MEI_MAX_FW_VER_BLOCKS];