crypto: qat - replace state machine calls

The device state machine functions are unsafe and interdependent on each
other. To perform a state transition, these shall be called in a
specific order:
  * device up:   adf_dev_init() -> adf_dev_start()
  * device down: adf_dev_stop() -> adf_dev_shutdown()

Replace all the state machine functions used in the QAT driver with the
safe wrappers adf_dev_up() and adf_dev_down().

Signed-off-by: Shashank Gupta <shashank.gupta@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_4xxx/adf_drv.c b/drivers/crypto/qat/qat_4xxx/adf_drv.c
index f7fdb435a70e5eab73247a53c9759b5e18d77d04..6f862b56c51c1db95083d20febacef8eef5f0cda 100644 (file)
--- a/drivers/crypto/qat/qat_4xxx/adf_drv.c
+++ b/drivers/crypto/qat/qat_4xxx/adf_drv.c
@@ -411,15 +411,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_disable_aer;
        }
 
-       ret = hw_data->dev_config(accel_dev);
-       if (ret)
-               goto out_err_disable_aer;
-
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;
 
@@ -430,9 +422,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_disable_aer:
        adf_disable_aer(accel_dev);
 out_err:
@@ -448,8 +438,7 @@ static void adf_remove(struct pci_dev *pdev)
                pr_err("QAT: Driver removal failed\n");
                return;
        }
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_disable_aer(accel_dev);
        adf_cleanup_accel(accel_dev);
 }

diff --git a/drivers/crypto/qat/qat_c3xxx/adf_drv.c b/drivers/crypto/qat/qat_c3xxx/adf_drv.c
index 1f4fbf4562b221b7a846293199fb08608fb2911f..4c00c49338050d92ec000becb8bf02f82839e702 100644 (file)
--- a/drivers/crypto/qat/qat_c3xxx/adf_drv.c
+++ b/drivers/crypto/qat/qat_c3xxx/adf_drv.c
@@ -201,24 +201,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_disable_aer;
        }
 
-       ret = hw_data->dev_config(accel_dev);
-       if (ret)
-               goto out_err_disable_aer;
-
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_disable_aer:
        adf_disable_aer(accel_dev);
 out_err_free_reg:
@@ -239,8 +229,7 @@ static void adf_remove(struct pci_dev *pdev)
                pr_err("QAT: Driver removal failed\n");
                return;
        }
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_disable_aer(accel_dev);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);

diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
index cf4ef83e186f835a7edf85ce461869eba43f28b9..e8cc10f641343786b02354032804b3d3c3379202 100644 (file)
--- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
@@ -173,20 +173,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_free_reg:
        pci_release_regions(accel_pci_dev->pci_dev);
 out_err_disable:
@@ -206,8 +200,7 @@ static void adf_remove(struct pci_dev *pdev)
                return;
        }
        adf_flush_vf_wq(accel_dev);
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);
        kfree(accel_dev);

diff --git a/drivers/crypto/qat/qat_c62x/adf_drv.c b/drivers/crypto/qat/qat_c62x/adf_drv.c
index 4ccaf298250c3c6286195381ba8d144c140d66e8..fcb2f5b8e053b0054f79610fbf81cdfb99565abd 100644 (file)
--- a/drivers/crypto/qat/qat_c62x/adf_drv.c
+++ b/drivers/crypto/qat/qat_c62x/adf_drv.c
@@ -201,24 +201,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_disable_aer;
        }
 
-       ret = hw_data->dev_config(accel_dev);
-       if (ret)
-               goto out_err_disable_aer;
-
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_disable_aer:
        adf_disable_aer(accel_dev);
 out_err_free_reg:
@@ -239,8 +229,7 @@ static void adf_remove(struct pci_dev *pdev)
                pr_err("QAT: Driver removal failed\n");
                return;
        }
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_disable_aer(accel_dev);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);

diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
index 0e642c94b92936bce3a0e92656c3b9865a3617e9..37566309df943a931ced86abcfc73f75be859a55 100644 (file)
--- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
@@ -173,20 +173,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_free_reg:
        pci_release_regions(accel_pci_dev->pci_dev);
 out_err_disable:
@@ -206,8 +200,7 @@ static void adf_remove(struct pci_dev *pdev)
                return;
        }
        adf_flush_vf_wq(accel_dev);
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);
        kfree(accel_dev);

diff --git a/drivers/crypto/qat/qat_common/adf_ctl_drv.c b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
index f030d8a85252bf2b2facf6dca0505904408f737e..88c41d6fbb7ca54c8da5e47321c4ae6d8abe2b01 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_ctl_drv.c
+++ b/drivers/crypto/qat/qat_common/adf_ctl_drv.c
@@ -244,8 +244,7 @@ static void adf_ctl_stop_devices(u32 id)
                        if (!accel_dev->is_vf)
                                continue;
 
-                       adf_dev_stop(accel_dev);
-                       adf_dev_shutdown(accel_dev);
+                       adf_dev_down(accel_dev, false);
                }
        }
 
@@ -254,8 +253,7 @@ static void adf_ctl_stop_devices(u32 id)
                        if (!adf_dev_started(accel_dev))
                                continue;
 
-                       adf_dev_stop(accel_dev);
-                       adf_dev_shutdown(accel_dev);
+                       adf_dev_down(accel_dev, false);
                }
        }
 }
