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 2D1BB21CC55; Mon, 18 Aug 2025 13:22:30 +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=1755523350; cv=none; b=pLGxgqM4Xeo6FMbZEW1SPNC/fa96/Zx0CHKU9EsV1WxuK3Ppni5Pi3jaMHX63oYzX/X3ZqkJ/DFtTrXZ2PAfla2LVf16ZeN7ZL7EBltVumTrAPd1URn2GAF/xtFvsoQ5cshQ5DMtWkwD7CkQ0HgzOeOPFJZfadsPvmmoi82DoV4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755523350; c=relaxed/simple; bh=6TndZ+jJaHr+21FgZb5S287LkFxfxudPPyQWMPIEU/U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DpRdmmA1OXCZuugYDADYm15ZMYW0+lIaO4ByZKAHz4sZ29wffzxY/AwnpWw95ZnZUbX8KlnI9iwTTL1EOWSEiU5K2YmGQY5aj27zqEytvn8bHJ7HMWuXLJvizcRAHTbGxb9Vb0Njz8ergfGtpl4oBN7S40n7IcIIRz4x0JEPbnw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=pCPDui1s; 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="pCPDui1s" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA41CC4CEEB; Mon, 18 Aug 2025 13:22:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755523350; bh=6TndZ+jJaHr+21FgZb5S287LkFxfxudPPyQWMPIEU/U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pCPDui1sq8n0n0YubAsUaPLAvjogVEgRZnhF909hxldYvK7ONxs+BuEMygQTbig3E 6q67p5g1jnJF1E1+eqFnEc1n3IwXuDNtPvOwN6enUDOtovZvsBswxI+DqLYhlhFcb7 mUveS4aDsRlhiPtqM/ZT35ekMsyViWE3o3dEm2B4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Benson Leung , Jameson Thies , Heikki Krogerus , Sebastian Reichel , Sasha Levin Subject: [PATCH 6.15 117/515] usb: typec: ucsi: psy: Set current max to 100mA for BC 1.2 and Default Date: Mon, 18 Aug 2025 14:41:43 +0200 Message-ID: <20250818124502.851982167@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250818124458.334548733@linuxfoundation.org> References: <20250818124458.334548733@linuxfoundation.org> User-Agent: quilt/0.68 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 6.15-stable review patch. If anyone has any objections, please let me know. ------------------ From: Benson Leung [ Upstream commit af833e7f7db3cf4c82f063668e1b52297a30ec18 ] ucsi_psy_get_current_max would return 0mA as the maximum current if UCSI detected a BC or a Default USB Power sporce. The comment in this function is true that we can't tell the difference between DCP/CDP or SDP chargers, but we can guarantee that at least 1-unit of USB 1.1/2.0 power is available, which is 100mA, which is a better fallback value than 0, which causes some userspaces, including the ChromeOS power manager, to regard this as a power source that is not providing any power. In reality, 100mA is guaranteed from all sources in these classes. Signed-off-by: Benson Leung Reviewed-by: Jameson Thies Reviewed-by: Heikki Krogerus Reviewed-by: Sebastian Reichel Link: https://lore.kernel.org/r/20250717200805.3710473-1-bleung@chromium.org Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- drivers/usb/typec/ucsi/psy.c | 2 +- drivers/usb/typec/ucsi/ucsi.h | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/usb/typec/ucsi/psy.c b/drivers/usb/typec/ucsi/psy.c index 62ac69730405..62a9d68bb66d 100644 --- a/drivers/usb/typec/ucsi/psy.c +++ b/drivers/usb/typec/ucsi/psy.c @@ -164,7 +164,7 @@ static int ucsi_psy_get_current_max(struct ucsi_connector *con, case UCSI_CONSTAT_PWR_OPMODE_DEFAULT: /* UCSI can't tell b/w DCP/CDP or USB2/3x1/3x2 SDP chargers */ default: - val->intval = 0; + val->intval = UCSI_TYPEC_DEFAULT_CURRENT * 1000; break; } return 0; diff --git a/drivers/usb/typec/ucsi/ucsi.h b/drivers/usb/typec/ucsi/ucsi.h index 70910232a05d..1ae068a92844 100644 --- a/drivers/usb/typec/ucsi/ucsi.h +++ b/drivers/usb/typec/ucsi/ucsi.h @@ -479,9 +479,10 @@ struct ucsi { #define UCSI_MAX_SVID 5 #define UCSI_MAX_ALTMODES (UCSI_MAX_SVID * 6) -#define UCSI_TYPEC_VSAFE5V 5000 -#define UCSI_TYPEC_1_5_CURRENT 1500 -#define UCSI_TYPEC_3_0_CURRENT 3000 +#define UCSI_TYPEC_VSAFE5V 5000 +#define UCSI_TYPEC_DEFAULT_CURRENT 100 +#define UCSI_TYPEC_1_5_CURRENT 1500 +#define UCSI_TYPEC_3_0_CURRENT 3000 struct ucsi_connector { int num; -- 2.39.5