From 1d4fde6c4e805f4cb5ecb54fb39c93686d3e5924 Mon Sep 17 00:00:00 2001

From: Marco Chiappero <marco.chiappero@intel.com>

Date: Wed, 17 Nov 2021 14:30:53 +0000

Subject: [PATCH] crypto: qat - use enums for PFVF protocol codes

Git-commit: 1d4fde6c4e805f4cb5ecb54fb39c93686d3e5924

Patch-mainline: v5.17-rc1

References: jsc#PED-1073

Replace PFVF constants with enumerations for valid protocol codes.

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>

Signed-off-by: Torsten Duwe <duwe@suse.de>

---

 drivers/crypto/qat/qat_common/adf_pfvf_msg.h | 33 +++++++++++++-------

 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_msg.h b/drivers/crypto/qat/qat_common/adf_pfvf_msg.h

index 23f4c4b35dace..8b476072df285 100644

--- a/drivers/crypto/qat/qat_common/adf_pfvf_msg.h

+++ b/drivers/crypto/qat/qat_common/adf_pfvf_msg.h

@@ -60,8 +60,11 @@

 #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

+

+enum pf2vf_msgtype {

+	ADF_PF2VF_MSGTYPE_RESTARTING		= 0x01,

+	ADF_PF2VF_MSGTYPE_VERSION_RESP		= 0x02,

+};

 /* VF->PF messages */

 #define ADF_VF2PF_INT				BIT(16)

@@ -70,14 +73,19 @@

 #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

-#define ADF_VF2PF_MSGTYPE_SHUTDOWN		0x4

-#define ADF_VF2PF_MSGTYPE_VERSION_REQ		0x5

-#define ADF_VF2PF_MSGTYPE_COMPAT_VER_REQ	0x6

+

+enum vf2pf_msgtype {

+	ADF_VF2PF_MSGTYPE_INIT			= 0x03,

+	ADF_VF2PF_MSGTYPE_SHUTDOWN		= 0x04,

+	ADF_VF2PF_MSGTYPE_VERSION_REQ		= 0x05,

+	ADF_VF2PF_MSGTYPE_COMPAT_VER_REQ	= 0x06,

+};

 /* VF/PF compatibility version. */

-/* Reference to the current version */

-#define ADF_PFVF_COMPAT_THIS_VERSION		1  /* PF<->VF compat */

+enum pfvf_compatibility_version {

+	/* Reference to the current version */

+	ADF_PFVF_COMPAT_THIS_VERSION		= 0x01,

+};

 /* PF->VF Version Response */

 #define ADF_PF2VF_MINORVERSION_SHIFT		6

@@ -86,9 +94,12 @@

 #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

+

+enum pf2vf_compat_response {

+	ADF_PF2VF_VF_COMPATIBLE			= 0x01,

+	ADF_PF2VF_VF_INCOMPATIBLE		= 0x02,

+	ADF_PF2VF_VF_COMPAT_UNKNOWN		= 0x03,

+};

 /* VF->PF Compatible Version Request */

 #define ADF_VF2PF_COMPAT_VER_REQ_SHIFT		22

-- 

2.35.3