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 798C9477E51; Tue, 16 Jun 2026 17:59:35 +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=1781632776; cv=none; b=ENXJoidanKslqNZi5vJoBLTjK78cUef3Dmby45BnXRRHXXZ74wovtxeKFYUsAPbnlbskwLRWZC8jeM50+dLabuQi9OZui9bZR5qgNQvP3AYjQ1N2WThvVBLBtKZAOzYzNh8DPmwirpdJSTRfarKaVSmsJ2sOcrXDIJrY811mmRw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781632776; c=relaxed/simple; bh=1DajXRydcxZbqRUnaT/jvuP/KH9vQnwUXXlwh+LJhRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dcWyR/d1Qim63O12mlqWeHy3gzaCS9QqIpYnVK2LLO6mOdQb9lN43grieHNFRh/eQp3Lo7N1ECFsDSA/xwohxP+2jMUQMfA06sb9qKgDCjkuUPxOLGOSX2K5r0pwSDqm0UDAXT6hfySCAqIlG3YVDA/YArPwah51/q6tGxapwkM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lXBnF9zL; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lXBnF9zL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4A0AD1F000E9; Tue, 16 Jun 2026 17:59:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1781632775; bh=wNHXlzScy5X2RjDaLr7x5fl55UcNJLw7fnRMoXbpg0c=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lXBnF9zL/vnTqKbzAJUgnf+LVzuR4wTRPzBZ6k6bwJ55eEyoh+LW3oFA97Xgz5h9V z6p7R9xgTzJlKAR3gmtCzqSIsNWD9wUFM7vF33lOKcb7ztAwtAIq4SlnehniY1/6+V FEWjdZgZAMWlP8TLv8nkZez16tzVgcauR/+9O24E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, stable , Myrrh Periwinkle , Heikki Krogerus , Sasha Levin , Sergey Senozhatsky Subject: [PATCH 6.1 473/522] usb: typec: ucsi: Check if power role change actually happened before handling Date: Tue, 16 Jun 2026 20:30:20 +0530 Message-ID: <20260616145147.974779178@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260616145125.307082728@linuxfoundation.org> References: <20260616145125.307082728@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 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Myrrh Periwinkle [ Upstream commit b80e7d34c7ea6a564525119d6138fbb577a23dba ] The CrOS EC may send a connector status change event with the power direction changed flag set even if the power direction hasn't actually changed after initiating a SET_PDR command internally [1]. In practice this happens on every system suspend due to other changes performed by the EC [2][3][4], causing suspend to fail. Fix this by checking if the power role change actually happened before handling it. [1]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/subsys/pd_controller/pdc_power_mgmt.c;l=1689;drc=2d5a1cffce4e5ac8a39442cb3b764d2d5e1cf794 [2]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/subsys/pd_controller/pdc_power_mgmt.c;l=3923;drc=2d5a1cffce4e5ac8a39442cb3b764d2d5e1cf794 [3]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/subsys/pd_controller/pdc_power_mgmt.c;l=5094;drc=2d5a1cffce4e5ac8a39442cb3b764d2d5e1cf794 [4]: https://source.chromium.org/chromiumos/chromiumos/codesearch/+/main:src/platform/ec/zephyr/subsys/pd_controller/pdc_power_mgmt.c;l=2229;drc=2d5a1cffce4e5ac8a39442cb3b764d2d5e1cf794 Cc: stable Fixes: 7616f006db07 ("usb: typec: ucsi: Update power_supply on power role change") Signed-off-by: Myrrh Periwinkle Reported-and-tested-by: Sergey Senozhatsky Reviewed-by: Heikki Krogerus Link: https://patch.msgid.link/20260519-ucsi-fix-2-v1-1-6f1239535187@qtmlabs.xyz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -783,7 +783,7 @@ static void ucsi_handle_connector_change struct ucsi_connector *con = container_of(work, struct ucsi_connector, work); struct ucsi *ucsi = con->ucsi; - enum typec_role role; + enum typec_role role, prev_role; u64 command; int ret; @@ -791,6 +791,8 @@ static void ucsi_handle_connector_change command = UCSI_GET_CONNECTOR_STATUS | UCSI_CONNECTOR_NUMBER(con->num); + prev_role = !!(con->status.flags & UCSI_CONSTAT_PWR_DIR); + ret = ucsi_send_command_common(ucsi, command, &con->status, sizeof(con->status), true); if (ret < 0) { @@ -804,7 +806,7 @@ static void ucsi_handle_connector_change role = !!(con->status.flags & UCSI_CONSTAT_PWR_DIR); - if (con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) { + if ((con->status.change & UCSI_CONSTAT_POWER_DIR_CHANGE) && role != prev_role) { typec_set_pwr_role(con->port, role); ucsi_port_psy_changed(con);