From 956125e21f460ef94660019b6ec9de3f835f93ab Mon Sep 17 00:00:00 2001

From: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

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

Subject: [PATCH] crypto: qat - change PFVF ACK behaviour

Git-commit: 956125e21f460ef94660019b6ec9de3f835f93ab

Patch-mainline: v5.17-rc1

References: jsc#PED-1073

Change the PFVF receipt flow on the VF side to read, ack and handle the

message instead of read, handle and ack.

This is done for (1) consistency with the PF side, see the function

adf_recv_and_handle_vf2pf_msg() in adf_pf2vf_msg.c, and (2) performance

reasons, to avoid keeping the CSR busy while parsing the message.

In addition, do not ACK PFVF legacy messages, as this driver is not

capable of handling PFVF legacy messages.

If a PFVF message with MSGORIGIN not set is received, do nothing.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>

Reviewed-by: Marco Chiappero <marco.chiappero@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_pf2vf_msg.c | 8 ++++----

 drivers/crypto/qat/qat_common/adf_vf2pf_msg.c | 7 ++++---

 2 files changed, 8 insertions(+), 7 deletions(-)

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

index 796301e9fe5bc..4922ee2a2a081 100644

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

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

@@ -195,14 +195,14 @@ bool adf_recv_and_handle_vf2pf_msg(struct adf_accel_dev *accel_dev, u32 vf_nr)

 		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 (!(msg & ADF_VF2PF_MSGORIGIN_SYSTEM))

 		/* Ignore legacy non-system (non-kernel) VF2PF messages */

 		goto err;

+	/* To ACK, clear the VF2PFINT bit */

+	msg &= ~ADF_VF2PF_INT;

+	ADF_CSR_WR(pmisc_addr, hw_data->get_pf2vf_offset(vf_nr), msg);

+

 	switch ((msg & ADF_VF2PF_MSGTYPE_MASK) >> ADF_VF2PF_MSGTYPE_SHIFT) {

 	case ADF_VF2PF_MSGTYPE_COMPAT_VER_REQ:

 		{

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

index 064477fcb5fb6..a6eaf93d5462b 100644

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

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

@@ -69,6 +69,10 @@ bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)

 		/* Ignore legacy non-system (non-kernel) PF2VF messages */

 		goto err;

+	/* To ack, clear the PF2VFINT bit */

+	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),

@@ -93,9 +97,6 @@ bool adf_recv_and_handle_pf2vf_msg(struct adf_accel_dev *accel_dev)

 		goto err;

 	}

-	/* To ack, clear the PF2VFINT bit */

-	msg &= ~ADF_PF2VF_INT;

-	ADF_CSR_WR(pmisc_bar_addr, offset, msg);

 	return ret;

 err:

-- 

2.35.3