@@ -309,23 +307,16 @@ static int adf_ctl_ioctl_dev_start(struct file *fp, unsigned int cmd,
        if (!accel_dev)
                goto out;
 
-       if (!adf_dev_started(accel_dev)) {
-               dev_info(&GET_DEV(accel_dev),
-                        "Starting acceleration device qat_dev%d.\n",
-                        ctl_data->device_id);
-               ret = adf_dev_init(accel_dev);
-               if (!ret)
-                       ret = adf_dev_start(accel_dev);
-       } else {
-               dev_info(&GET_DEV(accel_dev),
-                        "Acceleration device qat_dev%d already started.\n",
-                        ctl_data->device_id);
-       }
+       dev_info(&GET_DEV(accel_dev),
+                "Starting acceleration device qat_dev%d.\n",
+                ctl_data->device_id);
+
+       ret = adf_dev_up(accel_dev, false);
+
        if (ret) {
                dev_err(&GET_DEV(accel_dev), "Failed to start qat_dev%d\n",
                        ctl_data->device_id);
-               adf_dev_stop(accel_dev);
-               adf_dev_shutdown(accel_dev);
+               adf_dev_down(accel_dev, false);
        }
 out:
        kfree(ctl_data);

diff --git a/drivers/crypto/qat/qat_common/adf_sriov.c b/drivers/crypto/qat/qat_common/adf_sriov.c
index d85a90cc387b4f6337599c979a0a069a8335b020..f44025bb6f995d9bdf58bf9d6290fd5566c10192 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_sriov.c
+++ b/drivers/crypto/qat/qat_common/adf_sriov.c
@@ -159,7 +159,7 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
                        return -EBUSY;
                }
 
-               ret = adf_dev_shutdown_cache_cfg(accel_dev);
+               ret = adf_dev_down(accel_dev, true);
                if (ret)
                        return ret;
        }
@@ -184,13 +184,7 @@ int adf_sriov_configure(struct pci_dev *pdev, int numvfs)
        if (!accel_dev->pf.vf_info)
                return -ENOMEM;
 
-       if (adf_dev_init(accel_dev)) {
-               dev_err(&GET_DEV(accel_dev), "Failed to init qat_dev%d\n",
-                       accel_dev->accel_id);
-               return -EFAULT;
-       }
-
-       if (adf_dev_start(accel_dev)) {
+       if (adf_dev_up(accel_dev, false)) {
                dev_err(&GET_DEV(accel_dev), "Failed to start qat_dev%d\n",
                        accel_dev->accel_id);
                return -EFAULT;

diff --git a/drivers/crypto/qat/qat_common/adf_vf_isr.c b/drivers/crypto/qat/qat_common/adf_vf_isr.c
index 8c95fcd8e64b098e90797c4fed25b564efcf0c86..b05c3957a16019a63d3c6568c9573cef22d838b5 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_vf_isr.c
+++ b/drivers/crypto/qat/qat_common/adf_vf_isr.c
@@ -71,8 +71,7 @@ static void adf_dev_stop_async(struct work_struct *work)
        struct adf_accel_dev *accel_dev = stop_data->accel_dev;
 
        adf_dev_restarting_notify(accel_dev);
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 
        /* Re-enable PF2VF interrupts */
        adf_enable_pf2vf_interrupts(accel_dev);

diff --git a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
index ebeb17b67fcd58d89f7ab569ab4491f23faf8e99..4d27e4e436420a16311183f5aaa5dbfb7c2324bd 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xcc/adf_drv.c
@@ -201,24 +201,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                goto out_err_disable_aer;
        }
 
-       ret = hw_data->dev_config(accel_dev);
-       if (ret)
-               goto out_err_disable_aer;
-
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, true);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_disable_aer:
        adf_disable_aer(accel_dev);
 out_err_free_reg:
@@ -239,8 +229,7 @@ static void adf_remove(struct pci_dev *pdev)
                pr_err("QAT: Driver removal failed\n");
                return;
        }
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_disable_aer(accel_dev);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);

diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
index c1485e702b3eb5ab2e00cb8a55a6b36498e38369..96854a1cd87e8c6a9e7a610152ac72b60ecc257c 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
@@ -173,20 +173,14 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        /* Completion for VF2PF request/response message exchange */
        init_completion(&accel_dev->vf.msg_received);
 
-       ret = adf_dev_init(accel_dev);
-       if (ret)
-               goto out_err_dev_shutdown;
-
-       ret = adf_dev_start(accel_dev);
+       ret = adf_dev_up(accel_dev, false);
        if (ret)
                goto out_err_dev_stop;
 
        return ret;
 
 out_err_dev_stop:
-       adf_dev_stop(accel_dev);
-out_err_dev_shutdown:
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
 out_err_free_reg:
        pci_release_regions(accel_pci_dev->pci_dev);
 out_err_disable:
@@ -206,8 +200,7 @@ static void adf_remove(struct pci_dev *pdev)
                return;
        }
        adf_flush_vf_wq(accel_dev);
-       adf_dev_stop(accel_dev);
-       adf_dev_shutdown(accel_dev);
+       adf_dev_down(accel_dev, false);
        adf_cleanup_accel(accel_dev);
        adf_cleanup_pci_dev(accel_dev);
        kfree(accel_dev);