crypto: qat - support the reset of ring pairs on PF
Add support for triggering a HW reset of a specific ring pair. Being a device specific feature, add it to the hw_device_data struct. This feature is supported only by QAT GEN4 devices. This patch is based on earlier work done by Zelin Deng. 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:
parent
4b44d28c71
commit
03125541ca
@ -239,6 +239,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data)
|
|||||||
hw_data->dev_class = &adf_4xxx_class;
|
hw_data->dev_class = &adf_4xxx_class;
|
||||||
hw_data->instance_id = adf_4xxx_class.instances++;
|
hw_data->instance_id = adf_4xxx_class.instances++;
|
||||||
hw_data->num_banks = ADF_4XXX_ETR_MAX_BANKS;
|
hw_data->num_banks = ADF_4XXX_ETR_MAX_BANKS;
|
||||||
|
hw_data->num_banks_per_vf = ADF_4XXX_NUM_BANKS_PER_VF;
|
||||||
hw_data->num_rings_per_bank = ADF_4XXX_NUM_RINGS_PER_BANK;
|
hw_data->num_rings_per_bank = ADF_4XXX_NUM_RINGS_PER_BANK;
|
||||||
hw_data->num_accel = ADF_4XXX_MAX_ACCELERATORS;
|
hw_data->num_accel = ADF_4XXX_MAX_ACCELERATORS;
|
||||||
hw_data->num_engines = ADF_4XXX_MAX_ACCELENGINES;
|
hw_data->num_engines = ADF_4XXX_MAX_ACCELENGINES;
|
||||||
@ -279,6 +280,7 @@ void adf_init_hw_data_4xxx(struct adf_hw_device_data *hw_data)
|
|||||||
hw_data->pfvf_ops.enable_comms = adf_pfvf_comms_disabled;
|
hw_data->pfvf_ops.enable_comms = adf_pfvf_comms_disabled;
|
||||||
hw_data->pfvf_ops.get_vf2pf_sources = get_vf2pf_sources;
|
hw_data->pfvf_ops.get_vf2pf_sources = get_vf2pf_sources;
|
||||||
hw_data->disable_iov = adf_disable_sriov;
|
hw_data->disable_iov = adf_disable_sriov;
|
||||||
|
hw_data->ring_pair_reset = adf_gen4_ring_pair_reset;
|
||||||
|
|
||||||
adf_gen4_init_hw_csr_ops(&hw_data->csr_ops);
|
adf_gen4_init_hw_csr_ops(&hw_data->csr_ops);
|
||||||
}
|
}
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
|
|
||||||
/* Bank and ring configuration */
|
/* Bank and ring configuration */
|
||||||
#define ADF_4XXX_NUM_RINGS_PER_BANK 2
|
#define ADF_4XXX_NUM_RINGS_PER_BANK 2
|
||||||
|
#define ADF_4XXX_NUM_BANKS_PER_VF 4
|
||||||
|
|
||||||
/* Error source registers */
|
/* Error source registers */
|
||||||
#define ADF_4XXX_ERRSOU0 (0x41A200)
|
#define ADF_4XXX_ERRSOU0 (0x41A200)
|
||||||
|
@ -186,6 +186,7 @@ struct adf_hw_device_data {
|
|||||||
bool enable);
|
bool enable);
|
||||||
void (*enable_ints)(struct adf_accel_dev *accel_dev);
|
void (*enable_ints)(struct adf_accel_dev *accel_dev);
|
||||||
void (*set_ssm_wdtimer)(struct adf_accel_dev *accel_dev);
|
void (*set_ssm_wdtimer)(struct adf_accel_dev *accel_dev);
|
||||||
|
int (*ring_pair_reset)(struct adf_accel_dev *accel_dev, u32 bank_nr);
|
||||||
void (*reset_device)(struct adf_accel_dev *accel_dev);
|
void (*reset_device)(struct adf_accel_dev *accel_dev);
|
||||||
void (*set_msix_rttable)(struct adf_accel_dev *accel_dev);
|
void (*set_msix_rttable)(struct adf_accel_dev *accel_dev);
|
||||||
char *(*uof_get_name)(u32 obj_num);
|
char *(*uof_get_name)(u32 obj_num);
|
||||||
@ -206,6 +207,7 @@ struct adf_hw_device_data {
|
|||||||
u16 tx_rings_mask;
|
u16 tx_rings_mask;
|
||||||
u8 tx_rx_gap;
|
u8 tx_rx_gap;
|
||||||
u8 num_banks;
|
u8 num_banks;
|
||||||
|
u16 num_banks_per_vf;
|
||||||
u8 num_rings_per_bank;
|
u8 num_rings_per_bank;
|
||||||
u8 num_accel;
|
u8 num_accel;
|
||||||
u8 num_logical_accel;
|
u8 num_logical_accel;
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
|
// SPDX-License-Identifier: (BSD-3-Clause OR GPL-2.0-only)
|
||||||
/* Copyright(c) 2020 Intel Corporation */
|
/* Copyright(c) 2020 Intel Corporation */
|
||||||
|
#include <linux/iopoll.h>
|
||||||
#include "adf_accel_devices.h"
|
#include "adf_accel_devices.h"
|
||||||
#include "adf_common_drv.h"
|
#include "adf_common_drv.h"
|
||||||
#include "adf_gen4_hw_data.h"
|
#include "adf_gen4_hw_data.h"
|
||||||
@ -146,3 +147,55 @@ int adf_pfvf_comms_disabled(struct adf_accel_dev *accel_dev)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(adf_pfvf_comms_disabled);
|
EXPORT_SYMBOL_GPL(adf_pfvf_comms_disabled);
|
||||||
|
|
||||||
|
static int reset_ring_pair(void __iomem *csr, u32 bank_number)
|
||||||
|
{
|
||||||
|
u32 status;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
/* Write rpresetctl register BIT(0) as 1
|
||||||
|
* Since rpresetctl registers have no RW fields, no need to preserve
|
||||||
|
* values for other bits. Just write directly.
|
||||||
|
*/
|
||||||
|
ADF_CSR_WR(csr, ADF_WQM_CSR_RPRESETCTL(bank_number),
|
||||||
|
ADF_WQM_CSR_RPRESETCTL_RESET);
|
||||||
|
|
||||||
|
/* Read rpresetsts register and wait for rp reset to complete */
|
||||||
|
ret = read_poll_timeout(ADF_CSR_RD, status,
|
||||||
|
status & ADF_WQM_CSR_RPRESETSTS_STATUS,
|
||||||
|
ADF_RPRESET_POLL_DELAY_US,
|
||||||
|
ADF_RPRESET_POLL_TIMEOUT_US, true,
|
||||||
|
csr, ADF_WQM_CSR_RPRESETSTS(bank_number));
|
||||||
|
if (!ret) {
|
||||||
|
/* When rp reset is done, clear rpresetsts */
|
||||||
|
ADF_CSR_WR(csr, ADF_WQM_CSR_RPRESETSTS(bank_number),
|
||||||
|
ADF_WQM_CSR_RPRESETSTS_STATUS);
|
||||||
|
}
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
int adf_gen4_ring_pair_reset(struct adf_accel_dev *accel_dev, u32 bank_number)
|
||||||
|
{
|
||||||
|
struct adf_hw_device_data *hw_data = accel_dev->hw_device;
|
||||||
|
u32 etr_bar_id = hw_data->get_etr_bar_id(hw_data);
|
||||||
|
void __iomem *csr;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (bank_number >= hw_data->num_banks)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
dev_dbg(&GET_DEV(accel_dev),
|
||||||
|
"ring pair reset for bank:%d\n", bank_number);
|
||||||
|
|
||||||
|
csr = (&GET_BARS(accel_dev)[etr_bar_id])->virt_addr;
|
||||||
|
ret = reset_ring_pair(csr, bank_number);
|
||||||
|
if (ret)
|
||||||
|
dev_err(&GET_DEV(accel_dev),
|
||||||
|
"ring pair reset failed (timeout)\n");
|
||||||
|
else
|
||||||
|
dev_dbg(&GET_DEV(accel_dev), "ring pair reset successful\n");
|
||||||
|
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
EXPORT_SYMBOL_GPL(adf_gen4_ring_pair_reset);
|
||||||
|
@ -106,6 +106,15 @@ do { \
|
|||||||
#define ADF_SSMWDTPKEL_OFFSET 0x58
|
#define ADF_SSMWDTPKEL_OFFSET 0x58
|
||||||
#define ADF_SSMWDTPKEH_OFFSET 0x60
|
#define ADF_SSMWDTPKEH_OFFSET 0x60
|
||||||
|
|
||||||
|
/* Ring reset */
|
||||||
|
#define ADF_RPRESET_POLL_TIMEOUT_US (5 * USEC_PER_SEC)
|
||||||
|
#define ADF_RPRESET_POLL_DELAY_US 20
|
||||||
|
#define ADF_WQM_CSR_RPRESETCTL_RESET BIT(0)
|
||||||
|
#define ADF_WQM_CSR_RPRESETCTL(bank) (0x6000 + ((bank) << 3))
|
||||||
|
#define ADF_WQM_CSR_RPRESETSTS_STATUS BIT(0)
|
||||||
|
#define ADF_WQM_CSR_RPRESETSTS(bank) (ADF_WQM_CSR_RPRESETCTL(bank) + 4)
|
||||||
|
|
||||||
void adf_gen4_set_ssm_wdtimer(struct adf_accel_dev *accel_dev);
|
void adf_gen4_set_ssm_wdtimer(struct adf_accel_dev *accel_dev);
|
||||||
void adf_gen4_init_hw_csr_ops(struct adf_hw_csr_ops *csr_ops);
|
void adf_gen4_init_hw_csr_ops(struct adf_hw_csr_ops *csr_ops);
|
||||||
|
int adf_gen4_ring_pair_reset(struct adf_accel_dev *accel_dev, u32 bank_number);
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user