tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Damian Muszynski <damian.muszynski@intel.com>
Reviewed-by: Tero Kristo <tero.kristo@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Giovanni Cabiddu and committed by
Herbert Xu f7df2329 2990d2ed

+25 -21
+25 -21
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
··· 15 15 #include "adf_cfg_services.h" 16 16 #include "icp_qat_hw.h" 17 17 18 + #define ADF_AE_GROUP_0 GENMASK(3, 0) 19 + #define ADF_AE_GROUP_1 GENMASK(7, 4) 20 + #define ADF_AE_GROUP_2 BIT(8) 21 + 18 22 enum adf_fw_objs { 19 23 ADF_FW_SYM_OBJ, 20 24 ADF_FW_ASYM_OBJ, ··· 46 42 }; 47 43 48 44 static const struct adf_fw_config adf_fw_cy_config[] = { 49 - {0xF0, ADF_FW_SYM_OBJ}, 50 - {0xF, ADF_FW_ASYM_OBJ}, 51 - {0x100, ADF_FW_ADMIN_OBJ}, 45 + {ADF_AE_GROUP_1, ADF_FW_SYM_OBJ}, 46 + {ADF_AE_GROUP_0, ADF_FW_ASYM_OBJ}, 47 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 52 48 }; 53 49 54 50 static const struct adf_fw_config adf_fw_dc_config[] = { 55 - {0xF0, ADF_FW_DC_OBJ}, 56 - {0xF, ADF_FW_DC_OBJ}, 57 - {0x100, ADF_FW_ADMIN_OBJ}, 51 + {ADF_AE_GROUP_1, ADF_FW_DC_OBJ}, 52 + {ADF_AE_GROUP_0, ADF_FW_DC_OBJ}, 53 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 58 54 }; 59 55 60 56 static const struct adf_fw_config adf_fw_sym_config[] = { 61 - {0xF0, ADF_FW_SYM_OBJ}, 62 - {0xF, ADF_FW_SYM_OBJ}, 63 - {0x100, ADF_FW_ADMIN_OBJ}, 57 + {ADF_AE_GROUP_1, ADF_FW_SYM_OBJ}, 58 + {ADF_AE_GROUP_0, ADF_FW_SYM_OBJ}, 59 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 64 60 }; 65 61 66 62 static const struct adf_fw_config adf_fw_asym_config[] = { 67 - {0xF0, ADF_FW_ASYM_OBJ}, 68 - {0xF, ADF_FW_ASYM_OBJ}, 69 - {0x100, ADF_FW_ADMIN_OBJ}, 63 + {ADF_AE_GROUP_1, ADF_FW_ASYM_OBJ}, 64 + {ADF_AE_GROUP_0, ADF_FW_ASYM_OBJ}, 65 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 70 66 }; 71 67 72 68 static const struct adf_fw_config adf_fw_asym_dc_config[] = { 73 - {0xF0, ADF_FW_ASYM_OBJ}, 74 - {0xF, ADF_FW_DC_OBJ}, 75 - {0x100, ADF_FW_ADMIN_OBJ}, 69 + {ADF_AE_GROUP_1, ADF_FW_ASYM_OBJ}, 70 + {ADF_AE_GROUP_0, ADF_FW_DC_OBJ}, 71 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 76 72 }; 77 73 78 74 static const struct adf_fw_config adf_fw_sym_dc_config[] = { 79 - {0xF0, ADF_FW_SYM_OBJ}, 80 - {0xF, ADF_FW_DC_OBJ}, 81 - {0x100, ADF_FW_ADMIN_OBJ}, 75 + {ADF_AE_GROUP_1, ADF_FW_SYM_OBJ}, 76 + {ADF_AE_GROUP_0, ADF_FW_DC_OBJ}, 77 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 82 78 }; 83 79 84 80 static const struct adf_fw_config adf_fw_dcc_config[] = { 85 - {0xF0, ADF_FW_DC_OBJ}, 86 - {0xF, ADF_FW_SYM_OBJ}, 87 - {0x100, ADF_FW_ADMIN_OBJ}, 81 + {ADF_AE_GROUP_1, ADF_FW_DC_OBJ}, 82 + {ADF_AE_GROUP_0, ADF_FW_SYM_OBJ}, 83 + {ADF_AE_GROUP_2, ADF_FW_ADMIN_OBJ}, 88 84 }; 89 85 90 86 static_assert(ARRAY_SIZE(adf_fw_cy_config) == ARRAY_SIZE(adf_fw_dc_config));