Merge remote-tracking branch 'origin/ib-chrome-platform-cros-ec-sysfs-debugfs-for-v4.17' into working-branch-for-4.17

Merging Enric's cros-ec sysfs and debugfs fixes from immutable branch.

Signed-off-by: Benson Leung <bleung@chromium.org>

2 files changed, 176 insertions, 41 deletions

diff --git a/drivers/platform/chrome/cros_ec_debugfs.c b/drivers/platform/chrome/cros_ec_debugfs.c
index 0e88e18362c1..cc265ed8deb7 100644
--- a/drivers/platform/chrome/cros_ec_debugfs.c
+++ b/drivers/platform/chrome/cros_ec_debugfs.c
@@ -211,6 +211,58 @@ static int cros_ec_console_log_release(struct inode *inode, struct file *file)
         return 0;
 }
 
+static ssize_t cros_ec_pdinfo_read(struct file *file,
+                                   char __user *user_buf,
+                                   size_t count,
+                                   loff_t *ppos)
+{
+        char read_buf[EC_USB_PD_MAX_PORTS * 40], *p = read_buf;
+        struct cros_ec_debugfs *debug_info = file->private_data;
+        struct cros_ec_device *ec_dev = debug_info->ec->ec_dev;
+        struct {
+                struct cros_ec_command msg;
+                union {
+                        struct ec_response_usb_pd_control_v1 resp;
+                        struct ec_params_usb_pd_control params;
+                };
+        } __packed ec_buf;
+        struct cros_ec_command *msg;
+        struct ec_response_usb_pd_control_v1 *resp;
+        struct ec_params_usb_pd_control *params;
+        int i;
+
+        msg = &ec_buf.msg;
+        params = (struct ec_params_usb_pd_control *)msg->data;
+        resp = (struct ec_response_usb_pd_control_v1 *)msg->data;
+
+        msg->command = EC_CMD_USB_PD_CONTROL;
+        msg->version = 1;
+        msg->insize = sizeof(*resp);
+        msg->outsize = sizeof(*params);
+
+        /*
+         * Read status from all PD ports until failure, typically caused
+         * by attempting to read status on a port that doesn't exist.
+         */
+        for (i = 0; i < EC_USB_PD_MAX_PORTS; ++i) {
+                params->port = i;
+                params->role = 0;
+                params->mux = 0;
+                params->swap = 0;
+
+                if (cros_ec_cmd_xfer_status(ec_dev, msg) < 0)
+                        break;
+
+                p += scnprintf(p, sizeof(read_buf) + read_buf - p,
+                               "p%d: %s en:%.2x role:%.2x pol:%.2x\n", i,
+                               resp->state, resp->enabled, resp->role,
+                               resp->polarity);
+        }
+
+        return simple_read_from_buffer(user_buf, count, ppos,
+                                       read_buf, p - read_buf);
+}
+
 const struct file_operations cros_ec_console_log_fops = {
         .owner = THIS_MODULE,
         .open = cros_ec_console_log_open,
@@ -220,6 +272,13 @@ const struct file_operations cros_ec_console_log_fops = {
         .release = cros_ec_console_log_release,
 };
 
+const struct file_operations cros_ec_pdinfo_fops = {
+        .owner = THIS_MODULE,
+        .open = simple_open,
+        .read = cros_ec_pdinfo_read,
+        .llseek = default_llseek,
+};
+
 static int ec_read_version_supported(struct cros_ec_dev *ec)
 {
         struct ec_params_get_cmd_versions_v1 *params;
@@ -288,7 +347,7 @@ static int cros_ec_create_console_log(struct cros_ec_debugfs *debug_info)
         init_waitqueue_head(&debug_info->log_wq);
 
         if (!debugfs_create_file("console_log",
-                                 S_IFREG | S_IRUGO,
+                                 S_IFREG | 0444,
                                  debug_info->dir,
                                  debug_info,
                                  &cros_ec_console_log_fops))
@@ -341,7 +400,7 @@ static int cros_ec_create_panicinfo(struct cros_ec_debugfs *debug_info)
         debug_info->panicinfo_blob.size = ret;
 
         if (!debugfs_create_blob("panicinfo",
-                                 S_IFREG | S_IRUGO,
+                                 S_IFREG | 0444,
                                  debug_info->dir,
                                  &debug_info->panicinfo_blob)) {
                 ret = -ENOMEM;
@@ -355,6 +414,15 @@ free:
         return ret;
 }
 
+static int cros_ec_create_pdinfo(struct cros_ec_debugfs *debug_info)
+{
+        if (!debugfs_create_file("pdinfo", 0444, debug_info->dir, debug_info,
+                                 &cros_ec_pdinfo_fops))
+                return -ENOMEM;
+
+        return 0;
+}
+
 int cros_ec_debugfs_init(struct cros_ec_dev *ec)
 {
         struct cros_ec_platform *ec_platform = dev_get_platdata(ec->dev);
@@ -379,6 +447,10 @@ int cros_ec_debugfs_init(struct cros_ec_dev *ec)
         if (ret)
                 goto remove_debugfs;
 
+        ret = cros_ec_create_pdinfo(debug_info);
+        if (ret)
+                goto remove_debugfs;
+
         ec->debug_info = debug_info;
 
         return 0;
diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
index da0a719d32f7..5a6db3fe213a 100644
--- a/drivers/platform/chrome/cros_ec_sysfs.c
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -34,10 +34,12 @@
 #include <linux/types.h>
 #include <linux/uaccess.h>
 
+#define to_cros_ec_dev(dev)  container_of(dev, struct cros_ec_dev, class_dev)
+
 /* Accessor functions */
 
-static ssize_t show_ec_reboot(struct device *dev,
-                              struct device_attribute *attr, char *buf)
+static ssize_t reboot_show(struct device *dev,
+                           struct device_attribute *attr, char *buf)
 {
         int count = 0;
 
@@ -48,9 +50,9 @@ static ssize_t show_ec_reboot(struct device *dev,
         return count;
 }
 
-static ssize_t store_ec_reboot(struct device *dev,
-                               struct device_attribute *attr,
-                               const char *buf, size_t count)
+static ssize_t reboot_store(struct device *dev,
+                            struct device_attribute *attr,
+                            const char *buf, size_t count)
 {
         static const struct {
                 const char * const str;
@@ -70,8 +72,7 @@ static ssize_t store_ec_reboot(struct device *dev,
         int got_cmd = 0, offset = 0;
         int i;
         int ret;
-        struct cros_ec_dev *ec = container_of(dev,
-                                              struct cros_ec_dev, class_dev);
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
 
         msg = kmalloc(sizeof(*msg) + sizeof(*param), GFP_KERNEL);
         if (!msg)
@@ -114,22 +115,16 @@ static ssize_t store_ec_reboot(struct device *dev,
         msg->command = EC_CMD_REBOOT_EC + ec->cmd_offset;
         msg->outsize = sizeof(*param);
         msg->insize = 0;
-        ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
-        if (ret < 0) {
+        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
+        if (ret < 0)
                 count = ret;
-                goto exit;
-        }
-        if (msg->result != EC_RES_SUCCESS) {
-                dev_dbg(ec->dev, "EC result %d\n", msg->result);
-                count = -EINVAL;
-        }
 exit:
         kfree(msg);
         return count;
 }
 
-static ssize_t show_ec_version(struct device *dev,
-                               struct device_attribute *attr, char *buf)
+static ssize_t version_show(struct device *dev,
+                            struct device_attribute *attr, char *buf)
 {
         static const char * const image_names[] = {"unknown", "RO", "RW"};
         struct ec_response_get_version *r_ver;
@@ -138,8 +133,7 @@ static ssize_t show_ec_version(struct device *dev,
         struct cros_ec_command *msg;
         int ret;
         int count = 0;
-        struct cros_ec_dev *ec = container_of(dev,
-                                              struct cros_ec_dev, class_dev);
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
 
         msg = kmalloc(sizeof(*msg) + EC_HOST_PARAM_SIZE, GFP_KERNEL);
         if (!msg)
@@ -150,17 +144,11 @@ static ssize_t show_ec_version(struct device *dev,
         msg->command = EC_CMD_GET_VERSION + ec->cmd_offset;
         msg->insize = sizeof(*r_ver);
         msg->outsize = 0;
-        ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
         if (ret < 0) {
                 count = ret;
                 goto exit;
         }
-        if (msg->result != EC_RES_SUCCESS) {
-                count = scnprintf(buf, PAGE_SIZE,
-                                  "ERROR: EC returned %d\n", msg->result);
-                goto exit;
-        }
-
         r_ver = (struct ec_response_get_version *)msg->data;
         /* Strings should be null-terminated, but let's be sure. */
         r_ver->version_string_ro[sizeof(r_ver->version_string_ro) - 1] = '\0';
@@ -237,14 +225,13 @@ exit:
         return count;
 }
 
-static ssize_t show_ec_flashinfo(struct device *dev,
-                                 struct device_attribute *attr, char *buf)
+static ssize_t flashinfo_show(struct device *dev,
+                              struct device_attribute *attr, char *buf)
 {
         struct ec_response_flash_info *resp;
         struct cros_ec_command *msg;
         int ret;
-        struct cros_ec_dev *ec = container_of(dev,
-                                              struct cros_ec_dev, class_dev);
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
 
         msg = kmalloc(sizeof(*msg) + sizeof(*resp), GFP_KERNEL);
         if (!msg)
@@ -255,14 +242,9 @@ static ssize_t show_ec_flashinfo(struct device *dev,
         msg->command = EC_CMD_FLASH_INFO + ec->cmd_offset;
         msg->insize = sizeof(*resp);
         msg->outsize = 0;
-        ret = cros_ec_cmd_xfer(ec->ec_dev, msg);
+        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
         if (ret < 0)
                 goto exit;
-        if (msg->result != EC_RES_SUCCESS) {
-                ret = scnprintf(buf, PAGE_SIZE,
-                                "ERROR: EC returned %d\n", msg->result);
-                goto exit;
-        }
 
         resp = (struct ec_response_flash_info *)msg->data;
 
@@ -276,21 +258,102 @@ exit:
         return ret;
 }
 
+/* Keyboard wake angle control */
+static ssize_t kb_wake_angle_show(struct device *dev,
+                                  struct device_attribute *attr, char *buf)
+{
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
+        struct ec_response_motion_sense *resp;
+        struct ec_params_motion_sense *param;
+        struct cros_ec_command *msg;
+        int ret;
+
+        msg = kmalloc(sizeof(*msg) + EC_HOST_PARAM_SIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        param = (struct ec_params_motion_sense *)msg->data;
+        msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
+        msg->version = 2;
+        param->cmd = MOTIONSENSE_CMD_KB_WAKE_ANGLE;
+        param->kb_wake_angle.data = EC_MOTION_SENSE_NO_VALUE;
+        msg->outsize = sizeof(*param);
+        msg->insize = sizeof(*resp);
+
+        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
+        if (ret < 0)
+                goto exit;
+
+        resp = (struct ec_response_motion_sense *)msg->data;
+        ret = scnprintf(buf, PAGE_SIZE, "%d\n", resp->kb_wake_angle.ret);
+exit:
+        kfree(msg);
+        return ret;
+}
+
+static ssize_t kb_wake_angle_store(struct device *dev,
+                                   struct device_attribute *attr,
+                                   const char *buf, size_t count)
+{
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
+        struct ec_params_motion_sense *param;
+        struct cros_ec_command *msg;
+        u16 angle;
+        int ret;
+
+        ret = kstrtou16(buf, 0, &angle);
+        if (ret)
+                return ret;
+
+        msg = kmalloc(sizeof(*msg) + EC_HOST_PARAM_SIZE, GFP_KERNEL);
+        if (!msg)
+                return -ENOMEM;
+
+        param = (struct ec_params_motion_sense *)msg->data;
+        msg->command = EC_CMD_MOTION_SENSE_CMD + ec->cmd_offset;
+        msg->version = 2;
+        param->cmd = MOTIONSENSE_CMD_KB_WAKE_ANGLE;
+        param->kb_wake_angle.data = angle;
+        msg->outsize = sizeof(*param);
+        msg->insize = sizeof(struct ec_response_motion_sense);
+
+        ret = cros_ec_cmd_xfer_status(ec->ec_dev, msg);
+        kfree(msg);
+        if (ret < 0)
+                return ret;
+        return count;
+}
+
 /* Module initialization */
 
-static DEVICE_ATTR(reboot, S_IWUSR | S_IRUGO, show_ec_reboot, store_ec_reboot);
-static DEVICE_ATTR(version, S_IRUGO, show_ec_version, NULL);
-static DEVICE_ATTR(flashinfo, S_IRUGO, show_ec_flashinfo, NULL);
+static DEVICE_ATTR_RW(reboot);
+static DEVICE_ATTR_RO(version);
+static DEVICE_ATTR_RO(flashinfo);
+static DEVICE_ATTR_RW(kb_wake_angle);
 
 static struct attribute *__ec_attrs[] = {
+        &dev_attr_kb_wake_angle.attr,
         &dev_attr_reboot.attr,
         &dev_attr_version.attr,
         &dev_attr_flashinfo.attr,
         NULL,
 };
 
+static umode_t cros_ec_ctrl_visible(struct kobject *kobj,
+                                    struct attribute *a, int n)
+{
+        struct device *dev = container_of(kobj, struct device, kobj);
+        struct cros_ec_dev *ec = to_cros_ec_dev(dev);
+
+        if (a == &dev_attr_kb_wake_angle.attr && !ec->has_kb_wake_angle)
+                return 0;
+
+        return a->mode;
+}
+
 struct attribute_group cros_ec_attr_group = {
         .attrs = __ec_attrs,
+        .is_visible = cros_ec_ctrl_visible,
 };
 EXPORT_SYMBOL(cros_ec_attr_group);