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 4C48435293D; Wed, 3 Dec 2025 16:16:48 +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=1764778608; cv=none; b=YzFNOMED5nXaH7FxtHC7OeqBfnKQ37jmFug/UQot7GmoNWZDLtSYVGu7SiK1HW+9vPIYf73sT1Xcv6SXEiWpuJ4L9r0LOiEg1OcmNpz+Wkjp7qvdosbAygh+jLwbQq9MYU2HzuIvasHUj55lMexlu3NoHJ1jj+SmE9yxfIsB+sI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764778608; c=relaxed/simple; bh=37nUXdoDCa8KUxos3Dt+m2I2DKGJuFMArDVpUI/p9p4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oLaUUPZ0POEY1HO+UFHLKhs7fVWIZ1JkRa54WxiVVwMrbixeBfbXDZtSdXaHR/gOF32FC5AdLsKf0uf9ZVEDFYLTIwTy+yOo13WOggvh7xD+apDIA9n152UNjNbFjKXTHdi9EWFb0j95PkLu5RM4X+k9H2Ave4iq7EQRTuf/hp0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uTwyQaZh; 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="uTwyQaZh" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ADB3EC4CEF5; Wed, 3 Dec 2025 16:16:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1764778608; bh=37nUXdoDCa8KUxos3Dt+m2I2DKGJuFMArDVpUI/p9p4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uTwyQaZh7tjbPEaLBS6bkC71tPC7QlPg7KaAGfCgtP2Krzx6/bYCJ9A7xKq4gpp92 x627q3DHE51hsAfw6aIel6UpsiV/E9+7A0fMA6sfqK39kM1KQajTCcLsUR/y3hrra2 0TFgRcYBbqWe85p2eYbg/RVSFXQNNXMtLyePwlwY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jameson Thies , Benson Leung , Heikki Krogerus , Sebastian Reichel , "Kenneth R. Crudup" , Sasha Levin Subject: [PATCH 5.15 386/392] usb: typec: ucsi: psy: Set max current to zero when disconnected Date: Wed, 3 Dec 2025 16:28:56 +0100 Message-ID: <20251203152428.398919111@linuxfoundation.org> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20251203152414.082328008@linuxfoundation.org> References: <20251203152414.082328008@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jameson Thies [ Upstream commit 23379a17334fc24c4a9cbd9967d33dcd9323cc7c ] The ucsi_psy_get_current_max function defaults to 0.1A when it is not clear how much current the partner device can support. But this does not check the port is connected, and will report 0.1A max current when nothing is connected. Update ucsi_psy_get_current_max to report 0A when there is no connection. Fixes: af833e7f7db3 ("usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default") Cc: stable@vger.kernel.org Signed-off-by: Jameson Thies Reviewed-by: Benson Leung Reviewed-by: Heikki Krogerus Reviewed-by: Sebastian Reichel Tested-by: Kenneth R. Crudup Rule: add Link: https://lore.kernel.org/stable/20251017000051.2094101-1-jthies%40google.com Link: https://patch.msgid.link/20251106011446.2052583-1-jthies@google.com Signed-off-by: Greg Kroah-Hartman [ adapted UCSI_CONSTAT() macro to direct flag access ] Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/psy.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/usb/typec/ucsi/psy.c +++ b/drivers/usb/typec/ucsi/psy.c @@ -123,6 +123,11 @@ static int ucsi_psy_get_current_max(stru { u32 pdo; + if (!(con->status.flags & UCSI_CONSTAT_CONNECTED)) { + val->intval = 0; + return 0; + } + switch (UCSI_CONSTAT_PWR_OPMODE(con->status.flags)) { case UCSI_CONSTAT_PWR_OPMODE_PD: if (con->num_pdos > 0) {