crypto: qat - split PFVF message decoding from handling

Refactor the receive and handle logic to separate the parsing and
handling of the PFVF message from the initial retrieval and ACK.

This is to allow the intoduction of the recv function in a subsequent
patch.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Co-developed-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_common/adf_pf2vf_msg.c b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
index 296f548..2017448 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
+++ b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
@@ -178,30 +178,12 @@ static int adf_send_vf2pf_req(struct adf_accel_dev *accel_dev, u32 msg)
        return 0;
 }
 
-bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
+static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,
+                               u32 msg, u32 *response)
 {
        struct adf_accel_vf_info *vf_info = &accel_dev->pf.vf_info[vf_nr];
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
-       int bar_id = hw_data->get_misc_bar_id(hw_data);
-       struct adf_bar *pmisc = &GET_BARS(accel_dev)[bar_id];
-       void __iomem *pmisc_addr = pmisc->virt_addr;
-       u32 msg, resp = 0;
-
-       /* Read message from the VF */
-       msg = ADF_CSR_RD(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr));
-       if (!(msg & ADF_VF2PF_INT)) {
-               dev_info(&GET_DEV(accel_dev),
-                        "Spurious VF2PF interrupt, msg %X. Ignored\n", msg);
-               return true;
-       }
-
-       if (!(msg & ADF_VF2PF_MSGORIGIN_SYSTEM))
-               /* Ignore legacy non-system (non-kernel) VF2PF messages */
-               return true;
-
-       /* To ACK, clear the VF2PFINT bit */
-       msg &= ~ADF_VF2PF_INT;
-       ADF_CSR_WR(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr), msg);
+       u32 resp = 0;
 
        switch ((msg & ADF_VF2PF_MSGTYPE_MASK) >> ADF_VF2PF_MSGTYPE_SHIFT) {
        case ADF_VF2PF_MSGTYPE_COMPAT_VER_REQ:
@@ -271,17 +253,51 @@ bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
                }
                break;
        default:
-               goto err;
+               dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%x)\n",
+                       vf_nr + 1, msg);
+               return -ENOMSG;
+       }
+
+       *response = resp;
+
+       return 0;
+}
+
+bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)
+{
+       struct adf_hw_device_data *hw_data = accel_dev->hw_device;
+       int bar_id = hw_data->get_misc_bar_id(hw_data);
+       struct adf_bar *pmisc = &GET_BARS(accel_dev)[bar_id];
+       void __iomem *pmisc_addr = pmisc->virt_addr;
+       u32 msg, resp = 0;
+
+       /* Read message from the VF */
+       msg = ADF_CSR_RD(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr));
+       if (!(msg & ADF_VF2PF_INT)) {
+               dev_info(&GET_DEV(accel_dev),
+                        "Spurious VF2PF interrupt, msg %X. Ignored\n", msg);
+               return true;
+       }
+
+       /* Ignore legacy non-system (non-kernel) VF2PF messages */
+       if (!(msg & ADF_VF2PF_MSGORIGIN_SYSTEM)) {
+               dev_dbg(&GET_DEV(accel_dev),
+                       "Ignored non-system message from VF%d (0x%x);\n",
+                       vf_nr + 1, msg);
+               return true;
        }
 
+       /* To ACK, clear the VF2PFINT bit */
+       msg &= ~ADF_VF2PF_INT;
+       ADF_CSR_WR(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr), msg);
+
+       if (adf_handle_vf2pf_msg(accel_dev, vf_nr, msg, &resp))
+               return false;
+
        if (resp && adf_send_pf2vf_msg(accel_dev, vf_nr, resp))
                dev_err(&GET_DEV(accel_dev), "Failed to send response to VF\n");
 
        return true;
-err:
-       dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%x);\n",
-               vf_nr + 1, msg);
-       return false;
 }
 
 void adf_pf2vf_notify_restarting(struct adf_accel_dev *accel_dev)

diff --git a/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c b/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
index e383232..01a6e68 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
+++ b/drivers/crypto/qat/qat_common/adf_vf2pf_msg.c
@@ -47,6 +47,34 @@ void adf_vf2pf_notify_shutdown(struct adf_accel_dev *accel_dev)
 }
 EXPORT_SYMBOL_GPL(adf_vf2pf_notify_shutdown);
 
+static bool adf_handle_pf2vf_msg(struct adf_accel_dev *accel_dev, u32 msg)
+{
+       switch ((msg & ADF_PF2VF_MSGTYPE_MASK) >> ADF_PF2VF_MSGTYPE_SHIFT) {
+       case ADF_PF2VF_MSGTYPE_RESTARTING:
+               dev_dbg(&GET_DEV(accel_dev),
+                       "Restarting msg received from PF 0x%x\n", 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);
+               return true;
+       default:
+               dev_err(&GET_DEV(accel_dev),
+                       "Unknown PF2VF message(0x%x)\n", msg);
+       }
+
+       return false;
+}
+
 bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;
@@ -54,7 +82,6 @@ bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)
                        &GET_BARS(accel_dev)[hw_data->get_misc_bar_id(hw_data)];
        void __iomem *pmisc_bar_addr = pmisc->virt_addr;
        u32 offset = hw_data->get_pf2vf_offset(0);
-       bool ret;
        u32 msg;
 
        /* Read the message from PF */
@@ -73,36 +100,5 @@ bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)
        msg &= ~ADF_PF2VF_INT;
        ADF_CSR_WR(pmisc_bar_addr, offset, msg);
 
-       switch ((msg & ADF_PF2VF_MSGTYPE_MASK) >> ADF_PF2VF_MSGTYPE_SHIFT) {
-       case ADF_PF2VF_MSGTYPE_RESTARTING:
-               dev_dbg(&GET_DEV(accel_dev),
-                       "Restarting msg received from PF 0x%x\n", msg);
-
-               adf_pf2vf_handle_pf_restarting(accel_dev);
-               ret = false;
-               break;
-       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);
-               ret = true;
-               break;
-       default:
-               goto err;
-       }
-
-       return ret;
-
-err:
-       dev_err(&GET_DEV(accel_dev),
-               "Unknown message from PF (0x%x); leaving PF2VF ints disabled\n",
-               msg);
-
-       return false;
+       return adf_handle_pf2vf_msg(accel_dev, msg);
 }