Commit c4e84286 authored by Giovanni Cabiddu's avatar Giovanni Cabiddu Committed by Herbert Xu
Browse files

crypto: qat - fix configuration of iov threads 



The number of AE2FUNC_MAP registers is different in every QAT device
(c62x, c3xxx and dh895xcc) although the logic and the register offsets
are the same across devices.

This patch separates the logic that configures the iov threads in a
common function that takes as input the number of AE2FUNC_MAP registers
supported by a device. The function is then added to the
adf_hw_device_data structure of each device, and called with the
appropriate parameters.

The configure iov thread logic is added to a new file,
adf_gen2_hw_data.c, that is going to contain code that is shared across
QAT GEN2 devices.

Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarFiona Trahe <fiona.trahe@intel.com>
Reviewed-by: default avatarWojciech Ziemba <wojciech.ziemba@intel.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 70b9bd39

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+9 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <adf_accel_devices.h>

#include <adf_common_drv.h>

#include <adf_pf2vf_msg.h>

#include <adf_gen2_hw_data.h>

#include "adf_c3xxx_hw_data.h"



/* Worker thread to service arbiter mappings based on dev SKUs */
@@ -171,6 +172,13 @@ static int adf_pf_enable_vf2pf_comms(struct adf_accel_dev *accel_dev) 
	return 0;

}



static void configure_iov_threads(struct adf_accel_dev *accel_dev, bool enable)

{

	adf_gen2_cfg_iov_thds(accel_dev, enable,

			      ADF_C3XXX_AE2FUNC_MAP_GRP_A_NUM_REGS,

			      ADF_C3XXX_AE2FUNC_MAP_GRP_B_NUM_REGS);

}



void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data)

{

	hw_data->dev_class = &c3xxx_class;
@@ -199,6 +207,7 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data) 
	hw_data->fw_mmp_name = ADF_C3XXX_MMP;

	hw_data->init_admin_comms = adf_init_admin_comms;

	hw_data->exit_admin_comms = adf_exit_admin_comms;

	hw_data->configure_iov_threads = configure_iov_threads;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->send_admin_init = adf_send_admin_init;

	hw_data->init_arb = adf_init_arb;

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.h

+4 −0
Original line number Diff line number Diff line
@@ -31,6 +31,10 @@ 
#define ADF_C3XXX_PF2VF_OFFSET(i)	(0x3A000 + 0x280 + ((i) * 0x04))

#define ADF_C3XXX_VINTMSK_OFFSET(i)	(0x3A000 + 0x200 + ((i) * 0x04))



/* AE to function mapping */

#define ADF_C3XXX_AE2FUNC_MAP_GRP_A_NUM_REGS 48

#define ADF_C3XXX_AE2FUNC_MAP_GRP_B_NUM_REGS 6



/* Firmware Binary */

#define ADF_C3XXX_FW "qat_c3xxx.bin"

#define ADF_C3XXX_MMP "qat_c3xxx_mmp.bin"

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c

+9 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include <adf_accel_devices.h>

#include <adf_common_drv.h>

#include <adf_pf2vf_msg.h>

#include <adf_gen2_hw_data.h>

#include "adf_c62x_hw_data.h"



/* Worker thread to service arbiter mappings based on dev SKUs */
@@ -181,6 +182,13 @@ static int adf_pf_enable_vf2pf_comms(struct adf_accel_dev *accel_dev) 
	return 0;

}



static void configure_iov_threads(struct adf_accel_dev *accel_dev, bool enable)

{

	adf_gen2_cfg_iov_thds(accel_dev, enable,

			      ADF_C62X_AE2FUNC_MAP_GRP_A_NUM_REGS,

			      ADF_C62X_AE2FUNC_MAP_GRP_B_NUM_REGS);

}



void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data)

{

	hw_data->dev_class = &c62x_class;
@@ -209,6 +217,7 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data) 
	hw_data->fw_mmp_name = ADF_C62X_MMP;

	hw_data->init_admin_comms = adf_init_admin_comms;

	hw_data->exit_admin_comms = adf_exit_admin_comms;

	hw_data->configure_iov_threads = configure_iov_threads;

	hw_data->disable_iov = adf_disable_sriov;

	hw_data->send_admin_init = adf_send_admin_init;

	hw_data->init_arb = adf_init_arb;

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.h

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ 
#define ADF_C62X_PF2VF_OFFSET(i)	(0x3A000 + 0x280 + ((i) * 0x04))

#define ADF_C62X_VINTMSK_OFFSET(i)	(0x3A000 + 0x200 + ((i) * 0x04))



/* AE to function mapping */

#define ADF_C62X_AE2FUNC_MAP_GRP_A_NUM_REGS 80

#define ADF_C62X_AE2FUNC_MAP_GRP_B_NUM_REGS 10



/* Firmware Binary */

#define ADF_C62X_FW "qat_c62x.bin"

#define ADF_C62X_MMP "qat_c62x_mmp.bin"

drivers/crypto/qat/qat_common/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ intel_qat-objs := adf_cfg.o \ 
	adf_transport.o \

	adf_admin.o \

	adf_hw_arbiter.o \

	adf_gen2_hw_data.o \

	qat_crypto.o \

	qat_algs.o \

	qat_asym_algs.o \