diff --git a/kernel/sched/rtg/frame_rtg.c b/kernel/sched/rtg/frame_rtg.c index 89561c84774e726ad7bb61216dabdec5f4291779..6daa51ebb70ea0496379526b7cd145c7d543994b 100644 --- a/kernel/sched/rtg/frame_rtg.c +++ b/kernel/sched/rtg/frame_rtg.c @@ -182,7 +182,7 @@ int set_frame_rate(struct frame_info *frame_info, int rate) return -EINVAL; frame_info->frame_rate = (unsigned int)rate; - frame_info->frame_time = frame_info->frame_time = div_u64(NSEC_PER_SEC, rate); + frame_info->frame_time = div_u64(NSEC_PER_SEC, rate); frame_info->max_vload_time = div_u64(frame_info->frame_time, NSEC_PER_MSEC) + frame_info->vload_margin; diff --git a/kernel/sched/rtg/rtg_ctrl.c b/kernel/sched/rtg/rtg_ctrl.c index 0e87dc7162c4bd940567e40e6d2d4560a9104e2e..54460086ce7308051922dad8f3f4ab978659055f 100644 --- a/kernel/sched/rtg/rtg_ctrl.c +++ b/kernel/sched/rtg/rtg_ctrl.c @@ -15,7 +15,6 @@ #include atomic_t g_rtg_enable = ATOMIC_INIT(0); -atomic_t g_enable_type = ATOMIC_INIT(ALL_ENABLE); // default: all enable static atomic_t g_rt_frame_num = ATOMIC_INIT(0); static int g_frame_max_util = DEFAULT_MAX_UTIL; static int g_max_rt_frames = DEFAULT_MAX_RT_FRAME; @@ -55,11 +54,6 @@ static rtg_ctrl_func g_func_array[RTG_CTRL_MAX_NR] = { static int init_proc_state(const int *config, int len); static void deinit_proc_state(void); -int get_enable_type(void) -{ - return atomic_read(&g_enable_type); -} - static int set_enable_config(char *config_str) { char *p = NULL; @@ -86,8 +80,6 @@ static int set_enable_config(char *config_str) config[RTG_FRAME_MAX_UTIL] = value; else if (!strcmp(tmp, "invalid_interval")) config[RTG_INVALID_INTERVAL] = value; - else if (!strcmp(tmp, "enable_type")) - atomic_set(&g_enable_type, value); else continue; } @@ -242,7 +234,7 @@ static long ctrl_set_enable(int abi, void __user *uarg) static long ctrl_get_enable(int abi, void __user *uarg) { - return get_enable_type(); + return atomic_read(&g_rtg_enable); } static int parse_config(const struct rtg_str_data *rs_data) @@ -718,7 +710,7 @@ static int parse_add_rtg_thread(const struct rtg_grp_data *rs_data) return -INVALID_RTG_ID; } add_index = frame_info->thread_num; - prio = frame_info->prio; + prio = (proc_info.type == NORMAL_TASK) ? NOT_RT_PRIO : frame_info->prio; for (i = 0; i < add_num; i++) { frame_info->thread[add_index] = update_frame_thread(frame_info, prio, prio, rs_data->tids[i], @@ -902,7 +894,7 @@ static long do_proc_rtg_ioctl(int abi, struct file *file, unsigned int cmd, unsi return -INVALID_MAGIC; } - if ((func_id != SET_ENABLE) && !atomic_read(&g_rtg_enable)) { + if (!atomic_read(&g_rtg_enable) && (func_id != SET_ENABLE) && (func_id != GET_ENABLE)) { pr_err("[SCHED_RTG] CMD_ID %x error: Rtg not enabled yet.\n", cmd); return -RTG_DISABLED; } diff --git a/kernel/sched/rtg/rtg_ctrl.h b/kernel/sched/rtg/rtg_ctrl.h index df8ac420d156c4d60456365fd0e3b4d9a91c3dd8..8993700048be3d8e0f7b2dd40f54e7a585a7b243 100644 --- a/kernel/sched/rtg/rtg_ctrl.h +++ b/kernel/sched/rtg/rtg_ctrl.h @@ -67,10 +67,6 @@ enum rtg_err_no { INVALID_RTG_ID, NO_RT_FRAME, }; -enum enable_type { - ALL_ENABLE = 1, - ENABLE_MAX -}; struct rtg_grp_data { int rtg_cmd;