leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

crypto: qat - leverage read_poll_timeout in PFVF send

Browse Source 
Replace the polling loop, waiting for the remote end to acknowledge
the reception of the message, with the equivalent and standard
read_poll_timeout() in adf_gen2_pfvf_send().

Also, the use of the read_poll_timeout():
- implies the use of microseconds for the timings, so update the previous
  values from ms to us
- allows to leverage the return value for both success and error,
  removing the need for the reset of the 'ret' variable soon after the
  'start' label.

Signed-off-by: Marco Chiappero <marco.chiappero@intel.com>
Co-developed-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Fiona Trahe <fiona.trahe@intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Marco Chiappero 2021-12-16 09:13:22 +00:00 committed by Herbert Xu
parent 952f4e8127
commit 1c94d80359
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/crypto/qat/qat_common/adf_gen2_pfvf.c
View File

@ -1,6 +1,7 @@
// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only) // SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
/* Copyright(c) 2021 Intel Corporation */ /* Copyright(c) 2021 Intel Corporation */
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/iopoll.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/types.h> #include <linux/types.h>
#include "adf_accel_devices.h" #include "adf_accel_devices.h"
@ -36,8 +37,8 @@ static const struct pfvf_csr_format csr_gen2_fmt = {
{ ADF_PFVF_GEN2_MSGDATA_SHIFT, ADF_PFVF_GEN2_MSGDATA_MASK }, { ADF_PFVF_GEN2_MSGDATA_SHIFT, ADF_PFVF_GEN2_MSGDATA_MASK },
}; };
#define ADF_PFVF_MSG_ACK_DELAY 2 #define ADF_PFVF_MSG_ACK_DELAY_US 2000
#define ADF_PFVF_MSG_ACK_MAX_RETRY 100 #define ADF_PFVF_MSG_ACK_MAX_DELAY_US (ADF_PFVF_MSG_ACK_DELAY_US * 100)
#define ADF_PFVF_MSG_RETRY_DELAY 5 #define ADF_PFVF_MSG_RETRY_DELAY 5
#define ADF_PFVF_MSG_MAX_RETRIES 3 #define ADF_PFVF_MSG_MAX_RETRIES 3
@ -143,7 +144,6 @@ static int adf_gen2_pfvf_send(struct adf_accel_dev *accel_dev,
unsigned int retries = ADF_PFVF_MSG_MAX_RETRIES; unsigned int retries = ADF_PFVF_MSG_MAX_RETRIES;
struct mutex *lock = params->csr_lock; struct mutex *lock = params->csr_lock;
u32 pfvf_offset = params->pfvf_offset; u32 pfvf_offset = params->pfvf_offset;
u32 count = 0;
u32 int_bit; u32 int_bit;
u32 csr_val; u32 csr_val;
u32 csr_msg; u32 csr_msg;
@ -172,8 +172,6 @@ static int adf_gen2_pfvf_send(struct adf_accel_dev *accel_dev,
mutex_lock(lock); mutex_lock(lock);
start: start:
ret = 0;
/* Check if the PFVF CSR is in use by remote function */ /* Check if the PFVF CSR is in use by remote function */
csr_val = ADF_CSR_RD(pmisc_addr, pfvf_offset); csr_val = ADF_CSR_RD(pmisc_addr, pfvf_offset);
if (gen2_csr_is_in_use(csr_val, local_offset)) { if (gen2_csr_is_in_use(csr_val, local_offset)) {
@ -186,15 +184,13 @@ start:
ADF_CSR_WR(pmisc_addr, pfvf_offset, csr_msg | int_bit); ADF_CSR_WR(pmisc_addr, pfvf_offset, csr_msg | int_bit);
/* Wait for confirmation from remote func it received the message */ /* Wait for confirmation from remote func it received the message */
do { ret = read_poll_timeout(ADF_CSR_RD, csr_val, !(csr_val & int_bit),
msleep(ADF_PFVF_MSG_ACK_DELAY); ADF_PFVF_MSG_ACK_DELAY_US,
csr_val = ADF_CSR_RD(pmisc_addr, pfvf_offset); ADF_PFVF_MSG_ACK_MAX_DELAY_US,
} while ((csr_val & int_bit) && (count++ < ADF_PFVF_MSG_ACK_MAX_RETRY)); true, pmisc_addr, pfvf_offset);
if (unlikely(ret < 0)) {
if (csr_val & int_bit) {
dev_dbg(&GET_DEV(accel_dev), "ACK not received from remote\n"); dev_dbg(&GET_DEV(accel_dev), "ACK not received from remote\n");
csr_val &= ~int_bit; csr_val &= ~int_bit;
ret = -EIO;
} }
if (csr_val != csr_msg) { if (csr_val != csr_msg) {