From nobody Mon Jun 29 16:00:59 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 5D87AC433EF for ; Mon, 7 Feb 2022 21:40:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241316AbiBGVkz (ORCPT ); Mon, 7 Feb 2022 16:40:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56752 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240208AbiBGVkx (ORCPT ); Mon, 7 Feb 2022 16:40:53 -0500 Received: from mail-pl1-x636.google.com (mail-pl1-x636.google.com [IPv6:2607:f8b0:4864:20::636]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 615D4C0612A4 for ; Mon, 7 Feb 2022 13:40:53 -0800 (PST) Received: by mail-pl1-x636.google.com with SMTP id y7so6897475plp.2 for ; Mon, 07 Feb 2022 13:40:53 -0800 (PST) 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=iLTcgJEE5JgO7+vcfSsf1eN9sSCfARQf+RGdDGP6rwo=; b=SfFjpz5qq97wVAMpmv9jw6U2UOOU8z/fn7keqOWSGZgJ2JSWWhYtWvaONjLt8rsuRg /AXYYnec7GIsl94j84iAZ5Fe6LRIUMEKxsphuve2FJBuPmTySoltfHVbDSS+j+VUkVLR Ojg0G3Bbr3QZO5wn58fxf1CPXN0ZgS5Yu4J7I= 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=iLTcgJEE5JgO7+vcfSsf1eN9sSCfARQf+RGdDGP6rwo=; b=7/nNChuUPYq9pFTCZKP+xIo5CiZOWrpkidv+98OwYEHong3Onbykhme0DOl2LqlfRW 4UMWhOp0Bas0TmTqWn6/255TrbWwADmf0sDGXng+ubihfxZzqm7zOwA8fQiG4LEIDuY2 hJk6TSP2jD65RrxCudxTd+Yvs3dCqBZS+FA/uTKPjV96/tYdPktnTwL8FM+9B2qET2Np fGd05Qku0mGKe/KBJWk/GTvoa+e+wFZNjVuGNzLwRq0PYzEnIn8ByOgMqbk5jvJ3ms75 R4WBiW3G74VkMHakzojVmBbmdunf3GXmPcXUp3DLN2+e01QTfil7b7DkDQ72gqZxl4Xe pfnw== X-Gm-Message-State: AOAM532Z0YM2Sh8KnrsdzdxPwtT7WZgGPayWQddRM6gHEg4V9GNaJsg1 1mFbaNGUs5YAL/6zR9i9ptzIEEezxb58Rg== X-Google-Smtp-Source: ABdhPJz8XeVRKNiZrIITbxZKovi5CB3bJAlwxEaK1wwdUZeiNzvobdhk5htJLyoVfrL6v/Hp/eILsA== X-Received: by 2002:a17:90a:738d:: with SMTP id j13mr992638pjg.196.1644270052694; Mon, 07 Feb 2022 13:40:52 -0800 (PST) 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 s9sm9268010pgm.76.2022.02.07.13.40.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 13:40:52 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org Cc: Prashant Malani , Benson Leung , chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB TYPE-C DRIVER), Guenter Roeck Subject: [PATCH 1/4] platform/chrome: cros_ec_typec: Move mux flag checks Date: Mon, 7 Feb 2022 21:40:24 +0000 Message-Id: <20220207214026.1526151-2-pmalani@chromium.org> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org> References: <20220207214026.1526151-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" Move mux and role flag checks inside of cros_typec_configure_mux(), which is a more logical location for them. Signed-off-by: Prashant Malani --- drivers/platform/chrome/cros_ec_typec.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index c6f17e3ef72d..445da4f122e7 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -519,7 +519,14 @@ static int cros_typec_configure_mux(struct cros_typec_= data *typec, int port_num, struct cros_typec_port *port =3D typec->ports[port_num]; struct ec_params_usb_pd_mux_ack mux_ack; enum typec_orientation orientation; - int ret; + int ret =3D 0; + + /* No change needs to be made, let's exit early. */ + if (port->mux_flags =3D=3D mux_flags && port->role =3D=3D pd_ctrl->role) + return 0; + + port->mux_flags =3D mux_flags; + port->role =3D pd_ctrl->role; =20 if (mux_flags =3D=3D USB_PD_MUX_NONE) { ret =3D cros_typec_usb_disconnect_state(port); @@ -983,13 +990,6 @@ static int cros_typec_port_update(struct cros_typec_da= ta *typec, int port_num) return 0; } =20 - /* No change needs to be made, let's exit early. */ - if (typec->ports[port_num]->mux_flags =3D=3D mux_resp.flags && - typec->ports[port_num]->role =3D=3D resp.role) - return 0; - - typec->ports[port_num]->mux_flags =3D mux_resp.flags; - typec->ports[port_num]->role =3D resp.role; ret =3D cros_typec_configure_mux(typec, port_num, mux_resp.flags, &resp); if (ret) dev_warn(typec->dev, "Configure muxes failed, err =3D %d\n", ret); --=20 2.35.0.263.gb82422642f-goog From nobody Mon Jun 29 16:00:59 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 2F930C433EF for ; Mon, 7 Feb 2022 21:41:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241390AbiBGVlN (ORCPT ); Mon, 7 Feb 2022 16:41:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57016 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240208AbiBGVlL (ORCPT ); Mon, 7 Feb 2022 16:41:11 -0500 Received: from mail-pl1-x631.google.com (mail-pl1-x631.google.com [IPv6:2607:f8b0:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8F2A6C061355 for ; Mon, 7 Feb 2022 13:41:10 -0800 (PST) Received: by mail-pl1-x631.google.com with SMTP id k17so12218010plk.0 for ; Mon, 07 Feb 2022 13:41:10 -0800 (PST) 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=M6RMVhrwY73oweC4VD7eDKWPb7Lpv9Fo2Z1EMKHmMCs=; b=e6IDHSmLKnbw0yyK9PiYrCfWp6ZqKL4teQeTA4/2Xf4NJX9S8XcuvJPDCE1Wt5sBVn 4tfJqZAXhhLjctxLOsd1bx1F8IAOFTDUCb7GjrwF7xvywVd8JCOdwhyrDFFmKISJ1SZS lTyKuggwccFH5Ptx92HuI8qm1cFUWJFQiOeVA= 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=M6RMVhrwY73oweC4VD7eDKWPb7Lpv9Fo2Z1EMKHmMCs=; b=vHD1pMqdO8j1PARsNbjfCxZdu2ZnZWtcZlG1sH1h9MKxXsF0FgRoGEa1Nu8KH4gmkp fGVvWh5v4PfXgL3fBuwX/S7Bv5RTwAmo5QjjfifDIcYz53xc8DPcH6HNDrpXl4Z857Bz nGhqEEeh2wn+PTmxHI25OuScBXT5X02vYEsGyhhnaHOc+ryeHaQrw20/wMiE9iuZDw34 XtJ/6/d81Jwu6JK52dh2fNnEyZW3dUFz5EBQHrqstIo7HktXXgfxrIoXUT02ndYEeVt/ aY9JOuWUVmBHrzJ3BO6P2bjXt5VYmjYa7UjXvXSpXJJQwy9KTdgIF0NfT6ZE/1nXNNJY 08VQ== X-Gm-Message-State: AOAM530SbDpuUytiLgzLzdCMZu88yCyyYg1uTP+uJfj2ZTf83YB8/rEb 8dZCU83nHzLtYyB42eM9FCD2//4Ydy4ZMg== X-Google-Smtp-Source: ABdhPJykAs6qkVRRxJ4xNzfCBF0q9OYxPMflWpf+vLKVeHRfhAbaAMtFu7HVaLpS93Kd3Dk0ZK2NoQ== X-Received: by 2002:a17:90a:d58d:: with SMTP id v13mr975999pju.210.1644270069960; Mon, 07 Feb 2022 13:41:09 -0800 (PST) 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 s9sm9268010pgm.76.2022.02.07.13.41.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 13:41:09 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org Cc: Prashant Malani , Benson Leung , chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB TYPE-C DRIVER), Guenter Roeck Subject: [PATCH 2/4] platform/chrome: cros_ec_typec: Get mux state inside configure_mux Date: Mon, 7 Feb 2022 21:40:26 +0000 Message-Id: <20220207214026.1526151-3-pmalani@chromium.org> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org> References: <20220207214026.1526151-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" Move the function which gets current mux state inside the cros_typec_configure_mux() function. It is better to group those bits of functionality together, and it makes it easier to move around cros_typec_configure_mux() later. While we are doing this, also inline the cros_typec_get_mux_info() inside of cros_typec_configure_mux(). Signed-off-by: Prashant Malani --- drivers/platform/chrome/cros_ec_typec.c | 55 +++++++++++-------------- 1 file changed, 23 insertions(+), 32 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 445da4f122e7..671d3569faf6 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -513,27 +513,38 @@ static int cros_typec_enable_usb4(struct cros_typec_d= ata *typec, } =20 static int cros_typec_configure_mux(struct cros_typec_data *typec, int por= t_num, - uint8_t mux_flags, struct ec_response_usb_pd_control_v2 *pd_ctrl) { struct cros_typec_port *port =3D typec->ports[port_num]; + struct ec_response_usb_pd_mux_info mux_resp; + struct ec_params_usb_pd_mux_info req =3D { + .port =3D port_num, + }; struct ec_params_usb_pd_mux_ack mux_ack; enum typec_orientation orientation; int ret =3D 0; =20 + ret =3D cros_ec_command(typec->ec, 0, EC_CMD_USB_PD_MUX_INFO, + &req, sizeof(req), &mux_resp, sizeof(mux_resp)); + if (ret < 0) { + dev_warn(typec->dev, "Failed to get mux info for port: %d, err =3D %d\n", + port_num, ret); + return ret; + } + /* No change needs to be made, let's exit early. */ - if (port->mux_flags =3D=3D mux_flags && port->role =3D=3D pd_ctrl->role) + if (port->mux_flags =3D=3D mux_resp.flags && port->role =3D=3D pd_ctrl->r= ole) return 0; =20 - port->mux_flags =3D mux_flags; + port->mux_flags =3D mux_resp.flags; port->role =3D pd_ctrl->role; =20 - if (mux_flags =3D=3D USB_PD_MUX_NONE) { + if (port->mux_flags =3D=3D USB_PD_MUX_NONE) { ret =3D cros_typec_usb_disconnect_state(port); goto mux_ack; } =20 - if (mux_flags & USB_PD_MUX_POLARITY_INVERTED) + if (port->mux_flags & USB_PD_MUX_POLARITY_INVERTED) orientation =3D TYPEC_ORIENTATION_REVERSE; else orientation =3D TYPEC_ORIENTATION_NORMAL; @@ -548,22 +559,22 @@ static int cros_typec_configure_mux(struct cros_typec= _data *typec, int port_num, if (ret) return ret; =20 - if (mux_flags & USB_PD_MUX_USB4_ENABLED) { + if (port->mux_flags & USB_PD_MUX_USB4_ENABLED) { ret =3D cros_typec_enable_usb4(typec, port_num, pd_ctrl); - } else if (mux_flags & USB_PD_MUX_TBT_COMPAT_ENABLED) { + } else if (port->mux_flags & USB_PD_MUX_TBT_COMPAT_ENABLED) { ret =3D cros_typec_enable_tbt(typec, port_num, pd_ctrl); - } else if (mux_flags & USB_PD_MUX_DP_ENABLED) { + } else if (port->mux_flags & USB_PD_MUX_DP_ENABLED) { ret =3D cros_typec_enable_dp(typec, port_num, pd_ctrl); - } else if (mux_flags & USB_PD_MUX_SAFE_MODE) { + } else if (port->mux_flags & USB_PD_MUX_SAFE_MODE) { ret =3D cros_typec_usb_safe_state(port); - } else if (mux_flags & USB_PD_MUX_USB_ENABLED) { + } 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); } else { dev_dbg(typec->dev, "Unrecognized mode requested, mux flags: %x\n", - mux_flags); + port->mux_flags); } =20 mux_ack: @@ -638,17 +649,6 @@ static void cros_typec_set_port_params_v1(struct cros_= typec_data *typec, } } =20 -static int cros_typec_get_mux_info(struct cros_typec_data *typec, int port= _num, - struct ec_response_usb_pd_mux_info *resp) -{ - struct ec_params_usb_pd_mux_info req =3D { - .port =3D port_num, - }; - - return cros_ec_command(typec->ec, 0, EC_CMD_USB_PD_MUX_INFO, &req, - sizeof(req), resp, sizeof(*resp)); -} - /* * Helper function to register partner/plug altmodes. */ @@ -946,7 +946,6 @@ static int cros_typec_port_update(struct cros_typec_dat= a *typec, int port_num) { struct ec_params_usb_pd_control req; struct ec_response_usb_pd_control_v2 resp; - struct ec_response_usb_pd_mux_info mux_resp; int ret; =20 if (port_num < 0 || port_num >=3D typec->num_ports) { @@ -982,15 +981,7 @@ static int cros_typec_port_update(struct cros_typec_da= ta *typec, int port_num) cros_typec_handle_status(typec, port_num); =20 /* Update the switches if they exist, according to requested state */ - ret =3D cros_typec_get_mux_info(typec, port_num, &mux_resp); - if (ret < 0) { - dev_warn(typec->dev, - "Failed to get mux info for port: %d, err =3D %d\n", - port_num, ret); - return 0; - } - - ret =3D cros_typec_configure_mux(typec, port_num, mux_resp.flags, &resp); + ret =3D cros_typec_configure_mux(typec, port_num, &resp); if (ret) dev_warn(typec->dev, "Configure muxes failed, err =3D %d\n", ret); =20 --=20 2.35.0.263.gb82422642f-goog From nobody Mon Jun 29 16:00:59 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 F20BBC433EF for ; Mon, 7 Feb 2022 21:41:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241393AbiBGVld (ORCPT ); Mon, 7 Feb 2022 16:41:33 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57274 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234612AbiBGVl3 (ORCPT ); Mon, 7 Feb 2022 16:41:29 -0500 Received: from mail-pf1-x433.google.com (mail-pf1-x433.google.com [IPv6:2607:f8b0:4864:20::433]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80658C061355 for ; Mon, 7 Feb 2022 13:41:29 -0800 (PST) Received: by mail-pf1-x433.google.com with SMTP id i17so15277588pfq.13 for ; Mon, 07 Feb 2022 13:41:29 -0800 (PST) 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=Tcubl29wxHrfPOdKaU07z1LfBhKF2TahuS0DNugCibg=; b=P9mQpQf+5Bnn27EUGTnkmIZKoXhB3KlHr2N64cTo7YYurZP/mLFu40sjirHtATMxvL WtTAG0uGmf4tTd4F9ITtPYlxb3I7UFw9xVJdBNpOi9S/XYady/yHlNbLxIDnstkI2dvv EwCEFkazZwpdY9ryvKOcPAlgWeCn1S6na8rDI= 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=Tcubl29wxHrfPOdKaU07z1LfBhKF2TahuS0DNugCibg=; b=fLn/+muRfeMv7vYj6L1F1pfzrWxeDdIgUxk8CHw35dEXNEWbexoFNYwbQIbU0k+hb0 86+vF+KtNi0N/Ac1Sr/piWPzNiYOK8VlXEvOzJU+5XhbOJnDHyWw39qtkM1ITuGRIxU+ QKI3pHAk3FK+jEGDNjqFPfq9LnvDf0fpN9mqVoK7x3wXwmH16tn+CUDRHjjI7CSH+VR9 oX6n1pe7LJHimZma0BQUw6rfW0YtuGjAknkc0iLFj/A0ftdguZnUyy67kVXImrceO1vI IbQ/JMI3f3IOLAifzpkv/9VkP/r+JFioNt1yhmqHNdWg5Rp160c6OAogueloFtMpOZSB nVTQ== X-Gm-Message-State: AOAM530KjpudpwDiO7MwDGmESOKp7wEXG0nVyzpKV9/TkD5YhLcCpXAY u3fzBBUF2w8afx1/DZ8vE0uk7C8+ZWJ5uw== X-Google-Smtp-Source: ABdhPJwW4HOSPUEVZwDeOrc4ZHIHjzjmHviUCjZFB/LBvAqozD33GakPGcuKE+nM6JHJABWvGkcfKQ== X-Received: by 2002:a65:550a:: with SMTP id f10mr1118443pgr.204.1644270088935; Mon, 07 Feb 2022 13:41:28 -0800 (PST) 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 s9sm9268010pgm.76.2022.02.07.13.41.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 13:41:28 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org Cc: Prashant Malani , Benson Leung , Guenter Roeck , chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB TYPE-C DRIVER) Subject: [PATCH 3/4] platform/chrome: cros_ec_typec: Configure muxes at start of port update Date: Mon, 7 Feb 2022 21:40:28 +0000 Message-Id: <20220207214026.1526151-4-pmalani@chromium.org> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org> References: <20220207214026.1526151-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" There are situations where the mux state reported by the Embedded Controller (EC), might lag the partner "connected" state. So, the mux state might still suggest that a partner is connected, while the PD "connected" state, being in Try.SNK (for example) suggests that the partner is disconnected. In such a scenario, we will end up sending a disconnect command to the mux driver, followed by a connect command, since the mux is configured later. Avoid this by configuring the mux before registering/disconnecting a partner. Signed-off-by: Prashant Malani --- drivers/platform/chrome/cros_ec_typec.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 671d3569faf6..164c82f537dd 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -965,6 +965,11 @@ static int cros_typec_port_update(struct cros_typec_da= ta *typec, int port_num) if (ret < 0) return ret; =20 + /* Update the switches if they exist, according to requested state */ + ret =3D cros_typec_configure_mux(typec, port_num, &resp); + if (ret) + dev_warn(typec->dev, "Configure muxes failed, err =3D %d\n", ret); + dev_dbg(typec->dev, "Enabled %d: 0x%hhx\n", port_num, resp.enabled); dev_dbg(typec->dev, "Role %d: 0x%hhx\n", port_num, resp.role); dev_dbg(typec->dev, "Polarity %d: 0x%hhx\n", port_num, resp.polarity); @@ -980,11 +985,6 @@ static int cros_typec_port_update(struct cros_typec_da= ta *typec, int port_num) if (typec->typec_cmd_supported) cros_typec_handle_status(typec, port_num); =20 - /* Update the switches if they exist, according to requested state */ - ret =3D cros_typec_configure_mux(typec, port_num, &resp); - if (ret) - dev_warn(typec->dev, "Configure muxes failed, err =3D %d\n", ret); - return ret; } =20 --=20 2.35.0.263.gb82422642f-goog From nobody Mon Jun 29 16:00:59 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 EECC5C433F5 for ; Mon, 7 Feb 2022 21:41:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241468AbiBGVlq (ORCPT ); Mon, 7 Feb 2022 16:41:46 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57498 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241431AbiBGVlm (ORCPT ); Mon, 7 Feb 2022 16:41:42 -0500 Received: from mail-pj1-x1034.google.com (mail-pj1-x1034.google.com [IPv6:2607:f8b0:4864:20::1034]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 39AF6C061355 for ; Mon, 7 Feb 2022 13:41:42 -0800 (PST) Received: by mail-pj1-x1034.google.com with SMTP id v13-20020a17090ac90d00b001b87bc106bdso327658pjt.4 for ; Mon, 07 Feb 2022 13:41:42 -0800 (PST) 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=s/hl0O9rqFd7bKBt/Qe/w/3MyowDWns3Oab/XTzbE6A=; b=OWIX7hGJb7sr/BycqGl/565lOe5WzmuzxWaEf+NxhZTIsTw/cUwFyXL5+5oz6CBGbc aX95wrOMhy++t4NUbmWC4EkVBiqP3BebTj5kmifMoxuwB9x+WJIwDNpf6SGPrxAmOWO/ JQDwMJWZJbyXLgQJCdl62alITB9Ft0WuWh2LY= 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=s/hl0O9rqFd7bKBt/Qe/w/3MyowDWns3Oab/XTzbE6A=; b=cPfOUV57mBHg20Zgb+D3JhHJTRJvdcK/6cYXuKJRbQWrabkWX0AP4kHd7rvYNLBgUW 5WqSRa08sLs6Nm8bq3uG+BnYfMYQ3v/xb89OfOKcwMxCJKyZBC0sPHXlEGc0e8I3/4dx ziZtAALOqNnFij8VfJDuQLzW+XU2RX/jT+V3fPWZ7a9dzGy1Pa6iiotjqavv3zCqCBrP yvPUBhrkkv9A4ALQyjj3uI3np2YWc01I4xrNuEvPaPCvMGZiQ+o2tR0aEmA/ReGmGq6M e8D5ERuD7tifqkriazmB4cOTw3eDRA8kgD4DE0g0YIw6nNZfpQmg3pJ7LrJu3w/NsJGF wxvQ== X-Gm-Message-State: AOAM530y2xq8gWydmDrZ7pGtS0oVSV9sPJ0QsySEqRSDBO/KvgIVNTYU sUctYfqMT7UdY+AjbcSEjCTYF07we/m47Q== X-Google-Smtp-Source: ABdhPJyeEBlPmpFICFq2NN4b0ydlmQv/nNFJsYMLBjte8XvejLtZ8GQK+u74wDQefVudR8Zv6j1KGw== X-Received: by 2002:a17:902:8f8e:: with SMTP id z14mr1601969plo.28.1644270101643; Mon, 07 Feb 2022 13:41:41 -0800 (PST) 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 s9sm9268010pgm.76.2022.02.07.13.41.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Feb 2022 13:41:41 -0800 (PST) From: Prashant Malani To: linux-kernel@vger.kernel.org Cc: Prashant Malani , Benson Leung , Guenter Roeck , chrome-platform@lists.linux.dev (open list:CHROMEOS EC USB TYPE-C DRIVER) Subject: [PATCH 4/4] platform/chrome: cros_ec_typec: Update mux flags during partner removal Date: Mon, 7 Feb 2022 21:40:30 +0000 Message-Id: <20220207214026.1526151-5-pmalani@chromium.org> X-Mailer: git-send-email 2.35.0.263.gb82422642f-goog In-Reply-To: <20220207214026.1526151-1-pmalani@chromium.org> References: <20220207214026.1526151-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" In cros_typec_remove_partner(), we call cros_typec_usb_disconnect_state() which sets the switches/muxes to be in a disconnected state. This also happens in cros_typec_configure_mux(). However, unlike there, here the mux_flags variable hasn't been updated to reflect that a disconnection has occurred. Update the flag here accordingly. Signed-off-by: Prashant Malani --- drivers/platform/chrome/cros_ec_typec.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/platform/chrome/cros_ec_typec.c b/drivers/platform/chr= ome/cros_ec_typec.c index 164c82f537dd..ce37b6abe69f 100644 --- a/drivers/platform/chrome/cros_ec_typec.c +++ b/drivers/platform/chrome/cros_ec_typec.c @@ -228,6 +228,7 @@ static void cros_typec_remove_partner(struct cros_typec= _data *typec, cros_typec_unregister_altmodes(typec, port_num, true); =20 cros_typec_usb_disconnect_state(port); + port->mux_flags =3D USB_PD_MUX_NONE; =20 typec_unregister_partner(port->partner); port->partner =3D NULL; --=20 2.35.0.263.gb82422642f-goog