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

crypto: qat - abstract arbiter access 



The arbiter configuration, the offset to the arbiter config CSR and the
offset to the worker thread to service arbiter CSR are going to be
different in QAT GEN4 devices although the logic that uses them is the
same across all QAT generations.

This patch reworks the gen-specific parts of the arbiter access code by
introducing the arb_info structure, that contains the values that are
generation specific, and a function in the structure adf_hw_device_data,
get_arb_info(), that allows to get them.

Since the arbiter values for QAT GEN2 devices (c62x, c3xxx and
dh895xcc) are the same, a single function, adf_gen2_get_arb_info() is
provided in adf_gen2_hw_data.c and referenced by each QAT GEN2 driver.

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 c685d7a7

drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -203,6 +203,7 @@ void adf_init_hw_data_c3xxx(struct adf_hw_device_data *hw_data) 
	hw_data->get_pf2vf_offset = get_pf2vf_offset;

	hw_data->get_vintmsk_offset = get_vintmsk_offset;

	hw_data->get_admin_info = adf_gen2_get_admin_info;

	hw_data->get_arb_info = adf_gen2_get_arb_info;

	hw_data->get_sku = get_sku;

	hw_data->fw_name = ADF_C3XXX_FW;

	hw_data->fw_mmp_name = ADF_C3XXX_MMP;

drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c

+1 −0
Original line number Diff line number Diff line
@@ -213,6 +213,7 @@ void adf_init_hw_data_c62x(struct adf_hw_device_data *hw_data) 
	hw_data->get_pf2vf_offset = get_pf2vf_offset;

	hw_data->get_vintmsk_offset = get_vintmsk_offset;

	hw_data->get_admin_info = adf_gen2_get_admin_info;

	hw_data->get_arb_info = adf_gen2_get_arb_info;

	hw_data->get_sku = get_sku;

	hw_data->fw_name = ADF_C62X_FW;

	hw_data->fw_mmp_name = ADF_C62X_MMP;

drivers/crypto/qat/qat_common/adf_accel_devices.h

+7 −0
Original line number Diff line number Diff line
@@ -97,6 +97,12 @@ struct adf_hw_device_class { 
	u32 instances;

} __packed;



struct arb_info {

	u32 arb_cfg;

	u32 arb_offset;

	u32 wt2sam_offset;

};



struct admin_info {

	u32 admin_msg_ur;

	u32 admin_msg_lr;
@@ -144,6 +150,7 @@ struct adf_hw_device_data { 
	u32 (*get_num_accels)(struct adf_hw_device_data *self);

	u32 (*get_pf2vf_offset)(u32 i);

	u32 (*get_vintmsk_offset)(u32 i);

	void (*get_arb_info)(struct arb_info *arb_csrs_info);

	void (*get_admin_info)(struct admin_info *admin_csrs_info);

	enum dev_sku_info (*get_sku)(struct adf_hw_device_data *self);

	int (*alloc_irq)(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_common/adf_gen2_hw_data.c

+8 −0
Original line number Diff line number Diff line
@@ -45,6 +45,14 @@ void adf_gen2_get_admin_info(struct admin_info *admin_csrs_info) 
}

EXPORT_SYMBOL_GPL(adf_gen2_get_admin_info);



void adf_gen2_get_arb_info(struct arb_info *arb_info)

{

	arb_info->arb_cfg = ADF_ARB_CONFIG;

	arb_info->arb_offset = ADF_ARB_OFFSET;

	arb_info->wt2sam_offset = ADF_ARB_WRK_2_SER_MAP_OFFSET;

}

EXPORT_SYMBOL_GPL(adf_gen2_get_arb_info);



static u32 read_csr_ring_head(void __iomem *csr_base_addr, u32 bank, u32 ring)

{

	return READ_CSR_RING_HEAD(csr_base_addr, bank, ring);

drivers/crypto/qat/qat_common/adf_gen2_hw_data.h

+6 −0
Original line number Diff line number Diff line
@@ -97,9 +97,15 @@ do { \ 
#define ADF_ADMINMSGLR_OFFSET	(0x3A000 + 0x578)

#define ADF_MAILBOX_BASE_OFFSET	0x20970



/* Arbiter configuration */

#define ADF_ARB_OFFSET			0x30000

#define ADF_ARB_WRK_2_SER_MAP_OFFSET	0x180

#define ADF_ARB_CONFIG			(BIT(31) | BIT(6) | BIT(0))



void adf_gen2_cfg_iov_thds(struct adf_accel_dev *accel_dev, bool enable,

			   int num_a_regs, int num_b_regs);

void adf_gen2_init_hw_csr_ops(struct adf_hw_csr_ops *csr_ops);

void adf_gen2_get_admin_info(struct admin_info *admin_csrs_info);

void adf_gen2_get_arb_info(struct arb_info *arb_info);



#endif