Skip to contentSkip to conversation

FAILED: patch "[PATCH] usb: typec: ucsi: Check the connection on resume" failed to apply to 5.4-stable tree

PATCH [email protected] 1 participant 1 message Oct 31, 2022

Subsystems (3)
Stable branch USB USB Type-C class
lore
Share & tools
lore

[email protected]

author maintainer
#0 lore raw

The patch below does not apply to the 5.4-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

Possible dependencies:

99f6d4361113 ("usb: typec: ucsi: Check the connection on resume")
512df95b9432 ("usb: typec: ucsi: Better fix for missing unplug events issue") bd19ac98f77e ("usb: typec: ucsi: Read the PDOs in separate work")
6cbe4b2d5a3f ("usb: typec: ucsi: Check the partner alt modes always if there is PD contract") b9aa02ca39a4 ("usb: typec: ucsi: Add polling mechanism for partner tasks like alt mode checking") 8c9b3caab3ac ("usb: typec: ucsi: Clear pending after acking connector change") 1f4642b72be7 ("usb: typec: ucsi: Retrieve all the PDOs instead of just the first 4") 89795852c9c4 ("usb: typec: ucsi: Add support for USB role switch")
0fb2c41f992c ("Merge 5.10-rc4 into here.")

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 99f6d43611135bd6f211dec9e88bb41e4167e304 Mon Sep 17 00:00:00 2001
From: Heikki Krogerus <[email protected]>
Date: Fri, 7 Oct 2022 13:09:50 +0300
Subject: [PATCH] usb: typec: ucsi: Check the connection on resume

Checking the connection status of every port on resume. This fixes an issue where the partner device is not unregistered properly after resume if it was unplugged while the system was suspended.

The function ucsi_check_connection() is also modified so that it can be used also for registering the connection on top of unregistering it.

Link https://bugzilla.kernel.org/show_bug.cgi?id=210425
Fixes a94ecde41f7e ("usb: typec: ucsi: ccg: enable runtime pm support")
Cc <[email protected]>
Signed-off-by Heikki Krogerus <[email protected]>
Link https://lore.kernel.org/r/[email protected] open here
Signed-off-by Greg Kroah-Hartman <[email protected]>
drivers/usb/typec/ucsi/ucsi.c +29 -13
index 74fb5a4c6f21..a7987fc764cc 100644
@@ -183,16 +183,6 @@ int ucsi_send_command(struct ucsi *ucsi, u64 command,
 }
 EXPORT_SYMBOL_GPL(ucsi_send_command);
 
-int ucsi_resume(struct ucsi *ucsi)
-{
-	u64 command;
-
-	/* Restore UCSI notification enable mask after system resume */
-	command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy;
-
-	return ucsi_send_command(ucsi, command, NULL, 0);
-}
-EXPORT_SYMBOL_GPL(ucsi_resume);
 /* -------------------------------------------------------------------------- */
 
 struct ucsi_work {

@@ -744,6 +734,7 @@ static void ucsi_partner_change(struct ucsi_connector *con)
 
 static int ucsi_check_connection(struct ucsi_connector *con)
 {
+	u8 prev_flags = con->status.flags;
 	u64 command;
 	int ret;
 

@@ -754,10 +745,13 @@ static int ucsi_check_connection(struct ucsi_connector *con)
 		return ret;
 	}
 
+	if (con->status.flags == prev_flags)
+		return 0;
+
 	if (con->status.flags & UCSI_CONSTAT_CONNECTED) {
-		if (UCSI_CONSTAT_PWR_OPMODE(con->status.flags) ==
-		    UCSI_CONSTAT_PWR_OPMODE_PD)
-			ucsi_partner_task(con, ucsi_check_altmodes, 30, 0);
+		ucsi_register_partner(con);
+		ucsi_pwr_opmode_change(con);
+		ucsi_partner_change(con);
 	} else {
 		ucsi_partner_change(con);
 		ucsi_port_psy_changed(con);

@@ -1276,6 +1270,28 @@ static int ucsi_init(struct ucsi *ucsi)
 	return ret;
 }
 
+int ucsi_resume(struct ucsi *ucsi)
+{
+	struct ucsi_connector *con;
+	u64 command;
+	int ret;
+
+	/* Restore UCSI notification enable mask after system resume */
+	command = UCSI_SET_NOTIFICATION_ENABLE | ucsi->ntfy;
+	ret = ucsi_send_command(ucsi, command, NULL, 0);
+	if (ret < 0)
+		return ret;
+
+	for (con = ucsi->connector; con->port; con++) {
+		mutex_lock(&con->lock);
+		ucsi_check_connection(con);
+		mutex_unlock(&con->lock);
+	}
+
+	return 0;
+}
+EXPORT_SYMBOL_GPL(ucsi_resume);
+
 static void ucsi_init_work(struct work_struct *work)
 {
 	struct ucsi *ucsi = container_of(work, struct ucsi, work.work);