Received: by 2002:ac0:a594:0:0:0:0:0 with SMTP id m20-v6csp551140imm; Tue, 15 May 2018 05:48:43 -0700 (PDT) X-Google-Smtp-Source: AB8JxZqWDB753stbKDxtMJe/M5iS7q1IHCKcF7iccL3VjB5kF/0QAPEa5wq3X8yAp813qpWthRt1 X-Received: by 2002:a62:9342:: with SMTP id b63-v6mr15120279pfe.130.1526388523326; Tue, 15 May 2018 05:48:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526388523; cv=none; d=google.com; s=arc-20160816; b=esliSjGxIZ9pdM+We5rbzRw/HHyMNB7ZTS4ogKnbqOwP9CL9yL6dfsCNBXiJx2dqkp w7i8ymzN69rymaJjpGOTu/GkW1bCL9w3hY0+A5/K2AIqU3UZ0Nvk8rvduMhrRmctuFQK t3UNJKIAni3b0yfGnic7zBGeJ5Z9meEjzYdpxK77LmGeAjX3z+/8iR+C94tnsOqPzdsj XXwQ2wBdhu3F+z8R+QrLXOEJAoKAqvdLIjf7/lG7G3grukEDYBWypZcxtSJ4Pt8Duldq 8qjQphmWoV2v6Cbl26b8HE2uiPiLspFEqeAvbYmpe5ciTAf1TcqqbUXBj+4xN5zGQyhy AbsQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=2x+/nK4AM9q0GnxGds7YSmtgfQmtPh3pKtsZJwE4NYo=; b=s1FOvQ1SBAAztIqxDRw2ksqV7dIzIfEuU5DYZOyOtHDKCxpOwCedhTjskFMx1ZMRjh Wl0f9WQOa4eR3eIuYHs+9RFivUDSXbegqmR/CXxeMHn0HIiZUTKMpyNr1TJp30gxfsgJ s9S2eNKVAYXtzh5SBN6S/XCr7cRC3yPCw0SuMoQiOd+YTlQixT8KQvenbRON1nYNz/jO CKJbE58bTsFc5jLkQ49nhdfAj8P6bDvBH7Yc1laJrsGqwu/GavSCaX9WjyAcKAOoUd/l o78Mw+Np05CbwUU6klaqBIIdZkQfXIsSGl29myXST+wQh8DEqR+7FbohhPVh/NR8MIeQ Y+nA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=gqsOtjEa; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y13-v6si9703152pgr.654.2018.05.15.05.48.28; Tue, 15 May 2018 05:48:43 -0700 (PDT) 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=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=gqsOtjEa; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753503AbeEOMra (ORCPT + 99 others); Tue, 15 May 2018 08:47:30 -0400 Received: from mail-qk0-f193.google.com ([209.85.220.193]:33289 "EHLO mail-qk0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752952AbeEOMr0 (ORCPT ); Tue, 15 May 2018 08:47:26 -0400 Received: by mail-qk0-f193.google.com with SMTP id c11-v6so9957qkm.0 for ; Tue, 15 May 2018 05:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=2x+/nK4AM9q0GnxGds7YSmtgfQmtPh3pKtsZJwE4NYo=; b=gqsOtjEaTzKa9EZI5kj5+AgcF9bQ+9UHIdhJSEJsnJIOWSdoUHD/lhkyRYGI/PwkGA bNsxzf9A+MPhpbExpzyRpZT75c+hwHHEOc4vHzD7HVDgMj+F6O++1jq9vgk12VWYbPze zCzIRzxaR5kV6Z42jHHzWnJ2j1Peb2wGeUMPmWjeSdWmppsGin+DdFX+dNefZVwt7jiY TFWR3oSc/w9CmPwYxroHTp8uVVUs8OETvyj1lN7A9xyBpkJbpgoFfbF+h3CdRRETLOhw PnkmG3PejvneofSa+X13LTaHk6LO/X0viw4OaKSEJLCdOCz9gQ2gTE/s3ExhYUxGrpdq WTrQ== 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; bh=2x+/nK4AM9q0GnxGds7YSmtgfQmtPh3pKtsZJwE4NYo=; b=Yh1o91kyK7UouQnxxCjsS90QJtueUsKtsVqlUw3qF0BIT5/9x3WNbwZRbWBVjwjJk3 MCs7kGjH27KOhoTEEKwGjoa5Gi0NgexF4wmer4bpuI1lB8eRK0wrrVPZ0awaDpcejBLw GB7DuLAuGEYsAQoGOfFW38zHpW8u3Hzertdryyf0mHWCNmmiFi6E9KmTxeUwmgtdB5V4 gt1QQD93j80NOS12A5vAlk62+GvH6FZOgEqZ2MYmavlaWwGQBPyaKEVnGxAmi01DaPik DVq8g2DSxWroP+dIOs/q8z2LA/OCZM+0UjLyTh5tqJE789wrBQjYvfiY2Y1aKG+PjF2n 6Gaw== X-Gm-Message-State: ALKqPwf7mgP3WjnaC0/CzxfwQ8HeIK4Sq/5mUt7ML6fCas1AHa3VqYZf CqPCiSdlj1HzrYzugD8fYwgE3w== X-Received: by 2002:a37:1f46:: with SMTP id f67-v6mr12497031qkf.387.1526388445421; Tue, 15 May 2018 05:47:25 -0700 (PDT) Received: from localhost.localdomain ([2620:0:1043:fd00:748b:2433:2688:e1f]) by smtp.gmail.com with ESMTPSA id d88-v6sm9725530qkj.25.2018.05.15.05.47.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 15 May 2018 05:47:24 -0700 (PDT) From: Neil Armstrong To: airlied@linux.ie, hans.verkuil@cisco.com, lee.jones@linaro.org, olof@lixom.net, seanpaul@google.com Cc: Neil Armstrong , sadolfsson@google.com, felixe@google.com, bleung@google.com, darekm@google.com, marcheu@chromium.org, fparent@baylibre.com, dri-devel@lists.freedesktop.org, linux-media@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, Stefan Adolfsson Subject: [PATCH 3/5] mfd: cros-ec: Introduce CEC commands and events definitions. Date: Tue, 15 May 2018 14:46:59 +0200 Message-Id: <1526388421-18808-4-git-send-email-narmstrong@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526388421-18808-1-git-send-email-narmstrong@baylibre.com> References: <1526388421-18808-1-git-send-email-narmstrong@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The EC can expose a CEC bus, this patch adds the CEC related definitions needed by the cros-ec-cec driver. Having a 16 byte mkbp event size makes it possible to send CEC messages from the EC to the AP directly inside the mkbp event instead of first doing a notification and then a read. Signed-off-by: Stefan Adolfsson Signed-off-by: Neil Armstrong --- drivers/platform/chrome/cros_ec_proto.c | 42 +++++++++++++---- include/linux/mfd/cros_ec.h | 2 +- include/linux/mfd/cros_ec_commands.h | 80 +++++++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 10 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_proto.c b/drivers/platform/chrome/cros_ec_proto.c index e7bbdf9..ba47f79 100644 --- a/drivers/platform/chrome/cros_ec_proto.c +++ b/drivers/platform/chrome/cros_ec_proto.c @@ -504,29 +504,53 @@ int cros_ec_cmd_xfer_status(struct cros_ec_device *ec_dev, } EXPORT_SYMBOL(cros_ec_cmd_xfer_status); +static int get_next_event_xfer(struct cros_ec_device *ec_dev, + struct cros_ec_command *msg, + int version, uint32_t size) +{ + int ret; + + msg->version = version; + msg->command = EC_CMD_GET_NEXT_EVENT; + msg->insize = size; + msg->outsize = 0; + + ret = cros_ec_cmd_xfer(ec_dev, msg); + if (ret > 0) { + ec_dev->event_size = ret - 1; + memcpy(&ec_dev->event_data, msg->data, size); + } + + return ret; +} + static int get_next_event(struct cros_ec_device *ec_dev) { u8 buffer[sizeof(struct cros_ec_command) + sizeof(ec_dev->event_data)]; struct cros_ec_command *msg = (struct cros_ec_command *)&buffer; + static int cmd_version = 1; int ret; + BUILD_BUG_ON(sizeof(union ec_response_get_next_data_v1) != 16); + if (ec_dev->suspended) { dev_dbg(ec_dev->dev, "Device suspended.\n"); return -EHOSTDOWN; } - msg->version = 0; - msg->command = EC_CMD_GET_NEXT_EVENT; - msg->insize = sizeof(ec_dev->event_data); - msg->outsize = 0; + if (cmd_version == 1) { + ret = get_next_event_xfer(ec_dev, msg, cmd_version, + sizeof(ec_dev->event_data)); + if (ret != EC_RES_INVALID_VERSION) + return ret; - ret = cros_ec_cmd_xfer(ec_dev, msg); - if (ret > 0) { - ec_dev->event_size = ret - 1; - memcpy(&ec_dev->event_data, msg->data, - sizeof(ec_dev->event_data)); + /* Fallback to version 0 for future send attempts */ + cmd_version = 0; } + ret = get_next_event_xfer(ec_dev, msg, cmd_version, + sizeof(struct ec_response_get_next_event)); + return ret; } diff --git a/include/linux/mfd/cros_ec.h b/include/linux/mfd/cros_ec.h index 2d4e23c..f3415eb 100644 --- a/include/linux/mfd/cros_ec.h +++ b/include/linux/mfd/cros_ec.h @@ -147,7 +147,7 @@ struct cros_ec_device { bool mkbp_event_supported; struct blocking_notifier_head event_notifier; - struct ec_response_get_next_event event_data; + struct ec_response_get_next_event_v1 event_data; int event_size; u32 host_event_wake_mask; }; diff --git a/include/linux/mfd/cros_ec_commands.h b/include/linux/mfd/cros_ec_commands.h index f2edd99..18df466 100644 --- a/include/linux/mfd/cros_ec_commands.h +++ b/include/linux/mfd/cros_ec_commands.h @@ -804,6 +804,8 @@ enum ec_feature_code { EC_FEATURE_MOTION_SENSE_FIFO = 24, /* EC has RTC feature that can be controlled by host commands */ EC_FEATURE_RTC = 27, + /* EC supports CEC commands */ + EC_FEATURE_CEC = 35, }; #define EC_FEATURE_MASK_0(event_code) (1UL << (event_code % 32)) @@ -2078,6 +2080,12 @@ enum ec_mkbp_event { /* EC sent a sysrq command */ EC_MKBP_EVENT_SYSRQ = 6, + /* Notify the AP that something happened on CEC */ + EC_MKBP_CEC_EVENT = 8, + + /* Send an incoming CEC message to the AP */ + EC_MKBP_EVENT_CEC_MESSAGE = 9, + /* Number of MKBP events */ EC_MKBP_EVENT_COUNT, }; @@ -2093,12 +2101,31 @@ union ec_response_get_next_data { uint32_t sysrq; } __packed; +union ec_response_get_next_data_v1 { + uint8_t key_matrix[16]; + + /* Unaligned */ + uint32_t host_event; + + uint32_t buttons; + uint32_t switches; + uint32_t sysrq; + uint32_t cec_events; + uint8_t cec_message[16]; +} __packed; + struct ec_response_get_next_event { uint8_t event_type; /* Followed by event data if any */ union ec_response_get_next_data data; } __packed; +struct ec_response_get_next_event_v1 { + uint8_t event_type; + /* Followed by event data if any */ + union ec_response_get_next_data_v1 data; +} __packed; + /* Bit indices for buttons and switches.*/ /* Buttons */ #define EC_MKBP_POWER_BUTTON 0 @@ -2828,6 +2855,59 @@ struct ec_params_reboot_ec { /* Current version of ACPI memory address space */ #define EC_ACPI_MEM_VERSION_CURRENT 1 +/*****************************************************************************/ +/* + * HDMI CEC commands + * + * These commands are for sending and receiving message via HDMI CEC + */ +#define MAX_CEC_MSG_LEN 16 + +/* CEC message from the AP to be written on the CEC bus */ +#define EC_CMD_CEC_WRITE_MSG 0x00B8 + +/* Message to write to the CEC bus */ +struct ec_params_cec_write { + uint8_t msg[MAX_CEC_MSG_LEN]; +} __packed; + +/* Set various CEC parameters */ +#define EC_CMD_CEC_SET 0x00BA + +struct ec_params_cec_set { + uint8_t cmd; /* enum cec_command */ + union { + uint8_t enable; + uint8_t address; + }; +} __packed; + +/* Read various CEC parameters */ +#define EC_CMD_CEC_GET 0x00BB + +struct ec_params_cec_get { + uint8_t cmd; /* enum cec_command */ +} __packed; + +struct ec_response_cec_get { + union { + uint8_t enable; + uint8_t address; + }; +}__packed; + +enum cec_command { + /* CEC reading, writing and events enable */ + CEC_CMD_ENABLE, + /* CEC logical address */ + CEC_CMD_LOGICAL_ADDRESS, +}; + +/* Events from CEC to AP */ +enum mkbp_cec_event { + EC_MKBP_CEC_SEND_OK = 1 << 0, + EC_MKBP_CEC_SEND_FAILED = 1 << 1, +}; /*****************************************************************************/ /* -- 2.7.4