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

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

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

Subject: [PATCH] crypto: qat - fix VF IDs in PFVF log messages

Git-commit: 1d9a915fafabc27739ad6e19db6f86c233f676b2

Patch-mainline: v5.17-rc1

References: jsc#PED-1073

PFVF debug messages use a mix of zero and one based VF IDs.

Switch to zero based VF numbers in all log messages.

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_isr.c           |  2 +-

 drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c | 10 +++++-----

 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/crypto/qat/qat_common/adf_isr.c b/drivers/crypto/qat/qat_common/adf_isr.c

index 358200c0d5981..522e0c10d9b9b 100644

--- a/drivers/crypto/qat/qat_common/adf_isr.c

+++ b/drivers/crypto/qat/qat_common/adf_isr.c

@@ -123,7 +123,7 @@ static bool adf_handle_vf2pf_int(struct adf_accel_dev *accel_dev)

 			if (!__ratelimit(&vf_info->vf2pf_ratelimit)) {

 				dev_info(&GET_DEV(accel_dev),

 					 "Too many ints from VF%d\n",

-					  vf_info->vf_nr + 1);

+					  vf_info->vf_nr);

 				continue;

 			}

diff --git a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

index db5bbb9db32e3..b486b2b599c25 100644

--- a/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

+++ b/drivers/crypto/qat/qat_common/adf_pfvf_pf_proto.c

@@ -50,7 +50,7 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,

 		dev_dbg(&GET_DEV(accel_dev),

 			"Compatibility Version Request from VF%d vers=%u\n",

-			vf_nr + 1, vf_compat_ver);

+			vf_nr, vf_compat_ver);

 		if (vf_compat_ver <= ADF_PFVF_COMPAT_THIS_VERSION) {

 			compat = ADF_PF2VF_VF_COMPATIBLE;

@@ -78,7 +78,7 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,

 		dev_dbg(&GET_DEV(accel_dev),

 			"Legacy VersionRequest received from VF%d 0x%x\n",

-			vf_nr + 1, msg);

+			vf_nr, msg);

 		/* PF always newer than legacy VF */

 		compat = ADF_PF2VF_VF_COMPATIBLE;

@@ -96,7 +96,7 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,

 		{

 		dev_dbg(&GET_DEV(accel_dev),

 			"Init message received from VF%d 0x%x\n",

-			vf_nr + 1, msg);

+			vf_nr, msg);

 		vf_info->init = true;

 		}

 		break;

@@ -104,13 +104,13 @@ static int adf_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr,

 		{

 		dev_dbg(&GET_DEV(accel_dev),

 			"Shutdown message received from VF%d 0x%x\n",

-			vf_nr + 1, msg);

+			vf_nr, msg);

 		vf_info->init = false;

 		}

 		break;

 	default:

 		dev_dbg(&GET_DEV(accel_dev), "Unknown message from VF%d (0x%x)\n",

-			vf_nr + 1, msg);

+			vf_nr, msg);

 		return -ENOMSG;

 	}

-- 

2.35.3