]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop usb-typec-ucsi-check-for-notifications-after-init.patch
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Apr 2024 07:53:30 +0000 (09:53 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 2 Apr 2024 07:53:30 +0000 (09:53 +0200)
12 files changed:
queue-5.10/series
queue-5.10/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]
queue-5.15/series
queue-5.15/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]
queue-6.1/series
queue-6.1/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]
queue-6.6/series
queue-6.6/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]
queue-6.7/series
queue-6.7/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]
queue-6.8/series
queue-6.8/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]

index a47e39860a4c30364e20b4a5057f9331ccefd4c8..7042e1cbe1f1cb0be0e0efbb7f02679fa11ebce5 100644 (file)
@@ -170,7 +170,6 @@ usb-dwc2-host-fix-hibernation-flow.patch
 usb-dwc2-host-fix-isoc-flow-in-ddma-mode.patch
 usb-dwc2-gadget-lpm-flow-fix.patch
 usb-udc-remove-warning-when-queue-disabled-ep.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
 scsi-qla2xxx-split-fce-eft-trace-control.patch
diff --git a/queue-5.10/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-5.10/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index ac424d2..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -823,7 +823,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;
-       }
-@@ -1153,6 +1153,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1204,6 +1205,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:
index f3ec76e282a23fdcb0cd98aff2002f2e7102408d..63fb3b060c0841f25b5ddb8c0b21a83f51a1878e 100644 (file)
@@ -589,7 +589,6 @@ usb-dwc2-host-fix-isoc-flow-in-ddma-mode.patch
 usb-dwc2-gadget-fix-exiting-from-clock-gating.patch
 usb-dwc2-gadget-lpm-flow-fix.patch
 usb-udc-remove-warning-when-queue-disabled-ep.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
 scsi-qla2xxx-prevent-command-send-on-chip-reset.patch
diff --git a/queue-5.15/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-5.15/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index 808eaef..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -850,7 +850,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;
-       }
-@@ -1203,6 +1203,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1254,6 +1255,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:
index f52b6bbcba11ef36bd882c66de6fa327d4b631b6..da0a636b2f310b05febe983c344156ce5afefaaf 100644 (file)
@@ -247,7 +247,6 @@ usb-dwc2-gadget-lpm-flow-fix.patch
 usb-udc-remove-warning-when-queue-disabled-ep.patch
 usb-typec-return-size-of-buffer-if-pd_set-operation-succeeds.patch
 usb-typec-ucsi-clear-event_pending-under-ppm-lock.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi_acpi-refactor-and-fix-dell-quirk.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
diff --git a/queue-6.1/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-6.1/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index 67566fb..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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:
index 2c5ffc60842e90a0bece7a8bef40fc08bf12f0b0..9610def149b79b8d32f7184de2de97bb3645653e 100644 (file)
@@ -369,7 +369,6 @@ usb-dwc2-gadget-lpm-flow-fix.patch
 usb-udc-remove-warning-when-queue-disabled-ep.patch
 usb-typec-return-size-of-buffer-if-pd_set-operation-succeeds.patch
 usb-typec-ucsi-clear-event_pending-under-ppm-lock.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi_acpi-refactor-and-fix-dell-quirk.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
diff --git a/queue-6.6/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-6.6/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index b3056f2..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -955,7 +955,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;
-       }
-@@ -1352,6 +1352,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1404,6 +1405,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:
index ac3fe4a318ac0f71cd57adabe0232f579308afa5..bcd7dea6276084f722892baa64c6ffe7be60640d 100644 (file)
@@ -403,7 +403,6 @@ usb-udc-remove-warning-when-queue-disabled-ep.patch
 usb-typec-ucsi-fix-race-between-typec_switch-and-role_switch.patch
 usb-typec-return-size-of-buffer-if-pd_set-operation-succeeds.patch
 usb-typec-ucsi-clear-event_pending-under-ppm-lock.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi_acpi-refactor-and-fix-dell-quirk.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
diff --git a/queue-6.7/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-6.7/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index b3056f2..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -955,7 +955,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;
-       }
-@@ -1352,6 +1352,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1404,6 +1405,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:
index c2b2e839a2f86170239e8fde2a870194adf74e2c..577c06b73225388a6a1062a1adf3b35810bd008a 100644 (file)
@@ -369,7 +369,6 @@ usb-typec-tcpm-correct-port-source-pdo-array-in-pd_set-callback.patch
 usb-typec-tcpm-update-pd-of-type-c-port-upon-pd_set.patch
 usb-typec-return-size-of-buffer-if-pd_set-operation-succeeds.patch
 usb-typec-ucsi-clear-event_pending-under-ppm-lock.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 usb-typec-ucsi-ack-unsupported-commands.patch
 usb-typec-ucsi_acpi-refactor-and-fix-dell-quirk.patch
 usb-typec-ucsi-clear-ucsi_cci_reset_complete-before-reset.patch
diff --git a/queue-6.8/usb-typec-ucsi-check-for-notifications-after-init.patch b/queue-6.8/usb-typec-ucsi-check-for-notifications-after-init.patch
deleted file mode 100644 (file)
index c28c2d8..0000000
+++ /dev/null
@@ -1,64 +0,0 @@
-From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001
-From: "Christian A. Ehrhardt" <lk@c--e.de>
-Date: Wed, 20 Mar 2024 08:39:23 +0100
-Subject: usb: typec: ucsi: Check for notifications after init
-
-From: Christian A. Ehrhardt <lk@c--e.de>
-
-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 <lk@c--e.de>
-Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
-Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
-Link: https://lore.kernel.org/r/20240320073927.1641788-3-lk@c--e.de
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- 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
-@@ -958,7 +958,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;
-       }
-@@ -1355,6 +1355,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1407,6 +1408,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: