crypto: qat - pass the PF2VF responses back to the callers

Currently, any PF response to a VF request is fully parsed during the
interrupt handling. This way the individual response values are stored
into the accel_dev structure, preventing the caller to access and decode
the full response message itself.

Change this behavior, by letting the API return back the entire message
to the caller, in order to:
  - keep correlated code together, that is, the (building of the)
    request and the (decoding of the) response;
  - avoid polluting the accel_dev data structure with unnecessary and at
    times temporary values; only the entire message is stored in a
    temporary buffer.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Reviewed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
index 1df1b868978d94a92c00398a6de9390c2de09514..0ba1d293bb819652430fdce67ecf299b9f1a065c 100644 (file)
--- a/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c3xxxvf/adf_drv.c
@@ -171,7 +171,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        pci_set_master(pdev);
        /* Completion for VF2PF request/response message exchange */
-       init_completion(&accel_dev->vf.iov_msg_completion);
+       init_completion(&accel_dev->vf.msg_received);
 
        ret = qat_crypto_dev_config(accel_dev);
        if (ret)

diff --git a/drivers/crypto/qat/qat_c62xvf/adf_drv.c b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
index 8103bd81d617ae9fbe1906b6e8537b89aa42d5e7..176d8e2786f477828cb43cc90be8f09e8a206936 100644 (file)
--- a/drivers/crypto/qat/qat_c62xvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_c62xvf/adf_drv.c
@@ -171,7 +171,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        pci_set_master(pdev);
        /* Completion for VF2PF request/response message exchange */
-       init_completion(&accel_dev->vf.iov_msg_completion);
+       init_completion(&accel_dev->vf.msg_received);
 
        ret = qat_crypto_dev_config(accel_dev);
        if (ret)

diff --git a/drivers/crypto/qat/qat_common/adf_accel_devices.h b/drivers/crypto/qat/qat_common/adf_accel_devices.h
index 35e62a73f9fa805728f10ea94af186b7c28ead49..b05b217df24c47ca4123fd5e1562b0f16c7e173d 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_accel_devices.h
+++ b/drivers/crypto/qat/qat_common/adf_accel_devices.h
@@ -271,8 +271,8 @@ struct adf_accel_dev {
                        char irq_name[ADF_MAX_MSIX_VECTOR_NAME];
                        struct tasklet_struct pf2vf_bh_tasklet;
                        struct mutex vf2pf_lock; /* protect CSR access */
-                       struct completion iov_msg_completion;
-                       u8 compatible;
+                       struct completion msg_received;
+                       u32 response; /* temp field holding pf2vf response */
                        u8 pf_version;
                } vf;
        };

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c b/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c
index 7969a644e24b7443e072b62943b8266f319e813c..d5cccec03a3b36ddc7ef06deb24b5528c85f64db 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_vf_msg.c
@@ -52,7 +52,10 @@ EXPORT_SYMBOL_GPL(adf_vf2pf_notify_shutdown);
 int adf_vf2pf_request_version(struct adf_accel_dev *accel_dev)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
+       u8 pf_version;
        u32 msg = 0;
+       int compat;
+       u32 resp;
        int ret;
 
        msg = ADF_VF2PF_MSGORIGIN_SYSTEM;
@@ -60,34 +63,38 @@ int adf_vf2pf_request_version(struct adf_accel_dev *accel_dev)
        msg |= ADF_PFVF_COMPAT_THIS_VERSION << ADF_VF2PF_COMPAT_VER_REQ_SHIFT;
        BUILD_BUG_ON(ADF_PFVF_COMPAT_THIS_VERSION > 255);
 
-       ret = adf_send_vf2pf_req(accel_dev, msg);
+       ret = adf_send_vf2pf_req(accel_dev, msg, &resp);
        if (ret) {
                dev_err(&GET_DEV(accel_dev),
                        "Failed to send Compatibility Version Request.\n");
                return ret;
        }
 
+       pf_version = (resp & ADF_PF2VF_VERSION_RESP_VERS_MASK)
+                    >> ADF_PF2VF_VERSION_RESP_VERS_SHIFT;
+       compat = (resp & ADF_PF2VF_VERSION_RESP_RESULT_MASK)
+                >> ADF_PF2VF_VERSION_RESP_RESULT_SHIFT;
+
        /* Response from PF received, check compatibility */
