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 17CB622E00A; Mon, 10 Mar 2025 17:29:49 +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=1741627790; cv=none; b=Mxateosc+tdOxKmvIhDStVwdm9ylRYJRJ7yCamcf7Xk+kQ2aYwryzKmbPC3oFhogf/lvRobviF1YCfu7bOl4gJ6WcQwj305rPBaToIBmUm9ftZXasjOAsqZZ0XetDaGTGsuUyL1kMbz9Qh6xZm8za4NMwdMRwDScA0duPVDwsqk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741627790; c=relaxed/simple; bh=XG6dCaxUqiywHDPjBPU+jPQUNmxzaTnd+h9YOFEIO7g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oKWjvFjmxR6TvpBPflEZfWVw7lQmX9Nkmd4Ba3vn2fW/NkRCj8NIn7aSFlCAaXzvGEOX3+0/k4m2L94YJv2jcmFb1pmD5nUsqtp+Lnzr0ckl4Lp3IxMyYZc0RDYE1T2fQBydvTYdHBE9yM1Vnyy+IGDyDASCeSVg7YeiDZ+ChgE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=xbvnrR+9; 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="xbvnrR+9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E19FC4CEE5; Mon, 10 Mar 2025 17:29:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1741627789; bh=XG6dCaxUqiywHDPjBPU+jPQUNmxzaTnd+h9YOFEIO7g=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xbvnrR+9yoGiMMaZrVZoclscHQDOM13+uDf1htp7yD61VHmmo679lzavWmlU1wYXA t3wL4cm40wlpfQF1UYTPMnX3ldG+v8a1nCfGYklceIz/1iTy0ehG7zf0Srd2dI300b CRQxqZfKfq0bWo1DvTJoWgclWUGYa/8wVletsdgU= 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.12 218/269] usb: typec: ucsi: increase timeout for PPM reset operations Date: Mon, 10 Mar 2025 18:06:11 +0100 Message-ID: <20250310170506.375459705@linuxfoundation.org> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250310170457.700086763@linuxfoundation.org> References: <20250310170457.700086763@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.12-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