Received: by 2002:a05:7208:9594:b0:7e:5202:c8b4 with SMTP id gs20csp1240347rbb; Mon, 26 Feb 2024 03:25:51 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU4lnacws0toTbanQB8aV2D84UfR2+YYFkJYnvZoSXYz3gayO12hQMDgBsNfSV2mERqjL5lbmoOhnK6KkxenPKce+AyxfyBpYfi2eDWAQ== X-Google-Smtp-Source: AGHT+IGvXCIQAz30cdEzzP+Ndn/aiy9QcDM0HiHsFa4Af8t27Wey6RIUDcMRpb9Q801WKliBsWoC X-Received: by 2002:a05:6870:b520:b0:21e:6d93:7bca with SMTP id v32-20020a056870b52000b0021e6d937bcamr7222857oap.59.1708946750941; Mon, 26 Feb 2024 03:25:50 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708946750; cv=pass; d=google.com; s=arc-20160816; b=uz79v8N34m4u6thhKLe4Aqe+Bo7Pe5vzUmWkf5Dno5rgxU0uixYs29gBWpbqMXpHFC sF+1jNu6TXQNz+1yExsaNpnlmpmeQgfciZmSNEbrAa51GNmZEmsvzskB+KA8wsWBh51F g5JE3hEZI0RQzxZ3o3Apf0dOVvIm+mc66m65yVwiJ8CRgAm1Uq1oFHSh2UM8JZJa4pgs aiWIYBFkffWDcIjgg59hrYyUocYImKtBLOUxvlHDfNy5sbH46Bd8f14nI+cZWbd3zIjM QYQNsMMJuWrp4BFhNrgh48rS6HNuclUYZ+Mz5TYHKSKapGX2bPBymN1QmPs50Vfttr72 ooPQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=in-reply-to:content-transfer-encoding:content-disposition :mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:message-id:subject:cc:to:from:date:dkim-signature; bh=m7qiSU5I9U1pSgRb+IJPcq1W2ZscfW6vuI9mkZ1mqYg=; fh=cFA9/t4pSR2c99Tg5KdKjjx7O5IyfJUrh8dpKWd6N58=; b=FH15xc6Z7lYetK09ODZT4Qa5kSxSYEMr4j9REdaxvsBI7xmWqDlOP5MWR7FzIr6Xf2 AaT+1p0hFBanrD5waD2UW+AAbmWBFmB+ksGxgpOJydQSnu6CWqSM78mOFKU9s6KMsXtL bP9wUFTd3eflobCoFAOWtaTBEoXZnlmP289KRpHVvu/xdMP0nvGXxShsJNhEjMFRabPq JHvIUQYmqovktzsHJJ5jF6NllGs66z++Kqj5FJyIYT7wFJ0BlA1QXIhatMtTXiIkJcmI rupnrrXEJno1QPxEWCpYtaoplpbT+mz0A4W1NQVkoiDZfUsnninGkGul6qMklWGagdwk 52dQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=etGaf4uA; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-80690-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80690-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id j190-20020a6380c7000000b005dc95ff00bdsi3470093pgd.834.2024.02.26.03.25.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 03:25:50 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80690-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=etGaf4uA; arc=pass (i=1 dkim=pass dkdomain=intel.com dmarc=pass fromdomain=linux.intel.com); spf=pass (google.com: domain of linux-kernel+bounces-80690-linux.lists.archive=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80690-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id E53D3286000 for ; Mon, 26 Feb 2024 07:48:30 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 288461C283; Mon, 26 Feb 2024 07:48:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="etGaf4uA" Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.13]) (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 BC5151BF37; Mon, 26 Feb 2024 07:48:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=198.175.65.13 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708933700; cv=none; b=dTlY5cu7bfqzTgFKrH3IeJp1eUjufMQ1oI6BANz4vgHG106TNokpXjlyVso8O7u25OlLWYbeqgIybLtCry9X7uhW137ZHcMz5pyRKGxB3DJ3UAdb+MNioGJ8VufXfFCj2bQqpNyr8+B+gDi4ctjPDg99tJ/f/rW13iOr6QAoS50= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708933700; c=relaxed/simple; bh=YskQDqRYulrxgcJz1QYPkqijA0rMI2I1ULyE9kL6McA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XG3H7e8Hs8RiRDWJwOufkyIwhpg2op6DRnUfrbGFddEmYw2i7OW0vWzh4tgMMzjF3WIdpbZ/YKdE3tA5p/80s6eM2TH8mSEFtDySHWMb8TObO2K/z8/epYBO7Jpi76+6TD+KDgefJr1fSlYFRs/dEe/qsicdplQkCrHCR+8rmgc= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=etGaf4uA; arc=none smtp.client-ip=198.175.65.13 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1708933699; x=1740469699; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=YskQDqRYulrxgcJz1QYPkqijA0rMI2I1ULyE9kL6McA=; b=etGaf4uAMSLe/4XWXzJAfhiyDeuriP6QZdb5G2mnXaW7VuECEVUxMVku /f6O4rWrp+EYhdBMTlccZl6H5VK882gLklLl64Gf1jnqoffvA3UggSj58 ZWPXwm2rbZgqTpvFJE07CR6sK4KBixKW5PCgtIfwtEqkkBZkKE95ns34p 4KQR+XprjMTTMkVu0EkYtIOSRXvidilX/SKhjukFSUbw30leUSHk3ahB+ qiyZ5v3wFaqs6qfa6yQCvP9Q8yAHa3wMnh8Ey7CIfSgU163m9UK67yOdQ BIfNJ2jaLeu/ubOyky5z4rybjImDYalpPliCEOCB/r3OUaRuFKNowsPR+ g==; X-IronPort-AV: E=McAfee;i="6600,9927,10995"; a="14334338" X-IronPort-AV: E=Sophos;i="6.06,185,1705392000"; d="scan'208";a="14334338" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Feb 2024 23:48:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10995"; a="937029441" X-IronPort-AV: E=Sophos;i="6.06,185,1705392000"; d="scan'208";a="937029441" Received: from kuha.fi.intel.com ([10.237.72.185]) by fmsmga001.fm.intel.com with SMTP; 25 Feb 2024 23:48:14 -0800 Received: by kuha.fi.intel.com (sSMTP sendmail emulation); Mon, 26 Feb 2024 09:48:14 +0200 Date: Mon, 26 Feb 2024 09:48:14 +0200 From: Heikki Krogerus To: =?utf-8?Q?Ond=C5=99ej?= Jirman Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org, Guenter Roeck , Greg Kroah-Hartman , Xu Yang , "open list:USB TYPEC PORT CONTROLLER DRIVERS" Subject: Re: [PATCH] Revert "usb: typec: tcpm: reset counter when enter into unattached state after try role" Message-ID: References: <20240217162023.1719738-1-megi@xff.cz> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20240217162023.1719738-1-megi@xff.cz> On Sat, Feb 17, 2024 at 05:20:21PM +0100, Ondřej Jirman wrote: > From: Ondrej Jirman > > The reverted commit makes the state machine only ever go from SRC_ATTACH_WAIT > to SNK_TRY in endless loop when toggling. After revert it goes to SRC_ATTACHED > after initially trying SNK_TRY earlier, as it should for toggling to ever detect > the power source mode and the port is again able to provide power to attached > power sinks. > > This reverts commit 2d6d80127006ae3da26b1f21a65eccf957f2d1e5. > > Cc: stable@vger.kernel.org > Fixes: 2d6d80127006 ("usb: typec: tcpm: reset counter when enter into unattached state after try role") > Signed-of-by: Ondrej Jirman Acked-by: Heikki Krogerus > --- > drivers/usb/typec/tcpm/tcpm.c | 3 --- > 1 file changed, 3 deletions(-) > > See https://lore.kernel.org/all/odggrbbgjpardze76qiv57mw6tllisyu5sbrta37iadjzwamcv@qr3ubwnlzqqt/ > for more. > > diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c > index f7d7daa60c8d..295ae7eb912c 100644 > --- a/drivers/usb/typec/tcpm/tcpm.c > +++ b/drivers/usb/typec/tcpm/tcpm.c > @@ -3743,9 +3743,6 @@ static void tcpm_detach(struct tcpm_port *port) > if (tcpm_port_is_disconnected(port)) > port->hard_reset_count = 0; > > - port->try_src_count = 0; > - port->try_snk_count = 0; > - > if (!port->attached) > return; > > -- > 2.43.0 -- heikki