From nobody Sun Apr 19 04:23:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D79EEC433EF for ; Wed, 6 Jul 2022 17:16:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233299AbiGFRQu (ORCPT ); Wed, 6 Jul 2022 13:16:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38936 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232589AbiGFRQs (ORCPT ); Wed, 6 Jul 2022 13:16:48 -0400 Received: from mail-pj1-x1033.google.com (mail-pj1-x1033.google.com [IPv6:2607:f8b0:4864:20::1033]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6E80D2981D for ; Wed, 6 Jul 2022 10:16:47 -0700 (PDT) Received: by mail-pj1-x1033.google.com with SMTP id 89-20020a17090a09e200b001ef7638e536so12813720pjo.3 for ; Wed, 06 Jul 2022 10:16:47 -0700 (PDT) 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=nOxzzNqxP9p+XkxqjJmrHM896mN92roDpbi4243vf1k=; b=bU6c9MqPVXBuJxLQ7/Np+98fh9o1xn55UVvGFJ5y3gzSzwcADqtXkkDLTJcuVpsgue xyqZcs0f+vlT5rWCjviAsD7mo/f79yqL4ZN3IPKIOkOQtIpMXtOV8dJXkOhpcjWst36y 9OfWRAECnxzGA0Cq1R0NHwmbR/tbf7wq/xLEs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=nOxzzNqxP9p+XkxqjJmrHM896mN92roDpbi4243vf1k=; b=4yR6E0ye4QuHOT60FsHtraiU6C6SbG4KzKblEBM+Ut59W5d80P9swUbxaGIf4yufx9 bb4UBvHBXASgSFuIPET1+wQR6ionokA/BmH8y6RXp5AW9jLdEVpCm/hBRtuCuCQO0JjV 4pFbQyGu/MaHWGIvQ8wAc1XSOfFa+T3odU7qiUMQxDpWirjIOnXhfjhpJnIbIzwCjR/8 Sp3/1Zh4fU8RNSxUhN0MYzP3xoNJVV+qheU14Gj89od7vTEGQHNm7xsMPBgzYIQNavsK dUuxtlw0767lEOtdgmcAzEgjTh23jVUiddpfUHcqE6ZKR+R7hSn/Wb/ohl5fSVYa3yGT DwFA== X-Gm-Message-State: AJIora/qZ3n2EQwkvbNBSm5SXFDqybLV6QytukIp2xWjDIrVIvnhmxxq Rn9XjYuMI8qZfrB5MB7BWkZcu+pAvB1ONg== X-Google-Smtp-Source: AGRyM1s7EmLCkGQKjM7xOnzSMY34kcSKCTe1YwTk0c2gcuKvlNqztw+il7ue6v8AV6Qi3Q9eUXP+Fg== X-Received: by 2002:a17:902:e748:b0:16a:726e:7c9e with SMTP id p8-20020a170902e74800b0016a726e7c9emr46508227plf.12.1657127806755; Wed, 06 Jul 2022 10:16:46 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.16.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:16:46 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 1/9] usb: typec: Add support for retimers Date: Wed, 6 Jul 2022 17:15:05 +0000 Message-Id: <20220706171601.807042-2-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce a retimer device class and associated functions that register and use retimer "switch" devices. These operate in a manner similar to the "mode-switch" and help configure retimers that exist between the Type-C connector and host controller(s). Type C ports can be linked to retimers using firmware node device references (again, in a manner similar to "mode-switch"). Signed-off-by: Prashant Malani --- Changes since v11: - Change class name to "retimer" - Change device type to "typec_retimer". drivers/usb/typec/Makefile | 2 +- drivers/usb/typec/class.c | 9 +- drivers/usb/typec/class.h | 1 + drivers/usb/typec/retimer.c | 168 ++++++++++++++++++++++++++++++ drivers/usb/typec/retimer.h | 15 +++ include/linux/usb/typec_retimer.h | 45 ++++++++ 6 files changed, 238 insertions(+), 2 deletions(-) create mode 100644 drivers/usb/typec/retimer.c create mode 100644 drivers/usb/typec/retimer.h create mode 100644 include/linux/usb/typec_retimer.h diff --git a/drivers/usb/typec/Makefile b/drivers/usb/typec/Makefile index 2f174cd3e5df..4955d9af0811 100644 --- a/drivers/usb/typec/Makefile +++ b/drivers/usb/typec/Makefile @@ -1,6 +1,6 @@ # SPDX-License-Identifier: GPL-2.0 obj-$(CONFIG_TYPEC) +=3D typec.o -typec-y :=3D class.o mux.o bus.o pd.o +typec-y :=3D class.o mux.o bus.o pd.o retimer.o typec-$(CONFIG_ACPI) +=3D port-mapper.o obj-$(CONFIG_TYPEC) +=3D altmodes/ obj-$(CONFIG_TYPEC_TCPM) +=3D tcpm/ diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index bbc46b14f99a..9062836bb638 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -2299,10 +2299,14 @@ static int __init typec_init(void) if (ret) goto err_unregister_bus; =20 - ret =3D class_register(&typec_class); + ret =3D class_register(&retimer_class); if (ret) goto err_unregister_mux_class; =20 + ret =3D class_register(&typec_class); + if (ret) + goto err_unregister_retimer_class; + ret =3D usb_power_delivery_init(); if (ret) goto err_unregister_class; @@ -2312,6 +2316,9 @@ static int __init typec_init(void) err_unregister_class: class_unregister(&typec_class); =20 +err_unregister_retimer_class: + class_unregister(&retimer_class); + err_unregister_mux_class: class_unregister(&typec_mux_class); =20 diff --git a/drivers/usb/typec/class.h b/drivers/usb/typec/class.h index b531f9853bc0..43fcf9e37a8c 100644 --- a/drivers/usb/typec/class.h +++ b/drivers/usb/typec/class.h @@ -76,6 +76,7 @@ extern const struct device_type typec_port_dev_type; #define is_typec_port(dev) ((dev)->type =3D=3D &typec_port_dev_type) =20 extern struct class typec_mux_class; +extern struct class retimer_class; extern struct class typec_class; =20 #if defined(CONFIG_ACPI) diff --git a/drivers/usb/typec/retimer.c b/drivers/usb/typec/retimer.c new file mode 100644 index 000000000000..051eaa7d2899 --- /dev/null +++ b/drivers/usb/typec/retimer.c @@ -0,0 +1,168 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2022 Google LLC + * + * USB Type-C Retimer support. + * Author: Prashant Malani + * + */ + +#include +#include +#include +#include +#include +#include + +#include "class.h" +#include "retimer.h" + +static bool dev_name_ends_with(struct device *dev, const char *suffix) +{ + const char *name =3D dev_name(dev); + const int name_len =3D strlen(name); + const int suffix_len =3D strlen(suffix); + + if (suffix_len > name_len) + return false; + + return strcmp(name + (name_len - suffix_len), suffix) =3D=3D 0; +} + +static int retimer_fwnode_match(struct device *dev, const void *fwnode) +{ + return dev_fwnode(dev) =3D=3D fwnode && dev_name_ends_with(dev, "-retimer= "); +} + +static void *typec_retimer_match(struct fwnode_handle *fwnode, const char = *id, void *data) +{ + struct device *dev =3D class_find_device(&retimer_class, NULL, fwnode, + retimer_fwnode_match); + + return dev ? to_typec_retimer(dev) : ERR_PTR(-EPROBE_DEFER); +} + +/** + * fwnode_typec_retimer_get - Find USB Type-C retimer. + * @fwnode: The caller device node. + * + * Finds a retimer linked to the caller. This function is primarily meant = for the + * Type-C drivers. Returns a reference to the retimer on success, NULL if = no + * matching connection was found, or ERR_PTR(-EPROBE_DEFER) when a connect= ion + * was found but the retimer has not been enumerated yet. + */ +struct typec_retimer *fwnode_typec_retimer_get(struct fwnode_handle *fwnod= e) +{ + struct typec_retimer *retimer; + + retimer =3D fwnode_connection_find_match(fwnode, "retimer-switch", NULL, = typec_retimer_match); + if (!IS_ERR_OR_NULL(retimer)) + WARN_ON(!try_module_get(retimer->dev.parent->driver->owner)); + + return retimer; +} +EXPORT_SYMBOL_GPL(fwnode_typec_retimer_get); + +/** + * typec_retimer_put - Release handle to a retimer. + * @retimer: USB Type-C Connector Retimer. + * + * Decrements reference count for @retimer. + */ +void typec_retimer_put(struct typec_retimer *retimer) +{ + if (!IS_ERR_OR_NULL(retimer)) { + module_put(retimer->dev.parent->driver->owner); + put_device(&retimer->dev); + } +} +EXPORT_SYMBOL_GPL(typec_retimer_put); + +int typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer_= state *state) +{ + if (IS_ERR_OR_NULL(retimer)) + return 0; + + return retimer->set(retimer, state); +} +EXPORT_SYMBOL_GPL(typec_retimer_set); + +static void typec_retimer_release(struct device *dev) +{ + kfree(to_typec_retimer(dev)); +} + +static const struct device_type typec_retimer_dev_type =3D { + .name =3D "typec_retimer", + .release =3D typec_retimer_release, +}; + +/** + * typec_retimer_register - Register a retimer device. + * @parent: Parent device. + * @desc: Retimer description. + * + * Some USB Type-C connectors have their physical lines routed through ret= imers before they + * reach muxes or host controllers. In some cases (for example: using alte= rnate modes) + * these retimers need to be reconfigured appropriately. This function reg= isters retimer + * switches which route and potentially modify the signals on the Type C p= hysical lines + * enroute to the host controllers. + */ +struct typec_retimer * +typec_retimer_register(struct device *parent, const struct typec_retimer_d= esc *desc) +{ + struct typec_retimer *retimer; + int ret; + + if (!desc || !desc->set) + return ERR_PTR(-EINVAL); + + retimer =3D kzalloc(sizeof(*retimer), GFP_KERNEL); + if (!retimer) + return ERR_PTR(-ENOMEM); + + retimer->set =3D desc->set; + + device_initialize(&retimer->dev); + retimer->dev.parent =3D parent; + retimer->dev.fwnode =3D desc->fwnode; + retimer->dev.class =3D &retimer_class; + retimer->dev.type =3D &typec_retimer_dev_type; + retimer->dev.driver_data =3D desc->drvdata; + dev_set_name(&retimer->dev, "%s-retimer", + desc->name ? desc->name : dev_name(parent)); + + ret =3D device_add(&retimer->dev); + if (ret) { + dev_err(parent, "failed to register retimer (%d)\n", ret); + put_device(&retimer->dev); + return ERR_PTR(ret); + } + + return retimer; +} +EXPORT_SYMBOL_GPL(typec_retimer_register); + +/** + * typec_retimer_unregister - Unregister retimer device. + * @retimer: USB Type-C Connector retimer. + * + * Unregister retimer that was registered with typec_retimer_register(). + */ +void typec_retimer_unregister(struct typec_retimer *retimer) +{ + if (!IS_ERR_OR_NULL(retimer)) + device_unregister(&retimer->dev); +} +EXPORT_SYMBOL_GPL(typec_retimer_unregister); + +void *typec_retimer_get_drvdata(struct typec_retimer *retimer) +{ + return dev_get_drvdata(&retimer->dev); +} +EXPORT_SYMBOL_GPL(typec_retimer_get_drvdata); + +struct class retimer_class =3D { + .name =3D "retimer", + .owner =3D THIS_MODULE, +}; diff --git a/drivers/usb/typec/retimer.h b/drivers/usb/typec/retimer.h new file mode 100644 index 000000000000..fa15951d4846 --- /dev/null +++ b/drivers/usb/typec/retimer.h @@ -0,0 +1,15 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __USB_TYPEC_RETIMER__ +#define __USB_TYPEC_RETIMER__ + +#include + +struct typec_retimer { + struct device dev; + typec_retimer_set_fn_t set; +}; + +#define to_typec_retimer(_dev_) container_of(_dev_, struct typec_retimer, = dev) + +#endif /* __USB_TYPEC_RETIMER__ */ diff --git a/include/linux/usb/typec_retimer.h b/include/linux/usb/typec_re= timer.h new file mode 100644 index 000000000000..5e036b3360e2 --- /dev/null +++ b/include/linux/usb/typec_retimer.h @@ -0,0 +1,45 @@ +/* SPDX-License-Identifier: GPL-2.0 */ + +#ifndef __USB_TYPEC_RETIMER +#define __USB_TYPEC_RETIMER + +#include +#include + +struct device; +struct typec_retimer; +struct typec_altmode; +struct fwnode_handle; + +struct typec_retimer_state { + struct typec_altmode *alt; + unsigned long mode; + void *data; +}; + +typedef int (*typec_retimer_set_fn_t)(struct typec_retimer *retimer, + struct typec_retimer_state *state); + +struct typec_retimer_desc { + struct fwnode_handle *fwnode; + typec_retimer_set_fn_t set; + const char *name; + void *drvdata; +}; + +struct typec_retimer *fwnode_typec_retimer_get(struct fwnode_handle *fwnod= e); +void typec_retimer_put(struct typec_retimer *retimer); +int typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer_= state *state); + +static inline struct typec_retimer *typec_retimer_get(struct device *dev) +{ + return fwnode_typec_retimer_get(dev_fwnode(dev)); +} + +struct typec_retimer * +typec_retimer_register(struct device *parent, const struct typec_retimer_d= esc *desc); +void typec_retimer_unregister(struct typec_retimer *retimer); + +void *typec_retimer_get_drvdata(struct typec_retimer *retimer); + +#endif /* __USB_TYPEC_RETIMER */ --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA24FC433EF for ; Wed, 6 Jul 2022 17:18:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233190AbiGFRSs (ORCPT ); Wed, 6 Jul 2022 13:18:48 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40958 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229723AbiGFRSp (ORCPT ); Wed, 6 Jul 2022 13:18:45 -0400 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0421219003 for ; Wed, 6 Jul 2022 10:18:42 -0700 (PDT) Received: by mail-pg1-x531.google.com with SMTP id i190so1910217pge.7 for ; Wed, 06 Jul 2022 10:18:41 -0700 (PDT) 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=sB4D1atBiaqKiCp+/oP8s6xiYE5LCpCI5LwUJJ8ZAKk=; b=fCY8LiJ7Lx7jGPLpVOBG/PzTDFDgBR2+M9TVaoeErF0JqtEPIe1ynbxpUZPBHrzehU fxqDJQ24s4M0Vrwsjd0Z3qhlY1nTgElpZtgdQpBMhvGAjXGZD4UQMz5+2nZ+Qm4LW2CH JfJQflXLL8BzEkNAshx3aFvu4kPdU/a+6Apeg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sB4D1atBiaqKiCp+/oP8s6xiYE5LCpCI5LwUJJ8ZAKk=; b=bPr6u+qqja89nkmZ21d0oUGmh+UBs3k76vVEliQh5bBykjv5538Q7jyYX6odsWDxkY O32M0lvTl6rCTqsoaGrzuGNIuGkNwTHtiEfIAQvyDiAisur7jHjylyS8+jx+zf1LjA4C 7q4NeZN0+2PuB5WBpeIkdtkiQwrhOsAqDq7+ICkHCBf2GVirhKKsvyFnogHQMlkMrcVJ QkTA2bC0mMpf+7xTQqO5UuLEBazIiWRvRjGc14N55Rr3HYGdMfryZ+BrSYuOqVpHmNKo wUiVYGC83S5BMl6lDWSzkIqkDxkfOmoxg/blmmj0nWl6bbuqZPMfPTb+Lgck1ymDHQYh WiBw== X-Gm-Message-State: AJIora/MTZfEcP5fRIzm+dJJ/PrRDeXPgbLAPXGkDgzatRRpgbkIsikp Yu3jLULAmoPvDq85AgFVqGQmHHNTb7xrgQ== X-Google-Smtp-Source: AGRyM1vAFvh2Hyslk30+D+mp3QJUfmdlP6BYbMGe3W7KBUXLVDYIwgTZ55rfzR/lLX3w0CIIur+/Lw== X-Received: by 2002:a65:4b82:0:b0:412:4346:f594 with SMTP id t2-20020a654b82000000b004124346f594mr15815383pgq.593.1657127921401; Wed, 06 Jul 2022 10:18:41 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.18.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:18:41 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 2/9] usb: typec: Add retimer handle to port Date: Wed, 6 Jul 2022 17:15:06 +0000 Message-Id: <20220706171601.807042-3-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Similar to mux and orientation switch, add a handle for registered retimer to the port, so that it has handles to the various switches connected to it. Signed-off-by: Prashant Malani --- Changes since v1: - Relinquish retimer reference during typec_release. drivers/usb/typec/class.c | 9 +++++++++ drivers/usb/typec/class.h | 1 + 2 files changed, 10 insertions(+) diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 9062836bb638..f08e32d552b4 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -12,6 +12,7 @@ #include #include #include +#include =20 #include "bus.h" #include "class.h" @@ -1736,6 +1737,7 @@ static void typec_release(struct device *dev) ida_destroy(&port->mode_ids); typec_switch_put(port->sw); typec_mux_put(port->mux); + typec_retimer_put(port->retimer); kfree(port->cap); kfree(port); } @@ -2249,6 +2251,13 @@ struct typec_port *typec_register_port(struct device= *parent, return ERR_PTR(ret); } =20 + port->retimer =3D typec_retimer_get(&port->dev); + if (IS_ERR(port->retimer)) { + ret =3D PTR_ERR(port->retimer); + put_device(&port->dev); + return ERR_PTR(ret); + } + ret =3D device_add(&port->dev); if (ret) { dev_err(parent, "failed to register port (%d)\n", ret); diff --git a/drivers/usb/typec/class.h b/drivers/usb/typec/class.h index 43fcf9e37a8c..673b2952b074 100644 --- a/drivers/usb/typec/class.h +++ b/drivers/usb/typec/class.h @@ -55,6 +55,7 @@ struct typec_port { enum typec_orientation orientation; struct typec_switch *sw; struct typec_mux *mux; + struct typec_retimer *retimer; =20 const struct typec_capability *cap; const struct typec_operations *ops; --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:33 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8FA10C433EF for ; Wed, 6 Jul 2022 17:19:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233663AbiGFRTd (ORCPT ); Wed, 6 Jul 2022 13:19:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231147AbiGFRTc (ORCPT ); Wed, 6 Jul 2022 13:19:32 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4C2B51838E for ; Wed, 6 Jul 2022 10:19:31 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id 89-20020a17090a09e200b001ef7638e536so12820578pjo.3 for ; Wed, 06 Jul 2022 10:19:31 -0700 (PDT) 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=Nh8Zsj297L5xQ28EmOP0RXdwpiKaAwlSsSkxMC+PvCY=; b=huBl1UfJz8hUIIAtZ1nGtac5fgWGUI3RmihI7qawQJa/I55yzAIM1Lycp9AL4U8y0A oyrMmdQWtznysLCyudiO+MD8Yv5+StviKDRB/VOa27HdvuW48ovHuLT+Oud2BMCfXZ/B 7/2qGCGfZT1H0xC266KuuaDaG+lLrGpPgtzvI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Nh8Zsj297L5xQ28EmOP0RXdwpiKaAwlSsSkxMC+PvCY=; b=ZY/YbCfCNqjw/LY571NsT6K57GGtXQAhUkub+qiUyaZo6giQdPatxvswfBSTLVxoxS CvW8+XHF5uKWmQgEuGdBs+trjtXvUdZP5Yaa5kAoFpMIBSx2enBPoaIrw85qpBi568bY 612YxuNfUkOm6O2QA4Qr46c2FetszVDRItV/Oaqc3OEkLedfD7PK6I+LNrfNKtviIJYN DQgW6ICuJbMBHlgTZxxH/hY/I2LBCsn4+nE62bVxduhHHe5ZKFycGejY10Rc2nfwBeFn yl6VHx6lFZmZ1jx45R9aL9rqEhNBZJce4xc8cfwwsAkdSswmGwU/BUZLTuy5SU3iVy5T CSrw== X-Gm-Message-State: AJIora9gZqYpSni2czwHxXD3jjr3o2QXX6hGbvMYndjO7lhYU+jnV7LY Mf8x3WHZeCbVBGJMLKudOMTJExpC4A5ixA== X-Google-Smtp-Source: AGRyM1vbGj/LSC0lSOh1KWEBi/TyhTjEKK6CqY2DbWiF9bUc6u0EgUtEkwLUBM+TmWN+j6hR0OoqKg== X-Received: by 2002:a17:903:18e:b0:16a:5f55:c4e with SMTP id z14-20020a170903018e00b0016a5f550c4emr47870812plg.33.1657127970572; Wed, 06 Jul 2022 10:19:30 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.19.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:19:30 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 3/9] platform/chrome: Add Type-C mux set command definitions Date: Wed, 6 Jul 2022 17:15:07 +0000 Message-Id: <20220706171601.807042-4-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Copy EC header definitions for the USB Type-C Mux control command from the EC code base. Also pull in "TBT_UFP_REPLY" definitions, since that is the prior entry in the enum. These headers are already present in the EC code base. [1] [1] https://chromium.googlesource.com/chromiumos/platform/ec/+/b80f85a94a42= 3273c1638ef7b662c56931a138dd/include/ec_commands.h Signed-off-by: Prashant Malani --- Changes since v1: - No changes. include/linux/platform_data/cros_ec_commands.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/include/linux/platform_data/cros_ec_commands.h b/include/linux= /platform_data/cros_ec_commands.h index 8cfa8cfca77e..a3945c5e7f50 100644 --- a/include/linux/platform_data/cros_ec_commands.h +++ b/include/linux/platform_data/cros_ec_commands.h @@ -5722,8 +5722,21 @@ enum typec_control_command { TYPEC_CONTROL_COMMAND_EXIT_MODES, TYPEC_CONTROL_COMMAND_CLEAR_EVENTS, TYPEC_CONTROL_COMMAND_ENTER_MODE, + TYPEC_CONTROL_COMMAND_TBT_UFP_REPLY, + TYPEC_CONTROL_COMMAND_USB_MUX_SET, }; =20 +/* Replies the AP may specify to the TBT EnterMode command as a UFP */ +enum typec_tbt_ufp_reply { + TYPEC_TBT_UFP_REPLY_NAK, + TYPEC_TBT_UFP_REPLY_ACK, +}; + +struct typec_usb_mux_set { + uint8_t mux_index; /* Index of the mux to set in the chain */ + uint8_t mux_flags; /* USB_PD_MUX_*-encoded USB mux state to set */ +} __ec_align1; + struct ec_params_typec_control { uint8_t port; uint8_t command; /* enum typec_control_command */ @@ -5737,6 +5750,8 @@ struct ec_params_typec_control { union { uint32_t clear_events_mask; uint8_t mode_to_enter; /* enum typec_mode */ + uint8_t tbt_ufp_reply; /* enum typec_tbt_ufp_reply */ + struct typec_usb_mux_set mux_params; uint8_t placeholder[128]; }; } __ec_align1; @@ -5815,6 +5830,9 @@ enum tcpc_cc_polarity { #define PD_STATUS_EVENT_SOP_DISC_DONE BIT(0) #define PD_STATUS_EVENT_SOP_PRIME_DISC_DONE BIT(1) #define PD_STATUS_EVENT_HARD_RESET BIT(2) +#define PD_STATUS_EVENT_DISCONNECTED BIT(3) +#define PD_STATUS_EVENT_MUX_0_SET_DONE BIT(4) +#define PD_STATUS_EVENT_MUX_1_SET_DONE BIT(5) =20 struct ec_params_typec_status { uint8_t port; --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 25120C43334 for ; Wed, 6 Jul 2022 17:20:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232062AbiGFRUr (ORCPT ); Wed, 6 Jul 2022 13:20:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42064 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231860AbiGFRUp (ORCPT ); Wed, 6 Jul 2022 13:20:45 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E3E4C193D2 for ; Wed, 6 Jul 2022 10:20:44 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id s206so14532395pgs.3 for ; Wed, 06 Jul 2022 10:20:44 -0700 (PDT) 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=0mAPFLRpf5mKx/F8Hi4SurvzzhTNKba+eu5GuTpXPCo=; b=ELfXB+Bk6HiRh0qy1XL+YhZRyb8jc2FuH7Zdt1AhsMCy6coyNqBSA2anIqt/T/QNZ3 cWUIAIvFUO4dlBdvL6yZ+9P0IlHvNS8iVpthlzqp+pE+lMhaJup27yQj5wXk+wX/sv/S /1//gD7zH/TBJDqzQtJKC/tRFJ92Eoe1nHIKs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=0mAPFLRpf5mKx/F8Hi4SurvzzhTNKba+eu5GuTpXPCo=; b=E/PGi8FDkTWz0rS19+Qff4e+nyk2BaSFj4bepslUSCWjd/Tpa9lmOEogC1cxCPMMcc v5aXw/xkd8cgv3LRKH0bM5YufmGeESHwZsjCJpDVOx0t0hMme7jj3rn5wOGUb9PHEhf+ aAAp7ALuUWoCr7axLJVFCBPVPIlUDZ+wumEqaxMjPAr1fIKQ1gGRrDlpsGjIvfATboac 4ftzMhhZHwK0vZIUdJVZWjmApPq1yFZoJCx1djinPBgpEbFT3qRxQiZrTW+190yhVZ0R 6Lvpjrk/qIjAthzK3boGEmP5mJZORmdEXEq9SZdtku1lFIkU1q9rbdeQZ0BAupMttdES BvyQ== X-Gm-Message-State: AJIora8ZVhEVy2s8c7Xukh9Y26lx7Xc/xtwiX6qkq1adjjmZ+Z3cVnG3 TduGuz/EQUYLqaUbr3EVEdECEO4o/K+voA== X-Google-Smtp-Source: AGRyM1vTSkdhaYKWUxAlokXtexPiFDBlP2eg/5Y0AX/JR+CovhjdG0ayTLAARfDW68VJUIv8yfdi/g== X-Received: by 2002:a63:8341:0:b0:412:a34a:b9d3 with SMTP id h62-20020a638341000000b00412a34ab9d3mr2618813pge.437.1657128044289; Wed, 06 Jul 2022 10:20:44 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.20.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:20:43 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 4/9] platform/chrome: cros_typec_switch: Add switch driver Date: Wed, 6 Jul 2022 17:15:08 +0000 Message-Id: <20220706171601.807042-5-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Introduce a driver to configure USB Type-C mode switches and retimers which are controlled by the Chrome OS EC (Embedded Controller). This allows Type-C port drivers, as well as alternate mode drivers to configure their relevant mode switches and retimers according to the Type-C state they want to achieve. ACPI devices with ID GOOG001A will bind to this driver. Currently, we only register a retimer switch with a stub set function. Subsequent patches will implement the host command set functionality, and introduce mode switches. Signed-off-by: Prashant Malani Reported-by: kernel test robot --- Changes since v1: - No changes. MAINTAINERS | 1 + drivers/platform/chrome/Kconfig | 11 ++ drivers/platform/chrome/Makefile | 1 + drivers/platform/chrome/cros_typec_switch.c | 171 ++++++++++++++++++++ 4 files changed, 184 insertions(+) create mode 100644 drivers/platform/chrome/cros_typec_switch.c diff --git a/MAINTAINERS b/MAINTAINERS index 7533cb27adc0..35ea91c619b7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -4752,6 +4752,7 @@ M: Prashant Malani L: chrome-platform@lists.linux.dev S: Maintained F: drivers/platform/chrome/cros_ec_typec.c +F: drivers/platform/chrome/cros_typec_switch.c =20 CHROMEOS EC USB PD NOTIFY DRIVER M: Prashant Malani diff --git a/drivers/platform/chrome/Kconfig b/drivers/platform/chrome/Kcon= fig index 717299cbccac..c62a514a087f 100644 --- a/drivers/platform/chrome/Kconfig +++ b/drivers/platform/chrome/Kconfig @@ -265,6 +265,17 @@ config CHROMEOS_PRIVACY_SCREEN this should probably always be built into the kernel to avoid or minimize drm probe deferral. =20 +config CROS_TYPEC_SWITCH + tristate "ChromeOS EC Type-C Switch Control" + depends on MFD_CROS_EC_DEV && TYPEC + default MFD_CROS_EC_DEV + help + If you say Y here, you get support for configuring the Chrome OS EC Typ= e C + muxes and retimers. + + To compile this driver as a module, choose M here: the module will be + called cros_typec_switch. + source "drivers/platform/chrome/wilco_ec/Kconfig" =20 endif # CHROMEOS_PLATFORMS diff --git a/drivers/platform/chrome/Makefile b/drivers/platform/chrome/Mak= efile index 52f5a2dde8b8..0dcaf6a7ed27 100644 --- a/drivers/platform/chrome/Makefile +++ b/drivers/platform/chrome/Makefile @@ -12,6 +12,7 @@ obj-$(CONFIG_CHROMEOS_TBMC) +=3D chromeos_tbmc.o obj-$(CONFIG_CROS_EC) +=3D cros_ec.o obj-$(CONFIG_CROS_EC_I2C) +=3D cros_ec_i2c.o obj-$(CONFIG_CROS_EC_ISHTP) +=3D cros_ec_ishtp.o +obj-$(CONFIG_CROS_TYPEC_SWITCH) +=3D cros_typec_switch.o obj-$(CONFIG_CROS_EC_RPMSG) +=3D cros_ec_rpmsg.o obj-$(CONFIG_CROS_EC_SPI) +=3D cros_ec_spi.o cros_ec_lpcs-objs :=3D cros_ec_lpc.o cros_ec_lpc_mec.o diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform= /chrome/cros_typec_switch.c new file mode 100644 index 000000000000..1a795f613543 --- /dev/null +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -0,0 +1,171 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Copyright 2022 Google LLC + * + * This driver provides the ability to configure Type C muxes and retimers= which are controlled by + * the Chrome OS EC. + */ + +#include +#include +#include +#include +#include + +#define DRV_NAME "cros-typec-switch" + +/* Handles and other relevant data required for each port's switches. */ +struct cros_typec_port { + int port_num; + struct typec_retimer *retimer; + struct cros_typec_switch_data *sdata; +}; + +/* Driver-specific data. */ +struct cros_typec_switch_data { + struct device *dev; + struct cros_ec_device *ec; + struct cros_typec_port *ports[EC_USB_PD_MAX_PORTS]; +}; + +static int +cros_typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer= _state *state) +{ + return 0; +} + +void cros_typec_unregister_switches(struct cros_typec_switch_data *sdata) +{ + int i; + + for (i =3D 0; i < EC_USB_PD_MAX_PORTS; i++) { + if (!sdata->ports[i]) + continue; + typec_retimer_unregister(sdata->ports[i]->retimer); + } +} + +int cros_typec_register_retimer(struct cros_typec_port *port, struct fwnod= e_handle *fwnode) +{ + struct typec_retimer_desc retimer_desc =3D { + .fwnode =3D fwnode, + .drvdata =3D port, + .name =3D fwnode_get_name(fwnode), + .set =3D cros_typec_retimer_set, + }; + + port->retimer =3D typec_retimer_register(port->sdata->dev, &retimer_desc); + if (IS_ERR(port->retimer)) + return PTR_ERR(port->retimer); + + return 0; +} + +static int cros_typec_register_switches(struct cros_typec_switch_data *sda= ta) +{ + struct cros_typec_port *port =3D NULL; + struct device *dev =3D sdata->dev; + struct fwnode_handle *fwnode; + struct acpi_device *adev; + unsigned long long index; + int ret =3D 0; + int nports; + + nports =3D device_get_child_node_count(dev); + if (nports =3D=3D 0) { + dev_err(dev, "No switch devices found.\n"); + return -ENODEV; + } + + device_for_each_child_node(dev, fwnode) { + port =3D devm_kzalloc(dev, sizeof(*port), GFP_KERNEL); + if (!port) { + ret =3D -ENOMEM; + goto err_switch; + } + + adev =3D to_acpi_device_node(fwnode); + if (!adev) { + dev_err(fwnode->dev, "Couldn't get ACPI device handle\n"); + ret =3D -ENODEV; + goto err_switch; + } + + ret =3D acpi_evaluate_integer(adev->handle, "_ADR", NULL, &index); + if (ACPI_FAILURE(ret)) { + dev_err(fwnode->dev, "_ADR wasn't evaluated\n"); + ret =3D -ENODATA; + goto err_switch; + } + + if (index < 0 || index >=3D EC_USB_PD_MAX_PORTS) { + dev_err(fwnode->dev, "Invalid port index number: %llu", index); + ret =3D -EINVAL; + goto err_switch; + } + port->sdata =3D sdata; + port->port_num =3D index; + sdata->ports[index] =3D port; + + ret =3D cros_typec_register_retimer(port, fwnode); + if (ret) { + dev_err(dev, "Retimer switch register failed\n"); + goto err_switch; + } + + dev_dbg(dev, "Retimer switch registered for index %llu\n", index); + } + + return 0; +err_switch: + cros_typec_unregister_switches(sdata); + return ret; +} + +static int cros_typec_switch_probe(struct platform_device *pdev) +{ + struct device *dev =3D &pdev->dev; + struct cros_typec_switch_data *sdata; + + sdata =3D devm_kzalloc(dev, sizeof(*sdata), GFP_KERNEL); + if (!sdata) + return -ENOMEM; + + sdata->dev =3D dev; + sdata->ec =3D dev_get_drvdata(pdev->dev.parent); + + platform_set_drvdata(pdev, sdata); + + return cros_typec_register_switches(sdata); +} + +static int cros_typec_switch_remove(struct platform_device *pdev) +{ + struct cros_typec_switch_data *sdata =3D platform_get_drvdata(pdev); + + cros_typec_unregister_switches(sdata); + return 0; +} + +#ifdef CONFIG_ACPI +static const struct acpi_device_id cros_typec_switch_acpi_id[] =3D { + { "GOOG001A", 0 }, + {} +}; +MODULE_DEVICE_TABLE(acpi, cros_typec_switch_acpi_id); +#endif + +static struct platform_driver cros_typec_switch_driver =3D { + .driver =3D { + .name =3D DRV_NAME, + .acpi_match_table =3D ACPI_PTR(cros_typec_switch_acpi_id), + }, + .probe =3D cros_typec_switch_probe, + .remove =3D cros_typec_switch_remove, +}; + +module_platform_driver(cros_typec_switch_driver); + +MODULE_AUTHOR("Prashant Malani "); +MODULE_DESCRIPTION("Chrome OS EC Type C Switch control"); +MODULE_LICENSE("GPL"); --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A8332C433EF for ; Wed, 6 Jul 2022 17:21:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233758AbiGFRVf (ORCPT ); Wed, 6 Jul 2022 13:21:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42576 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233475AbiGFRVd (ORCPT ); Wed, 6 Jul 2022 13:21:33 -0400 Received: from mail-pj1-x1029.google.com (mail-pj1-x1029.google.com [IPv6:2607:f8b0:4864:20::1029]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 078601EC65 for ; Wed, 6 Jul 2022 10:21:33 -0700 (PDT) Received: by mail-pj1-x1029.google.com with SMTP id t5-20020a17090a6a0500b001ef965b262eso6138662pjj.5 for ; Wed, 06 Jul 2022 10:21:33 -0700 (PDT) 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=iKsWwpzQXwEVWxC4hA16xAKXLByt31Hz+Z1LHyl6odk=; b=OA2MFIvZ3ACYya3+5sy4cjFvSgoFnng2goQPIEYeRwDtH8JbMlJzdbK2rGIXZuTyns toWUjNuf7ovSDhd9371LGJpkFN7zkve+RQOcxyC0wJZdkHZ3/VBTH3ZYlMt0UAEBOnUz Ebd3OMWvkMpTNeLLX6hnmBEVKpTcbqQ8Iyzlo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iKsWwpzQXwEVWxC4hA16xAKXLByt31Hz+Z1LHyl6odk=; b=P3sWnI5r5drmyUZCFm4gO0AS7m+KVyLWCa97Qu2RxbRwMu4+npCkObj8ZxJYITYNRh En7Udvcf4DZHVxGV/IeKRXN0Dc3P2AId6rLSid3NzKjDXkCCM35ngBrHj8VevMy8QSlI O6jAzRSz0QPchT+fIkyGAFyD7JX5H5pWLYKL/uEMp1/8HXenBjTxu5rj9W2Vt0MMYLJW rwW4GoiGP9LQT1lRK5xpu/vtCPnpFx+l1GvJykY70G85XE6FMUw3EzzzgaBaubfiLmT4 YgGKjs3QJJBiVVtvgV2NPGTwhDbajfTJ7jekCVwn2G90G9To9bg+CQEFlOKnywU3jNb6 HfHA== X-Gm-Message-State: AJIora/V67ZMybba2JGaWdanT01muBm8Qug9p9+z0PqxwqWhGTILfPJC Zvj2VhR7np6pazm5BUkZxGe3LgDLPcRIig== X-Google-Smtp-Source: AGRyM1vPdmjyI8dTtqvwZMyk9GwZLf+KuO/p/zkeocnQ3DXNeHqvF1ymlXS6L92X4X8WSNQfBdSn2A== X-Received: by 2002:a17:903:2347:b0:16a:33cd:5308 with SMTP id c7-20020a170903234700b0016a33cd5308mr47348306plh.122.1657128092414; Wed, 06 Jul 2022 10:21:32 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.21.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:21:32 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 5/9] platform/chrome: cros_typec_switch: Set EC retimer Date: Wed, 6 Jul 2022 17:15:09 +0000 Message-Id: <20220706171601.807042-6-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Invoke Chrome EC host commands to set EC-controlled retimer switches to the state the Type-C framework instructs. Signed-off-by: Prashant Malani --- Changes since v1: - No changes. drivers/platform/chrome/cros_typec_switch.c | 56 ++++++++++++++++++++- 1 file changed, 55 insertions(+), 1 deletion(-) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform= /chrome/cros_typec_switch.c index 1a795f613543..9faa442dd81a 100644 --- a/drivers/platform/chrome/cros_typec_switch.c +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -9,7 +9,10 @@ #include #include #include +#include #include +#include +#include #include =20 #define DRV_NAME "cros-typec-switch" @@ -28,10 +31,61 @@ struct cros_typec_switch_data { struct cros_typec_port *ports[EC_USB_PD_MAX_PORTS]; }; =20 +static int cros_typec_cmd_mux_set(struct cros_typec_switch_data *sdata, in= t port_num, u8 index, + u8 state) +{ + struct typec_usb_mux_set params =3D { + .mux_index =3D index, + .mux_flags =3D state, + }; + + struct ec_params_typec_control req =3D { + .port =3D port_num, + .command =3D TYPEC_CONTROL_COMMAND_USB_MUX_SET, + .mux_params =3D params, + }; + + return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req, + sizeof(req), NULL, 0); +} + +static int cros_typec_get_mux_state(unsigned long mode, struct typec_altmo= de *alt) +{ + int ret =3D -EOPNOTSUPP; + + if (mode =3D=3D TYPEC_STATE_SAFE) + ret =3D USB_PD_MUX_SAFE_MODE; + else if (mode =3D=3D TYPEC_STATE_USB) + ret =3D USB_PD_MUX_USB_ENABLED; + else if (alt && alt->svid =3D=3D USB_TYPEC_DP_SID) + ret =3D USB_PD_MUX_DP_ENABLED; + + return ret; +} + +/* + * The Chrome EC treats both mode-switches and retimers as "muxes" for the= purposes of the + * host command API. This common function configures and verifies the reti= mer/mode-switch + * according to the provided setting. + */ +static int cros_typec_configure_mux(struct cros_typec_switch_data *sdata, = int port_num, int index, + unsigned long mode, struct typec_altmode *alt) +{ + int ret =3D cros_typec_get_mux_state(mode, alt); + + if (ret < 0) + return ret; + + return cros_typec_cmd_mux_set(sdata, port_num, index, (u8)ret); +} + static int cros_typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer= _state *state) { - return 0; + struct cros_typec_port *port =3D typec_retimer_get_drvdata(retimer); + + /* Retimers have index 1. */ + return cros_typec_configure_mux(port->sdata, port->port_num, 1, state->mo= de, state->alt); } =20 void cros_typec_unregister_switches(struct cros_typec_switch_data *sdata) --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id A821BC433EF for ; Wed, 6 Jul 2022 17:22:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233797AbiGFRWg (ORCPT ); Wed, 6 Jul 2022 13:22:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43100 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbiGFRWX (ORCPT ); Wed, 6 Jul 2022 13:22:23 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2E8CD20F4C for ; Wed, 6 Jul 2022 10:22:21 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id n12so14993912pfq.0 for ; Wed, 06 Jul 2022 10:22:21 -0700 (PDT) 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=8vkh4TpqQ2iDSGtdYg+e9qVXOj8wmBpN55yIEeN36y0=; b=ThTTUVLaBkNvNvD7kstnLhRwdeS954leLaxWs9DUoyO/M6VlQPx/G0zAQHtOIRcyIe SJx6dbUkTs4Wj9NVD/CC85q2hXjmkc2eeSJtNtD9avsWZXE1f9UPiUOJUKn621GRzrAv 2QeSVX4w7Gn76Ho02P3s2Ei+sW6816z0csY/g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8vkh4TpqQ2iDSGtdYg+e9qVXOj8wmBpN55yIEeN36y0=; b=1NdppfeEg7rK8HddBNavYB1cfvN/P5BM9bcE+lFEuDe1FRHO+iDkZApu6jX2S2P2mU djAcYuWOCppddUpzeAVtdtrNdlkBg0y2Wy1IL0tJ5Vg1Ar/yP41y1ge9SZiNQkaEYPUR IkY91E0zvrPI0MbxK3VNZUgzko4lWL80RnME/G2YFv5ftBM0XXxlowKN7sTe30OJgWpn u7iJ0dMJ9Fyk5TcSrBd6/er9UBMFGReMl6bU/bu9Mb/zkGKdm7cDc3F05tDC138HshMH 8SwdcqnMRjyrh3t/T17dfhkJJI2NLbTYWSv6MwyaqdOPM0dU5MGLDyR5T06Enfs7uhnX tSSA== X-Gm-Message-State: AJIora/SUFq8+gQtEvQLV6iD28Ad6ObGgDW7ts6hKbuxzruu+gcj+C36 avY8ftrMm4JBt6br0qfZ5yRA/JdD/0x0jw== X-Google-Smtp-Source: AGRyM1sOulPvskKuXxJw8YFyvB7Ug9Hn6UdaLMDf2/lSv05bFdXt9zZpJcRLUpeYqbs3c3fJXpSWcQ== X-Received: by 2002:a63:b341:0:b0:40d:677:881a with SMTP id x1-20020a63b341000000b0040d0677881amr35450152pgt.407.1657128140603; Wed, 06 Jul 2022 10:22:20 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.22.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:22:20 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 6/9] platform/chrome: cros_typec_switch: Add event check Date: Wed, 6 Jul 2022 17:15:10 +0000 Message-Id: <20220706171601.807042-7-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The Chrome EC updates Type-C status events when mux set requests from the Application Processor (AP) are completed. Add a check to the flow of configuring muxes to look for this status done bit, so that the driver is aware that the mux set completed successfully or not. Signed-off-by: Prashant Malani Reported-by: kernel test robot --- Changes since v1: - No changes. drivers/platform/chrome/cros_typec_switch.c | 72 ++++++++++++++++++++- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform= /chrome/cros_typec_switch.c index 9faa442dd81a..a226f828514f 100644 --- a/drivers/platform/chrome/cros_typec_switch.c +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -7,6 +7,8 @@ */ =20 #include +#include +#include #include #include #include @@ -63,6 +65,40 @@ static int cros_typec_get_mux_state(unsigned long mode, = struct typec_altmode *al return ret; } =20 +static int cros_typec_send_clear_event(struct cros_typec_switch_data *sdat= a, int port_num, + u32 events_mask) +{ + struct ec_params_typec_control req =3D { + .port =3D port_num, + .command =3D TYPEC_CONTROL_COMMAND_CLEAR_EVENTS, + .clear_events_mask =3D events_mask, + }; + + return cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_CONTROL, &req, + sizeof(req), NULL, 0); +} + +bool cros_typec_check_event(struct cros_typec_switch_data *sdata, int port= _num, u32 mask) +{ + struct ec_response_typec_status resp; + struct ec_params_typec_status req =3D { + .port =3D port_num, + }; + int ret; + + ret =3D cros_ec_command(sdata->ec, 0, EC_CMD_TYPEC_STATUS, &req, sizeof(r= eq), + &resp, sizeof(resp)); + if (ret < 0) { + dev_warn(sdata->dev, "EC_CMD_TYPEC_STATUS failed for port: %d\n", port_n= um); + return false; + } + + if (resp.events & mask) + return true; + + return false; +} + /* * The Chrome EC treats both mode-switches and retimers as "muxes" for the= purposes of the * host command API. This common function configures and verifies the reti= mer/mode-switch @@ -71,12 +107,44 @@ static int cros_typec_get_mux_state(unsigned long mode= , struct typec_altmode *al static int cros_typec_configure_mux(struct cros_typec_switch_data *sdata, = int port_num, int index, unsigned long mode, struct typec_altmode *alt) { - int ret =3D cros_typec_get_mux_state(mode, alt); + unsigned long end; + u32 event_mask; + u8 mux_state; + int ret; + + ret =3D cros_typec_get_mux_state(mode, alt); + if (ret < 0) + return ret; + mux_state =3D (u8)ret; =20 + /* Clear any old mux set done event. */ + if (index =3D=3D 0) + event_mask =3D PD_STATUS_EVENT_MUX_0_SET_DONE; + else + event_mask =3D PD_STATUS_EVENT_MUX_1_SET_DONE; + + ret =3D cros_typec_send_clear_event(sdata, port_num, event_mask); + if (ret < 0) + return ret; + + /* Send the set command. */ + ret =3D cros_typec_cmd_mux_set(sdata, port_num, index, mux_state); if (ret < 0) return ret; =20 - return cros_typec_cmd_mux_set(sdata, port_num, index, (u8)ret); + /* Check for the mux set done event. */ + end =3D jiffies + msecs_to_jiffies(1000); + do { + if (cros_typec_check_event(sdata, port_num, event_mask)) + return 0; + + usleep_range(500, 1000); + } while (time_before(jiffies, end)); + + dev_err(sdata->dev, "Timed out waiting for mux set done on index: %d, sta= te: %d\n", + index, mux_state); + + return -ETIMEDOUT; } =20 static int --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2FBA4C43334 for ; Wed, 6 Jul 2022 17:23:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233823AbiGFRXC (ORCPT ); Wed, 6 Jul 2022 13:23:02 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233680AbiGFRW6 (ORCPT ); Wed, 6 Jul 2022 13:22:58 -0400 Received: from mail-pg1-x529.google.com (mail-pg1-x529.google.com [IPv6:2607:f8b0:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D86A323172 for ; Wed, 6 Jul 2022 10:22:57 -0700 (PDT) Received: by mail-pg1-x529.google.com with SMTP id s27so14488638pga.13 for ; Wed, 06 Jul 2022 10:22:57 -0700 (PDT) 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=2YAt0+gf7y4LMncYGHgbbPO7WyHGY2DL6V5a7Qyl00Y=; b=cgDAxibNWiGm3t4131O6MlXdohP4fAvhgMGhYdssbVYiURMGpIe1n91oSnu0L6hcD2 cXbw+k9n6evV3tB5J8raBzAlHrUtUz72vuTpxzAWZDZPl684CRu2ZuXFRra7M9cdDexf OGmmETEyPZe0a83VvQ+kf6kdx8UiPD7l/NbKM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2YAt0+gf7y4LMncYGHgbbPO7WyHGY2DL6V5a7Qyl00Y=; b=akKY+CX5C2wjLm0EVgmOThw2H/R4+vaSQbNNs16OMHnk7w4PC2V7ZwiD0PxHSZCv3/ hhbOLv/+BW4/48Hp79Mr9IOFJwk0LpNXrLoHxPPKIlwp1PznlD1HShXSqwpfKBLLz+Kg Y8tm0sQMuk9ESZ0yhG8BMybDAOWcV0Lo75+QC/HJEN9n6G5cIKFPttQFyKSsYHcWRrky eBTtL81r6JUuioTH5Ego7e+ZlVoDFzwEe9WpzAvgNqpkubcXMvrBe1wS3bgw2nQO2LJw bkN7H/kKhSWTShkqGX7JcgbwXXz7RSuXy+BuMajcV3b88aIrElENYQN1Gbxqd3WIfl7m Zwrw== X-Gm-Message-State: AJIora9qFgRn5MNP03hIiBMJNixav9KuCEelBOqjhsNZqC14/FyFQKmn XZ5BhJW/OB7JGgifLapvECVDAGav7fUqhA== X-Google-Smtp-Source: AGRyM1sa+6OTXjIz2uN//xTGPLZ1Z0MVBL592m/2vJz72SaDd4PTgR09XDBlMC1z6C/fC/Sz57SPlw== X-Received: by 2002:a05:6a02:30d:b0:412:9de2:eb48 with SMTP id bn13-20020a056a02030d00b004129de2eb48mr2929248pgb.47.1657128177257; Wed, 06 Jul 2022 10:22:57 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.22.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:22:56 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 7/9] platform/chrome: cros_typec_switch: Register mode switches Date: Wed, 6 Jul 2022 17:15:11 +0000 Message-Id: <20220706171601.807042-8-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Register mode switch devices for Type C connectors, when they are specified by firmware. These control Type C configuration for any USB Type-C mode switches (sometimes known as "muxes") which are controlled by the Chrome EC. Signed-off-by: Prashant Malani --- Changes since v1: - No changes. drivers/platform/chrome/cros_typec_switch.c | 39 +++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/platform/chrome/cros_typec_switch.c b/drivers/platform= /chrome/cros_typec_switch.c index a226f828514f..2ea42e6596b9 100644 --- a/drivers/platform/chrome/cros_typec_switch.c +++ b/drivers/platform/chrome/cros_typec_switch.c @@ -15,6 +15,7 @@ #include #include #include +#include #include =20 #define DRV_NAME "cros-typec-switch" @@ -22,6 +23,7 @@ /* Handles and other relevant data required for each port's switches. */ struct cros_typec_port { int port_num; + struct typec_mux_dev *mode_switch; struct typec_retimer *retimer; struct cros_typec_switch_data *sdata; }; @@ -147,6 +149,15 @@ static int cros_typec_configure_mux(struct cros_typec_= switch_data *sdata, int po return -ETIMEDOUT; } =20 +static int +cros_typec_mode_switch_set(struct typec_mux_dev *mode_switch, struct typec= _mux_state *state) +{ + struct cros_typec_port *port =3D typec_mux_get_drvdata(mode_switch); + + /* Mode switches have index 0. */ + return cros_typec_configure_mux(port->sdata, port->port_num, 0, state->mo= de, state->alt); +} + static int cros_typec_retimer_set(struct typec_retimer *retimer, struct typec_retimer= _state *state) { @@ -164,9 +175,26 @@ void cros_typec_unregister_switches(struct cros_typec_= switch_data *sdata) if (!sdata->ports[i]) continue; typec_retimer_unregister(sdata->ports[i]->retimer); + typec_mux_unregister(sdata->ports[i]->mode_switch); } } =20 +int cros_typec_register_mode_switch(struct cros_typec_port *port, struct f= wnode_handle *fwnode) +{ + struct typec_mux_desc mode_switch_desc =3D { + .fwnode =3D fwnode, + .drvdata =3D port, + .name =3D fwnode_get_name(fwnode), + .set =3D cros_typec_mode_switch_set, + }; + + port->mode_switch =3D typec_mux_register(port->sdata->dev, &mode_switch_d= esc); + if (IS_ERR(port->mode_switch)) + return PTR_ERR(port->mode_switch); + + return 0; +} + int cros_typec_register_retimer(struct cros_typec_port *port, struct fwnod= e_handle *fwnode) { struct typec_retimer_desc retimer_desc =3D { @@ -236,6 +264,17 @@ static int cros_typec_register_switches(struct cros_ty= pec_switch_data *sdata) } =20 dev_dbg(dev, "Retimer switch registered for index %llu\n", index); + + if (!fwnode_property_read_bool(fwnode, "mode-switch")) + continue; + + ret =3D cros_typec_register_mode_switch(port, fwnode); + if (ret) { + dev_err(dev, "Mode switch register failed\n"); + goto err_switch; + } + + dev_dbg(dev, "Mode switch registered for index %llu\n", index); } =20 return 0; --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D0E7EC43334 for ; Wed, 6 Jul 2022 17:23:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233459AbiGFRXz (ORCPT ); Wed, 6 Jul 2022 13:23:55 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233905AbiGFRXl (ORCPT ); Wed, 6 Jul 2022 13:23:41 -0400 Received: from mail-pl1-x633.google.com (mail-pl1-x633.google.com [IPv6:2607:f8b0:4864:20::633]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6016D2A72C for ; Wed, 6 Jul 2022 10:23:38 -0700 (PDT) Received: by mail-pl1-x633.google.com with SMTP id y18so6176696plb.2 for ; Wed, 06 Jul 2022 10:23:38 -0700 (PDT) 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=yav60sk4t1jSHI9y7JwNTzYMHxVBsDg0h4MxYyUTEPE=; b=j2Jn45au290gtTFCTf5ikH5yAqAHf0I7w5DZ6J2ln2fTcaKI1HD+BMjDKiRf1fWhsh XfiCuSZJyaHD/8ghRqM5EcDDKHtC+IzPaP0SpwDeXP4r9gVE5NuBWd/QOd2qKPIqblc9 h/DGkYqxjMj00Jr6530xkwT3Gme6bs4dSOdfc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yav60sk4t1jSHI9y7JwNTzYMHxVBsDg0h4MxYyUTEPE=; b=ZU95Nn1BSh+/yEK8vJlOquBOXusKPGOwCLpRe0kT4O9EdaVjWvbYHEDQrmOqr41VxT axIBkh/aSvoTxZYv/384D4QIfNohNRcqz9/64Tg3Nfbltheps2fn1dxNN1IzRwoM/dlk oq2KcN1SaTgOjVXyrDnggzPPalOtg7aD9/mTj2xHAV/TYKZn6qb/+EH48MrBt+lVJgBE BvYeRfuQOI9+gMLbIR6BxX7VC0fUI0AGh6Oz18Z7dS0MLBQfZY8kgOaad0lUKUafNPEA ZXd3rroD5EPIJ6cBxvdXaOy4gFDmJhJYU5gT5iuWn4Yp9w83+kuWUNF0pgxCw8njmWaj P24g== X-Gm-Message-State: AJIora+O0xS48283yV2znUkgLS7ZrxhR7pLBuL9pN23vVzdygjggJINR hbcJ+sajmTH0H4YwvOtfxtTiKSfBZvviyA== X-Google-Smtp-Source: AGRyM1tnnh3jgtm7cCp9Qgeg1uF8C64jY6TXiUAsXTO+1wpBfTZrDmt44SkdsuY2bjLKYP5D1k01mw== X-Received: by 2002:a17:902:d50b:b0:16c:474:ce67 with SMTP id b11-20020a170902d50b00b0016c0474ce67mr3487691plg.112.1657128217975; Wed, 06 Jul 2022 10:23:37 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.23.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:23:37 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 8/9] platform/chrome: cros_ec_typec: Cleanup switch handle return paths Date: Wed, 6 Jul 2022 17:15:12 +0000 Message-Id: <20220706171601.807042-9-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Some of the return paths for the cros_typec_get_switch_handles() aren't necessary. Clean up the return paths to only undo the handle get's which succeeded. Signed-off-by: Prashant Malani --- Changes since v1: - No changes. drivers/platform/chrome/cros_ec_typec.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 7cb2e35c4ded..39e6fd4491a9 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -157,12 +157,10 @@ static int cros_typec_get_switch_handles(struct cros_= typec_port *port, return 0; =20 role_sw_err: - usb_role_switch_put(port->role_sw); -ori_sw_err: typec_switch_put(port->ori_sw); -mux_err: +ori_sw_err: typec_mux_put(port->mux); - +mux_err: return -ENODEV; } =20 --=20 2.37.0.rc0.161.g10f37bed90-goog From nobody Sun Apr 19 04:23:34 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57016CCA482 for ; Wed, 6 Jul 2022 17:24:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233842AbiGFRYo (ORCPT ); Wed, 6 Jul 2022 13:24:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46360 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233629AbiGFRYk (ORCPT ); Wed, 6 Jul 2022 13:24:40 -0400 Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38A58C38 for ; Wed, 6 Jul 2022 10:24:40 -0700 (PDT) Received: by mail-pf1-x42c.google.com with SMTP id i17so5417739pfk.1 for ; Wed, 06 Jul 2022 10:24:40 -0700 (PDT) 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=9wJYhm3/uWhsYJmynbAY7FTE4gP8XZZTFiI3IimxN8Y=; b=iZriOZXyCldJ6EpfWLc38+p6zVv9PJXGin48PsdmvE7K9UyUAisfs2dr5lVJDqR+1K Qi/Q9fB+OE6chmCevHzRyqepd4fbkRRp4n2JGk+jnvl0dEq0CSQlYnwoa0veOrch+OMt t14io2EjMPFpsslOrhjs2EvfojxZ6INlSgBjM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9wJYhm3/uWhsYJmynbAY7FTE4gP8XZZTFiI3IimxN8Y=; b=EtQzaW/dBkzFFEGQLaSr5fUc5IuM/2jCRJvbK1k+kN7tsP5KDpG0KGFjweQqiYPFd3 CLncmp3Ms90r0VS34XFnjPLxz2oKb9FVa3HsIUIqA2INbUhp8qSNvjlkhsSC7P3BKzta yEo5rjq3+m803vtFblDgF5ceukGMo4idBe2PVp1yqpftkC5T8hsFWlbh/7myiVgKXfH8 Q5XWbomKQUVpzZ1F2+l9x9BhGoHrSEsJiW8CJurSQNGEPO+fpZvHZsgn7Xq1RejLIJSD Wjcl3AsuKphCiBfIMuHn77ZyWF+LDdEKTzbZatwHAxM+QHF50aicQB7xQm/rg3QGkIpG 5nUg== X-Gm-Message-State: AJIora/ZC7eTs1CGyBU6gnAvbOLWNmDWiajaPnkPtXC/fOBGIoKpTL3q SlGo8QLNCJ+0P0sJP6AayzxrkkLpmp/3Eg== X-Google-Smtp-Source: AGRyM1v911WfKv30HIMZoXMDln5NS8h6Td0E42t4vok/WYmteTorc1q3WEdPHRP3YpXnKD/r3xfGhQ== X-Received: by 2002:a65:4b82:0:b0:412:4346:f594 with SMTP id t2-20020a654b82000000b004124346f594mr15836152pgq.593.1657128279640; Wed, 06 Jul 2022 10:24:39 -0700 (PDT) Received: from pmalani.c.googlers.com.com (157.214.185.35.bc.googleusercontent.com. [35.185.214.157]) by smtp.gmail.com with ESMTPSA id h14-20020a170902f7ce00b0016be0d5483asm7514953plw.252.2022.07.06.10.24.39 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 10:24:39 -0700 (PDT) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org, chrome-platform@lists.linux.dev Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Daisuke Nojiri , "Dustin L. Howett" , Greg Kroah-Hartman , Guenter Roeck , "Gustavo A. R. Silva" , Kees Cook , Sebastian Reichel , Tzung-Bi Shih Subject: [PATCH v2 9/9] platform/chrome: cros_ec_typec: Get retimer handle Date: Wed, 6 Jul 2022 17:15:13 +0000 Message-Id: <20220706171601.807042-10-pmalani@chromium.org> X-Mailer: git-send-email 2.37.0.rc0.161.g10f37bed90-goog In-Reply-To: <20220706171601.807042-1-pmalani@chromium.org> References: <20220706171601.807042-1-pmalani@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Where available, obtain the handle to retimer switch specified via firmware, and update the mux configuration callsites to add retimer support for supported modes. Signed-off-by: Prashant Malani --- Changes since v1: - No changes. drivers/platform/chrome/cros_ec_typec.c | 44 +++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 3 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 39e6fd4491a9..38c4ac754ea9 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -20,6 +20,7 @@ #include #include #include +#include #include #include =20 @@ -53,6 +54,7 @@ struct cros_typec_port { struct usb_pd_identity c_identity; struct typec_switch *ori_sw; struct typec_mux *mux; + struct typec_retimer *retimer; struct usb_role_switch *role_sw; =20 /* Variables keeping track of switch state. */ @@ -142,6 +144,12 @@ static int cros_typec_get_switch_handles(struct cros_t= ypec_port *port, goto mux_err; } =20 + port->retimer =3D fwnode_typec_retimer_get(fwnode); + if (IS_ERR(port->retimer)) { + dev_dbg(dev, "Retimer handle not found.\n"); + goto retimer_sw_err; + } + port->ori_sw =3D fwnode_typec_switch_get(fwnode); if (IS_ERR(port->ori_sw)) { dev_dbg(dev, "Orientation switch handle not found.\n"); @@ -159,6 +167,8 @@ static int cros_typec_get_switch_handles(struct cros_ty= pec_port *port, role_sw_err: typec_switch_put(port->ori_sw); ori_sw_err: + typec_retimer_put(port->retimer); +retimer_sw_err: typec_mux_put(port->mux); mux_err: return -ENODEV; @@ -203,6 +213,21 @@ static void cros_typec_unregister_altmodes(struct cros= _typec_data *typec, int po } } =20 +/* + * Map the Type-C Mux state to retimer state and call the retimer set func= tion. We need this + * because we re-use the Type-C mux state for retimers. + */ +static int cros_typec_retimer_set(struct typec_retimer *retimer, struct t= ypec_mux_state state) +{ + struct typec_retimer_state rstate =3D { + .alt =3D state.alt, + .mode =3D state.mode, + .data =3D state.data, + }; + + return typec_retimer_set(retimer, &rstate); +} + static int cros_typec_usb_disconnect_state(struct cros_typec_port *port) { port->state.alt =3D NULL; @@ -211,6 +236,7 @@ static int cros_typec_usb_disconnect_state(struct cros_= typec_port *port) =20 usb_role_switch_set_role(port->role_sw, USB_ROLE_NONE); typec_switch_set(port->ori_sw, TYPEC_ORIENTATION_NONE); + cros_typec_retimer_set(port->retimer, port->state); =20 return typec_mux_set(port->mux, &port->state); } @@ -381,9 +407,14 @@ static int cros_typec_init_ports(struct cros_typec_dat= a *typec) =20 static int cros_typec_usb_safe_state(struct cros_typec_port *port) { + int ret; port->state.mode =3D TYPEC_STATE_SAFE; =20 - return typec_mux_set(port->mux, &port->state); + ret =3D cros_typec_retimer_set(port->retimer, port->state); + if (!ret) + ret =3D typec_mux_set(port->mux, &port->state); + + return ret; } =20 /* @@ -480,7 +511,11 @@ static int cros_typec_enable_dp(struct cros_typec_data= *typec, port->state.data =3D &dp_data; port->state.mode =3D TYPEC_MODAL_STATE(ffs(pd_ctrl->dp_mode)); =20 - return typec_mux_set(port->mux, &port->state); + ret =3D cros_typec_retimer_set(port->retimer, port->state); + if (!ret) + ret =3D typec_mux_set(port->mux, &port->state); + + return ret; } =20 static int cros_typec_enable_usb4(struct cros_typec_data *typec, @@ -569,7 +604,10 @@ static int cros_typec_configure_mux(struct cros_typec_= data *typec, int port_num, } else if (port->mux_flags & USB_PD_MUX_USB_ENABLED) { port->state.alt =3D NULL; port->state.mode =3D TYPEC_STATE_USB; - ret =3D typec_mux_set(port->mux, &port->state); + + ret =3D cros_typec_retimer_set(port->retimer, port->state); + if (!ret) + ret =3D typec_mux_set(port->mux, &port->state); } else { dev_dbg(typec->dev, "Unrecognized mode requested, mux flags: %x\n", --=20 2.37.0.rc0.161.g10f37bed90-goog