These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / misc / mei / debugfs.c

diff --git a/kernel/drivers/misc/mei/debugfs.c b/kernel/drivers/misc/mei/debugfs.c
index d9cd7e6..a138d8a 100644 (file)
--- a/kernel/drivers/misc/mei/debugfs.c
+++ b/kernel/drivers/misc/mei/debugfs.c
@@ -116,7 +116,7 @@ static ssize_t mei_dbgfs_read_active(struct file *fp, char __user *ubuf,
 
                pos += scnprintf(buf + pos, bufsz - pos,
                        "%2d|%2d|%4d|%5d|%2d|%2d|\n",
-                       i, cl->me_client_id, cl->host_client_id, cl->state,
+                       i, mei_cl_me_id(cl), cl->host_client_id, cl->state,
                        !list_empty(&cl->rd_completed), cl->writing_state);
                i++;
        }
@@ -149,6 +149,19 @@ static ssize_t mei_dbgfs_read_devstate(struct file *fp, char __user *ubuf,
                        mei_dev_state_str(dev->dev_state));
        pos += scnprintf(buf + pos, bufsz - pos, "hbm: %s\n",
                        mei_hbm_state_str(dev->hbm_state));
+
+       if (dev->hbm_state == MEI_HBM_STARTED) {
+               pos += scnprintf(buf + pos, bufsz - pos, "hbm features:\n");
+               pos += scnprintf(buf + pos, bufsz - pos, "\tPG: %01d\n",
+                                dev->hbm_f_pg_supported);
+               pos += scnprintf(buf + pos, bufsz - pos, "\tDC: %01d\n",
+                                dev->hbm_f_dc_supported);
+               pos += scnprintf(buf + pos, bufsz - pos, "\tDOT: %01d\n",
+                                dev->hbm_f_dot_supported);
+               pos += scnprintf(buf + pos, bufsz - pos, "\tEV: %01d\n",
+                                dev->hbm_f_ev_supported);
+       }
+
        pos += scnprintf(buf + pos, bufsz - pos, "pg:  %s, %s\n",
                        mei_pg_is_enabled(dev) ? "ENABLED" : "DISABLED",
                        mei_pg_state_str(mei_pg_state(dev)));
@@ -191,6 +204,8 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
        if (!dir)
                return -ENOMEM;
 
+       dev->dbgfs_dir = dir;
+
        f = debugfs_create_file("meclients", S_IRUSR, dir,
                                dev, &mei_dbgfs_fops_meclients);
        if (!f) {
@@ -200,7 +215,7 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
        f = debugfs_create_file("active", S_IRUSR, dir,
                                dev, &mei_dbgfs_fops_active);
        if (!f) {
-               dev_err(dev->dev, "meclients: registration failed\n");
+               dev_err(dev->dev, "active: registration failed\n");
                goto err;
        }
        f = debugfs_create_file("devstate", S_IRUSR, dir,
@@ -209,7 +224,12 @@ int mei_dbgfs_register(struct mei_device *dev, const char *name)
                dev_err(dev->dev, "devstate: registration failed\n");
                goto err;
        }
-       dev->dbgfs_dir = dir;
+       f = debugfs_create_bool("allow_fixed_address", S_IRUSR | S_IWUSR, dir,
+                               &dev->allow_fixed_address);
+       if (!f) {
+               dev_err(dev->dev, "allow_fixed_address: registration failed\n");
+               goto err;
+       }
        return 0;
 err:
        mei_dbgfs_deregister(dev);