crypto: qat - reorganize PFVF protocol definitions

Organize PFVF protocol definitions by type rather than direction, by
keeping related fields close.
Also, make sure the order is consistent for both PF and VF definitions.

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_common/adf_pfvf_msg.h b/drivers/crypto/qat/qat_common/adf_pfvf_msg.h
index 0520466563fd6d6c33cbc8d411ef4a7668236b72..23f4c4b35daced1347b081243a57b82c8e325631 100644 (file)
--- a/drivers/crypto/qat/qat_common/adf_pfvf_msg.h
+++ b/drivers/crypto/qat/qat_common/adf_pfvf_msg.h
@@ -53,34 +53,21 @@
  * adf_gen2_pfvf_send() in adf_pf2vf_msg.c).
  */
 
-#define ADF_PFVF_COMPAT_THIS_VERSION           0x1     /* PF<->VF compat */
-
 /* PF->VF messages */
 #define ADF_PF2VF_INT                          BIT(0)
 #define ADF_PF2VF_MSGORIGIN_SYSTEM             BIT(1)
+#define ADF_PF2VF_IN_USE_BY_PF                 0x6AC20000
+#define ADF_PF2VF_IN_USE_BY_PF_MASK            0xFFFE0000
 #define ADF_PF2VF_MSGTYPE_MASK                 0x0000003C
 #define ADF_PF2VF_MSGTYPE_SHIFT                        2
 #define ADF_PF2VF_MSGTYPE_RESTARTING           0x01
 #define ADF_PF2VF_MSGTYPE_VERSION_RESP         0x02
-#define ADF_PF2VF_IN_USE_BY_PF                 0x6AC20000
-#define ADF_PF2VF_IN_USE_BY_PF_MASK            0xFFFE0000
-
-/* PF->VF Version Response */
-#define ADF_PF2VF_VERSION_RESP_VERS_MASK       0x00003FC0
-#define ADF_PF2VF_VERSION_RESP_VERS_SHIFT      6
-#define ADF_PF2VF_VERSION_RESP_RESULT_MASK     0x0000C000
-#define ADF_PF2VF_VERSION_RESP_RESULT_SHIFT    14
-#define ADF_PF2VF_MINORVERSION_SHIFT           6
-#define ADF_PF2VF_MAJORVERSION_SHIFT           10
-#define ADF_PF2VF_VF_COMPATIBLE                        1
-#define ADF_PF2VF_VF_INCOMPATIBLE              2
-#define ADF_PF2VF_VF_COMPAT_UNKNOWN            3
 
 /* VF->PF messages */
-#define ADF_VF2PF_IN_USE_BY_VF                 0x00006AC2
-#define ADF_VF2PF_IN_USE_BY_VF_MASK            0x0000FFFE
 #define ADF_VF2PF_INT                          BIT(16)
 #define ADF_VF2PF_MSGORIGIN_SYSTEM             BIT(17)
+#define ADF_VF2PF_IN_USE_BY_VF                 0x00006AC2
+#define ADF_VF2PF_IN_USE_BY_VF_MASK            0x0000FFFE
 #define ADF_VF2PF_MSGTYPE_MASK                 0x003C0000
 #define ADF_VF2PF_MSGTYPE_SHIFT                        18
 #define ADF_VF2PF_MSGTYPE_INIT                 0x3
@@ -88,6 +75,21 @@
 #define ADF_VF2PF_MSGTYPE_VERSION_REQ          0x5
 #define ADF_VF2PF_MSGTYPE_COMPAT_VER_REQ       0x6
 
+/* VF/PF compatibility version. */
+/* Reference to the current version */
+#define ADF_PFVF_COMPAT_THIS_VERSION           1  /* PF<->VF compat */
+
+/* PF->VF Version Response */
+#define ADF_PF2VF_MINORVERSION_SHIFT           6
+#define ADF_PF2VF_MAJORVERSION_SHIFT           10
+#define ADF_PF2VF_VERSION_RESP_VERS_MASK       0x00003FC0
+#define ADF_PF2VF_VERSION_RESP_VERS_SHIFT      6
+#define ADF_PF2VF_VERSION_RESP_RESULT_MASK     0x0000C000
+#define ADF_PF2VF_VERSION_RESP_RESULT_SHIFT    14
+#define ADF_PF2VF_VF_COMPATIBLE                        1
+#define ADF_PF2VF_VF_INCOMPATIBLE              2
+#define ADF_PF2VF_VF_COMPAT_UNKNOWN            3
+
 /* VF->PF Compatible Version Request */
 #define ADF_VF2PF_COMPAT_VER_REQ_SHIFT         22