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 - make fw images name constant

Update fw image names to be constant throughout the driver.

Signed-off-by: Giovanni Cabiddu <giovanni.cabiddu@intel.com>
Reviewed-by: Adam Guerin <adam.guerin@intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

authored by

Giovanni Cabiddu and committed by
Herbert Xu
52f9a284 038ccc28

+10 -10
+3 -3
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
··· 13 13 14 14 struct adf_fw_config { 15 15 u32 ae_mask; 16 - char *obj_name; 16 + const char *obj_name; 17 17 }; 18 18 19 19 static struct adf_fw_config adf_4xxx_fw_cy_config[] = { ··· 311 311 return ARRAY_SIZE(adf_4xxx_fw_cy_config); 312 312 } 313 313 314 - static char *uof_get_name_4xxx(struct adf_accel_dev *accel_dev, u32 obj_num) 314 + static const char *uof_get_name_4xxx(struct adf_accel_dev *accel_dev, u32 obj_num) 315 315 { 316 316 switch (get_service_enabled(accel_dev)) { 317 317 case SVC_CY: ··· 323 323 } 324 324 } 325 325 326 - static char *uof_get_name_402xx(struct adf_accel_dev *accel_dev, u32 obj_num) 326 + static const char *uof_get_name_402xx(struct adf_accel_dev *accel_dev, u32 obj_num) 327 327 { 328 328 switch (get_service_enabled(accel_dev)) { 329 329 case SVC_CY:
+1 -1
drivers/crypto/intel/qat/qat_common/adf_accel_devices.h
··· 202 202 int (*ring_pair_reset)(struct adf_accel_dev *accel_dev, u32 bank_nr); 203 203 void (*reset_device)(struct adf_accel_dev *accel_dev); 204 204 void (*set_msix_rttable)(struct adf_accel_dev *accel_dev); 205 - char *(*uof_get_name)(struct adf_accel_dev *accel_dev, u32 obj_num); 205 + const char *(*uof_get_name)(struct adf_accel_dev *accel_dev, u32 obj_num); 206 206 u32 (*uof_get_num_objs)(void); 207 207 u32 (*uof_get_ae_mask)(struct adf_accel_dev *accel_dev, u32 obj_num); 208 208 int (*dev_config)(struct adf_accel_dev *accel_dev);
+1 -1
drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
··· 13 13 struct adf_fw_loader_data *loader_data = accel_dev->fw_loader; 14 14 struct adf_hw_device_data *hw_device = accel_dev->hw_device; 15 15 struct icp_qat_fw_loader_handle *loader; 16 - char *obj_name; 16 + const char *obj_name; 17 17 u32 num_objs; 18 18 u32 ae_mask; 19 19 int i;
+1 -1
drivers/crypto/intel/qat/qat_common/adf_common_drv.h
··· 187 187 int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle, void *addr_ptr, 188 188 int mem_size); 189 189 int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle, 190 - void *addr_ptr, u32 mem_size, char *obj_name); 190 + void *addr_ptr, u32 mem_size, const char *obj_name); 191 191 int qat_uclo_set_cfg_ae_mask(struct icp_qat_fw_loader_handle *handle, 192 192 unsigned int cfg_ae_mask); 193 193 int adf_init_misc_wq(void);
+4 -4
drivers/crypto/intel/qat/qat_common/qat_uclo.c
··· 1685 1685 } 1686 1686 1687 1687 static int qat_uclo_seek_obj_inside_mof(struct icp_qat_mof_handle *mobj_handle, 1688 - char *obj_name, char **obj_ptr, 1688 + const char *obj_name, char **obj_ptr, 1689 1689 unsigned int *obj_size) 1690 1690 { 1691 1691 struct icp_qat_mof_objhdr *obj_hdr = mobj_handle->obj_table.obj_hdr; ··· 1837 1837 1838 1838 static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle, 1839 1839 struct icp_qat_mof_file_hdr *mof_ptr, 1840 - u32 mof_size, char *obj_name, char **obj_ptr, 1841 - unsigned int *obj_size) 1840 + u32 mof_size, const char *obj_name, 1841 + char **obj_ptr, unsigned int *obj_size) 1842 1842 { 1843 1843 struct icp_qat_mof_chunkhdr *mof_chunkhdr; 1844 1844 unsigned int file_id = mof_ptr->file_id; ··· 1888 1888 } 1889 1889 1890 1890 int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle, 1891 - void *addr_ptr, u32 mem_size, char *obj_name) 1891 + void *addr_ptr, u32 mem_size, const char *obj_name) 1892 1892 { 1893 1893 char *obj_addr; 1894 1894 u32 obj_size;