-       switch (accel_dev->vf.compatible) {
+       switch (compat) {
        case ADF_PF2VF_VF_COMPATIBLE:
                break;
        case ADF_PF2VF_VF_COMPAT_UNKNOWN:
                /* VF is newer than PF and decides whether it is compatible */
-               if (accel_dev->vf.pf_version >= hw_data->min_iov_compat_ver) {
-                       accel_dev->vf.compatible = ADF_PF2VF_VF_COMPATIBLE;
+               if (pf_version >= hw_data->min_iov_compat_ver)
                        break;
-               }
                fallthrough;
        case ADF_PF2VF_VF_INCOMPATIBLE:
                dev_err(&GET_DEV(accel_dev),
                        "PF (vers %d) and VF (vers %d) are not compatible\n",
-                       accel_dev->vf.pf_version,
-                       ADF_PFVF_COMPAT_THIS_VERSION);
+                       pf_version, ADF_PFVF_COMPAT_THIS_VERSION);
                return -EINVAL;
        default:
                dev_err(&GET_DEV(accel_dev),
                        "Invalid response from PF; assume not compatible\n");
                return -EINVAL;
        }
-       return ret;
+
+       accel_dev->vf.pf_version = pf_version;
+       return 0;
 }

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
index 62817bcec121e696325c42c99f1ae6474dc0ef8c..ea1a00e746ff5e9a9002a5d96c3d2268f8d3c4e4 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.c
@@ -47,18 +47,19 @@ static u32 adf_recv_pf2vf_msg(struct adf_accel_dev *accel_dev)
  * adf_send_vf2pf_req() - send VF2PF request message
  * @accel_dev: Pointer to acceleration device.
  * @msg:       Request message to send
+ * @resp:      Returned PF response
  *
  * This function sends a message that requires a response from the VF to the PF
  * and waits for a reply.
  *
  * Return: 0 on success, error code otherwise.
  */
-int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg)
+int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg, u32 *resp)
 {
        unsigned long timeout = msecs_to_jiffies(ADF_PFVF_MSG_RESP_TIMEOUT);
        int ret;
 
-       reinit_completion(&accel_dev->vf.iov_msg_completion);
+       reinit_completion(&accel_dev->vf.msg_received);
 
        /* Send request from VF to PF */
        ret = adf_send_vf2pf_msg(accel_dev, msg);
@@ -69,13 +70,19 @@ int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg)
        }
 
        /* Wait for response */
-       if (!wait_for_completion_timeout(&accel_dev->vf.iov_msg_completion,
+       if (!wait_for_completion_timeout(&accel_dev->vf.msg_received,
                                         timeout)) {
                dev_err(&GET_DEV(accel_dev),
                        "PFVF request/response message timeout expired\n");
                return -EIO;
        }
 
+       if (likely(resp))
+               *resp = accel_dev->vf.response;
+
+       /* Once copied, set to an invalid value */
+       accel_dev->vf.response = 0;
+
        return 0;
 }
 
@@ -89,15 +96,8 @@ static bool adf_handle_pf2vf_msg(struct adf_accel_dev *accel_dev, u32 msg)
                adf_pf2vf_handle_pf_restarting(accel_dev);
                return false;
        case ADF_PF2VF_MSGTYPE_VERSION_RESP:
-               dev_dbg(&GET_DEV(accel_dev),
-                       "Version resp received from PF 0x%x\n", msg);
-               accel_dev->vf.pf_version =
-                       (msg & ADF_PF2VF_VERSION_RESP_VERS_MASK) >>
-                       ADF_PF2VF_VERSION_RESP_VERS_SHIFT;
-               accel_dev->vf.compatible =
-                       (msg & ADF_PF2VF_VERSION_RESP_RESULT_MASK) >>
-                       ADF_PF2VF_VERSION_RESP_RESULT_SHIFT;
-               complete(&accel_dev->vf.iov_msg_completion);
+               accel_dev->vf.response = msg;
+               complete(&accel_dev->vf.msg_received);
                return true;
        default:
                dev_err(&GET_DEV(accel_dev),

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h
index a3ab24c7d18bd979daa8783363db2db176da95c9..6226d4d9d520f9f2b93dfba80b15f791c8f1d4f4 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_vf_proto.h
@@ -7,7 +7,7 @@
 #include "adf_accel_devices.h"
 
 int adf_send_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 msg);
-int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg);
+int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg, u32 *resp);
 
 int adf_enable_vf2pf_comms(struct adf_accel_dev *accel_dev);
 

diff --git a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
index 99d90f3ea2b7945dd064c99afd80725b42339ece..ee45d688b5d73e5f0aba63b9cb9292f84ff18e76 100644 (file)
--- a/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
+++ b/drivers/crypto/qat/qat_dh895xccvf/adf_drv.c
@@ -171,7 +171,7 @@ static int adf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
        }
        pci_set_master(pdev);
        /* Completion for VF2PF request/response message exchange */
-       init_completion(&accel_dev->vf.iov_msg_completion);
+       init_completion(&accel_dev->vf.msg_received);
 
        ret = qat_crypto_dev_config(accel_dev);
        if (ret)