From mboxrd@z Thu Jan 1 00:00:00 1970 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 1A982C4332F for ; Wed, 8 Nov 2023 01:25:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231551AbjKHBZr (ORCPT ); Tue, 7 Nov 2023 20:25:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229769AbjKHBZq (ORCPT ); Tue, 7 Nov 2023 20:25:46 -0500 Received: from mail-pl1-x62f.google.com (mail-pl1-x62f.google.com [IPv6:2607:f8b0:4864:20::62f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AF8F710CF for ; Tue, 7 Nov 2023 17:25:44 -0800 (PST) Received: by mail-pl1-x62f.google.com with SMTP id d9443c01a7336-1cc209561c3so82375ad.0 for ; Tue, 07 Nov 2023 17:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1699406744; x=1700011544; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=vbe9YhcmLnhVSdUJeBSp7NH8qTkLcFla8GELM3iBT5U=; b=RaSTpYL1QDtgoUN6EJf7e8wExA2iI+FUHwycahD8/d0PkiAuULXshZjMBJRNa6jjz3 pnUa2VjMk8pg4/qkyMmy3JqO+OQoDkV97EUgB+P2DLX3EmO8TL9oJPkk22GRM8Al4KjQ 0j763Y0afO/r32ZfqjAbeIX2vOgwly8eWx6zgr/SfW2nzDmwilcLTLKGupIB6HKsGxfP IyuejfNjDO3cgRVO+vrj/W0ZfNQPoDO6clU6uZTbuDU3uH8MIbIlx9OFMQxb9+PvQg5Z qHT1lZ/nDSVirEib0CBs6Vzg2o6cWFIpGG6MuAHiVthNE1q4GXSZYSzS/3+K1be2TX3W C/bw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699406744; x=1700011544; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=vbe9YhcmLnhVSdUJeBSp7NH8qTkLcFla8GELM3iBT5U=; b=F6FyceEuWOuCSXfPnRAgjlE5Xq7jmG3qrJ1PP0fODZGJbbdlbkExI4ztvpABcvis6n 3EFhEt537q1uw/wzo/GAJ2JbSCRFuOStWl02uAK3ztODHsetcuUt3yDiMLf+qZ9P0Q+T sDa3/jeVkXxAxTLhwS6ci1hm9A05rcYOCQdSKxCdoPN+EkcHo91nVStQbPUC5gngYT7n hhb5WaXHVcT9g5bOWoyeoqnDN7sKI4oGlk0VeOV2sL6hE4AWN8osx+WWGbYts+OWVhAP Wp51Z5Udw2YjCbuByOhti305c4JPyHCzEePa7EEWjI9d6bZrFc1nB07MqawePfI9pci3 nv7g== X-Gm-Message-State: AOJu0YwpftUcow2IYfGYKV1xiZ2h2MmMx5GAR5rmjCaIB0jcIoOKPvuv bBjgUIebazEwvWFIiqM6PSkFpQ== X-Google-Smtp-Source: AGHT+IE42iLXlgMX5gr5mmLSAoIv3BuaB0SLP21w+X4h906CeIcccKPnpmxrJYUEA/dpUY3sjAnZ5A== X-Received: by 2002:a17:902:eb8a:b0:1cc:6078:5305 with SMTP id q10-20020a170902eb8a00b001cc60785305mr350589plg.1.1699406743841; Tue, 07 Nov 2023 17:25:43 -0800 (PST) Received: from google.com (137.22.168.34.bc.googleusercontent.com. [34.168.22.137]) by smtp.gmail.com with ESMTPSA id i4-20020a17090332c400b001c9d968563csm444351plr.79.2023.11.07.17.25.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 17:25:43 -0800 (PST) Date: Tue, 7 Nov 2023 17:25:40 -0800 From: William McVicker To: Guenter Roeck Cc: Badhri Jagan Sridharan , gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com, kyletso@google.com, linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: Re: [PATCH v3] usb: typec: tcpm: Fix sink caps op current check Message-ID: References: <20231101012845.2701348-1-badhri@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On 10/31/2023, Guenter Roeck wrote: > On 10/31/23 18:28, Badhri Jagan Sridharan wrote: > > TCPM checks for sink caps operational current even when PD is disabled. > > This incorrectly sets tcpm_set_charge() when PD is disabled. > > Check for sink caps only when PD is enabled. > > > > [ 97.572342] Start toggling > > [ 97.578949] CC1: 0 -> 0, CC2: 0 -> 0 [state TOGGLING, polarity 0, disconnected] > > [ 99.571648] CC1: 0 -> 0, CC2: 0 -> 4 [state TOGGLING, polarity 0, connected] > > [ 99.571658] state change TOGGLING -> SNK_ATTACH_WAIT [rev3 NONE_AMS] > > [ 99.571673] pending state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED @ 170 ms [rev3 NONE_AMS] > > [ 99.741778] state change SNK_ATTACH_WAIT -> SNK_DEBOUNCED [delayed 170 ms] > > [ 99.789283] CC1: 0 -> 0, CC2: 4 -> 5 [state SNK_DEBOUNCED, polarity 0, connected] > > [ 99.789306] state change SNK_DEBOUNCED -> SNK_DEBOUNCED [rev3 NONE_AMS] > > [ 99.903584] VBUS on > > [ 99.903591] state change SNK_DEBOUNCED -> SNK_ATTACHED [rev3 NONE_AMS] > > [ 99.903600] polarity 1 > > [ 99.910155] enable vbus discharge ret:0 > > [ 99.910160] Requesting mux state 1, usb-role 2, orientation 2 > > [ 99.946791] state change SNK_ATTACHED -> SNK_STARTUP [rev3 NONE_AMS] > > [ 99.946798] state change SNK_STARTUP -> SNK_DISCOVERY [rev3 NONE_AMS] > > [ 99.946800] Setting voltage/current limit 5000 mV 500 mA > > [ 99.946803] vbus=0 charge:=1 > > [ 100.027139] state change SNK_DISCOVERY -> SNK_READY [rev3 NONE_AMS] > > [ 100.027145] Setting voltage/current limit 5000 mV 3000 mA > > [ 100.466830] VBUS on > > > > Cc: stable@vger.kernel.org > > Fixes: 803b1c8a0cea ("usb: typec: tcpm: not sink vbus if operational current is 0mA") > > Signed-off-by: Badhri Jagan Sridharan > > Reviewed-by: Guenter Roeck Thanks for catching this Badhri! I verified this fixes the charging issues seen on Pixel 6 and 7 with the mainline and v6.1 kernel. Feel free to add Tested-by: Will McVicker Thanks, Will > > > --- > > Changes since v2: > > * Fix the "Fixes" tag > > * Refactor code based on Guenter Roeck's suggestion. > > > > Changes since v1: > > * Fix commit title and description to address comments from Guenter Roeck > > --- > > drivers/usb/typec/tcpm/tcpm.c | 3 ++- > > 1 file changed, 2 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > > index 058d5b853b57..afc791ab6d4f 100644 > > --- a/drivers/usb/typec/tcpm/tcpm.c > > +++ b/drivers/usb/typec/tcpm/tcpm.c > > @@ -4273,7 +4273,8 @@ static void run_state_machine(struct tcpm_port *port) > > current_lim = PD_P_SNK_STDBY_MW / 5; > > tcpm_set_current_limit(port, current_lim, 5000); > > /* Not sink vbus if operational current is 0mA */ > > - tcpm_set_charge(port, !!pdo_max_current(port->snk_pdo[0])); > > + tcpm_set_charge(port, !port->pd_supported || > > + pdo_max_current(port->snk_pdo[0])); > > if (!port->pd_supported) > > tcpm_set_state(port, SNK_READY, 0); > > > > base-commit: c70793fb7632a153862ee9060e6d48131469a29c >