From patchwork Thu Apr 3 22:43:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Grzeschik X-Patchwork-Id: 878601 Received: from metis.whiteo.stw.pengutronix.de (metis.whiteo.stw.pengutronix.de [185.203.201.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C9611A8F97 for ; Thu, 3 Apr 2025 22:43:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=185.203.201.7 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743720199; cv=none; b=LZsSGtUYBAd/++ncKe2w0L414lNY4qRc2aEmpOeRqrjOnK3wrwZc5CIxX80cV1K6u0zCB0nZS9fuT11eXUUrMm4tmk9yFwo5eKIPjA5zMTV+BX2iGST9qOBKQ/GgFv+nSh8JEFiJMhXSc9xuVwO7kj9ptEvdEAcCgMkQvkqXHnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743720199; c=relaxed/simple; bh=SMcprCbzSdYBayAifllR4RUIbZ++HBCrIl+uX6Vkmws=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=bhL0Ouoj6miIwrppkXmcopcPtzgGS1Hh8QabkHTS6CYdnFq/xkvtKFmC+TeEhFnLgkLOA4oyG/K49+iVgYGng7BBDi8O0niKrpibHcuYPLvNqUjbnblDR5W28axW6aHKeA6rf6uAD17ZlI9BBylGa6UB+yeOp4xu3wA3zFswlA0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de; spf=pass smtp.mailfrom=pengutronix.de; arc=none smtp.client-ip=185.203.201.7 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=pengutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=pengutronix.de Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1u0THG-0000kF-33; Fri, 04 Apr 2025 00:43:14 +0200 Received: from dude04.red.stw.pengutronix.de ([2a0a:edc0:0:1101:1d::ac]) by drehscheibe.grey.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.96) (envelope-from ) id 1u0THF-003AjW-16; Fri, 04 Apr 2025 00:43:13 +0200 Received: from localhost ([::1] helo=dude04.red.stw.pengutronix.de) by dude04.red.stw.pengutronix.de with esmtp (Exim 4.96) (envelope-from ) id 1u0THF-004aMT-0t; Fri, 04 Apr 2025 00:43:13 +0200 From: Michael Grzeschik Date: Fri, 04 Apr 2025 00:43:06 +0200 Subject: [PATCH 3/3] usb: typec: tcpm: allow switching to mode accessory to mux properly Precedence: bulk X-Mailing-List: linux-usb@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250404-ml-topic-tcpm-v1-3-b99f44badce8@pengutronix.de> References: <20250404-ml-topic-tcpm-v1-0-b99f44badce8@pengutronix.de> In-Reply-To: <20250404-ml-topic-tcpm-v1-0-b99f44badce8@pengutronix.de> To: Heikki Krogerus , Greg Kroah-Hartman Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, kernel@pengutronix.de, Michael Grzeschik X-Mailer: b4 0.12.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4160; i=m.grzeschik@pengutronix.de; h=from:subject:message-id; bh=SMcprCbzSdYBayAifllR4RUIbZ++HBCrIl+uX6Vkmws=; b=owEBbQKS/ZANAwAKAb9pWET5cfSrAcsmYgBn7w8AYHhLMy4jSKsCd1plRQS5xgMXh8yBillLm rivdLLi0fiJAjMEAAEKAB0WIQQV2+2Fpbqd6fvv0Gi/aVhE+XH0qwUCZ+8PAAAKCRC/aVhE+XH0 qzA2EACLwzBAl9ZEb8KPL5KwErDsBKJGDqeFTU/Otu9n1AC3xG55ySo4eCN0iwR7QuVg6YGS0UA ecYFwoqAPxAsl9ZTqY4oTOtvtd6ELBv2wyxt+UGAPl0O5xRP0/AwxWZG2XFkNihzx7uGmw6rjyE 11z9lYldBygnRtV7UevsUEa10c4aQRrdOek1hJwzOJQURDtbm7QVXZ3Fp2zh3e70MXNliQMvTUu CUSzk+tk+IQWrIdNl8WV/etYptawJdM7VB9wsU3Qscez+bKrMOaz9/aIs2HvClKI2yCys92S2UM OeBQP8XZR4jZGIEgJMzb03kFcpyx1M0fTc7YugR1Y4bWzY3ZMBha2+XWpAxQNDVlQ/gWOubjnIE tDLMN12GrM3jJC9OPnRhyn0RUGQMd2Rycg+ukGKhkKnuRwEiZo1KwxlE3LAwuTG039hit78uZGs 8y1VYJ0CJNDXY95lM9wUVheAjhxpy+zOoSDAonEdi5rX9CDGWOyW/TfMISyDVUn6m363cxbfi37 OOCIgfYDiDDX0pQQVwArWkeGyDXQ+uh8Md/LhJIcLVDWnJ8E8SvVZcl2XBsyxJ+ALeuLyZwzUy/ nc4yL48Gel9QvqaMEmhKwFs7F3Y29GUk7CgS0Uogpui2ccf0lZ6GHrDrdSOzJhxuvw+5wfRv6FT Rm85jRcrFHlBOmQ== X-Developer-Key: i=m.grzeschik@pengutronix.de; a=openpgp; fpr=957BC452CE953D7EA60CF4FC0BE9E3157A1E2C64 X-SA-Exim-Connect-IP: 2a0a:edc0:0:c01:1d::a2 X-SA-Exim-Mail-From: m.grzeschik@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: linux-usb@vger.kernel.org The funciton tcpm_acc_attach is not setting the proper state when calling tcpm_set_role. The function tcpm_set_role is currently only handling TYPEC_STATE_USB. For the tcpm_acc_attach to switch into other modal states tcpm_set_role needs to be extended by an extra state parameter. This patch is handling the proper state change when calling tcpm_acc_attach. Signed-off-by: Michael Grzeschik --- drivers/usb/typec/tcpm/tcpm.c | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c index 01714a42f848a..784fa23102f90 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -1153,7 +1153,7 @@ static int tcpm_set_attached_state(struct tcpm_port *port, bool attached) port->data_role); } -static int tcpm_set_roles(struct tcpm_port *port, bool attached, +static int tcpm_set_roles(struct tcpm_port *port, bool attached, int state, enum typec_role role, enum typec_data_role data) { enum typec_orientation orientation; @@ -1190,7 +1190,7 @@ static int tcpm_set_roles(struct tcpm_port *port, bool attached, } } - ret = tcpm_mux_set(port, TYPEC_STATE_USB, usb_role, orientation); + ret = tcpm_mux_set(port, state, usb_role, orientation); if (ret < 0) return ret; @@ -4355,7 +4355,8 @@ static int tcpm_src_attach(struct tcpm_port *port) tcpm_enable_auto_vbus_discharge(port, true); - ret = tcpm_set_roles(port, true, TYPEC_SOURCE, tcpm_data_role_for_source(port)); + ret = tcpm_set_roles(port, true, TYPEC_STATE_USB, + TYPEC_SOURCE, tcpm_data_role_for_source(port)); if (ret < 0) return ret; @@ -4530,7 +4531,8 @@ static int tcpm_snk_attach(struct tcpm_port *port) tcpm_enable_auto_vbus_discharge(port, true); - ret = tcpm_set_roles(port, true, TYPEC_SINK, tcpm_data_role_for_sink(port)); + ret = tcpm_set_roles(port, true, TYPEC_STATE_USB, + TYPEC_SINK, tcpm_data_role_for_sink(port)); if (ret < 0) return ret; @@ -4555,6 +4557,7 @@ static int tcpm_acc_attach(struct tcpm_port *port) int ret; enum typec_role role; enum typec_data_role data; + int state = TYPEC_STATE_USB; if (port->attached) return 0; @@ -4563,7 +4566,13 @@ static int tcpm_acc_attach(struct tcpm_port *port) data = tcpm_port_is_sink(port) ? tcpm_data_role_for_sink(port) : tcpm_data_role_for_source(port); - ret = tcpm_set_roles(port, true, role, data); + if (tcpm_port_is_audio(port)) + state = TYPEC_MODE_AUDIO; + + if (tcpm_port_is_debug(port)) + state = TYPEC_MODE_DEBUG; + + ret = tcpm_set_roles(port, true, state, role, data); if (ret < 0) return ret; @@ -5349,7 +5358,7 @@ static void run_state_machine(struct tcpm_port *port) */ tcpm_set_vconn(port, false); tcpm_set_vbus(port, false); - tcpm_set_roles(port, port->self_powered, TYPEC_SOURCE, + tcpm_set_roles(port, port->self_powered, TYPEC_STATE_USB, TYPEC_SOURCE, tcpm_data_role_for_source(port)); /* * If tcpc fails to notify vbus off, TCPM will wait for PD_T_SAFE_0V + @@ -5381,7 +5390,7 @@ static void run_state_machine(struct tcpm_port *port) tcpm_set_vconn(port, false); if (port->pd_capable) tcpm_set_charge(port, false); - tcpm_set_roles(port, port->self_powered, TYPEC_SINK, + tcpm_set_roles(port, port->self_powered, TYPEC_STATE_USB, TYPEC_SINK, tcpm_data_role_for_sink(port)); /* * VBUS may or may not toggle, depending on the adapter. @@ -5505,10 +5514,10 @@ static void run_state_machine(struct tcpm_port *port) case DR_SWAP_CHANGE_DR: tcpm_unregister_altmodes(port); if (port->data_role == TYPEC_HOST) - tcpm_set_roles(port, true, port->pwr_role, + tcpm_set_roles(port, true, TYPEC_STATE_USB, port->pwr_role, TYPEC_DEVICE); else - tcpm_set_roles(port, true, port->pwr_role, + tcpm_set_roles(port, true, TYPEC_STATE_USB, port->pwr_role, TYPEC_HOST); tcpm_ams_finish(port); tcpm_set_state(port, ready_state(port), 0);