Received: by 2002:ac0:a679:0:0:0:0:0 with SMTP id p54csp269686imp; Thu, 21 Feb 2019 00:50:30 -0800 (PST) X-Google-Smtp-Source: AHgI3IagQOv0uvlHE3gWYjWOyUJisiauP4y5uO5xUHx9Knz94DVrLXjOHwKBBZqZpMa5bkey6Yan X-Received: by 2002:a63:fa48:: with SMTP id g8mr33481110pgk.203.1550739030440; Thu, 21 Feb 2019 00:50:30 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550739030; cv=none; d=google.com; s=arc-20160816; b=mgXI7gF7zWd5cQd2hoYA/4qP0O2Fz3Yolfc9gs6W5iwjRrZB/0Pm7r8zHODV8Hdwj3 pTvn46cHsqJ7jQsgf/XZ1GW7tGj+ROpzDxNfbNkcrtCLFDbIFfZd2pHgUR1zYxnNjffz mSwIYojmTqs1CmyuQxQRE+u9s3LTo3WFuCMB0GD+lvlDGOnclIJo8KIIriUm/3lPS8ot 5BUZ0hI2Hry7Xc08seQDziKVxhgL/LFgbgZ6phViqdoQC907idYmPOLwuMpkSjgkANPa sb9h3cubxm4067rsF5C2iMXjyFAfdk8r11PQbqGfp1AxJKrY9VpM10PVEtBLIjqYm7jC ZxuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:to:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:from :dkim-signature; bh=fDhmRBQb7h2i8BKq2Y1H07mPAubevwZx2hnQdM/dkic=; b=wiawz198cYXXdZrzN7vuKUlfXdsVl0Fsv62Q+u5WAYl6gqOZju26ODQDMVJzI+vhSF t/2tdtpCC7L96beJKt2rMYbeYQDXDkvGZI4fNwL5RBCTZ/278GJuQ6QCYzwcRRJhzQ0c QY0iFJM9xJ199wR5vie6sQdDrueSJIFLsJjfgvM1wd6iJZ0jbn65hnhvcmbYey7v4076 q+sD/NLSvrvvZQMwzlBXvyeq14JgZPU1/8QIW/oMf8RSLeRKPfoX7QixdtqZPpMYnZRo 31EczE3i34JiSwwSnlx2bfY5aKZ+NxFjD90GtO1yvShfyTteC6FPw8wpD6NMk7FC1kj5 Avow== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@chromium.org header.s=google header.b=lUrn1LZQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b9si23202791plb.350.2019.02.21.00.50.15; Thu, 21 Feb 2019 00:50:30 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@chromium.org header.s=google header.b=lUrn1LZQ; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727527AbfBUItD (ORCPT + 99 others); Thu, 21 Feb 2019 03:49:03 -0500 Received: from mail-pg1-f193.google.com ([209.85.215.193]:36200 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725850AbfBUItC (ORCPT ); Thu, 21 Feb 2019 03:49:02 -0500 Received: by mail-pg1-f193.google.com with SMTP id r124so13457126pgr.3 for ; Thu, 21 Feb 2019 00:49:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fDhmRBQb7h2i8BKq2Y1H07mPAubevwZx2hnQdM/dkic=; b=lUrn1LZQNG0ybndgGPye5YsP1EjH95oq3VzMWpLupzXhDd31Jf4/o51IdoUWHpApgv WTSVT9jgO6tLTRJqy9D/zQwcdN3CZcYaTRaDuN29dhoPS+pV0uymDg/iHQ5JJufboWeB 99hTbs00mQXDxOZ25mW8kmOawgUnJPi8ItmXg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fDhmRBQb7h2i8BKq2Y1H07mPAubevwZx2hnQdM/dkic=; b=kjIiQMYufD24by+RWclbFMAG5nMwGpBXvTMcQm6t8J8nLmEhz0OtqNqM34xOzvXctW qZxVfu8YlGRjQ+5jOWx7C1fpHtxZoTqwyZ5zYEhiKtIR2ei2o3xUN+FEjtLUDJ7ly7Jd qvpMy3DUn8Or4XSzeK9Lcw5LtW2K81IYcU/CE0lVlhU280rNVyFdcEMC/uBTTBFcUUrD kH55UHI5SXe/CjR0p7ZGABpqdvtxwSDivPSuM0Vx9M/U6Bon7xnGoqy33dCUhDR/cwdI /MEL6x5SjjaqYGoV/6oI3Zv/zjOBVcnrWrVA9Y0iGDqgo+VPdtCZ0Z8OdLMGKWygq51r 6zzw== X-Gm-Message-State: AHQUAuZvWVeuwS2rsJQVPKfwj9jv+LRgCTl/cog3hUnfzIw6Dmwtq0EH UO8JlMaDfp44x1MDvRyLCAhDGg== X-Received: by 2002:a63:8b42:: with SMTP id j63mr4150615pge.79.1550738941490; Thu, 21 Feb 2019 00:49:01 -0800 (PST) Received: from pihsun-z840.tpe.corp.google.com ([2401:fa00:1:10:7889:7a43:f899:134c]) by smtp.googlemail.com with ESMTPSA id b4sm23154027pgq.57.2019.02.21.00.48.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 21 Feb 2019 00:49:00 -0800 (PST) From: Pi-Hsun Shih Cc: Pi-Hsun Shih , Benson Leung , Enric Balletbo i Serra , Guenter Roeck , linux-kernel@vger.kernel.org (open list) Subject: [PATCH v5 5/6] mfd: add EC host command support using rpmsg. Date: Thu, 21 Feb 2019 16:47:28 +0800 Message-Id: <20190221084729.101784-6-pihsun@chromium.org> X-Mailer: git-send-email 2.21.0.rc0.258.g878e2cd30e-goog In-Reply-To: <20190221084729.101784-1-pihsun@chromium.org> References: <20190221084729.101784-1-pihsun@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit To: unlisted-recipients:; (no To-header on input) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add EC host command support through rpmsg. Signed-off-by: Pi-Hsun Shih --- Changes from v4: - Change from work queue to completion. - Change from matching using rpmsg id to device tree compatible, to support EC subdevices. Changes from v3: - Add host event support by adding an extra bytes at the start of IPC message to indicate the type of the message (host event or host command), since there's no additional irq that can be used for host event. Changes from v2: - Wait for ipi ack instead of depends on the behavior in mtk-rpmsg. Changes from v1: - Code format fix based on feedback for cros_ec_rpmsg.c. - Extract feature detection for SCP into separate patch (Patch 6). --- drivers/platform/chrome/Kconfig | 9 + drivers/platform/chrome/Makefile | 1 + drivers/platform/chrome/cros_ec_rpmsg.c | 248 ++++++++++++++++++++++++ 3 files changed, 258 insertions(+) create mode 100644 drivers/platform/chrome/cros_ec_rpmsg.c diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kconfig index 7f08bae19e7815..5cf12e9399f3b1 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -69,6 +69,15 @@ config CROS_EC_SPI response time cannot be guaranteed, we support ignoring 'pre-amble' bytes before the response actually starts. +config CROS_EC_RPMSG + tristate "ChromeOS Embedded Controller (rpmsg)" + depends on MFD_CROS_EC && RPMSG && OF + help + If you say Y here, you get support for talking to the ChromeOS EC + through rpmsg. This uses a simple byte-level protocol with a + checksum. Also since there's no addition EC-to-host interrupt, this + use a byte in message to distinguish host event from host command. + config CROS_EC_LPC tristate "ChromeOS Embedded Controller (LPC)" depends on MFD_CROS_EC && ACPI && (X86 || COMPILE_TEST) diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Makefile index 1e2f0029b5971f..949b5c5afa1bdb 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile @@ -5,6 +5,7 @@ obj-$(CONFIG_CHROMEOS_PSTORE) += chromeos_pstore.o obj-$(CONFIG_CHROMEOS_TBMC) += chromeos_tbmc.o obj-$(CONFIG_CROS_EC_I2C) += cros_ec_i2c.o obj-$(CONFIG_CROS_EC_SPI) += cros_ec_spi.o +obj-$(CONFIG_CROS_EC_RPMSG) += cros_ec_rpmsg.o cros_ec_lpcs-objs := cros_ec_lpc.o cros_ec_lpc_reg.o cros_ec_lpcs-$(CONFIG_CROS_EC_LPC_MEC) += cros_ec_lpc_mec.o obj-$(CONFIG_CROS_EC_LPC) += cros_ec_lpcs.o diff --git a/drivers/platform/chrome/cros_ec_rpmsg.c b/drivers/platform/chrome/cros_ec_rpmsg.c new file mode 100644 index 00000000000000..7c28735c23347e --- /dev/null +++ b/drivers/platform/chrome/cros_ec_rpmsg.c @@ -0,0 +1,248 @@ +// SPDX-License-Identifier: GPL-2.0 +// +// Copyright 2018 Google LLC. + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define EC_MSG_TIMEOUT_MS 200 +#define HOST_COMMAND_MARK 1 +#define HOST_EVENT_MARK 2 + +struct cros_ec_rpmsg_response { + uint8_t type; + uint8_t data[]; +}; + +struct cros_ec_rpmsg { + struct rpmsg_device *rpdev; + + struct completion xfer_ack; + + struct work_struct host_event_work; +}; + +/** + * cros_ec_cmd_xfer_rpmsg - Transfer a message over rpmsg and receive the reply + * + * This is only used for old EC proto version, and is not supported for this + * driver. + * + * @ec_dev: ChromeOS EC device + * @ec_msg: Message to transfer + */ +static int cros_ec_cmd_xfer_rpmsg(struct cros_ec_device *ec_dev, + struct cros_ec_command *ec_msg) +{ + return -EINVAL; +} + +/** + * cros_ec_pkt_xfer_rpmsg - Transfer a packet over rpmsg and receive the reply + * + * @ec_dev: ChromeOS EC device + * @ec_msg: Message to transfer + */ +static int cros_ec_pkt_xfer_rpmsg(struct cros_ec_device *ec_dev, + struct cros_ec_command *ec_msg) +{ + struct ec_host_response *response; + struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; + struct rpmsg_device *rpdev = ec_rpmsg->rpdev; + int len; + u8 sum; + int ret; + int i; + unsigned long timeout; + + ec_msg->result = 0; + len = cros_ec_prepare_tx(ec_dev, ec_msg); + dev_dbg(ec_dev->dev, "prepared, len=%d\n", len); + + reinit_completion(&ec_rpmsg->xfer_ack); + ret = rpmsg_send(rpdev->ept, ec_dev->dout, len); + if (ret) { + dev_err(ec_dev->dev, "rpmsg send failed\n"); + return ret; + } + + timeout = msecs_to_jiffies(EC_MSG_TIMEOUT_MS); + ret = wait_for_completion_timeout(&ec_rpmsg->xfer_ack, timeout); + if (!ret) { + dev_err(ec_dev->dev, "rpmsg send timeout\n"); + return -EIO; + } + + /* check response error code */ + response = (struct ec_host_response *)ec_dev->din; + ec_msg->result = response->result; + + ret = cros_ec_check_result(ec_dev, ec_msg); + if (ret) + goto exit; + + if (response->data_len > ec_msg->insize) { + dev_err(ec_dev->dev, "packet too long (%d bytes, expected %d)", + response->data_len, ec_msg->insize); + ret = -EMSGSIZE; + goto exit; + } + + /* copy response packet payload and compute checksum */ + memcpy(ec_msg->data, ec_dev->din + sizeof(*response), + response->data_len); + + sum = 0; + for (i = 0; i < sizeof(*response) + response->data_len; i++) + sum += ec_dev->din[i]; + + if (sum) { + dev_err(ec_dev->dev, "bad packet checksum, calculated %x\n", + sum); + ret = -EBADMSG; + goto exit; + } + + ret = response->data_len; +exit: + if (ec_msg->command == EC_CMD_REBOOT_EC) + msleep(EC_REBOOT_DELAY_MS); + + return ret; +} + +static void +cros_ec_rpmsg_host_event_function(struct work_struct *host_event_work) +{ + struct cros_ec_rpmsg *ec_rpmsg = container_of( + host_event_work, struct cros_ec_rpmsg, host_event_work); + struct cros_ec_device *ec_dev = dev_get_drvdata(&ec_rpmsg->rpdev->dev); + bool wake_event = true; + int ret; + + ret = cros_ec_get_next_event(ec_dev, &wake_event); + + /* + * Signal only if wake host events or any interrupt if + * cros_ec_get_next_event() returned an error (default value for + * wake_event is true) + */ + if (wake_event && device_may_wakeup(ec_dev->dev)) + pm_wakeup_event(ec_dev->dev, 0); + + if (ret > 0) + blocking_notifier_call_chain(&ec_dev->event_notifier, + 0, ec_dev); +} + +static int cros_ec_rpmsg_callback(struct rpmsg_device *rpdev, void *data, + int len, void *priv, u32 src) +{ + struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev); + struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; + struct cros_ec_rpmsg_response *resp; + + if (!len) { + dev_warn(ec_dev->dev, "rpmsg received empty response"); + return -EINVAL; + } + + resp = data; + len--; + if (resp->type == HOST_COMMAND_MARK) { + if (len > ec_dev->din_size) { + dev_warn( + ec_dev->dev, + "received length %d > din_size %d, truncating", + len, ec_dev->din_size); + len = ec_dev->din_size; + } + + memcpy(ec_dev->din, resp->data, len); + complete(&ec_rpmsg->xfer_ack); + } else if (resp->type == HOST_EVENT_MARK) { + schedule_work(&ec_rpmsg->host_event_work); + } else { + dev_warn(ec_dev->dev, "rpmsg received invalid type = %d", + resp->type); + return -EINVAL; + } + + return 0; +} + +static int cros_ec_rpmsg_probe(struct rpmsg_device *rpdev) +{ + struct device *dev = &rpdev->dev; + struct cros_ec_device *ec_dev; + struct cros_ec_rpmsg *ec_rpmsg; + int ret; + + ec_dev = devm_kzalloc(dev, sizeof(*ec_dev), GFP_KERNEL); + if (!ec_dev) + return -ENOMEM; + + ec_rpmsg = devm_kzalloc(dev, sizeof(*ec_rpmsg), GFP_KERNEL); + if (!ec_rpmsg) + return -ENOMEM; + + ec_dev->dev = dev; + ec_dev->priv = ec_rpmsg; + ec_dev->cmd_xfer = cros_ec_cmd_xfer_rpmsg; + ec_dev->pkt_xfer = cros_ec_pkt_xfer_rpmsg; + ec_dev->phys_name = dev_name(&rpdev->dev); + ec_dev->din_size = sizeof(struct ec_host_response) + + sizeof(struct ec_response_get_protocol_info); + ec_dev->dout_size = sizeof(struct ec_host_request); + dev_set_drvdata(dev, ec_dev); + + ec_rpmsg->rpdev = rpdev; + init_completion(&ec_rpmsg->xfer_ack); + INIT_WORK(&ec_rpmsg->host_event_work, + cros_ec_rpmsg_host_event_function); + + ret = cros_ec_register(ec_dev); + if (ret) { + dev_err(dev, "cannot register EC\n"); + return ret; + } + + return 0; +} + +static void cros_ec_rpmsg_remove(struct rpmsg_device *rpdev) +{ + struct cros_ec_device *ec_dev = dev_get_drvdata(&rpdev->dev); + struct cros_ec_rpmsg *ec_rpmsg = ec_dev->priv; + + cancel_work_sync(&ec_rpmsg->host_event_work); +} + +static const struct of_device_id cros_ec_rpmsg_of_match[] = { + { .compatible = "google,cros-ec-rpmsg", }, + { } +}; +MODULE_DEVICE_TABLE(of, cros_ec_rpmsg_of_match); + +static struct rpmsg_driver cros_ec_driver_rpmsg = { + .drv = { + .name = KBUILD_MODNAME, + .of_match_table = of_match_ptr(cros_ec_rpmsg_of_match), + }, + .probe = cros_ec_rpmsg_probe, + .remove = cros_ec_rpmsg_remove, + .callback = cros_ec_rpmsg_callback, +}; + +module_rpmsg_driver(cros_ec_driver_rpmsg); + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("ChromeOS EC multi function device (rpmsg)"); -- 2.21.0.rc0.258.g878e2cd30e-goog