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 A5FE447F5D; Tue, 14 May 2024 11:51:28 +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=1715687488; cv=none; b=cQO56wcttMtsrfbtTaD5QwXZKPKmEv/tUbQUBCOQgVnlcLazOyReEkIPJLueRtH81okxeculw+SyuU2vozHmtGvC+4AfFAEeeyYzJGMTFbmd4mRPLuHObGxIoihvrO9CEv3UzWiewXoLLuMl+W7a66zskRxeuNj//cMgMPc+Ffo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715687488; c=relaxed/simple; bh=vOY9QkzrONnE0ZgW3TxY0dZxsBw4qK/005/hOjzcP5k=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=MhzCWIuUXx2lYJV/NPr/uln5J31Nm5sHk1lnFm1+CEaNdbAchheBYnxltqZvebNBLMYEOPmZl0nDE0Kj9yd7Aaj2h3ayK4vnkxYNDoWnTcxud7asC0+sQY7AJtzkxXVV7Bq4mPVsCkUTPHwTa3ocx2zllML9WnCEWitku220ycY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jmsD6ed3; 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="jmsD6ed3" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 29C34C2BD10; Tue, 14 May 2024 11:51:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1715687488; bh=vOY9QkzrONnE0ZgW3TxY0dZxsBw4qK/005/hOjzcP5k=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jmsD6ed3+wEoglGUbqAiFkDPuOWcF4WxARVj3gpUYl8LdGuoEGxfiQ3VpsUcr1ep0 Rvw16bKWCpC3d58pzM0Ie9FWft8BUTk3+PAj3lqbmaGkVBD6jTK+bJeM6uXLz56bdl LFP3nMYbQYs6RiNurmYIbKJivWUkpn55VlfhBiE4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "Christian A. Ehrhardt" , Heikki Krogerus , Neil Armstrong Subject: [PATCH 5.10 092/111] usb: typec: ucsi: Check for notifications after init Date: Tue, 14 May 2024 12:20:30 +0200 Message-ID: <20240514101000.626446996@linuxfoundation.org> X-Mailer: git-send-email 2.45.0 In-Reply-To: <20240514100957.114746054@linuxfoundation.org> References: <20240514100957.114746054@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Christian A. Ehrhardt commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 upstream. The completion notification for the final SET_NOTIFICATION_ENABLE command during initialization can include a connector change notification. However, at the time this completion notification is processed, the ucsi struct is not ready to handle this notification. As a result the notification is ignored and the controller never sends an interrupt again. Re-check CCI for a pending connector state change after initialization is complete. Adjust the corresponding debug message accordingly. Fixes: 71a1fa0df2a3 ("usb: typec: ucsi: Store the notification mask") Cc: stable@vger.kernel.org Signed-off-by: Christian A. Ehrhardt Reviewed-by: Heikki Krogerus Tested-by: Neil Armstrong # on SM8550-QRD Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de Signed-off-by: Greg Kroah-Hartman --- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/drivers/usb/typec/ucsi/ucsi.c +++ b/drivers/usb/typec/ucsi/ucsi.c @@ -827,7 +827,7 @@ void ucsi_connector_change(struct ucsi * struct ucsi_connector *con = &ucsi->connector[num - 1]; if (!(ucsi->ntfy & UCSI_ENABLE_NTFY_CONNECTOR_CHANGE)) { - dev_dbg(ucsi->dev, "Bogus connector change event\n"); + dev_dbg(ucsi->dev, "Early connector change event\n"); return; } @@ -1191,6 +1191,7 @@ static int ucsi_init(struct ucsi *ucsi) { struct ucsi_connector *con; u64 command, ntfy; + u32 cci; int ret; int i; @@ -1242,6 +1243,13 @@ static int ucsi_init(struct ucsi *ucsi) goto err_unregister; ucsi->ntfy = ntfy; + + ret = ucsi->ops->read(ucsi, UCSI_CCI, &cci, sizeof(cci)); + if (ret) + return ret; + if (UCSI_CCI_CONNECTOR(READ_ONCE(cci))) + ucsi_connector_change(ucsi, cci); + return 0; err_unregister: