From 88e5ccdeb8e0788a15101d3387b776e3ce79cad7 Mon Sep 17 00:00:00 2001 From: dan huh Date: Wed, 28 Nov 2018 19:59:22 +0900 Subject: [PATCH] [RAMEN9610-9418][COMMON] fimc-is2: Add a __nocfi at function to happen cfi error PR JIRA ID: CPR-462 Change-Id: I4e666ac118a4f397e632cad4fe3cb28a4ca40ff7 Signed-off-by: dan huh --- .../fimc-is2/fimc-is-device-sensor_v2.c | 2 +- .../exynos/fimc-is2/fimc-is-interface-wrap.c | 2 +- .../exynos/fimc-is2/hardware/fimc-is-hw-3aa.c | 2 +- .../fimc-is2/hardware/fimc-is-hw-control.c | 2 +- .../exynos/fimc-is2/hardware/fimc-is-hw-isp.c | 4 +-- .../exynos/fimc-is2/hardware/fimc-is-hw-vra.c | 2 +- .../interface/fimc-is-interface-ddk.c | 32 +++++++++---------- .../interface/fimc-is-interface-library.c | 6 ++-- .../interface/fimc-is-interface-vra.c | 30 ++++++++--------- 9 files changed, 41 insertions(+), 41 deletions(-) diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c index 21cedc30d79e..e91a5710cbd5 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-device-sensor_v2.c @@ -2836,7 +2836,7 @@ int fimc_is_sensor_g_csis_error(struct fimc_is_device_sensor *device) return errorCode; } -int fimc_is_sensor_register_itf(struct fimc_is_device_sensor *device) +int __nocfi fimc_is_sensor_register_itf(struct fimc_is_device_sensor *device) { int ret = 0; struct v4l2_subdev *subdev = NULL; diff --git a/drivers/media/platform/exynos/fimc-is2/fimc-is-interface-wrap.c b/drivers/media/platform/exynos/fimc-is2/fimc-is-interface-wrap.c index 2aac9d7818b1..d68dcf72943c 100644 --- a/drivers/media/platform/exynos/fimc-is2/fimc-is-interface-wrap.c +++ b/drivers/media/platform/exynos/fimc-is2/fimc-is-interface-wrap.c @@ -453,7 +453,7 @@ void fimc_is_itf_sudden_stop_wrap(struct fimc_is_device_ischain *device, u32 ins return; } -int fimc_is_itf_power_down_wrap(struct fimc_is_interface *interface, u32 instance) +int __nocfi fimc_is_itf_power_down_wrap(struct fimc_is_interface *interface, u32 instance) { int ret = 0; struct fimc_is_core *core; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c index 3b98ddf0b27b..3712340afd3e 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-3aa.c @@ -13,7 +13,7 @@ extern struct fimc_is_lib_support gPtr_lib_support; -static int fimc_is_hw_3aa_open(struct fimc_is_hw_ip *hw_ip, u32 instance, +static int __nocfi fimc_is_hw_3aa_open(struct fimc_is_hw_ip *hw_ip, u32 instance, struct fimc_is_group *group) { int ret = 0; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c index a4de1e493453..c08fe1177ee7 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-control.c @@ -2977,7 +2977,7 @@ static void get_setfile_hw_slots(unsigned long *slots, unsigned long *hint) dbg_hw(1, " -> (0x%lx)\n", *hint); } -int fimc_is_hardware_load_setfile(struct fimc_is_hardware *hardware, ulong addr, +int __nocfi fimc_is_hardware_load_setfile(struct fimc_is_hardware *hardware, ulong addr, u32 instance, ulong hw_map) { struct fimc_is_setfile_header header; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c index 5492c8af5b1b..0df67a39d283 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-isp.c @@ -15,7 +15,7 @@ extern struct fimc_is_lib_support gPtr_lib_support; -static int fimc_is_hw_isp_open(struct fimc_is_hw_ip *hw_ip, u32 instance, +static int __nocfi fimc_is_hw_isp_open(struct fimc_is_hw_ip *hw_ip, u32 instance, struct fimc_is_group *group) { int ret = 0; @@ -439,7 +439,7 @@ config: return ret; } -static int fimc_is_hw_isp_set_param(struct fimc_is_hw_ip *hw_ip, struct is_region *region, +static int __nocfi fimc_is_hw_isp_set_param(struct fimc_is_hw_ip *hw_ip, struct is_region *region, u32 lindex, u32 hindex, u32 instance, ulong hw_map) { int ret = 0; diff --git a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c index 375af116e6a5..9209ad4519de 100644 --- a/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c +++ b/drivers/media/platform/exynos/fimc-is2/hardware/fimc-is-hw-vra.c @@ -279,7 +279,7 @@ static int fimc_is_hw_vra_ch1_handle_interrupt(u32 id, void *context) return ret; } -static int fimc_is_hw_vra_open(struct fimc_is_hw_ip *hw_ip, u32 instance, +static int __nocfi fimc_is_hw_vra_open(struct fimc_is_hw_ip *hw_ip, u32 instance, struct fimc_is_group *group) { int ret = 0; diff --git a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c index 5c84d576189c..43722ed986db 100644 --- a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c +++ b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-ddk.c @@ -520,7 +520,7 @@ struct lib_callback_func fimc_is_lib_cb_func = { .io_callback = fimc_is_lib_io_callback, }; -int fimc_is_lib_isp_chain_create(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_chain_create(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, u32 instance_id) { int ret = 0; @@ -577,7 +577,7 @@ int fimc_is_lib_isp_chain_create(struct fimc_is_hw_ip *hw_ip, return ret; } -int fimc_is_lib_isp_object_create(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_object_create(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, u32 instance_id, u32 rep_flag, u32 module_id) { int ret = 0; @@ -633,7 +633,7 @@ int fimc_is_lib_isp_object_create(struct fimc_is_hw_ip *hw_ip, return ret; } -void fimc_is_lib_isp_chain_destroy(struct fimc_is_hw_ip *hw_ip, +void __nocfi fimc_is_lib_isp_chain_destroy(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, u32 instance_id) { int ret = 0; @@ -670,7 +670,7 @@ void fimc_is_lib_isp_chain_destroy(struct fimc_is_hw_ip *hw_ip, return; } -void fimc_is_lib_isp_object_destroy(struct fimc_is_hw_ip *hw_ip, +void __nocfi fimc_is_lib_isp_object_destroy(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, u32 instance_id) { int ret = 0; @@ -695,7 +695,7 @@ void fimc_is_lib_isp_object_destroy(struct fimc_is_hw_ip *hw_ip, return; } -int fimc_is_lib_isp_set_param(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_set_param(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, void *param) { int ret; @@ -712,7 +712,7 @@ int fimc_is_lib_isp_set_param(struct fimc_is_hw_ip *hw_ip, return ret; } -int fimc_is_lib_isp_set_ctrl(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_set_ctrl(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, struct fimc_is_frame *frame) { int ret = 0; @@ -731,7 +731,7 @@ int fimc_is_lib_isp_set_ctrl(struct fimc_is_hw_ip *hw_ip, return 0; } -void fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, +void __nocfi fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, void *param_set, struct camera2_shot *shot) { int ret = 0; @@ -781,7 +781,7 @@ void fimc_is_lib_isp_shot(struct fimc_is_hw_ip *hw_ip, } } -int fimc_is_lib_isp_get_meta(struct fimc_is_hw_ip *hw_ip, +int __nocfi fimc_is_lib_isp_get_meta(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, struct fimc_is_frame *frame) { @@ -802,7 +802,7 @@ int fimc_is_lib_isp_get_meta(struct fimc_is_hw_ip *hw_ip, return ret; } -void fimc_is_lib_isp_stop(struct fimc_is_hw_ip *hw_ip, +void __nocfi fimc_is_lib_isp_stop(struct fimc_is_hw_ip *hw_ip, struct fimc_is_lib_isp *this, u32 instance_id) { int ret = 0; @@ -822,7 +822,7 @@ void fimc_is_lib_isp_stop(struct fimc_is_hw_ip *hw_ip, return; } -int fimc_is_lib_isp_create_tune_set(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_create_tune_set(struct fimc_is_lib_isp *this, ulong addr, u32 size, u32 index, int flag, u32 instance_id) { int ret = 0; @@ -849,7 +849,7 @@ int fimc_is_lib_isp_create_tune_set(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_apply_tune_set(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_apply_tune_set(struct fimc_is_lib_isp *this, u32 index, u32 instance_id) { int ret = 0; @@ -867,7 +867,7 @@ int fimc_is_lib_isp_apply_tune_set(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_delete_tune_set(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_delete_tune_set(struct fimc_is_lib_isp *this, u32 index, u32 instance_id) { int ret = 0; @@ -887,7 +887,7 @@ int fimc_is_lib_isp_delete_tune_set(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_load_cal_data(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_load_cal_data(struct fimc_is_lib_isp *this, u32 instance_id, ulong addr) { char version[32]; @@ -910,7 +910,7 @@ int fimc_is_lib_isp_load_cal_data(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_get_cal_data(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_get_cal_data(struct fimc_is_lib_isp *this, u32 instance_id, struct cal_info *c_info, int type) { int ret = 0; @@ -931,7 +931,7 @@ int fimc_is_lib_isp_get_cal_data(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_sensor_info_mode_chg(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_sensor_info_mode_chg(struct fimc_is_lib_isp *this, u32 instance_id, struct camera2_shot *shot) { int ret = 0; @@ -951,7 +951,7 @@ int fimc_is_lib_isp_sensor_info_mode_chg(struct fimc_is_lib_isp *this, return ret; } -int fimc_is_lib_isp_sensor_update_control(struct fimc_is_lib_isp *this, +int __nocfi fimc_is_lib_isp_sensor_update_control(struct fimc_is_lib_isp *this, u32 instance_id, u32 frame_count, struct camera2_shot *shot) { int ret = 0; diff --git a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-library.c b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-library.c index d94c96b29c28..734dd85a640d 100644 --- a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-library.c +++ b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-library.c @@ -1479,7 +1479,7 @@ ulong get_reg_addr(u32 id) return reg_addr; } -static void lib_task_work(struct kthread_work *work) +static void __nocfi lib_task_work(struct kthread_work *work) { struct fimc_is_task_work *cur_work; @@ -2160,7 +2160,7 @@ int fimc_is_memory_attribute_rox(struct fimc_is_memory_attribute *attribute) #define INDEX_VRA_BIN 0 #define INDEX_ISP_BIN 1 -int fimc_is_load_ddk_bin(int loadType) +int __nocfi fimc_is_load_ddk_bin(int loadType) { int ret = 0; char bin_type[4] = {0}; @@ -2384,7 +2384,7 @@ fail: #endif } -int fimc_is_load_rta_bin(int loadType) +int __nocfi fimc_is_load_rta_bin(int loadType) { int ret = 0; #ifdef USE_RTA_BINARY diff --git a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-vra.c b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-vra.c index 023fec0930f0..5d06261484cb 100644 --- a/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-vra.c +++ b/drivers/media/platform/exynos/fimc-is2/interface/fimc-is-interface-vra.c @@ -199,7 +199,7 @@ static void fimc_is_lib_vra_callback_post_detect_ready(u32 instance, } } -int fimc_is_lib_vra_set_post_detect_output(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_set_post_detect_output(struct fimc_is_lib_vra *lib_vra, unsigned int hfd_enable, u32 instance) { enum api_vra_type status = VRA_NO_ERROR; @@ -303,7 +303,7 @@ int fimc_is_lib_vra_invoke_contol_event(struct fimc_is_lib_vra *lib_vra) return 0; } -int fimc_is_lib_vra_invoke_fwalgs_event(struct fimc_is_lib_vra *lib_vra) +int __nocfi fimc_is_lib_vra_invoke_fwalgs_event(struct fimc_is_lib_vra *lib_vra) { enum api_vra_type status = VRA_NO_ERROR; @@ -339,7 +339,7 @@ int fimc_is_lib_vra_invoke_fwalgs_event(struct fimc_is_lib_vra *lib_vra) return 0; } -void fimc_is_lib_vra_task_work(struct kthread_work *work) +void __nocfi fimc_is_lib_vra_task_work(struct kthread_work *work) { struct fimc_is_task_work *cur_work; struct fimc_is_lib_vra *lib_vra; @@ -431,7 +431,7 @@ void fimc_is_lib_vra_set_event_fw_algs(u32 event_type) return; } -int fimc_is_lib_vra_alloc_memory(struct fimc_is_lib_vra *lib_vra, ulong dma_addr) +int __nocfi fimc_is_lib_vra_alloc_memory(struct fimc_is_lib_vra *lib_vra, ulong dma_addr) { int index; u32 size; @@ -546,7 +546,7 @@ int fimc_is_lib_vra_free_memory(struct fimc_is_lib_vra *lib_vra) return 0; } -int fimc_is_lib_vra_init_frame_work(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_init_frame_work(struct fimc_is_lib_vra *lib_vra, void __iomem *base_addr, enum fimc_is_lib_vra_input_type input_type) { int ret; @@ -656,7 +656,7 @@ free: return ret; } -int fimc_is_lib_vra_init_frame_desc(struct fimc_is_lib_vra *lib_vra, u32 instance) +int __nocfi fimc_is_lib_vra_init_frame_desc(struct fimc_is_lib_vra *lib_vra, u32 instance) { enum api_vra_type status; int ret = 0; @@ -764,7 +764,7 @@ int fimc_is_lib_vra_frame_desc_init(struct fimc_is_lib_vra *lib_vra, return 0; } -int fimc_is_lib_vra_set_orientation(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_set_orientation(struct fimc_is_lib_vra *lib_vra, u32 scaler_orientation, u32 instance) { enum api_vra_type status = VRA_NO_ERROR; @@ -840,7 +840,7 @@ int fimc_is_lib_vra_set_orientation(struct fimc_is_lib_vra *lib_vra, return 0; } -int fimc_is_lib_vra_new_frame(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_new_frame(struct fimc_is_lib_vra *lib_vra, unsigned char *buffer_kva, unsigned char *buffer_dva, u32 instance) { enum api_vra_type status = VRA_NO_ERROR; @@ -876,7 +876,7 @@ int fimc_is_lib_vra_new_frame(struct fimc_is_lib_vra *lib_vra, return 0; } -int fimc_is_lib_vra_handle_interrupt(struct fimc_is_lib_vra *lib_vra, u32 id) +int __nocfi fimc_is_lib_vra_handle_interrupt(struct fimc_is_lib_vra *lib_vra, u32 id) { enum api_vra_type result; @@ -941,7 +941,7 @@ int fimc_is_lib_vra_stop_instance(struct fimc_is_lib_vra *lib_vra, u32 instance) return 0; } -int fimc_is_lib_vra_stop(struct fimc_is_lib_vra *lib_vra) +int __nocfi fimc_is_lib_vra_stop(struct fimc_is_lib_vra *lib_vra) { int ret; enum api_vra_type result; @@ -977,7 +977,7 @@ int fimc_is_lib_vra_stop(struct fimc_is_lib_vra *lib_vra) return 0; } -int fimc_is_lib_vra_frame_work_final(struct fimc_is_lib_vra *lib_vra) +int __nocfi fimc_is_lib_vra_frame_work_final(struct fimc_is_lib_vra *lib_vra) { enum api_vra_type result; int ret; @@ -1267,7 +1267,7 @@ void fimc_is_lib_vra_assert(void) BUG_ON(1); } -void fimc_is_lib_vra_os_funcs(void) +void __nocfi fimc_is_lib_vra_os_funcs(void) { struct fimc_is_lib_vra_os_system_funcs funcs; @@ -1417,7 +1417,7 @@ int fimc_is_lib_vra_otf_input(struct fimc_is_lib_vra *lib_vra, return 0; } -int fimc_is_lib_vra_dma_input(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_dma_input(struct fimc_is_lib_vra *lib_vra, struct vra_param *param, u32 instance, u32 fcount) { enum api_vra_type status; @@ -1621,7 +1621,7 @@ debug_info_s_param: } #ifdef ENABLE_VRA_CHANGE_SETFILE_PARSING -int fimc_is_lib_vra_copy_tune_set(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_copy_tune_set(struct fimc_is_lib_vra *lib_vra, ulong addr, u32 size, u32 index, int flag, u32 instance_id) { int ret = 0; @@ -1649,7 +1649,7 @@ int fimc_is_lib_vra_copy_tune_set(struct fimc_is_lib_vra *lib_vra, return ret; } -int fimc_is_lib_vra_apply_tune_set(struct fimc_is_lib_vra *lib_vra, +int __nocfi fimc_is_lib_vra_apply_tune_set(struct fimc_is_lib_vra *lib_vra, u32 index, u32 instance_id) { int ret = 0; -- 2.20.1