From nobody Mon Sep 15 09:32:59 2025 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 A3D23C54EBE for ; Thu, 12 Jan 2023 22:23:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240197AbjALWXI (ORCPT ); Thu, 12 Jan 2023 17:23:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232908AbjALWWk (ORCPT ); Thu, 12 Jan 2023 17:22:40 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D1F541CB0A for ; Thu, 12 Jan 2023 14:16:25 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id 200so8677783pfx.7 for ; Thu, 12 Jan 2023 14:16:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=DjiuF0nk2Kld9KpyTDhRe2O6SrSLJ1BXqR8sAU0pb9U=; b=oZlwH+7eiNMzSIWcVe5eQOtedrPcUmvYsQ9xgKiam4GhJtqz9USbZasRnjKseYbjGy 5hNUOJCi1IrDGf9VQHhDgRf5oWzCSJi6nRjDnqXi7kLkWOD316vLo1N1u64Nftmlu4fj G8cBo7eSLqFgU5dWh+Ei1rPvnGc3Q2aNkITKg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=DjiuF0nk2Kld9KpyTDhRe2O6SrSLJ1BXqR8sAU0pb9U=; b=DG8QpJypcTq6D3Zk8tUhdm4O2QV1uV9S/t/UYg7sAs3eA9Rn+GhBH+YH77VjYSYrtK 0AtG/+LH8VFkBpVCG/qY8imxNCY8WRmeDyUcI5Hd37+VyzQdwyR75gdVmx9N16lvIyJ1 MQdtXLhIHeYajMaOiqgNW4B8A0iJbnxyhL3kTXdEXlRMigcn6zh1F9Ji2P4QE9Fw7Zrh bGo1MQDsMV/Xz+KYB5TuDAG33U0e+FcFk8Zh8konyV44IN7XrdfFbOMs6UTSp2oqqn8H dh2MMUCva8QSvCrYcWtl7cmOWdjmFGkdQLwTBll4g9um91wwFvKdon6fA4UwyMX7GG9s 5JHQ== X-Gm-Message-State: AFqh2kob7R2b2a4epcXCTW5NXgMMaR4RXrvHKw3P50JgIspXTroWBpiT /8ZvQ8fnUiz23SUg4xVEqDm16yrFMSbjCT/l X-Google-Smtp-Source: AMrXdXurxr+VIziGlnQiBgwKaswKl4TWFukGIKJbTAbZII2HoYU9eQx7fzUE0kwb+hx3J0V9Tcasaw== X-Received: by 2002:a62:5801:0:b0:574:a541:574a with SMTP id m1-20020a625801000000b00574a541574amr72123429pfb.0.1673561785239; Thu, 12 Jan 2023 14:16:25 -0800 (PST) Received: from pmalani.c.googlers.com.com (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id d191-20020a621dc8000000b0058193135f6bsm12330658pfd.84.2023.01.12.14.16.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 14:16:24 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Greg Kroah-Hartman Subject: [PATCH 1/3] usb: typec: Add retimer handle to port altmode Date: Thu, 12 Jan 2023 22:16:06 +0000 Message-Id: <20230112221609.540754-2-pmalani@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230112221609.540754-1-pmalani@chromium.org> References: <20230112221609.540754-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" Just like it does with muxes, the Type-C bus code can update the state of connected retimers (especially when altmode-related transitions occur). Add a retimer handle to the port altmode struct to enable this. Signed-off-by: Prashant Malani Reviewed-by: Heikki Krogerus --- drivers/usb/typec/bus.h | 2 ++ drivers/usb/typec/class.c | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/bus.h b/drivers/usb/typec/bus.h index 56dec268d4dd..c89168857417 100644 --- a/drivers/usb/typec/bus.h +++ b/drivers/usb/typec/bus.h @@ -7,11 +7,13 @@ =20 struct bus_type; struct typec_mux; +struct typec_retimer; =20 struct altmode { unsigned int id; struct typec_altmode adev; struct typec_mux *mux; + struct typec_retimer *retimer; =20 enum typec_port_data roles; =20 diff --git a/drivers/usb/typec/class.c b/drivers/usb/typec/class.c index 5897905cb4f0..ed3d070b1ca4 100644 --- a/drivers/usb/typec/class.c +++ b/drivers/usb/typec/class.c @@ -583,6 +583,7 @@ void typec_unregister_altmode(struct typec_altmode *ade= v) { if (IS_ERR_OR_NULL(adev)) return; + typec_retimer_put(to_altmode(adev)->retimer); typec_mux_put(to_altmode(adev)->mux); device_unregister(&adev->dev); } @@ -2108,16 +2109,26 @@ typec_port_register_altmode(struct typec_port *port, { struct typec_altmode *adev; struct typec_mux *mux; + struct typec_retimer *retimer; =20 mux =3D typec_mux_get(&port->dev, desc); if (IS_ERR(mux)) return ERR_CAST(mux); =20 + retimer =3D typec_retimer_get(&port->dev); + if (IS_ERR(retimer)) { + typec_mux_put(mux); + return ERR_CAST(retimer); + } + adev =3D typec_register_altmode(&port->dev, desc); - if (IS_ERR(adev)) + if (IS_ERR(adev)) { + typec_retimer_put(retimer); typec_mux_put(mux); - else + } else { to_altmode(adev)->mux =3D mux; + to_altmode(adev)->retimer =3D retimer; + } =20 return adev; } --=20 2.39.0.314.g84b9a713c41-goog From nobody Mon Sep 15 09:32:59 2025 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 20A80C54EBE for ; Thu, 12 Jan 2023 22:23:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240679AbjALWXN (ORCPT ); Thu, 12 Jan 2023 17:23:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39396 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240066AbjALWWl (ORCPT ); Thu, 12 Jan 2023 17:22:41 -0500 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 14C971CB11 for ; Thu, 12 Jan 2023 14:16:29 -0800 (PST) Received: by mail-pg1-x529.google.com with SMTP id e10so13738735pgc.9 for ; Thu, 12 Jan 2023 14:16:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZaweIEmq0HPzqbMZsHX/5KqxEfI0AK60Sg/9xC2e0nw=; b=AEnDVzdmu2UBDjpJSwKIR+H3w4ZA+cGy28te8O8B6LwcJ3OHPDMy7KuF7X/BTuAYow LSZJOk/Vpya21bQ8eEVdUWudOzXg2h0zt/0KH2rINXDqPGueIKrY/YM2nGCbe1UJyGzW woxeEE3JKSEUivGkiHmPgfmY8PUqlwSRtpcBg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZaweIEmq0HPzqbMZsHX/5KqxEfI0AK60Sg/9xC2e0nw=; b=61Q8HapJ7LTHMty6HHMw48/wUIp3kuuzWrS3sV7eiqTA7Lk7yyALitrysV7RhNf8gY go6sozty3XuiPcjUIHPZj1L0wJSbG7sc9j0wY6IZCNgZELhyksc6pZbmWf0WH0oHh7aM oNCeqG7FI7aK5h/7I1hAd3zx0FRemWCwkwc7T2AT+MDze6WTM1EwbRj0r07kq4531On3 URdvMJPlOAFmlb48O7s69JuF/Agnc9dQ1BidBWhUkZb6p1jIF1UCmsNu9Sl9iTEahvmd kf/h/mWYw54OtwWqyVYqj6orWp0HUCJsP6sAyVNSs5bOMSTyrf7iTVfGUsy8eGkfoWD2 zkbg== X-Gm-Message-State: AFqh2krNTxe0f7GZ517Qkqah2Xe3pzAs5nVczcmToj6gkCXsU+IP2G1c 93I3coqg/gLTUAGQPrdqFG55lkepYT2Xa27x X-Google-Smtp-Source: AMrXdXulBBi75TVTDqJKRdehZ+kuf8IyHmC3L9jSLnsD7CySIXZ4pY8l8TV7oI8z1UiL34Yj1ySrkw== X-Received: by 2002:a62:1887:0:b0:582:5886:e1b7 with SMTP id 129-20020a621887000000b005825886e1b7mr38083089pfy.14.1673561788350; Thu, 12 Jan 2023 14:16:28 -0800 (PST) Received: from pmalani.c.googlers.com.com (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id d191-20020a621dc8000000b0058193135f6bsm12330658pfd.84.2023.01.12.14.16.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 14:16:28 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Greg Kroah-Hartman Subject: [PATCH 2/3] usb: typec: Add wrapper for bus switch set code Date: Thu, 12 Jan 2023 22:16:07 +0000 Message-Id: <20230112221609.540754-3-pmalani@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230112221609.540754-1-pmalani@chromium.org> References: <20230112221609.540754-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" Add a wrapper that calls the set() function for various switches associated with a port altmode. Right now, it just wraps the existing typec_mux_set() command, but it can be expanded to include other switches in future patches. No functional changes introduced by this patch. Signed-off-by: Prashant Malani Reviewed-by: Heikki Krogerus --- drivers/usb/typec/bus.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 31c2a3130cad..9f1bbd26ca47 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -27,6 +27,13 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long= conf, void *data) return typec_mux_set(alt->mux, &state); } =20 +/* Wrapper to set various Type-C port switches together. */ +static inline int +typec_altmode_set_switches(struct altmode *alt, unsigned long conf, void *= data) +{ + return typec_altmode_set_mux(alt, conf, data); +} + static int typec_altmode_set_state(struct typec_altmode *adev, unsigned long conf, void *data) { @@ -35,7 +42,7 @@ static int typec_altmode_set_state(struct typec_altmode *= adev, =20 port_altmode =3D is_port ? to_altmode(adev) : to_altmode(adev)->partner; =20 - return typec_altmode_set_mux(port_altmode, conf, data); + return typec_altmode_set_switches(port_altmode, conf, data); } =20 /* -----------------------------------------------------------------------= --- */ @@ -73,7 +80,7 @@ int typec_altmode_notify(struct typec_altmode *adev, is_port =3D is_typec_port(adev->dev.parent); partner =3D altmode->partner; =20 - ret =3D typec_altmode_set_mux(is_port ? altmode : partner, conf, data); + ret =3D typec_altmode_set_switches(is_port ? altmode : partner, conf, dat= a); if (ret) return ret; =20 --=20 2.39.0.314.g84b9a713c41-goog From nobody Mon Sep 15 09:32:59 2025 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 CFAD0C61DB3 for ; Thu, 12 Jan 2023 22:23:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240202AbjALWXT (ORCPT ); Thu, 12 Jan 2023 17:23:19 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39398 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240526AbjALWWl (ORCPT ); Thu, 12 Jan 2023 17:22:41 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE3E51C42A for ; Thu, 12 Jan 2023 14:16:33 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id a30so14840669pfr.6 for ; Thu, 12 Jan 2023 14:16:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=HkTLc1JhoYqMaaSpYl6NjHEmEMaKe24mQDtcgzRm6SA=; b=NwLL3cGlWAqecjjWMIePO/VbFJDy2XUOI5/qdVpiCUq0EckUGu/5j6Vp9tvJRzjoYQ GQdfLylJSd4qj5BMlvzNNJ/mHcln91tySW6DlhghM4B6qEFYGV06w88nAgHdpOrjqPkg gpd8k0s0/DytaeePtdTqyGeWCK8Iw990vOn9A= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=HkTLc1JhoYqMaaSpYl6NjHEmEMaKe24mQDtcgzRm6SA=; b=UPc56rT8rtLMluLuyOk4ZN0s7QBigig5iYxygmeMYXwcjb78LhQeZYD82jJHyxbhwg bOcZHPIDPQdYTDCsP7+x9tf27qiwPuqE6+twjAMD3luNeJzRPYO0BVCgVoHotnbZnARh lO0rZZzCCWlp+6XQb90qIK4otuGmslP8aKow40WfMDjdJzHqPsLYL8UEqAoU1FlPvMju SmDUGXeaBPsJ1nkD1C655w+RzjJkKvD3KxXBKGs5bQAh8dJtXeT8rYLfN4ngneGPRe7D k/v9VYxeQBGLsB0p2VNeRppSdRlGmMVS+04v4LSTFfjrwC5rnzRXwAwnApngSIPAWs0A dH5Q== X-Gm-Message-State: AFqh2krK45dA9RXwJhpQNNTgAByWCcTU9I37zExHJce11Q4FiMXL3F5r 2I5VY8jWT+JHkByMLw7An2HUDTmawKxRWKGV X-Google-Smtp-Source: AMrXdXu7TKCZLDuVqub1CbHP5FcMT2Ikb234wbbgK+KrHmlZ69SXJ33Vm/CgeCPW7pI4tTF273r0bQ== X-Received: by 2002:a05:6a00:3311:b0:582:6732:ee03 with SMTP id cq17-20020a056a00331100b005826732ee03mr8142964pfb.9.1673561793131; Thu, 12 Jan 2023 14:16:33 -0800 (PST) Received: from pmalani.c.googlers.com.com (33.5.83.34.bc.googleusercontent.com. [34.83.5.33]) by smtp.gmail.com with ESMTPSA id d191-20020a621dc8000000b0058193135f6bsm12330658pfd.84.2023.01.12.14.16.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 12 Jan 2023 14:16:32 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org, linux-usb@vger.kernel.org Cc: bleung@chromium.org, heikki.krogerus@linux.intel.com, Prashant Malani , Greg Kroah-Hartman Subject: [PATCH 3/3] usb: typec: Make bus switch code retimer-aware Date: Thu, 12 Jan 2023 22:16:08 +0000 Message-Id: <20230112221609.540754-4-pmalani@chromium.org> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog In-Reply-To: <20230112221609.540754-1-pmalani@chromium.org> References: <20230112221609.540754-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" Since ports can have retimers associated with them, update the Type-C alternate mode bus code to also set retimer state when the switch state is updated. While we are here, make the typec_retimer_dev_type declaration in the retimer.h file as extern, so that the header file can be successfully included in the bus code without redeclaration compilation errors. Signed-off-by: Prashant Malani Reviewed-by: Heikki Krogerus --- drivers/usb/typec/bus.c | 22 ++++++++++++++++++++++ drivers/usb/typec/retimer.h | 2 +- 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/bus.c b/drivers/usb/typec/bus.c index 9f1bbd26ca47..0c8d554240be 100644 --- a/drivers/usb/typec/bus.c +++ b/drivers/usb/typec/bus.c @@ -11,6 +11,22 @@ #include "bus.h" #include "class.h" #include "mux.h" +#include "retimer.h" + +static inline int +typec_altmode_set_retimer(struct altmode *alt, unsigned long conf, void *d= ata) +{ + struct typec_retimer_state state; + + if (!alt->retimer) + return 0; + + state.alt =3D &alt->adev; + state.mode =3D conf; + state.data =3D data; + + return typec_retimer_set(alt->retimer, &state); +} =20 static inline int typec_altmode_set_mux(struct altmode *alt, unsigned long conf, void *data) @@ -31,6 +47,12 @@ typec_altmode_set_mux(struct altmode *alt, unsigned long= conf, void *data) static inline int typec_altmode_set_switches(struct altmode *alt, unsigned long conf, void *= data) { + int ret; + + ret =3D typec_altmode_set_retimer(alt, conf, data); + if (ret) + return ret; + return typec_altmode_set_mux(alt, conf, data); } =20 diff --git a/drivers/usb/typec/retimer.h b/drivers/usb/typec/retimer.h index e34bd23323be..d6a5ef9881e1 100644 --- a/drivers/usb/typec/retimer.h +++ b/drivers/usb/typec/retimer.h @@ -12,7 +12,7 @@ struct typec_retimer { =20 #define to_typec_retimer(_dev_) container_of(_dev_, struct typec_retimer, = dev) =20 -const struct device_type typec_retimer_dev_type; +extern const struct device_type typec_retimer_dev_type; =20 #define is_typec_retimer(dev) ((dev)->type =3D=3D &typec_retimer_dev_type) =20 --=20 2.39.0.314.g84b9a713c41-goog