From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 F1E4C233149; Mon, 10 Mar 2025 17:15:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626941; cv=none; b=XHMg9FiM0rppN0tp2oGVjluOFMJtMS7jiV4eFH5auXeWav0az4/1zteBMYZyndnYj1ZBoNrwoZmLNLKbuB7sZSqBO3LN6jeBtCkrlrLxQFwwQ11CfRdybrSomRc2tc7ag+kTcYgWzU5AB3n9uvUA6faM42pZ2BqJZwV9KUYGApM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741626941; c=relaxed/simple; bh=YFGdQlC8+UulMtgLzDiLoL6iEiN2JsS4+zW/eF8yRAA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iEyWYtLSLnUuFA/Dkff7MECj4ed68Z5m+hn98X/slHFGZE53da1aXq4tNKqW4OaLR455+Skt2pUEvbZGB2WOT/tKB5ceA4ttdKxRJIMAzYD6QfjqB+Ajte5mTD665EOVTIVbslm7exgA7/xs2ccoW1CxpJCxw9kDjPNvD0bG3Rg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=ez7a9pEE; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="ez7a9pEE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A9C9C4CEE5; Mon, 10 Mar 2025 17:15:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741626940; bh=YFGdQlC8+UulMtgLzDiLoL6iEiN2JsS4+zW/eF8yRAA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ez7a9pEEjlAlpJtzR33++P+coBWk2OE2bUPP0vPLjKopj7tJ2fJpEXIv8VMHtI1MK CpIbBrICvVOQiQRV6CNkU4+MfYZnWo+VFrTCzYUNha4Vwoph8+J1L+H8Zs3pJr5KV3 K6OkczavuO37ye8suSjd7qQniuL7Z5NWg0bB7CKk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Fedor Pchelkin , Heikki Krogerus Subject: [PATCH 6.13 165/207] usb: typec: ucsi: increase timeout for PPM reset operations Date: Mon, 10 Mar 2025 18:05:58 +0100 Message-ID: <20250310170454.345895012@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170447.729440535@linuxfoundation.org> References: <20250310170447.729440535@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.13-stable review patch. If anyone has any objections, please let me know. ------------------ From: Fedor Pchelkin commit bf4f9ae1cb08ccaafbe6874be6c46f59b83ae778 upstream. It is observed that on some systems an initial PPM reset during the boot phase can trigger a timeout: [ 6.482546] ucsi_acpi USBC000:00: failed to reset PPM! [ 6.482551] ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failed Still, increasing the timeout value, albeit being the most straightforward solution, eliminates the problem: the initial PPM reset may take up to ~8000-10000ms on some Lenovo laptops. When it is reset after the above period of time (or even if ucsi_reset_ppm() is not called overall), UCSI works as expected. Moreover, if the ucsi_acpi module is loaded/unloaded manually after the system has booted, reading the CCI values and resetting the PPM works perfectly, without any timeout. Thus it's only a boot-time issue. The reason for this behavior is not clear but it may be the consequence of some tricks that the firmware performs or be an actual firmware bug. As a workaround, increase the timeout to avoid failing the UCSI initialization prematurely. Fixes: b1b59e16075f ("usb: typec: ucsi: Increase command completion timeout value") Cc: stable Signed-off-by: Fedor Pchelkin Reviewed-by: Heikki Krogerus Link: https://lore.kernel.org/r/20250217105442.113486-3-boddah8794@gmail.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -25,7 +25,7 @@ * difficult to estimate the time it takes for the system to process the command * before it is actually passed to the PPM. */ -#define UCSI_TIMEOUT_MS 5000 +#define UCSI_TIMEOUT_MS 10000 /* * UCSI_SWAP_TIMEOUT_MS - Timeout for role swap requests