drop queue-5.4/crypto-safexcel-cleanup-ring-irq-workqueues-on-load-failure.patch

diff --git a/queue-5.4/crypto-safexcel-cleanup-ring-irq-workqueues-on-load-failure.patch b/queue-5.4/crypto-safexcel-cleanup-ring-irq-workqueues-on-load-failure.patch
deleted file mode 100644 (file)
index 232932b..0000000
--- a/queue-5.4/crypto-safexcel-cleanup-ring-irq-workqueues-on-load-failure.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-From ca25c00ccbc5f942c63897ed23584cfc66e8ec81 Mon Sep 17 00:00:00 2001
-From: Jonathan McDowell <noodles@earth.li>
-Date: Tue, 28 Feb 2023 18:28:58 +0000
-Subject: crypto: safexcel - Cleanup ring IRQ workqueues on load failure
-
-From: Jonathan McDowell <noodles@earth.li>
-
-commit ca25c00ccbc5f942c63897ed23584cfc66e8ec81 upstream.
-
-A failure loading the safexcel driver results in the following warning
-on boot, because the IRQ affinity has not been correctly cleaned up.
-Ensure we clean up the affinity and workqueues on a failure to load the
-driver.
-
-crypto-safexcel: probe of f2800000.crypto failed with error -2
-------------[ cut here ]------------
-WARNING: CPU: 1 PID: 232 at kernel/irq/manage.c:1913 free_irq+0x300/0x340
-Modules linked in: hwmon mdio_i2c crypto_safexcel(+) md5 sha256_generic libsha256 authenc libdes omap_rng rng_core nft_masq nft_nat nft_chain_nat nf_nat nft_ct nf_conntrack nf_defrag_ipv6 nf_defrag_ipv4 nf_tables libcrc32c nfnetlink fuse autofs4
-CPU: 1 PID: 232 Comm: systemd-udevd Tainted: G        W          6.1.6-00002-g9d4898824677 #3
-Hardware name: MikroTik RB5009 (DT)
-pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
-pc : free_irq+0x300/0x340
-lr : free_irq+0x2e0/0x340
-sp : ffff800008fa3890
-x29: ffff800008fa3890 x28: 0000000000000000 x27: 0000000000000000
-x26: ffff8000008e6dc0 x25: ffff000009034cac x24: ffff000009034d50
-x23: 0000000000000000 x22: 000000000000004a x21: ffff0000093e0d80
-x20: ffff000009034c00 x19: ffff00000615fc00 x18: 0000000000000000
-x17: 0000000000000000 x16: 0000000000000000 x15: 000075f5c1584c5e
-x14: 0000000000000017 x13: 0000000000000000 x12: 0000000000000040
-x11: ffff000000579b60 x10: ffff000000579b62 x9 : ffff800008bbe370
-x8 : ffff000000579dd0 x7 : 0000000000000000 x6 : ffff000000579e18
-x5 : ffff000000579da8 x4 : ffff800008ca0000 x3 : ffff800008ca0188
-x2 : 0000000013033204 x1 : ffff000009034c00 x0 : ffff8000087eadf0
-Call trace:
- free_irq+0x300/0x340
- devm_irq_release+0x14/0x20
- devres_release_all+0xa0/0x100
- device_unbind_cleanup+0x14/0x60
- really_probe+0x198/0x2d4
- __driver_probe_device+0x74/0xdc
- driver_probe_device+0x3c/0x110
- __driver_attach+0x8c/0x190
- bus_for_each_dev+0x6c/0xc0
- driver_attach+0x20/0x30
- bus_add_driver+0x148/0x1fc
- driver_register+0x74/0x120
- __platform_driver_register+0x24/0x30
- safexcel_init+0x48/0x1000 [crypto_safexcel]
- do_one_initcall+0x4c/0x1b0
- do_init_module+0x44/0x1cc
- load_module+0x1724/0x1be4
- __do_sys_finit_module+0xbc/0x110
- __arm64_sys_finit_module+0x1c/0x24
- invoke_syscall+0x44/0x110
- el0_svc_common.constprop.0+0xc0/0xe0
- do_el0_svc+0x20/0x80
- el0_svc+0x14/0x4c
- el0t_64_sync_handler+0xb0/0xb4
- el0t_64_sync+0x148/0x14c
----[ end trace 0000000000000000 ]---
-
-Fixes: 1b44c5a60c13 ("inside-secure - add SafeXcel EIP197 crypto engine driver")
-Signed-off-by: Jonathan McDowell <noodles@earth.li>
-Cc: stable@vger.kernel.org
-Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/crypto/inside-secure/safexcel.c |   37 +++++++++++++++++++++++---------
- 1 file changed, 27 insertions(+), 10 deletions(-)
-
---- a/drivers/crypto/inside-secure/safexcel.c
-+++ b/drivers/crypto/inside-secure/safexcel.c
-@@ -1462,19 +1462,23 @@ static int safexcel_probe_generic(void *
-                                                    &priv->ring[i].rdr);
-               if (ret) {
-                       dev_err(dev, "Failed to initialize rings\n");
--                      return ret;
-+                      goto err_cleanup_rings;
-               }
- 
-               priv->ring[i].rdr_req = devm_kcalloc(dev,
-                       EIP197_DEFAULT_RING_SIZE,
-                       sizeof(*priv->ring[i].rdr_req),
-                       GFP_KERNEL);
--              if (!priv->ring[i].rdr_req)
--                      return -ENOMEM;
-+              if (!priv->ring[i].rdr_req) {
-+                      ret = -ENOMEM;
-+                      goto err_cleanup_rings;
-+              }
- 
-               ring_irq = devm_kzalloc(dev, sizeof(*ring_irq), GFP_KERNEL);
--              if (!ring_irq)
--                      return -ENOMEM;
-+              if (!ring_irq) {
-+                      ret = -ENOMEM;
-+                      goto err_cleanup_rings;
-+              }
- 
-               ring_irq->priv = priv;
-               ring_irq->ring = i;
-@@ -1487,7 +1491,8 @@ static int safexcel_probe_generic(void *
-                                               ring_irq);
-               if (irq < 0) {
-                       dev_err(dev, "Failed to get IRQ ID for ring %d\n", i);
--                      return irq;
-+                      ret = irq;
-+                      goto err_cleanup_rings;
-               }
- 
-               priv->ring[i].work_data.priv = priv;
-@@ -1498,8 +1503,10 @@ static int safexcel_probe_generic(void *
-               snprintf(wq_name, 9, "wq_ring%d", i);
-               priv->ring[i].workqueue =
-                       create_singlethread_workqueue(wq_name);
--              if (!priv->ring[i].workqueue)
--                      return -ENOMEM;
-+              if (!priv->ring[i].workqueue) {
-+                      ret = -ENOMEM;
-+                      goto err_cleanup_rings;
-+              }
- 
-               priv->ring[i].requests = 0;
-               priv->ring[i].busy = false;
-@@ -1516,16 +1523,26 @@ static int safexcel_probe_generic(void *
-       ret = safexcel_hw_init(priv);
-       if (ret) {
-               dev_err(dev, "HW init failed (%d)\n", ret);
--              return ret;
-+              goto err_cleanup_rings;
-       }
- 
-       ret = safexcel_register_algorithms(priv);
-       if (ret) {
-               dev_err(dev, "Failed to register algorithms (%d)\n", ret);
--              return ret;
-+              goto err_cleanup_rings;
-       }
- 
-       return 0;
-+
-+err_cleanup_rings:
-+      for (i = 0; i < priv->config.rings; i++) {
-+              if (priv->ring[i].irq)
-+                      irq_set_affinity_hint(priv->ring[i].irq, NULL);
-+              if (priv->ring[i].workqueue)
-+                      destroy_workqueue(priv->ring[i].workqueue);
-+      }
-+
-+      return ret;
- }
- 
- static void safexcel_hw_reset_rings(struct safexcel_crypto_priv *priv)

diff --git a/queue-5.4/series b/queue-5.4/series
index 68e42a7e011fb1206da6fc15b019610728ae9731..f987c17331ebc81b9509c8a3e070b01b28a5fed5 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -21,7 +21,6 @@ pwm-meson-fix-axg-ao-mux-parents.patch
 pwm-meson-fix-g12a-ao-clk81-name.patch
 ring-buffer-sync-irq-works-before-buffer-destruction.patch
 crypto-api-demote-bug_on-in-crypto_unregister_alg-to-a-warn_on.patch
-crypto-safexcel-cleanup-ring-irq-workqueues-on-load-failure.patch
 reiserfs-add-security-prefix-to-xattr-name-in-reiserfs_security_write.patch
 kvm-nvmx-emulate-nops-in-l2-and-pause-if-it-s-not-intercepted.patch
 i2c-omap-fix-standard-mode-false-ack-readings.patch