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 5B86847A5D; Mon, 1 Apr 2024 17:09:53 +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=1711991393; cv=none; b=rSdiffXw/Pz4IbC4FIltrgqArCckFwK0T0PYfUirrynjfHepO6QttPqLySVlJNYcZRzFgFI8uY3gTgJhQBLWhyFD3CSwX5Hk8bE1CiUp710/km1oTqk0ec62+rkqdC3iNfRfK9lblCDBRTXRFDoCjtXYf+HEtI25CJCzgWeOcSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711991393; c=relaxed/simple; bh=49Dp2efPSpy2c0cbg5vZtWfuN5+6MYrP0uu70c40JiA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TE83JUNvspxdIE+lYf81lL8otdOfpH3kHnurR0xA97LEzTY1S+5ozS3EvQRNrXDAhmB5042y002ihIMqbufC1EIobuwGGsbqKWGpGvfLrNwWeogHCxjkYMUckdrGE/UAVIsBP4YH/ClU93IDKNfdBahbeMAiFBCpW27/CI7ugiQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=mV3W183v; 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="mV3W183v" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BBACCC433F1; Mon, 1 Apr 2024 17:09:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711991393; bh=49Dp2efPSpy2c0cbg5vZtWfuN5+6MYrP0uu70c40JiA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mV3W183vFsV3wABe/Q6gwO1R7jmnJbZ51aJ0zcZ0UcAOjFubSvv+v9Hjk9AmhqNaH YyFygD7nRBbPQFwix9VBDQ8zdM5gg6gg2UV2hi8hqmSVQZ9if4Aict3tTWqL9K6XPZ 82/Z8OK0Y4ZFpY9vY2vcB2FpJap5fdpUAGz/3vhg= 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 6.1 251/272] usb: typec: ucsi: Check for notifications after init Date: Mon, 1 Apr 2024 17:47:21 +0200 Message-ID: <20240401152538.859016197@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152530.237785232@linuxfoundation.org> References: <20240401152530.237785232@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 6.1-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 @@ -851,7 +851,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; } @@ -1210,6 +1210,7 @@ static int ucsi_init(struct ucsi *ucsi) { struct ucsi_connector *con, *connector; u64 command, ntfy; + u32 cci; int ret; int i; @@ -1262,6 +1263,13 @@ static int ucsi_init(struct ucsi *ucsi) ucsi->connector = connector; 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: