From: Greg Kroah-Hartman Date: Tue, 2 Apr 2024 07:53:30 +0000 (+0200) Subject: drop usb-typec-ucsi-check-for-notifications-after-init.patch X-Git-Tag: v6.7.12~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=567f806e8f985bde90e1eb0abeef3eed2abc79a8;p=thirdparty%2Fkernel%2Fstable-queue.git drop usb-typec-ucsi-check-for-notifications-after-init.patch --- diff --git a/queue-5.10/series b/queue-5.10/series index a47e39860a4..7042e1cbe1f 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -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 index ac424d2e9b8..00000000000 --- a/queue-5.10/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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 -@@ -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: diff --git a/queue-5.15/series b/queue-5.15/series index f3ec76e282a..63fb3b060c0 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -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 index 808eaef6d52..00000000000 --- a/queue-5.15/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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 -@@ -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: diff --git a/queue-6.1/series b/queue-6.1/series index f52b6bbcba1..da0a636b2f3 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -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 index 67566fb1e58..00000000000 --- a/queue-6.1/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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: diff --git a/queue-6.6/series b/queue-6.6/series index 2c5ffc60842..9610def149b 100644 --- a/queue-6.6/series +++ b/queue-6.6/series @@ -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 index b3056f2a913..00000000000 --- a/queue-6.6/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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 -@@ -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: diff --git a/queue-6.7/series b/queue-6.7/series index ac3fe4a318a..bcd7dea6276 100644 --- a/queue-6.7/series +++ b/queue-6.7/series @@ -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 index b3056f2a913..00000000000 --- a/queue-6.7/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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 -@@ -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: diff --git a/queue-6.8/series b/queue-6.8/series index c2b2e839a2f..577c06b7322 100644 --- a/queue-6.8/series +++ b/queue-6.8/series @@ -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 index c28c2d89dfb..00000000000 --- a/queue-6.8/usb-typec-ucsi-check-for-notifications-after-init.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 Mon Sep 17 00:00:00 2001 -From: "Christian A. Ehrhardt" -Date: Wed, 20 Mar 2024 08:39:23 +0100 -Subject: usb: typec: ucsi: Check for notifications after init - -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 -@@ -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: