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

crypto: qat - use masks for AE groups 



The adf_fw_config structures hardcode a bit mask that represents the
acceleration engines (AEs) where a certain firmware image will have to
be loaded to. Remove the hardcoded masks and replace them with defines.

This does not introduce any functional change.

Signed-off-by: default avatarGiovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: default avatarDamian Muszynski <damian.muszynski@intel.com>
Reviewed-by: default avatarTero Kristo <tero.kristo@linux.intel.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 2990d2ed

drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c

+25 −21
Original line number Diff line number Diff line
@@ -15,6 +15,10 @@ 
#include "adf_cfg_services.h"

#include "icp_qat_hw.h"



#define ADF_AE_GROUP_0		GENMASK(3, 0)

#define ADF_AE_GROUP_1		GENMASK(7, 4)

#define ADF_AE_GROUP_2		BIT(8)



enum adf_fw_objs {

	ADF_FW_SYM_OBJ,

	ADF_FW_ASYM_OBJ,
@@ -42,45 +46,45 @@ struct adf_fw_config { 
};



static const struct adf_fw_config adf_fw_cy_config[] = {

	{0xF0, ADF_FW_SYM_OBJ},

	{0xF, ADF_FW_ASYM_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_ASYM_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_dc_config[] = {

	{0xF0, ADF_FW_DC_OBJ},

	{0xF, ADF_FW_DC_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_DC_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_DC_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_sym_config[] = {

	{0xF0, ADF_FW_SYM_OBJ},

	{0xF, ADF_FW_SYM_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_asym_config[] = {

	{0xF0, ADF_FW_ASYM_OBJ},

	{0xF, ADF_FW_ASYM_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_ASYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_ASYM_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_asym_dc_config[] = {

	{0xF0, ADF_FW_ASYM_OBJ},

	{0xF, ADF_FW_DC_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_ASYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_DC_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_sym_dc_config[] = {

	{0xF0, ADF_FW_SYM_OBJ},

	{0xF, ADF_FW_DC_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_DC_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static const struct adf_fw_config adf_fw_dcc_config[] = {

	{0xF0, ADF_FW_DC_OBJ},

	{0xF, ADF_FW_SYM_OBJ},

	{0x100, ADF_FW_ADMIN_OBJ},

	{ADF_AE_GROUP_1, ADF_FW_DC_OBJ},

	{ADF_AE_GROUP_0, ADF_FW_SYM_OBJ},

	{ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ},

};



static_assert(ARRAY_SIZE(adf_fw_cy_config) == ARRAY_SIZE(adf_fw_dc_config));