Merge tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform

Pull chrome platform updates from Olof Johansson:
 "Here's a set of updates to the Chrome OS platform drivers for this
  merge window.

  Main new things this cycle is:

   - Driver changes to expose the lightbar to users.  With this, you can
     make your own blinkenlights on Chromebook Pixels.

   - Changes in the way that the atmel_mxt trackpads are probed.  The
     laptop driver is trying to be smart and not instantiate the devices
     that don't answer to probe.  For the trackpad that can come up in
     two modes (bootloader or regular), this gets complicated since the
     driver already knows how to handle the two modes including the
     actual addresses used.  So now the laptop driver needs to know more
     too, instantiating the regular address even if the bootloader one
     is the probe that passed.

   - mfd driver improvements by Javier Martines Canillas, and a few
     bugfixes from him, kbuild and myself"

* tag 'chrome-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform:
  platform/chrome: chromeos_laptop - instantiate Atmel at primary address
  platform/chrome: cros_ec_lpc - Depend on X86 || COMPILE_TEST
  platform/chrome: cros_ec_lpc - Include linux/io.h header file
  platform/chrome: fix platform_no_drv_owner.cocci warnings
  platform/chrome: cros_ec_lightbar - fix duplicate const warning
  platform/chrome: cros_ec_dev - fix Unknown escape '%' warning
  platform/chrome: Expose Chrome OS Lightbar to users
  platform/chrome: Create sysfs attributes for the ChromeOS EC
  mfd: cros_ec: Instantiate ChromeOS EC character device
  platform/chrome: Add Chrome OS EC userspace device interface
  platform/chrome: Add cros_ec_lpc driver for x86 devices
  mfd: cros_ec: Add char dev and virtual dev pointers
  mfd: cros_ec: Use fixed size arrays to transfer data with the EC

1 files changed, 271 insertions, 0 deletions

