Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-04 01:51:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: qat - make fw images name constant

Browse Source 
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>
This commit is contained in:
Giovanni Cabiddu 2023-06-09 17:38:20 +01:00 committed by Herbert Xu
parent 038ccc2876
commit 52f9a2848b
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c
View File

@ -13,7 +13,7 @@
struct adf_fw_config { struct adf_fw_config {
u32 ae_mask; u32 ae_mask;
char *obj_name; const char *obj_name;
}; };
static struct adf_fw_config adf_4xxx_fw_cy_config[] = { static struct adf_fw_config adf_4xxx_fw_cy_config[] = {
@ -311,7 +311,7 @@ static u32 uof_get_num_objs(void)
return ARRAY_SIZE(adf_4xxx_fw_cy_config); return ARRAY_SIZE(adf_4xxx_fw_cy_config);
} }
static char *uof_get_name_4xxx(struct adf_accel_dev *accel_dev, u32 obj_num) static const char *uof_get_name_4xxx(struct adf_accel_dev *accel_dev, u32 obj_num)
{ {
switch (get_service_enabled(accel_dev)) { switch (get_service_enabled(accel_dev)) {
case SVC_CY: case SVC_CY:
@ -323,7 +323,7 @@ static char *uof_get_name_4xxx(struct adf_accel_dev *accel_dev, u32 obj_num)
} }
} }
static char *uof_get_name_402xx(struct adf_accel_dev *accel_dev, u32 obj_num) static const char *uof_get_name_402xx(struct adf_accel_dev *accel_dev, u32 obj_num)
{ {
switch (get_service_enabled(accel_dev)) { switch (get_service_enabled(accel_dev)) {
case SVC_CY: case SVC_CY:

2
drivers/crypto/intel/qat/qat_common/adf_accel_devices.h
View File

@ -202,7 +202,7 @@ struct adf_hw_device_data {
int (*ring_pair_reset)(struct adf_accel_dev *accel_dev, u32 bank_nr); int (*ring_pair_reset)(struct adf_accel_dev *accel_dev, u32 bank_nr);
void (*reset_device)(struct adf_accel_dev *accel_dev); void (*reset_device)(struct adf_accel_dev *accel_dev);
void (*set_msix_rttable)(struct adf_accel_dev *accel_dev); void (*set_msix_rttable)(struct adf_accel_dev *accel_dev);
char *(*uof_get_name)(struct adf_accel_dev *accel_dev, u32 obj_num); const char *(*uof_get_name)(struct adf_accel_dev *accel_dev, u32 obj_num);
u32 (*uof_get_num_objs)(void); u32 (*uof_get_num_objs)(void);
u32 (*uof_get_ae_mask)(struct adf_accel_dev *accel_dev, u32 obj_num); u32 (*uof_get_ae_mask)(struct adf_accel_dev *accel_dev, u32 obj_num);
int (*dev_config)(struct adf_accel_dev *accel_dev); int (*dev_config)(struct adf_accel_dev *accel_dev);

2
drivers/crypto/intel/qat/qat_common/adf_accel_engine.c
View File

@ -13,7 +13,7 @@ static int adf_ae_fw_load_images(struct adf_accel_dev *accel_dev, void *fw_addr,
struct adf_fw_loader_data *loader_data = accel_dev->fw_loader; struct adf_fw_loader_data *loader_data = accel_dev->fw_loader;
struct adf_hw_device_data *hw_device = accel_dev->hw_device; struct adf_hw_device_data *hw_device = accel_dev->hw_device;
struct icp_qat_fw_loader_handle *loader; struct icp_qat_fw_loader_handle *loader;
char *obj_name; const char *obj_name;
u32 num_objs; u32 num_objs;
u32 ae_mask; u32 ae_mask;
int i; int i;

2
drivers/crypto/intel/qat/qat_common/adf_common_drv.h
View File

@ -187,7 +187,7 @@ void qat_uclo_del_obj(struct icp_qat_fw_loader_handle *handle);
int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle, void *addr_ptr, int qat_uclo_wr_mimage(struct icp_qat_fw_loader_handle *handle, void *addr_ptr,
int mem_size); int mem_size);
int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle, int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle,
void *addr_ptr, u32 mem_size, char *obj_name); void *addr_ptr, u32 mem_size, const char *obj_name);
int qat_uclo_set_cfg_ae_mask(struct icp_qat_fw_loader_handle *handle, int qat_uclo_set_cfg_ae_mask(struct icp_qat_fw_loader_handle *handle,
unsigned int cfg_ae_mask); unsigned int cfg_ae_mask);
int adf_init_misc_wq(void); int adf_init_misc_wq(void);

8
drivers/crypto/intel/qat/qat_common/qat_uclo.c
View File

@ -1685,7 +1685,7 @@ static void qat_uclo_del_mof(struct icp_qat_fw_loader_handle *handle)
} }
static int qat_uclo_seek_obj_inside_mof(struct icp_qat_mof_handle *mobj_handle, static int qat_uclo_seek_obj_inside_mof(struct icp_qat_mof_handle *mobj_handle,
char *obj_name, char **obj_ptr, const char *obj_name, char **obj_ptr,
unsigned int *obj_size) unsigned int *obj_size)
{ {
struct icp_qat_mof_objhdr *obj_hdr = mobj_handle->obj_table.obj_hdr; struct icp_qat_mof_objhdr *obj_hdr = mobj_handle->obj_table.obj_hdr;
@ -1837,8 +1837,8 @@ static int qat_uclo_check_mof_format(struct icp_qat_mof_file_hdr *mof_hdr)
static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle, static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle,
struct icp_qat_mof_file_hdr *mof_ptr, struct icp_qat_mof_file_hdr *mof_ptr,
u32 mof_size, char *obj_name, char **obj_ptr, u32 mof_size, const char *obj_name,
unsigned int *obj_size) char **obj_ptr, unsigned int *obj_size)
{ {
struct icp_qat_mof_chunkhdr *mof_chunkhdr; struct icp_qat_mof_chunkhdr *mof_chunkhdr;
unsigned int file_id = mof_ptr->file_id; unsigned int file_id = mof_ptr->file_id;
@ -1888,7 +1888,7 @@ static int qat_uclo_map_mof_obj(struct icp_qat_fw_loader_handle *handle,
} }
int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle, int qat_uclo_map_obj(struct icp_qat_fw_loader_handle *handle,
void *addr_ptr, u32 mem_size, char *obj_name) void *addr_ptr, u32 mem_size, const char *obj_name)
{ {
char *obj_addr; char *obj_addr;
u32 obj_size; u32 obj_size;