From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 450844F55B7 for ; Fri, 4 Sep 2026 15:58:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788537536; cv=none; b=Nwlf8I5pB60/QenYYfbo1W+Ci/G0BNNANk1YyDuvjVnQRjeCuWlxy9pOrn19mHja8snAnwRIZeAC+NM6TEKCoPOTz9AyLvCpPBDTXZDIKQS9mBAdzu9cbibm6xdQ35BYJi/IQsjThPh7FeAZudIO2BHxjjruPeFutZA6FFhPraU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1788537536; c=relaxed/simple; bh=Vw6h8CHJPm4McmyGoWulhK5FQcnsAz1o9B1l5XaTMlw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XiupWu+xH/kxusN3REol4I0wdQagYFMbQ2m1rQdN7hRK25TffILHAkEpW6kAJovg/vi4lks4ijhmjlOEE3E/xt9nPeeYbB8qKLhvD0MquWXDkpSzVlFlJLkscKvHYotaSw3CqHSClwsNII/3F7qbVmY5J8HZDRTEBrtD7C3yXzQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FGkn2ugX; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FGkn2ugX" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7C0E21F0155A; Fri, 4 Sep 2026 15:58:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1788537534; bh=/CkhMBEy3Qb1qwUC2hzuUvIOwxNM0aLH1Un+2Oqo744=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FGkn2ugXJUtM5KlA1ZGbElyiD1wzunPpObs4wa6rVH+Hru0kwudL6sBwVyyzpzz/u ydVSWFDCkaJ+eH5cyhumb7c/tvATVqeVLqVjkyt+svxUv1OIbfuh9m4wfcBXoww6lZ PGU04FOx13HpNBXALpVmGlMiNEDsLQQ9u3Bxz9iID7RW71hH3fpeWxrdww3BoSk/Ng EswI5clrSZ4QnKO9LooYF8casnWQbrMP7XT6dRTaBy6fBkZl6lNpgb8jq4s+aB57Go 6je9tT5WWhCmzGUKd7MXBZeT5bSbgYMafEAqIPY30TcJ+nB3331ytbk+PcrHlxOKRm oOQhy+jJURyuw== From: Sasha Levin To: stable@vger.kernel.org Cc: Huang Wei , Heikki Krogerus , Fedor Pchelkin , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH 6.6.y 7/7] usb: typec: ucsi: use UCSI_TIMEOUT_MS for sync command completion Date: Fri, 4 Sep 2026 11:58:46 -0400 Message-ID: <20260904155846.1071149-7-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260904155846.1071149-1-sashal@kernel.org> References: <2026090307-cannot-posh-1230@gregkh> <20260904155846.1071149-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Huang Wei [ Upstream commit eb4573cf2fd860b20adfae050c3f6ec6ddc3abdb ] The synchronous command completion path in ucsi_sync_control_common() hardcodes a 5 second (5 * HZ) timeout when waiting for the PPM to signal command completion via ACPI notification. This value matched UCSI_TIMEOUT_MS when it was still 5000 ms, but it was not updated when that macro was later raised to 10000 ms to fix PPM reset timeouts. As a result, the two PPM communication paths are now inconsistent: the polling path in ucsi_reset_ppm() respects the 10 second timeout, while the event-driven completion path still uses 5 seconds. On machines where the firmware is slow to respond during boot (e.g. some Lenovo ThinkPad models such as the E14 Gen 7), commands sent after the PPM reset, such as SET_NOTIFICATION_ENABLE and GET_CAPABILITY, can exceed 5 seconds and cause UCSI initialization to fail with: ucsi_acpi USBC000:00: error -ETIMEDOUT: PPM init failed Once UCSI init aborts, USB-C PD negotiation never completes, which in turn blocks USB-C dock enumeration since the dock depends on a successful PD contract. Replace the hardcoded 5 * HZ with msecs_to_jiffies(UCSI_TIMEOUT_MS) so that both communication paths share a single, consistent timeout value, and future adjustments to UCSI_TIMEOUT_MS are picked up automatically. Link: https://bugzilla.kernel.org/show_bug.cgi?id=221740 Link: https://bugzilla.kernel.org/show_bug.cgi?id=2183790 Fixes: bf4f9ae1cb08c ("usb: typec: ucsi: increase timeout for PPM reset operations") Cc: stable@vger.kernel.org Signed-off-by: Huang Wei Reviewed-by: Heikki Krogerus Reviewed-by: Fedor Pchelkin Link: https://patch.msgid.link/20260805085725.389761-1-huangwei@kylinos.cn Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/ucsi/ucsi.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c index 9f736a34b4f1c..a4c13476c8001 100644 --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -65,7 +65,8 @@ int ucsi_sync_control_common(struct ucsi *ucsi, u64 command) if (ret) goto out_clear_bit; - if (!wait_for_completion_timeout(&ucsi->complete, 5 * HZ)) + if (!wait_for_completion_timeout(&ucsi->complete, + msecs_to_jiffies(UCSI_TIMEOUT_MS))) ret = -ETIMEDOUT; out_clear_bit: -- 2.53.0