crypto: qat - move pfvf collision detection values

Keep adf_pf2vf_msg.h as much as possible focused on the protocol
definition.
Instead, collision parameters are an implementation detail which should
stay close to the code consuming them, therefore move them to
adf_pf2vf_msg.c.

Signed-off-by: Marco Chiappero <marco.chiappero@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_common/adf_pf2vf_msg.c b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
index 41f4b5643dbb4bbc2ebba566930edd4c71f5d4e7..22977001271c6eb07ccf0083730334cd6c39e7c0 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
+++ b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.c
@@ -5,6 +5,15 @@
 #include "adf_common_drv.h"
 #include "adf_pf2vf_msg.h"
 
+#define ADF_IOV_MSG_COLLISION_DETECT_DELAY     10
+#define ADF_IOV_MSG_ACK_DELAY                  2
+#define ADF_IOV_MSG_ACK_MAX_RETRY              100
+#define ADF_IOV_MSG_RETRY_DELAY                        5
+#define ADF_IOV_MSG_MAX_RETRIES                        3
+#define ADF_IOV_MSG_RESP_TIMEOUT       (ADF_IOV_MSG_ACK_DELAY * \
+                                        ADF_IOV_MSG_ACK_MAX_RETRY + \
+                                        ADF_IOV_MSG_COLLISION_DETECT_DELAY)
+
 void adf_enable_vf2pf_interrupts(struct adf_accel_dev *accel_dev, u32 vf_mask)
 {
        struct adf_hw_device_data *hw_data = accel_dev->hw_device;

diff --git a/drivers/crypto/qat/qat_common/adf_pf2vf_msg.h b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.h
index ffd43aa50b57e6b854f9aa26fd939f9b90bd2e96..a7d8f836734538fa6f5e48e649383f79e26c2f50 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pf2vf_msg.h
+++ b/drivers/crypto/qat/qat_common/adf_pf2vf_msg.h
@@ -90,13 +90,4 @@
 /* VF->PF Compatible Version Request */
 #define ADF_VF2PF_COMPAT_VER_REQ_SHIFT         22
 
-/* Collision detection */
-#define ADF_IOV_MSG_COLLISION_DETECT_DELAY     10
-#define ADF_IOV_MSG_ACK_DELAY                  2
-#define ADF_IOV_MSG_ACK_MAX_RETRY              100
-#define ADF_IOV_MSG_RETRY_DELAY                        5
-#define ADF_IOV_MSG_MAX_RETRIES                        3
-#define ADF_IOV_MSG_RESP_TIMEOUT       (ADF_IOV_MSG_ACK_DELAY * \
-                                        ADF_IOV_MSG_ACK_MAX_RETRY + \
-                                        ADF_IOV_MSG_COLLISION_DETECT_DELAY)
 #endif /* ADF_IOV_MSG_H */