]> www.infradead.org Git - users/hch/misc.git/commitdiff
platform/chrome: cros_ec_typec: Displayport support
authorAbhishek Pandit-Subedi <abhishekpandit@chromium.org>
Fri, 13 Dec 2024 23:35:47 +0000 (15:35 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 24 Dec 2024 07:56:05 +0000 (08:56 +0100)
Add support for entering and exiting displayport alt-mode on systems
using AP driven alt-mode.

Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
Link: https://lore.kernel.org/r/20241213153543.v5.6.I142fc0c09df58689b98f0cebf1c5e48b9d4fa800@changeid
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/platform/chrome/Kconfig
drivers/platform/chrome/Makefile
drivers/platform/chrome/cros_ec_typec.c
drivers/platform/chrome/cros_ec_typec.h
drivers/platform/chrome/cros_typec_altmode.c [new file with mode: 0644]
drivers/platform/chrome/cros_typec_altmode.h [new file with mode: 0644]

index 910305c11e8a882da5b49ce5bd55011b93f28c32..270db08c69ccb8c074bb1644b358e93afd154b2a 100644 (file)
@@ -5436,9 +5436,12 @@ F:       include/linux/platform_data/cros_usbpd_notify.h
 
 CHROMEOS EC USB TYPE-C DRIVER
 M:     Prashant Malani <pmalani@chromium.org>
+M:     Benson Leung <bleung@chromium.org>
+M:     Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
 L:     chrome-platform@lists.linux.dev
 S:     Maintained
 F:     drivers/platform/chrome/cros_ec_typec.*
+F:     drivers/platform/chrome/cros_typec_altmode.*
 F:     drivers/platform/chrome/cros_typec_switch.c
 F:     drivers/platform/chrome/cros_typec_vdm.*
 
index b7dbaf77b6db468a9b1cc55c0c9689ce07580f07..23aa594fbb5b2646fa32ab0ff4d7183ee50c9f90 100644 (file)
@@ -237,12 +237,18 @@ config CROS_EC_SYSFS
          To compile this driver as a module, choose M here: the
          module will be called cros_ec_sysfs.
 
+config CROS_EC_TYPEC_ALTMODES
+       bool
+       help
+         Selectable symbol to enable altmodes.
+
 config CROS_EC_TYPEC
        tristate "ChromeOS EC Type-C Connector Control"
        depends on MFD_CROS_EC_DEV && TYPEC
        depends on CROS_USBPD_NOTIFY
        depends on USB_ROLE_SWITCH
        default MFD_CROS_EC_DEV
+       select CROS_EC_TYPEC_ALTMODES if TYPEC_DP_ALTMODE
        help
          If you say Y here, you get support for accessing Type C connector
          information from the Chrome OS EC.
index fb8335458a2216133e1e1712b2dedc684fea4ff8..1a5a484563cc1300c6d20f08d6fc127a9a6b3e34 100644 (file)
@@ -19,7 +19,11 @@ obj-$(CONFIG_CROS_EC_SPI)            += cros_ec_spi.o
 obj-$(CONFIG_CROS_EC_UART)             += cros_ec_uart.o
 cros_ec_lpcs-objs                      := cros_ec_lpc.o cros_ec_lpc_mec.o
 cros-ec-typec-objs                     := cros_ec_typec.o cros_typec_vdm.o
+ifneq ($(CONFIG_CROS_EC_TYPEC_ALTMODES),)
+       cros-ec-typec-objs              += cros_typec_altmode.o
+endif
 obj-$(CONFIG_CROS_EC_TYPEC)            += cros-ec-typec.o
+
 obj-$(CONFIG_CROS_EC_LPC)              += cros_ec_lpcs.o
 obj-$(CONFIG_CROS_EC_PROTO)            += cros_ec_proto.o cros_ec_trace.o
 obj-$(CONFIG_CROS_KBD_LED_BACKLIGHT)   += cros_kbd_led_backlight.o
index 77f748fc854280e67aab9df190f5c3b08df6779f..1bcaa72693950341f292774bcd279245d70a188f 100644 (file)
@@ -18,6 +18,7 @@
 
 #include "cros_ec_typec.h"
 #include "cros_typec_vdm.h"
+#include "cros_typec_altmode.h"
 
 #define DRV_NAME "cros-ec-typec"
 
@@ -290,15 +291,15 @@ static int cros_typec_register_port_altmodes(struct cros_typec_data *typec,
        struct typec_altmode *amode;
 
        /* All PD capable CrOS devices are assumed to support DP altmode. */
+       memset(&desc, 0, sizeof(desc));
        desc.svid = USB_TYPEC_DP_SID;
        desc.mode = USB_TYPEC_DP_MODE;
        desc.vdo = DP_PORT_VDO;
-       amode = typec_port_register_altmode(port->port, &desc);
+       amode = cros_typec_register_displayport(port, &desc,
+                                               typec->ap_driven_altmode);
        if (IS_ERR(amode))
                return PTR_ERR(amode);
        port->port_altmode[CROS_EC_ALTMODE_DP] = amode;
-       typec_altmode_set_drvdata(amode, port);
-       amode->ops = &port_amode_ops;
 
        /*
         * Register TBT compatibility alt mode. The EC will not enter the mode
@@ -576,6 +577,10 @@ static int cros_typec_enable_dp(struct cros_typec_data *typec,
        if (!ret)
                ret = typec_mux_set(port->mux, &port->state);
 
+       if (!ret)
+               ret = cros_typec_displayport_status_update(port->state.alt,
+                                                          port->state.data);
+
        return ret;
 }
 
@@ -1253,6 +1258,8 @@ static int cros_typec_probe(struct platform_device *pdev)
 
        typec->typec_cmd_supported = cros_ec_check_features(ec_dev, EC_FEATURE_TYPEC_CMD);
        typec->needs_mux_ack = cros_ec_check_features(ec_dev, EC_FEATURE_TYPEC_MUX_REQUIRE_AP_ACK);
+       typec->ap_driven_altmode = cros_ec_check_features(
+               ec_dev, EC_FEATURE_TYPEC_REQUIRE_AP_MODE_ENTRY);
 
        ret = cros_ec_cmd(typec->ec, 0, EC_CMD_USB_PD_PORTS, NULL, 0,
                          &resp, sizeof(resp));
index deda180a646f33acbf989329757aec6d3a1f487a..9fd5342bb0ad14f7bb85f908ca3e230c0d61a4b4 100644 (file)
@@ -39,6 +39,7 @@ struct cros_typec_data {
        struct work_struct port_work;
        bool typec_cmd_supported;
        bool needs_mux_ack;
+       bool ap_driven_altmode;
 };
 
 /* Per port data. */
diff --git a/drivers/platform/chrome/cros_typec_altmode.c b/drivers/platform/chrome/cros_typec_altmode.c
new file mode 100644 (file)
index 0000000..6e73616
--- /dev/null
@@ -0,0 +1,285 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/*
+ * Alt-mode implementation on ChromeOS EC.
+ *
+ * Copyright 2024 Google LLC
+ * Author: Abhishek Pandit-Subedi <abhishekpandit@chromium.org>
+ */
+#include "cros_ec_typec.h"
+
+#include <linux/mutex.h>
+#include <linux/workqueue.h>
+#include <linux/usb/typec_dp.h>
+#include <linux/usb/pd_vdo.h>
+
+#include "cros_typec_altmode.h"
+
+struct cros_typec_altmode_data {
+       struct work_struct work;
+       struct cros_typec_port *port;
+       struct typec_altmode *alt;
+       bool ap_mode_entry;
+
+       struct mutex lock;
+       u32 header;
+       u32 *vdo_data;
+       u8 vdo_size;
+
+       u16 sid;
+       u8 mode;
+};
+
+struct cros_typec_dp_data {
+       struct cros_typec_altmode_data adata;
+       struct typec_displayport_data data;
+       bool configured;
+       bool pending_status_update;
+};
+
+static void cros_typec_altmode_work(struct work_struct *work)
+{
+       struct cros_typec_altmode_data *data =
+               container_of(work, struct cros_typec_altmode_data, work);
+
+       mutex_lock(&data->lock);
+
+       if (typec_altmode_vdm(data->alt, data->header, data->vdo_data,
+                             data->vdo_size))
+               dev_err(&data->alt->dev, "VDM 0x%x failed\n", data->header);
+
+       data->header = 0;
+       data->vdo_data = NULL;
+       data->vdo_size = 0;
+
+       mutex_unlock(&data->lock);
+}
+
+static int cros_typec_altmode_enter(struct typec_altmode *alt, u32 *vdo)
+{
+       struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt);
+       struct ec_params_typec_control req = {
+               .port = adata->port->port_num,
+               .command = TYPEC_CONTROL_COMMAND_ENTER_MODE,
+       };
+       int svdm_version;
+       int ret;
+
+       if (!adata->ap_mode_entry) {
+               dev_warn(&alt->dev,
+                        "EC does not support AP driven mode entry\n");
+               return -EOPNOTSUPP;
+       }
+
+       if (adata->sid == USB_TYPEC_DP_SID)
+               req.mode_to_enter = CROS_EC_ALTMODE_DP;
+       else
+               return -EOPNOTSUPP;
+
+       ret = cros_ec_cmd(adata->port->typec_data->ec, 0, EC_CMD_TYPEC_CONTROL,
+                         &req, sizeof(req), NULL, 0);
+       if (ret < 0)
+               return ret;
+
+       svdm_version = typec_altmode_get_svdm_version(alt);
+       if (svdm_version < 0)
+               return svdm_version;
+
+       mutex_lock(&adata->lock);
+
+       adata->header = VDO(adata->sid, 1, svdm_version, CMD_ENTER_MODE);
+       adata->header |= VDO_OPOS(adata->mode);
+       adata->header |= VDO_CMDT(CMDT_RSP_ACK);
+       adata->vdo_data = NULL;
+       adata->vdo_size = 1;
+       schedule_work(&adata->work);
+
+       mutex_unlock(&adata->lock);
+       return ret;
+}
+
+static int cros_typec_altmode_exit(struct typec_altmode *alt)
+{
+       struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt);
+       struct ec_params_typec_control req = {
+               .port = adata->port->port_num,
+               .command = TYPEC_CONTROL_COMMAND_EXIT_MODES,
+       };
+       int svdm_version;
+       int ret;
+
+       if (!adata->ap_mode_entry) {
+               dev_warn(&alt->dev,
+                        "EC does not support AP driven mode exit\n");
+               return -EOPNOTSUPP;
+       }
+
+       ret = cros_ec_cmd(adata->port->typec_data->ec, 0, EC_CMD_TYPEC_CONTROL,
+                         &req, sizeof(req), NULL, 0);
+
+       if (ret < 0)
+               return ret;
+
+       svdm_version = typec_altmode_get_svdm_version(alt);
+       if (svdm_version < 0)
+               return svdm_version;
+
+       mutex_lock(&adata->lock);
+
+       adata->header = VDO(adata->sid, 1, svdm_version, CMD_EXIT_MODE);
+       adata->header |= VDO_OPOS(adata->mode);
+       adata->header |= VDO_CMDT(CMDT_RSP_ACK);
+       adata->vdo_data = NULL;
+       adata->vdo_size = 1;
+       schedule_work(&adata->work);
+
+       mutex_unlock(&adata->lock);
+       return ret;
+}
+
+static int cros_typec_displayport_vdm(struct typec_altmode *alt, u32 header,
+                                     const u32 *data, int count)
+{
+       struct cros_typec_dp_data *dp_data = typec_altmode_get_drvdata(alt);
+       struct cros_typec_altmode_data *adata = &dp_data->adata;
+
+
+       int cmd_type = PD_VDO_CMDT(header);
+       int cmd = PD_VDO_CMD(header);
+       int svdm_version;
+
+       svdm_version = typec_altmode_get_svdm_version(alt);
+       if (svdm_version < 0)
+               return svdm_version;
+
+       mutex_lock(&adata->lock);
+
+       switch (cmd_type) {
+       case CMDT_INIT:
+               if (PD_VDO_SVDM_VER(header) < svdm_version) {
+                       typec_partner_set_svdm_version(adata->port->partner,
+                                                      PD_VDO_SVDM_VER(header));
+                       svdm_version = PD_VDO_SVDM_VER(header);
+               }
+
+               adata->header = VDO(adata->sid, 1, svdm_version, cmd);
+               adata->header |= VDO_OPOS(adata->mode);
+
+               /*
+                * DP_CMD_CONFIGURE: We can't actually do anything with the
+                * provided VDO yet so just send back an ACK.
+                *
+                * DP_CMD_STATUS_UPDATE: We wait for Mux changes to send
+                * DPStatus Acks.
+                */
+               switch (cmd) {
+               case DP_CMD_CONFIGURE:
+                       dp_data->data.conf = *data;
+                       adata->header |= VDO_CMDT(CMDT_RSP_ACK);
+                       dp_data->configured = true;
+                       schedule_work(&adata->work);
+                       break;
+               case DP_CMD_STATUS_UPDATE:
+                       dp_data->pending_status_update = true;
+                       break;
+               default:
+                       adata->header |= VDO_CMDT(CMDT_RSP_ACK);
+                       schedule_work(&adata->work);
+                       break;
+               }
+
+               break;
+       default:
+               break;
+       }
+
+       mutex_unlock(&adata->lock);
+       return 0;
+}
+
+static int cros_typec_altmode_vdm(struct typec_altmode *alt, u32 header,
+                                     const u32 *data, int count)
+{
+       struct cros_typec_altmode_data *adata = typec_altmode_get_drvdata(alt);
+
+       if (!adata->ap_mode_entry)
+               return -EOPNOTSUPP;
+
+       if (adata->sid == USB_TYPEC_DP_SID)
+               return cros_typec_displayport_vdm(alt, header, data, count);
+
+       return -EINVAL;
+}
+
+static const struct typec_altmode_ops cros_typec_altmode_ops = {
+       .enter = cros_typec_altmode_enter,
+       .exit = cros_typec_altmode_exit,
+       .vdm = cros_typec_altmode_vdm,
+};
+
+#if IS_ENABLED(CONFIG_TYPEC_DP_ALTMODE)
+int cros_typec_displayport_status_update(struct typec_altmode *altmode,
+                                        struct typec_displayport_data *data)
+{
+       struct cros_typec_dp_data *dp_data =
+               typec_altmode_get_drvdata(altmode);
+       struct cros_typec_altmode_data *adata = &dp_data->adata;
+
+       if (!dp_data->pending_status_update) {
+               dev_dbg(&altmode->dev,
+                       "Got DPStatus without a pending request\n");
+               return 0;
+       }
+
+       if (dp_data->configured && dp_data->data.conf != data->conf)
+               dev_dbg(&altmode->dev,
+                       "DP Conf doesn't match. Requested 0x%04x, Actual 0x%04x\n",
+                       dp_data->data.conf, data->conf);
+
+       mutex_lock(&adata->lock);
+
+       dp_data->data = *data;
+       dp_data->pending_status_update = false;
+       adata->header |= VDO_CMDT(CMDT_RSP_ACK);
+       adata->vdo_data = &dp_data->data.status;
+       adata->vdo_size = 2;
+       schedule_work(&adata->work);
+
+       mutex_unlock(&adata->lock);
+
+       return 0;
+}
+
+struct typec_altmode *
+cros_typec_register_displayport(struct cros_typec_port *port,
+                               struct typec_altmode_desc *desc,
+                               bool ap_mode_entry)
+{
+       struct typec_altmode *alt;
+       struct cros_typec_dp_data *dp_data;
+       struct cros_typec_altmode_data *adata;
+
+       alt = typec_port_register_altmode(port->port, desc);
+       if (IS_ERR(alt))
+               return alt;
+
+       dp_data = devm_kzalloc(&alt->dev, sizeof(*dp_data), GFP_KERNEL);
+       if (!dp_data) {
+               typec_unregister_altmode(alt);
+               return ERR_PTR(-ENOMEM);
+       }
+
+       adata = &dp_data->adata;
+       INIT_WORK(&adata->work, cros_typec_altmode_work);
+       mutex_init(&adata->lock);
+       adata->alt = alt;
+       adata->port = port;
+       adata->ap_mode_entry = ap_mode_entry;
+       adata->sid = desc->svid;
+       adata->mode = desc->mode;
+
+       typec_altmode_set_ops(alt, &cros_typec_altmode_ops);
+       typec_altmode_set_drvdata(alt, adata);
+
+       return alt;
+}
+#endif
diff --git a/drivers/platform/chrome/cros_typec_altmode.h b/drivers/platform/chrome/cros_typec_altmode.h
new file mode 100644 (file)
index 0000000..ed00ee7
--- /dev/null
@@ -0,0 +1,37 @@
+/* SPDX-License-Identifier: GPL-2.0-only */
+
+#ifndef __CROS_TYPEC_ALTMODE_H__
+#define __CROS_TYPEC_ALTMODE_H__
+
+#include <linux/kconfig.h>
+#include <linux/usb/typec.h>
+
+struct cros_typec_port;
+struct typec_altmode;
+struct typec_altmode_desc;
+struct typec_displayport_data;
+
+#if IS_ENABLED(CONFIG_TYPEC_DP_ALTMODE)
+struct typec_altmode *
+cros_typec_register_displayport(struct cros_typec_port *port,
+                               struct typec_altmode_desc *desc,
+                               bool ap_mode_entry);
+
+int cros_typec_displayport_status_update(struct typec_altmode *altmode,
+                                        struct typec_displayport_data *data);
+#else
+static inline struct typec_altmode *
+cros_typec_register_displayport(struct cros_typec_port *port,
+                               struct typec_altmode_desc *desc,
+                               bool ap_mode_entry)
+{
+       return typec_port_register_altmode(port->port, desc);
+}
+
+static inline int cros_typec_displayport_status_update(struct typec_altmode *altmode,
+                                        struct typec_displayport_data *data)
+{
+       return 0;
+}
+#endif
+#endif /* __CROS_TYPEC_ALTMODE_H__ */