diff --git a/drivers/platform/chrome/cros_ec_sysfs.c b/drivers/platform/chrome/cros_ec_sysfs.c
new file mode 100644
index 000000000000..fb62ab6cc659
--- /dev/null
+++ b/drivers/platform/chrome/cros_ec_sysfs.c
@@ -0,0 +1,271 @@
+/*
+ * cros_ec_sysfs - expose the Chrome OS EC through sysfs
+ *
+ * Copyright (C) 2014 Google, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#define pr_fmt(fmt) "cros_ec_sysfs: " fmt
+
+#include <linux/ctype.h>
+#include <linux/delay.h>
+#include <linux/device.h>
+#include <linux/fs.h>
+#include <linux/kobject.h>
+#include <linux/mfd/cros_ec.h>
+#include <linux/mfd/cros_ec_commands.h>
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/printk.h>
+#include <linux/stat.h>
+#include <linux/types.h>
+#include <linux/uaccess.h>
+
+#include "cros_ec_dev.h"
+
+/* Accessor functions */
+
+static ssize_t show_ec_reboot(struct device *dev,
+                              struct device_attribute *attr, char *buf)
+{
+        int count = 0;
+
+        count += scnprintf(buf + count, PAGE_SIZE - count,
+                           "ro|rw|cancel|cold|disable-jump|hibernate");
+        count += scnprintf(buf + count, PAGE_SIZE - count,
+                           " [at-shutdown]\n");
+        return count;
+}
+
+static ssize_t store_ec_reboot(struct device *dev,
+                               struct device_attribute *attr,
+                               const char *buf, size_t count)
+{
+        static const struct {
+                const char * const str;
+                uint8_t cmd;
+                uint8_t flags;
+        } words[] = {
+                {"cancel",       EC_REBOOT_CANCEL, 0},
+                {"ro",           EC_REBOOT_JUMP_RO, 0},
+                {"rw",           EC_REBOOT_JUMP_RW, 0},
+                {"cold",         EC_REBOOT_COLD, 0},
+                {"disable-jump", EC_REBOOT_DISABLE_JUMP, 0},
+                {"hibernate",    EC_REBOOT_HIBERNATE, 0},
+                {"at-shutdown",  -1, EC_REBOOT_FLAG_ON_AP_SHUTDOWN},
+        };
+        struct cros_ec_command msg = { 0 };
+        struct ec_params_reboot_ec *param =
+                (struct ec_params_reboot_ec *)msg.outdata;
+        int got_cmd = 0, offset = 0;
+        int i;
+        int ret;
+        struct cros_ec_device *ec = dev_get_drvdata(dev);
+
+        param->flags = 0;
+        while (1) {
+                /* Find word to start scanning */
+                while (buf[offset] && isspace(buf[offset]))
+                        offset++;
+                if (!buf[offset])
+                        break;
+
+                for (i = 0; i < ARRAY_SIZE(words); i++) {
+                        if (!strncasecmp(words[i].str, buf+offset,
+                                         strlen(words[i].str))) {
+                                if (words[i].flags) {
+                                        param->flags |= words[i].flags;
+                                } else {
+                                        param->cmd = words[i].cmd;
+                                        got_cmd = 1;
+                                }
+                                break;
+                        }
+                }
+
+                /* On to the next word, if any */
+                while (buf[offset] && !isspace(buf[offset]))
+                        offset++;
+        }
+
+        if (!got_cmd)
+                return -EINVAL;
+
+        msg.command = EC_CMD_REBOOT_EC;
+        msg.outsize = sizeof(param);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                return ret;
+        if (msg.result != EC_RES_SUCCESS) {
+                dev_dbg(ec->dev, "EC result %d\n", msg.result);
+                return -EINVAL;
+        }
+
+        return count;
+}
+
+static ssize_t show_ec_version(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;
+        struct ec_response_get_chip_info *r_chip;
+        struct ec_response_board_version *r_board;
+        struct cros_ec_command msg = { 0 };
+        int ret;
+        int count = 0;
+        struct cros_ec_device *ec = dev_get_drvdata(dev);
+
+        /* Get versions. RW may change. */
+        msg.command = EC_CMD_GET_VERSION;
+        msg.insize = sizeof(*r_ver);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                return ret;
+        if (msg.result != EC_RES_SUCCESS)
+                return scnprintf(buf, PAGE_SIZE,
+                                 "ERROR: EC returned %d\n", msg.result);
+
+        r_ver = (struct ec_response_get_version *)msg.indata;
+        /* Strings should be null-terminated, but let's be sure. */
+        r_ver->version_string_ro[sizeof(r_ver->version_string_ro) - 1] = '\0';
+        r_ver->version_string_rw[sizeof(r_ver->version_string_rw) - 1] = '\0';
+        count += scnprintf(buf + count, PAGE_SIZE - count,
+                           "RO version:    %s\n", r_ver->version_string_ro);
+        count += scnprintf(buf + count, PAGE_SIZE - count,
+                           "RW version:    %s\n", r_ver->version_string_rw);
+        count += scnprintf(buf + count, PAGE_SIZE - count,
+                           "Firmware copy: %s\n",
+                           (r_ver->current_image < ARRAY_SIZE(image_names) ?
+                            image_names[r_ver->current_image] : "?"));
+
+        /* Get build info. */
+        msg.command = EC_CMD_GET_BUILD_INFO;
+        msg.insize = sizeof(msg.indata);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Build info:    XFER ERROR %d\n", ret);
+        else if (msg.result != EC_RES_SUCCESS)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Build info:    EC error %d\n", msg.result);
+        else {
+                msg.indata[sizeof(msg.indata) - 1] = '\0';
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Build info:    %s\n", msg.indata);
+        }
+
+        /* Get chip info. */
+        msg.command = EC_CMD_GET_CHIP_INFO;
+        msg.insize = sizeof(*r_chip);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Chip info:     XFER ERROR %d\n", ret);
+        else if (msg.result != EC_RES_SUCCESS)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Chip info:     EC error %d\n", msg.result);
+        else {
+                r_chip = (struct ec_response_get_chip_info *)msg.indata;
+
+                r_chip->vendor[sizeof(r_chip->vendor) - 1] = '\0';
+                r_chip->name[sizeof(r_chip->name) - 1] = '\0';
+                r_chip->revision[sizeof(r_chip->revision) - 1] = '\0';
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Chip vendor:   %s\n", r_chip->vendor);
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Chip name:     %s\n", r_chip->name);
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Chip revision: %s\n", r_chip->revision);
+        }
+
+        /* Get board version */
+        msg.command = EC_CMD_GET_BOARD_VERSION;
+        msg.insize = sizeof(*r_board);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Board version: XFER ERROR %d\n", ret);
+        else if (msg.result != EC_RES_SUCCESS)
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Board version: EC error %d\n", msg.result);
+        else {
+                r_board = (struct ec_response_board_version *)msg.indata;
+
+                count += scnprintf(buf + count, PAGE_SIZE - count,
+                                   "Board version: %d\n",
+                                   r_board->board_version);
+        }
+
+        return count;
+}
+
+static ssize_t show_ec_flashinfo(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+        struct ec_response_flash_info *resp;
+        struct cros_ec_command msg = { 0 };
+        int ret;
+        struct cros_ec_device *ec = dev_get_drvdata(dev);
+
+        /* The flash info shouldn't ever change, but ask each time anyway. */
+        msg.command = EC_CMD_FLASH_INFO;
+        msg.insize = sizeof(*resp);
+        ret = cros_ec_cmd_xfer(ec, &msg);
+        if (ret < 0)
+                return ret;
+        if (msg.result != EC_RES_SUCCESS)
+                return scnprintf(buf, PAGE_SIZE,
+                                 "ERROR: EC returned %d\n", msg.result);
+
+        resp = (struct ec_response_flash_info *)msg.indata;
+
+        return scnprintf(buf, PAGE_SIZE,
+                         "FlashSize %d\nWriteSize %d\n"
+                         "EraseSize %d\nProtectSize %d\n",
+                         resp->flash_size, resp->write_block_size,
+                         resp->erase_block_size, resp->protect_block_size);
+}
+
+/* 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 struct attribute *__ec_attrs[] = {
+        &dev_attr_reboot.attr,
+        &dev_attr_version.attr,
+        &dev_attr_flashinfo.attr,
+        NULL,
+};
+
+static struct attribute_group ec_attr_group = {
+        .attrs = __ec_attrs,
+};
+
+void ec_dev_sysfs_init(struct cros_ec_device *ec)
+{
+        int error;
+
+        error = sysfs_create_group(&ec->vdev->kobj, &ec_attr_group);
+        if (error)
+                pr_warn("failed to create group: %d\n", error);
+}
+
+void ec_dev_sysfs_remove(struct cros_ec_device *ec)
+{
+        sysfs_remove_group(&ec->vdev->kobj, &ec_attr_group);
+}