Commit 244f572c authored by Jack Xu's avatar Jack Xu Committed by Herbert Xu
Browse files

crypto: qat - allow to target specific AEs 



Introduce new API, qat_uclo_set_cfg_ae_mask(), to allow the load of the
firmware image to a subset of Acceleration Engines (AEs). This is
required by the next generation of QAT devices to be able to load
different firmware images to the device.

Signed-off-by: default avatarJack Xu <jack.xu@intel.com>
Reviewed-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent d707d3f2

drivers/crypto/qat/qat_common/adf_common_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -186,6 +186,8 @@ int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle, void *addr_ptr, 
		       int mem_size);

int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle,

		     void *addr_ptr, u32 mem_size, char *obj_name);

int qat_uclo_set_cfg_ae_mask(struct icp_qat_fw_loader_handle *handle,

			     unsigned int cfg_ae_mask);

#if defined(CONFIG_PCI_IOV)

int adf_sriov_configure(struct pci_dev *pdev, int numvfs);

void adf_disable_sriov(struct adf_accel_dev *accel_dev);

drivers/crypto/qat/qat_common/icp_qat_fw_loader_handle.h

+1 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ struct icp_qat_fw_loader_handle { 
	void *obj_handle;

	void *sobj_handle;

	void *mobj_handle;

	unsigned int cfg_ae_mask;

	void __iomem *hal_sram_addr_v;

	void __iomem *hal_cap_g_ctl_csr_addr_v;

	void __iomem *hal_cap_ae_xfer_csr_addr_v;

drivers/crypto/qat/qat_common/icp_qat_hal.h

+2 −0
Original line number Diff line number Diff line
@@ -68,6 +68,8 @@ enum fcu_sts { 
	FCU_STS_LOAD_FAIL = 4,

	FCU_STS_BUSY      = 5

};



#define ALL_AE_MASK                 0xFFFFFFFF

#define UA_ECS                      (0x1 << 31)

#define ACS_ABO_BITPOS              31

#define ACS_ACNO                    0x7

drivers/crypto/qat/qat_common/icp_qat_uclo.h

+1 −1
Original line number Diff line number Diff line
@@ -432,7 +432,7 @@ struct icp_qat_suof_handle { 


struct icp_qat_fw_auth_desc {

	unsigned int   img_len;

	unsigned int   reserved;

	unsigned int   ae_mask;

	unsigned int   css_hdr_high;

	unsigned int   css_hdr_low;

	unsigned int   img_high;

drivers/crypto/qat/qat_common/qat_hal.c

+1 −0
Original line number Diff line number Diff line
@@ -761,6 +761,7 @@ static int qat_hal_chip_init(struct icp_qat_fw_loader_handle *handle, 
	handle->hal_handle->revision_id = accel_dev->accel_pci_dev.revid;

	handle->hal_handle->ae_mask = hw_data->ae_mask;

	handle->hal_handle->slice_mask = hw_data->accel_mask;

	handle->cfg_ae_mask = ALL_AE_MASK;

	/* create AE objects */

	handle->hal_handle->upc_mask = 0x1ffff;

	handle->hal_handle->max_ustore = 0x4000;