]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
drop usbpatch again
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2024 07:21:21 +0000 (09:21 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Apr 2024 07:21:21 +0000 (09:21 +0200)
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.8/series
queue-6.8/usb-typec-ucsi-check-for-notifications-after-init.patch [deleted file]

index e127ec680f7f93fe2d7d27ab2e010b1b850d57c0..26d36a93c6b9451aae398e474d4abeebeeb8a02b 100644 (file)
@@ -224,7 +224,6 @@ i40e-fix-vf-may-be-used-uninitialized-in-this-function-warning.patch
 scsi-qla2xxx-update-manufacturer-details.patch
 scsi-qla2xxx-update-manufacturer-detail.patch
 revert-usb-phy-generic-get-the-vbus-supply.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 udp-do-not-accept-non-tunnel-gso-skbs-landing-in-a-t.patch
 net-ravb-always-process-tx-descriptor-ring.patch
 arm64-dts-qcom-sc7180-remove-clock-for-bluetooth-on-.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 8a9087b..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From d1d681805efd208e8c36de3f4a35632b064b85fe Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index 2ddc8936a8935..ad648372106bd 100644
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -827,7 +827,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
-       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:
--- 
-2.43.0
-
index 866165974605e2cfab3bf2b2c7a03a0efe4952ec..f180f96f42fcf3c66c36e535cb7d6c9121db87d6 100644 (file)
@@ -656,7 +656,6 @@ i40e-fix-vf-may-be-used-uninitialized-in-this-function-warning.patch
 scsi-qla2xxx-update-manufacturer-details.patch
 scsi-qla2xxx-update-manufacturer-detail.patch
 revert-usb-phy-generic-get-the-vbus-supply.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 i40e-store-the-irq-number-in-i40e_q_vector.patch
 i40e-remove-_t-suffix-from-enum-type-names.patch
 i40e-enforce-software-interrupt-during-busy-poll-exi.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 cff3c19..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 40a0a3307d80bc4f10761d7a01bc3cc4a6cf4328 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index 985e512c0e659..df7c42df9ea0d 100644
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -854,7 +854,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
-       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;
-       }
-@@ -1241,6 +1241,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1292,6 +1293,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:
--- 
-2.43.0
-
index 89f02b9790a865114937988431c6a10067649575..fa81f264f3b06bf00c8496c828f7a71b12a5325e 100644 (file)
@@ -66,7 +66,6 @@ octeontx2-pf-check-negative-error-code-in-otx2_open.patch
 octeontx2-af-add-array-index-check.patch
 i40e-fix-i40e_count_filters-to-count-only-active-new-filters.patch
 i40e-fix-vf-may-be-used-uninitialized-in-this-function-warning.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 drm-amd-evict-resources-during-pm-ops-prepare-callba.patch
 drm-amd-add-concept-of-running-prepare_suspend-seque.patch
 drm-amd-flush-gfxoff-requests-in-prepare-stage.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 9ec7eea..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From ca61215561a0947476576f8ee06c0dca69b25884 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index 98f335cbbcdea..1fd4aaf348047 100644
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -855,7 +855,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
-       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;
-       }
-@@ -1248,6 +1248,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1300,6 +1301,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:
--- 
-2.43.0
-
index 7ad5f3f104712a5fb1098864ff4ab56be1f53d5d..ae39cde0694ab432e1dc5f1bc8105e3c5a032048 100644 (file)
@@ -130,7 +130,6 @@ i40e-fix-i40e_count_filters-to-count-only-active-new-filters.patch
 i40e-fix-vf-may-be-used-uninitialized-in-this-function-warning.patch
 scsi-sg-avoid-sg-device-teardown-race.patch
 usb-typec-ucsi-fix-race-between-typec_switch-and-rol.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 drm-amd-display-fix-dpstream-clk-on-and-off-sequence.patch
 drm-amd-display-prevent-crash-when-disable-stream.patch
 drm-amd-evict-resources-during-pm-ops-prepare-callba.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 867b2b3..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 4ad0eedd5be3b953ad7281ca95696ff2bc82308c Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index 70d9f4eebf1a7..15fbadaca55b1 100644
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -959,7 +959,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
-       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;
-       }
-@@ -1390,6 +1390,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1442,6 +1443,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:
--- 
-2.43.0
-
index 0875397b65df750b4bbb2e7fd2e58a8ff56f2a4d..fa8cbce5e19e6137a9ab0715a935ecd421bc05bd 100644 (file)
@@ -128,7 +128,6 @@ i40e-fix-i40e_count_filters-to-count-only-active-new-filters.patch
 i40e-fix-vf-may-be-used-uninitialized-in-this-function-warning.patch
 i40e-enforce-software-interrupt-during-busy-poll-exit.patch
 scsi-sg-avoid-sg-device-teardown-race.patch
-usb-typec-ucsi-check-for-notifications-after-init.patch
 drm-amd-flush-gfxoff-requests-in-prepare-stage.patch
 e1000e-minor-flow-correction-in-e1000_shutdown-funct.patch
 e1000e-move-force-smbus-from-enable-ulp-function-to-.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 296a6e3..0000000
+++ /dev/null
@@ -1,70 +0,0 @@
-From 903bfed719f3e87b607956bbe4d855c71831a43a Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-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>
-
-[ Upstream commit 808a8b9e0b87bbc72bcc1f7ddfe5d04746e7ce56 ]
-
-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>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- drivers/usb/typec/ucsi/ucsi.c | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/usb/typec/ucsi/ucsi.c b/drivers/usb/typec/ucsi/ucsi.c
-index 0bfe5e906e543..96da828f556a9 100644
---- a/drivers/usb/typec/ucsi/ucsi.c
-+++ b/drivers/usb/typec/ucsi/ucsi.c
-@@ -962,7 +962,7 @@ void ucsi_connector_change(struct ucsi *ucsi, u8 num)
-       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;
-       }
-@@ -1393,6 +1393,7 @@ static int ucsi_init(struct ucsi *ucsi)
- {
-       struct ucsi_connector *con, *connector;
-       u64 command, ntfy;
-+      u32 cci;
-       int ret;
-       int i;
-@@ -1445,6 +1446,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:
--- 
-2.43.0
-