diff --git a/arch/arm64/configs/emerald_debug_defconfig b/arch/arm64/configs/emerald_debug_defconfig index 9984c1ff18ef3e24879dba505fb7c0d1a4c27048..31953949f9e9e7501b0239e3c01d30b24f706354 100755 --- a/arch/arm64/configs/emerald_debug_defconfig +++ b/arch/arm64/configs/emerald_debug_defconfig @@ -20,7 +20,7 @@ CONFIG_MTK_SCHED_EXTENSION=y CONFIG_MTK_IDLE_BALANCE_ENHANCEMENT=y CONFIG_MTK_SCHED_INTEROP=y CONFIG_MTK_SCHED_LB_ENHANCEMENT=y -CONFIG_MTK_SCHED_TRACERS=y +# CONFIG_MTK_SCHED_TRACERS is not set CONFIG_MTK_SCHED_CPU_PREFER=y CONFIG_MTK_SCHED_BIG_TASK_MIGRATE=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/arm64/configs/emerald_defconfig b/arch/arm64/configs/emerald_defconfig index 11d28ed27c2ca2b7c23cb97b05b9e0b39ded4e93..bff0979785102164815ca683bfc2cdb0d04611f4 100755 --- a/arch/arm64/configs/emerald_defconfig +++ b/arch/arm64/configs/emerald_defconfig @@ -21,7 +21,7 @@ CONFIG_MTK_SCHED_EXTENSION=y CONFIG_MTK_IDLE_BALANCE_ENHANCEMENT=y CONFIG_MTK_SCHED_INTEROP=y CONFIG_MTK_SCHED_LB_ENHANCEMENT=y -CONFIG_MTK_SCHED_TRACERS=y +# CONFIG_MTK_SCHED_TRACERS is not set CONFIG_MTK_SCHED_CPU_PREFER=y CONFIG_MTK_SCHED_BIG_TASK_MIGRATE=y # CONFIG_SLUB_DEBUG is not set diff --git a/arch/arm64/configs/zirconia_debug_defconfig b/arch/arm64/configs/zirconia_debug_defconfig index 223c2887efebae3b4d001e3fd464c0f51bec9a73..95ad52c0df6ebc63a7686dad3525caef905a420c 100755 --- a/arch/arm64/configs/zirconia_debug_defconfig +++ b/arch/arm64/configs/zirconia_debug_defconfig @@ -20,7 +20,7 @@ CONFIG_MTK_SCHED_EXTENSION=y CONFIG_MTK_IDLE_BALANCE_ENHANCEMENT=y CONFIG_MTK_SCHED_INTEROP=y CONFIG_MTK_SCHED_LB_ENHANCEMENT=y -CONFIG_MTK_SCHED_TRACERS=y +# CONFIG_MTK_SCHED_TRACERS is not set CONFIG_MTK_SCHED_CPU_PREFER=y CONFIG_MTK_SCHED_BIG_TASK_MIGRATE=y # CONFIG_COMPAT_BRK is not set diff --git a/arch/arm64/configs/zirconia_defconfig b/arch/arm64/configs/zirconia_defconfig index de46f78d493c52cd80673232b423c74d2fddb661..98f6cdb6cadbb66dbfc51dfd50695e38501e812a 100755 --- a/arch/arm64/configs/zirconia_defconfig +++ b/arch/arm64/configs/zirconia_defconfig @@ -21,7 +21,7 @@ CONFIG_MTK_SCHED_EXTENSION=y CONFIG_MTK_IDLE_BALANCE_ENHANCEMENT=y CONFIG_MTK_SCHED_INTEROP=y CONFIG_MTK_SCHED_LB_ENHANCEMENT=y -CONFIG_MTK_SCHED_TRACERS=y +# CONFIG_MTK_SCHED_TRACERS is not set CONFIG_MTK_SCHED_CPU_PREFER=y CONFIG_MTK_SCHED_BIG_TASK_MIGRATE=y # CONFIG_SLUB_DEBUG is not set diff --git a/drivers/android/binder.c b/drivers/android/binder.c index 0628c2ab20db66d076b62bf54b550a568beaf45b..0e7afd34eda9953ef5479b4825ef3c4a34dc654d 100644 --- a/drivers/android/binder.c +++ b/drivers/android/binder.c @@ -5192,7 +5192,7 @@ static long binder_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) if (thread) thread->looper_need_return = false; wait_event_interruptible(binder_user_error_wait, binder_stop_on_user_error < 2); - if (ret && ret != -ERESTARTSYS) + if (ret && ret != -EINTR) pr_info("%d:%d ioctl %x %lx returned %d\n", proc->pid, current->pid, cmd, arg, ret); err_unlocked: trace_binder_ioctl_done(ret); diff --git a/drivers/iio/adc/mt635x-auxadc.c b/drivers/iio/adc/mt635x-auxadc.c index 38846b3ad064984903dcaaeb65ba53b1e61b8b42..1ae64e5a31981af1f88d6c30c86015d7e6c29f84 100644 --- a/drivers/iio/adc/mt635x-auxadc.c +++ b/drivers/iio/adc/mt635x-auxadc.c @@ -24,7 +24,7 @@ #include #include -#define AUXADC_DEBUG 1 +#define AUXADC_DEBUG 0 #define AUXADC_RDY_BIT BIT(15) #define AUXADC_DEF_R_RATIO 1 @@ -319,26 +319,6 @@ static void auxadc_reset(struct mt635x_auxadc_device *adc_dev) dev_info(adc_dev->dev, "reset AUXADC done\n"); } -static void auxadc_debug_dump(struct mt635x_auxadc_device *adc_dev, - int timeout_times) -{ - int i = 0, len = 0; - unsigned char reg_log[631] = "", reg_str[21] = ""; - unsigned int reg_val = 0; - - for (i = 0; i < adc_dev->info->num_dbg_regs; i++) { - regmap_read(adc_dev->regmap, - adc_dev->info->dbg_regs[i], ®_val); - len += snprintf(reg_str, 20, "Reg[0x%x]=0x%x,", - adc_dev->info->dbg_regs[i], reg_val); - strncat(reg_log, reg_str, ARRAY_SIZE(reg_log) - 1); - } - if (len) - dev_notice(adc_dev->dev, - "(%s)Time out!(%d) %s\n" - , __func__, timeout_times, reg_log); -} - static void imp_timeout_handler(struct mt635x_auxadc_device *adc_dev, bool is_timeout) { @@ -349,7 +329,6 @@ static void imp_timeout_handler(struct mt635x_auxadc_device *adc_dev, return; } timeout_times++; - auxadc_debug_dump(adc_dev, timeout_times); if (timeout_times == 5) auxadc_reset(adc_dev); #if IS_ENABLED(CONFIG_MTK_AEE_FEATURE) @@ -368,7 +347,6 @@ static void auxadc_timeout_handler(struct mt635x_auxadc_device *adc_dev, return; } timeout_times++; - auxadc_debug_dump(adc_dev, timeout_times); if (timeout_times == 11) auxadc_reset(adc_dev); } @@ -727,16 +705,16 @@ static int auxadc_get_rac(struct mt635x_auxadc_device *adc_dev) ret = rac * 1; if (ret < 50) { ret = -1; - pr_info("bypass due to Rac < 50mOhm\n"); + pr_debug("bypass due to Rac < 50mOhm\n"); } } else { ret = -1; - pr_info("bypass due to c_diff < 70mA\n"); + pr_debug("bypass due to c_diff < 70mA\n"); } - pr_info("v1=%d,v2=%d,c1=%d,c2=%d,v_diff=%d,c_diff=%d\n", + pr_debug("v1=%d,v2=%d,c1=%d,c2=%d,v_diff=%d,c_diff=%d\n", vbat_1, vbat_2, ibat_1, ibat_2, (vbat_1 - vbat_2), (ibat_2 - ibat_1)); - pr_info("rac=%d,ret=%d,retry=%d\n", + pr_debug("rac=%d,ret=%d,retry=%d\n", rac, ret, retry_count); if (++retry_count >= 3) @@ -935,7 +913,7 @@ int auxadc_priv_read_channel(struct mt635x_auxadc_device *adc_dev, ret = get_auxadc_out(adc_dev, auxadc_chan, &val); if (ret < 0) - pr_info("%s ret=%d\n", __func__, ret); + pr_debug("%s ret=%d\n", __func__, ret); val = val * auxadc_chan->r_ratio[0] * VOLT_FULL; val = (val / auxadc_chan->r_ratio[1]) >> auxadc_chan->res; @@ -971,17 +949,16 @@ static int wk_bat_temp_dbg(struct mt635x_auxadc_device *adc_dev, unsigned short i; vbif28 = auxadc_priv_read_channel(adc_dev, AUXADC_VBIF); - pr_notice("BAT_TEMP_PREV:%d,BAT_TEMP:%d,VBIF28:%d\n", + pr_debug("BAT_TEMP_PREV:%d,BAT_TEMP:%d,VBIF28:%d\n", bat_temp_prev, bat_temp, vbif28); if (bat_temp < 200 || abs(bat_temp_prev - bat_temp) > 100) { - auxadc_debug_dump(adc_dev, 0); for (i = 0; i < 5; i++) { arr_bat_temp[i] = auxadc_priv_read_channel(adc_dev, AUXADC_BAT_TEMP); } bat_temp_new = bat_temp_filter(arr_bat_temp, 5); - pr_notice("%d,%d,%d,%d,%d, BAT_TEMP_NEW:%d\n", + pr_debug("%d,%d,%d,%d,%d, BAT_TEMP_NEW:%d\n", arr_bat_temp[0], arr_bat_temp[1], arr_bat_temp[2], arr_bat_temp[3], arr_bat_temp[4], bat_temp_new); @@ -993,11 +970,11 @@ static int wk_bat_temp_dbg(struct mt635x_auxadc_device *adc_dev, arr_bat_temp[i] = auxadc_priv_read_channel(adc_dev, AUXADC_BAT_TEMP); - pr_notice("[CH3_DBG] %d,%d\n", + pr_debug("[CH3_DBG] %d,%d\n", bat, arr_bat_temp[i]); } bat_temp_new = bat_temp_filter(arr_bat_temp, 5); - pr_notice("Final BAT_TEMP_NEW:%d\n", bat_temp_new); + pr_debug("Final BAT_TEMP_NEW:%d\n", bat_temp_new); } return bat_temp_new; } @@ -1020,7 +997,7 @@ static int mt635x_bat_temp_cali(struct mt635x_auxadc_device *adc_dev, if (bat_temp < 200 || abs(bat_temp_prev - bat_temp) > 100) { /* dump debug log when BAT_TEMP being abnormal */ bat_temp = wk_bat_temp_dbg(adc_dev, bat_temp_prev, bat_temp); - pr_notice("PMIC AUXADC BAT_TEMP aee_count=%d\n", aee_count); + pr_debug("PMIC AUXADC BAT_TEMP aee_count=%d\n", aee_count); aee_count++; } else if (dbg_count % 50 == 0) { /* dump debug log in normal case */ @@ -1058,16 +1035,16 @@ static int auxadc_cali_imix_r(struct mt635x_auxadc_device *dev) adc_dev = dev; return 0; } else if (!adc_dev) { - pr_info("%s NULL adc_dev, skip\n", + pr_debug("%s NULL adc_dev, skip\n", __func__); return -EINVAL; } else if (!get_mtk_gauge_psy()) { - pr_info("%s gauge disabled, skip\n", + pr_debug("%s gauge disabled, skip\n", __func__); return -ENODEV; } else if (cur_uisoc < 0 || cur_uisoc == pre_uisoc) { - pr_info("%s pre_SOC=%d SOC=%d, skip\n", + pr_debug("%s pre_SOC=%d SOC=%d, skip\n", __func__, pre_uisoc, cur_uisoc); return 0; } @@ -1079,7 +1056,7 @@ static int auxadc_cali_imix_r(struct mt635x_auxadc_device *dev) return -EIO; } imix_r_avg = imix_r_avg / IMIX_R_CALI_CNT; - pr_info("[%s] %d,%d,ravg:%d\n", + pr_debug("[%s] %d,%d,ravg:%d\n", __func__, rac_val[0], rac_val[1], imix_r_avg); if (imix_r_avg > IMIX_R_MIN_MOHM) diff --git a/drivers/input/fingerprint/fpsensor_ree/fpsensor_spi.h b/drivers/input/fingerprint/fpsensor_ree/fpsensor_spi.h index 3d84fc88e3e0a22e21293cba0445416ec3761f3b..ab08701dc005a23d85dd9d442772ae0c5bd7a6c6 100755 --- a/drivers/input/fingerprint/fpsensor_ree/fpsensor_spi.h +++ b/drivers/input/fingerprint/fpsensor_ree/fpsensor_spi.h @@ -134,7 +134,7 @@ extern u8 fpsensor_debug_level; #define fpsensor_debug(level, fmt, args...) do { \ if (fpsensor_debug_level >= level) {\ - printk( "[fpsensor_k_log] " fmt, ##args); \ + pr_debug( "[fpsensor_k_log] " fmt, ##args); \ } \ } while (0) diff --git a/drivers/input/fingerprint/fpsensor_tee/fpsensor_spi_tee.h b/drivers/input/fingerprint/fpsensor_tee/fpsensor_spi_tee.h index 7cea61694c961ba27480e7f978739c04b6988358..c2dfcee82dabffe1bc4e80be3963cd9a6107701d 100755 --- a/drivers/input/fingerprint/fpsensor_tee/fpsensor_spi_tee.h +++ b/drivers/input/fingerprint/fpsensor_tee/fpsensor_spi_tee.h @@ -21,7 +21,7 @@ uint32_t g_cmd_sn = 0; static u8 fpsensor_debug_level = DEBUG_LOG; #define fpsensor_debug(level, fmt, args...) do { \ if (fpsensor_debug_level >= level) {\ - printk("[fpsensor][SN=%d] " fmt, g_cmd_sn, ##args); \ + pr_debug("[fpsensor][SN=%d] " fmt, g_cmd_sn, ##args); \ } \ } while (0) #define FUNC_ENTRY() fpsensor_debug(DEBUG_LOG, "%s, %d, entry\n", __func__, __LINE__) diff --git a/drivers/misc/mediatek/Kconfig b/drivers/misc/mediatek/Kconfig index aec864c8b26526ff02ed36a079a851a54e374339..c86b5add54e1feae0f4b0261b72c675fdef144d1 100644 --- a/drivers/misc/mediatek/Kconfig +++ b/drivers/misc/mediatek/Kconfig @@ -18,6 +18,7 @@ config FPGA_EARLY_PORTING config MTK_ENG_BUILD bool "MTK Engineer Build" + default n help This is an option for developers. Say Y here for MTK engineering mode, which will have more debugging features built-in. diff --git a/drivers/misc/mediatek/Makefile b/drivers/misc/mediatek/Makefile index d049d9179685f6fa03173473930a0c2333c3c51c..92861ee417283ee2ff6c3e09c594ae348f6a7c9f 100644 --- a/drivers/misc/mediatek/Makefile +++ b/drivers/misc/mediatek/Makefile @@ -113,7 +113,9 @@ obj-y += mmdvfs/ obj-$(CONFIG_MTK_IOMMU_MISC) += iommu/ obj-$(CONFIG_INTERCONNECT_MTK_MMQOS_COMMON) += mmqos/ obj-$(CONFIG_MTK_PERF_COMMON) += perf_common/ +ifneq ($(CONFIG_MTK_SYSTRACKER_DISABLE),y) obj-$(CONFIG_MTK_SYSTRACKER_V2) += systracker/ +endif ifneq ($(CONFIG_MTK_PLATFORM), "mt6771") obj-$(CONFIG_MTK_HANG_DETECT) += monitor_hang/ endif diff --git a/drivers/misc/mediatek/base/power/ppm_v3/src/mtk_ppm_main.c b/drivers/misc/mediatek/base/power/ppm_v3/src/mtk_ppm_main.c index b256b26372bbfe4e2910ed19d1e2f03b35e1cde3..f9622cbcc70a5708612f74001d05a5fdd1e998dd 100644 --- a/drivers/misc/mediatek/base/power/ppm_v3/src/mtk_ppm_main.c +++ b/drivers/misc/mediatek/base/power/ppm_v3/src/mtk_ppm_main.c @@ -650,12 +650,14 @@ int mt_ppm_main(void) pos->is_limit_updated = true; for (idx = 0; idx < pos->req.cluster_num; idx++) { +#ifdef CONFIG_MTK_SCHED_TRACERS trace_ppm_user_setting( pos->policy, idx, pos->req.limit[idx].min_cpufreq_idx, pos->req.limit[idx].max_cpufreq_idx ); +#endif } ppm_unlock(&pos->lock); diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_internal.c b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_internal.c index 2147aa18cdf51378b54d15fc4539ddfa98c40e7a..65ad4a0d17e16c3403b6d821ab76a09427522fcb 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_internal.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_internal.c @@ -69,7 +69,7 @@ static idle_footprint_t fp[NR_IDLE_TYPES] = { int __attribute__((weak)) mtk_idle_trigger_wfi( int idle_type, unsigned int idle_flag, int cpu) { - printk_deferred("[name:spm&]Power/swap %s is not implemented!\n" + pr_debug("[name:spm&]Power/swap %s is not implemented!\n" , __func__); do { diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_profile.c b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_profile.c index ac7961a1d537918eb3c4895a04a2313209ed63c4..1afc9e5ef185f206c7e9f98a27dad9d53415eb9c 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_profile.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_profile.c @@ -356,7 +356,7 @@ void mtk_idle_dump_cnt_in_interval(void) mtk_idle_dump_cnt(IDLE_TYPE_SO); /* dump log */ - printk_deferred("[name:spm&]Power/swap %s\n", get_log()); + pr_debug("[name:spm&]Power/swap %s\n", get_log()); /* dump idle ratio */ if (idle_ratio_en) { @@ -375,7 +375,7 @@ void mtk_idle_dump_cnt_in_interval(void) idle_prof[i].ratio.value = 0; } append_log("--- (ms)\n"); - printk_deferred("[name:spm&]Power/swap %s\n", get_log()); + pr_debug("[name:spm&]Power/swap %s\n", get_log()); idle_ratio_profile_start_time = idle_get_current_time_ms(); } } @@ -433,7 +433,7 @@ bool mtk_idle_select_state(int type, int reason) , "[%d] = (%lu), " , i, p_idle->cnt[i]); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); /* block category */ @@ -445,7 +445,7 @@ bool mtk_idle_select_state(int type, int reason) , "[%s] = %lu, " , mtk_idle_block_reason_name(i) , p_idle->block_cnt[i]); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); /* block mask */ @@ -455,7 +455,7 @@ bool mtk_idle_select_state(int type, int reason) idle_state_log.p_idx += mtk_idle_cond_append_info(true, type, idle_state_log.p_idx, IDLE_LOG_BUF_LEN - strlen(idle_state_log.buf)); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); memset(p_idle->block_cnt, 0, @@ -483,7 +483,7 @@ void mtk_idle_block_setting( if (cnt && block_cnt) p_idle->init = true; else - printk_deferred("[name:spm&]Power/swap BLOCK FAIL (type:%d)\n" + pr_debug("[name:spm&]Power/swap BLOCK FAIL (type:%d)\n" , type); #if SPM_MET_TAGGING @@ -585,7 +585,7 @@ void mtk_idle_latency_profile_result(unsigned int idle_type) pdata->total[2] += (data[2]); pdata->count++; } else { - printk_deferred("[name:spm&]Power/latency_profile avg %s: %u, %u, %u\n" + pr_debug("[name:spm&]Power/latency_profile avg %s: %u, %u, %u\n" , mtk_idle_name(idle_type) , (unsigned int)pdata->total[0]/PROFILE_LATENCY_NUMBER , (unsigned int)pdata->total[1]/PROFILE_LATENCY_NUMBER @@ -594,6 +594,6 @@ void mtk_idle_latency_profile_result(unsigned int idle_type) pdata->total[0] = pdata->total[1] = pdata->total[2] = 0; } - printk_deferred("[name:spm&]Power/latency_profile %s\n", plog); + pr_debug("[name:spm&]Power/latency_profile %s\n", plog); } diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_select.c b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_select.c index b280a90649ca73adc1bbaaa9c1373a4cb1ddb054..ae55987bd8573b89c6bf820320fd7020e8ad0516 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_select.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_select.c @@ -185,7 +185,7 @@ int mtk_idle_select(int cpu) (mtk_idle_plat_bootblock_check() == MTK_IDLE_PLAT_READY)) ) { if (system_state < SYSTEM_RUNNING) { - printk_deferred("[name:spm&]Power/swap %s %s %d\n", + pr_debug("[name:spm&]Power/swap %s %s %d\n", __func__, LOG_STR, system_state); } return -1; diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_twam.c b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_twam.c index 108c7dc4ca8399353b50a0c47769cf1c4aceb291..2fbb97b016d51e9e862e39b9e602b9179fe25082 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_idle_twam.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_idle_twam.c @@ -50,7 +50,7 @@ static void mtk_idle_twam_callback(struct twam_cfg *ts, struct twam_select *sel) int index = 0; for (index = 0; index < 4; index++) { - printk_deferred("[name:spm&]Power/swap spm twam (sel%d: %d) ratio: %5u/1000, %d, %d\n", + pr_debug("[name:spm&]Power/swap spm twam (sel%d: %d) ratio: %5u/1000, %d, %d\n", sel->signal[index], sel->id[index], (idle_twam.speed_mode) ? GET_EVENT_RATIO_SPEED(ts->byte[index].id) : diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_sleep.c b/drivers/misc/mediatek/base/power/spm/common/mtk_sleep.c index 945d556752cb82f6f01f93e4fb0e7e4dd22246ed..ba09b5965e8527e6c1432169fab83c38c1fee608 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_sleep.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_sleep.c @@ -52,7 +52,7 @@ static int slp_suspend_ops_valid(suspend_state_t state) static int slp_suspend_ops_begin(suspend_state_t state) { /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_begin(%u)(%u)\t@@@@@@@@@@@@@\n", + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_begin(%u)(%u)\t@@@@@@@@@@@@@\n", spm_get_is_cpu_pdn(), spm_get_is_infra_pdn()); slp_wake_reason = WR_NONE; @@ -69,7 +69,7 @@ static int slp_suspend_ops_prepare(void) || defined(CONFIG_SND_SOC_MTK_SMART_PHONE) bool __attribute__ ((weak)) ConditionEnterSuspend(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return true; } #endif /* MTK_SUSPEND_AUDIO_SUPPORT */ @@ -77,25 +77,25 @@ bool __attribute__ ((weak)) ConditionEnterSuspend(void) #ifdef CONFIG_MTK_SYSTRACKER void __attribute__ ((weak)) systracker_enable(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } #endif /* CONFIG_MTK_SYSTRACKER */ #ifdef CONFIG_MTK_BUS_TRACER void __attribute__ ((weak)) bus_tracer_enable(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } #endif /* CONFIG_MTK_BUS_TRACER */ void __attribute__((weak)) subsys_if_on(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } void __attribute__((weak)) pll_if_on(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } void __attribute__((weak)) @@ -136,14 +136,14 @@ spm_go_to_sleep(void) bool __attribute__((weak)) spm_get_is_cpu_pdn(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return false; } bool __attribute__((weak)) spm_get_is_infra_pdn(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return false; } @@ -174,14 +174,14 @@ static int slp_suspend_ops_enter(suspend_state_t state) #endif /* CONFIG_FPGA_EARLY_PORTING */ if (spm_get_is_infra_pdn() && !spm_get_is_cpu_pdn()) { - printk_deferred("[name:spm&][SLP] CANNOT SLEEP DUE TO INFRA PDN BUT CPU PDN\n"); + pr_debug("[name:spm&][SLP] CANNOT SLEEP DUE TO INFRA PDN BUT CPU PDN\n"); ret = -EPERM; goto LEAVE_SLEEP; } #ifdef CONFIG_MTK_TINYSYS_SSPM_SUPPORT if (is_sspm_ipi_lock_spm()) { - printk_deferred("[name:spm&][SLP] CANNOT SLEEP DUE TO SSPM IPI\n"); + pr_debug("[name:spm&][SLP] CANNOT SLEEP DUE TO SSPM IPI\n"); ret = -EPERM; goto LEAVE_SLEEP; } @@ -189,7 +189,7 @@ static int slp_suspend_ops_enter(suspend_state_t state) #if !defined(CONFIG_FPGA_EARLY_PORTING) if (spm_load_firmware_status() < 1) { - printk_deferred("[name:spm&]SPM FIRMWARE IS NOT READY\n"); + pr_debug("[name:spm&]SPM FIRMWARE IS NOT READY\n"); ret = -EPERM; goto LEAVE_SLEEP; } @@ -252,7 +252,7 @@ static const struct platform_suspend_ops slp_suspend_ops = { __attribute__ ((weak)) int spm_set_dpidle_wakesrc(u32 wakesrc, bool enable, bool replace) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return 0; } @@ -266,7 +266,7 @@ int slp_set_wakesrc(u32 wakesrc, bool enable, bool ck26m_on) int r; unsigned long flags; - printk_deferred("[name:spm&][SLP] wakesrc = 0x%x, enable = %u, ck26m_on = %u\n", + pr_debug("[name:spm&][SLP] wakesrc = 0x%x, enable = %u, ck26m_on = %u\n", wakesrc, enable, ck26m_on); #if SLP_REPLACE_DEF_WAKESRC diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_sodi.c b/drivers/misc/mediatek/base/power/spm/common/mtk_sodi.c index 52fe2d6c66e9d6fa2c93363bc972b40f6d9f885a..3676ba2c55ca17f3abb9d498a33ea5b71172ec12 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_sodi.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_sodi.c @@ -48,7 +48,7 @@ void mtk_sodi_disable(void) /* for display use, abandoned 'spm_enable_sodi' */ void mtk_idle_disp_is_ready(bool enable) { - printk_deferred("[name:spm&]Power/swap - %s not support anymore!\n" + pr_debug("[name:spm&]Power/swap - %s not support anymore!\n" , __func__); } diff --git a/drivers/misc/mediatek/base/power/spm/common/mtk_spm_resource_req.c b/drivers/misc/mediatek/base/power/spm/common/mtk_spm_resource_req.c index 78271df19d9bb49c37870faa8bb3d9ac8873ba39..0734141cded049d65ea370e77742c191795fad6f 100644 --- a/drivers/misc/mediatek/base/power/spm/common/mtk_spm_resource_req.c +++ b/drivers/misc/mediatek/base/power/spm/common/mtk_spm_resource_req.c @@ -311,12 +311,12 @@ void spm_resource_req_dump(void) int i; unsigned long flags; - printk_deferred("[name:spm&]resource_req:\n"); + pr_debug("[name:spm&]resource_req:\n"); spin_lock_irqsave(&spm_resource_desc_update_lock, flags); for (i = 0; i < NF_SPM_RESOURCE; i++) - printk_deferred("[name:spm&][%s]: 0x%x, 0x%x, mask = 0x%x, 0x%x\n", + pr_debug("[name:spm&][%s]: 0x%x, 0x%x, mask = 0x%x, 0x%x\n", spm_resource_name[i], resc_desc[i].user_usage[0], resc_desc[i].user_usage[1], @@ -333,7 +333,7 @@ void spm_resource_req_block_dump(void) spin_lock_irqsave(&spm_resource_desc_update_lock, flags); if (curr_res_usage == SPM_RESOURCE_ALL) { - printk_deferred("[name:spm&][resource_req_block] user: 0x%x, 0x%x\n", + pr_debug("[name:spm&][resource_req_block] user: 0x%x, 0x%x\n", resc_desc[0].user_usage[0], resc_desc[0].user_usage[1]); } diff --git a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_module.c b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_module.c index d235806aeb8e4e3694a8b84fbbfb72e57cf6cb99..bc7f1924427b75012f5ecb0d1d1e4a593f7f662c 100644 --- a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_module.c +++ b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_module.c @@ -189,7 +189,7 @@ enum idle_fp_step { int __attribute__((weak)) mtk_idle_trigger_wfi( int idle_type, unsigned int idle_flag, int cpu) { - printk_deferred("[name:spm&]Power/swap %s is not implemented!\n" + pr_debug("[name:spm&]Power/swap %s is not implemented!\n" , __func__); do { @@ -352,7 +352,7 @@ int mtk_idle_enter(int idle_type, #if defined(CONFIG_SERIAL_8250_MT6577) if (!(idle_flag & MTK_IDLE_LOG_DUMP_LP_GS)) { if (mtk8250_request_to_sleep()) { - printk_deferred("[name:spm&]Power/swap Fail to request uart sleep\n"); + pr_debug("[name:spm&]Power/swap Fail to request uart sleep\n"); goto RESTORE_UART; } } diff --git a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_profile.c b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_profile.c index 1234705105ebda314cddb595ba9ae446352e5465..bb53cbc2bd6db72bca41296d983a79858d27d60a 100644 --- a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_profile.c +++ b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_profile.c @@ -129,7 +129,7 @@ void mtk_idle_dump_cnt_in_interval(void) mtk_idle_module_info_dump(MTK_IDLE_MODULE_INFO_COUNT , get_log(), IDLE_LOG_BUF_LEN); /* dump log */ - printk_deferred("[name:spm&]Power/swap %s\n", get_log()); + pr_debug("[name:spm&]Power/swap %s\n", get_log()); /* dump idle ratio */ if (idle_ratio_en) { @@ -142,7 +142,7 @@ void mtk_idle_dump_cnt_in_interval(void) mtk_idle_module_info_dump(MTK_IDLE_MODULE_INFO_RATIO , get_log_cur() , IDLE_LOG_BUF_LEN - (get_log_cur() - get_log())); - printk_deferred("[name:spm&]Power/swap %s --- (ms)\n" + pr_debug("[name:spm&]Power/swap %s --- (ms)\n" , get_log()); idle_ratio_profile_start_time = idle_get_current_time_ms(); } @@ -161,7 +161,7 @@ void mtk_idle_block_reason_report(struct MTK_IDLE_MODEL_CLERK const *clerk) , "[%d] = (%lu), " , i, clerk->status.cnt.enter[i]); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); /* block category */ @@ -173,7 +173,7 @@ void mtk_idle_block_reason_report(struct MTK_IDLE_MODEL_CLERK const *clerk) , "[%s] = %lu, " , mtk_idle_block_reason_name(i) , clerk->status.cnt.block[i]); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); /* block mask */ @@ -183,7 +183,7 @@ void mtk_idle_block_reason_report(struct MTK_IDLE_MODEL_CLERK const *clerk) idle_state_log.p_idx += mtk_idle_cond_append_info(true, clerk->type, idle_state_log.p_idx, IDLE_LOG_BUF_LEN - strlen(idle_state_log.buf)); - printk_deferred("[name:spm&]Power/swap %s\n" + pr_debug("[name:spm&]Power/swap %s\n" , get_idle_buf(idle_state_log)); spm_resource_req_block_dump(); } @@ -264,7 +264,7 @@ void mtk_idle_latency_profile_result(struct MTK_IDLE_MODEL_CLERK *clerk) _LATENCY.total[2] += (ProfileLatency[2]); _LATENCY.count++; } else { - printk_deferred("[name:spm&]Power/latency_profile avg %s: %u, %u, %u\n" + pr_debug("[name:spm&]Power/latency_profile avg %s: %u, %u, %u\n" , clerk->name , (unsigned int)_LATENCY.total[0]/PROFILE_LATENCY_NUM , (unsigned int)_LATENCY.total[1]/PROFILE_LATENCY_NUM @@ -273,6 +273,6 @@ void mtk_idle_latency_profile_result(struct MTK_IDLE_MODEL_CLERK *clerk) _LATENCY.total[0] = _LATENCY.total[1] = _LATENCY.total[2] = 0; } - printk_deferred("[name:spm&]Power/latency_profile %s\n", plog); + pr_debug("[name:spm&]Power/latency_profile %s\n", plog); } diff --git a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_select.c b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_select.c index dbbe98545ac48002812f854eb9ddb630debf54b6..75453270f46f00324045296c96ba25c84f99cc3d 100644 --- a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_select.c +++ b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_idle_select.c @@ -110,7 +110,7 @@ int mtk_idle_entrance(struct mtk_idle_info *info (mtk_idle_plat_bootblock_check() == MTK_IDLE_PLAT_READY)) ) { if (system_state < SYSTEM_RUNNING) { - printk_deferred("[name:spm&]Power/swap %s %s %d\n" + pr_debug("[name:spm&]Power/swap %s %s %d\n" , __func__, LOG_STR, system_state); } diff --git a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_sleep.c b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_sleep.c index d674242ddd46df726f1053f7b42e44149821123e..3c1214e4c6a884f02c68bb6d0b9bb17716c5119c 100644 --- a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_sleep.c +++ b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_sleep.c @@ -54,7 +54,7 @@ static int slp_suspend_ops_valid(suspend_state_t state) static int slp_suspend_ops_begin(suspend_state_t state) { /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_begin(%u)(%u)\t@@@@@@@@@@@@@\n", + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_begin(%u)(%u)\t@@@@@@@@@@@@@\n", spm_get_is_cpu_pdn(), spm_get_is_infra_pdn()); slp_wake_reason = WR_NONE; @@ -66,7 +66,7 @@ static int slp_suspend_ops_prepare(void) { #if 0 /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@@@\tChip_pm_prepare\t@@@@@@@@@@@@@@\n"); + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@@@\tChip_pm_prepare\t@@@@@@@@@@@@@@\n"); #endif return 0; } @@ -75,7 +75,7 @@ static int slp_suspend_ops_prepare(void) || defined(CONFIG_SND_SOC_MTK_SMART_PHONE) bool __attribute__ ((weak)) ConditionEnterSuspend(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return true; } #endif /* MTK_SUSPEND_AUDIO_SUPPORT */ @@ -83,25 +83,25 @@ bool __attribute__ ((weak)) ConditionEnterSuspend(void) #ifdef CONFIG_MTK_SYSTRACKER void __attribute__ ((weak)) systracker_enable(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } #endif /* CONFIG_MTK_SYSTRACKER */ #ifdef CONFIG_MTK_BUS_TRACER void __attribute__ ((weak)) bus_tracer_enable(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } #endif /* CONFIG_MTK_BUS_TRACER */ void __attribute__((weak)) subsys_if_on(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } void __attribute__((weak)) pll_if_on(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } void __attribute__((weak)) @@ -144,7 +144,7 @@ spm_go_to_sleep_ex(unsigned int ex_flag) unsigned int bRet = 0; if ((ex_flag & SPM_SUSPEND_PLAT_SLP_DP) != 0) - printk_deferred( + pr_debug( "[name:spm&][%s:%d] - Spm suspend sleep dpidle not support!!\n" , __func__, __LINE__); else @@ -155,14 +155,14 @@ spm_go_to_sleep_ex(unsigned int ex_flag) bool __attribute__((weak)) spm_get_is_cpu_pdn(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return false; } bool __attribute__((weak)) spm_get_is_infra_pdn(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return false; } @@ -184,7 +184,7 @@ static int slp_suspend_ops_enter(suspend_state_t state) #if 0 /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@@@@\tChip_pm_enter\t@@@@@@@@@@@@@@@\n"); + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@@@@\tChip_pm_enter\t@@@@@@@@@@@@@@@\n"); #endif #if !defined(CONFIG_FPGA_EARLY_PORTING) @@ -198,14 +198,14 @@ static int slp_suspend_ops_enter(suspend_state_t state) #endif /* CONFIG_FPGA_EARLY_PORTING */ if (spm_get_is_infra_pdn() && !spm_get_is_cpu_pdn()) { - printk_deferred("[name:spm&][SLP] CANNOT SLEEP DUE TO INFRA PDN BUT CPU PDN\n"); + pr_debug("[name:spm&][SLP] CANNOT SLEEP DUE TO INFRA PDN BUT CPU PDN\n"); ret = -EPERM; goto LEAVE_SLEEP; } #ifdef CONFIG_MTK_TINYSYS_SSPM_SUPPORT if (is_sspm_ipi_lock_spm()) { - printk_deferred("[name:spm&][SLP] CANNOT SLEEP DUE TO SSPM IPI\n"); + pr_debug("[name:spm&][SLP] CANNOT SLEEP DUE TO SSPM IPI\n"); ret = -EPERM; goto LEAVE_SLEEP; } @@ -213,7 +213,7 @@ static int slp_suspend_ops_enter(suspend_state_t state) #if !defined(CONFIG_FPGA_EARLY_PORTING) if (spm_load_firmware_status() < 1) { - printk_deferred("[name:spm&]SPM FIRMWARE IS NOT READY\n"); + pr_debug("[name:spm&]SPM FIRMWARE IS NOT READY\n"); ret = -EPERM; goto LEAVE_SLEEP; } @@ -259,7 +259,7 @@ static void slp_suspend_ops_finish(void) { #if 0 /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_finish\t@@@@@@@@@@\n"); + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_finish\t@@@@@@@@@@\n"); #endif } @@ -267,7 +267,7 @@ static void slp_suspend_ops_end(void) { #if 0 /* legacy log */ - printk_deferred("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_end\t@@@@@@@@@@@@\n"); + pr_debug("[name:spm&][SLP] @@@@@@@@@@@@\tChip_pm_end\t@@@@@@@@@@@@\n"); #endif } @@ -283,7 +283,7 @@ static const struct platform_suspend_ops slp_suspend_ops = { __attribute__ ((weak)) int spm_set_dpidle_wakesrc(u32 wakesrc, bool enable, bool replace) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return 0; } @@ -297,7 +297,7 @@ int slp_set_wakesrc(u32 wakesrc, bool enable, bool ck26m_on) int r; unsigned long flags; - printk_deferred("[name:spm&][SLP] wakesrc = 0x%x, enable = %u, ck26m_on = %u\n", + pr_debug("[name:spm&][SLP] wakesrc = 0x%x, enable = %u, ck26m_on = %u\n", wakesrc, enable, ck26m_on); #if SLP_REPLACE_DEF_WAKESRC diff --git a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_spm_resource_req.c b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_spm_resource_req.c index 0f9b36409605e8fe3855bb2ccfdad7be3ba34ddb..28bbc1d879a8a8572fb6f18e01082d37bd601cdb 100644 --- a/drivers/misc/mediatek/base/power/spm/common_v1/mtk_spm_resource_req.c +++ b/drivers/misc/mediatek/base/power/spm/common_v1/mtk_spm_resource_req.c @@ -251,12 +251,12 @@ void spm_resource_req_dump(void) int i; unsigned long flags; - printk_deferred("[name:spm&]resource_req:\n"); + pr_debug("[name:spm&]resource_req:\n"); spin_lock_irqsave(&spm_resource_desc_update_lock, flags); for (i = 0; i < NF_SPM_RESOURCE; i++) - printk_deferred("[name:spm&][%s]: 0x%x, 0x%x, mask = 0x%x, 0x%x\n", + pr_debug("[name:spm&][%s]: 0x%x, 0x%x, mask = 0x%x, 0x%x\n", spm_resource_name[i], resc_desc[i].user_usage[0], resc_desc[i].user_usage[1], @@ -273,7 +273,7 @@ void spm_resource_req_block_dump(void) spin_lock_irqsave(&spm_resource_desc_update_lock, flags); if (curr_res_usage == SPM_RESOURCE_ALL) { - printk_deferred("[name:spm&][resource_req_block] user: 0x%x, 0x%x\n", + pr_debug("[name:spm&][resource_req_block] user: 0x%x, 0x%x\n", resc_desc[0].user_usage[0], resc_desc[0].user_usage[1]); } diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm.c index fcb784cd4bf564761bfcec91320f151d770ebfac..acc10170a240fd894a7880ed820c0145b2d6a7b3 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm.c @@ -198,14 +198,14 @@ static int spm_pm_event(struct notifier_block *notifier, unsigned long pm_event, case PM_POST_HIBERNATION: return NOTIFY_DONE; case PM_SUSPEND_PREPARE: - printk_deferred( + pr_debug( "[name:spm&][SPM] PM: suspend entry %d-%02d-%02d %02d:%02d:%02d.%09lu UTC\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec); return NOTIFY_DONE; case PM_POST_SUSPEND: - printk_deferred( + pr_debug( "[name:spm&][SPM] PM: suspend exit %d-%02d-%02d %02d:%02d:%02d.%09lu UTC\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec); diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_idle.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_idle.c index 3ae9573383a8854ed7ca9f124c44e44e0e5569b4..7dbc68797392059d29d6fa1e2dc0076915599b4e 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_idle.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_idle.c @@ -488,7 +488,7 @@ static unsigned int mtk_sodi_output_log( } if (print_log) { - printk_deferred("[name:spm&]Power/swap op_cond = 0x%x\n" + pr_debug("[name:spm&]Power/swap op_cond = 0x%x\n" , op_cond); wr = __spm_output_wake_reason( wakesta, false, mtk_idle_name(idle_type)); diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_internal.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_internal.c index c19ce495bd5fc57247e35e033c1d259c8b7945a2..985e2afe29658da34335d2068caaad06ae643d9f 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_internal.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_internal.c @@ -183,7 +183,7 @@ unsigned int __spm_output_wake_reason( " debug_flag = 0x%x 0x%x\n", wakesta->debug_flag, wakesta->debug_flag1); - printk_deferred("[name:spm&]%s", log_buf); + pr_debug("[name:spm&]%s", log_buf); return WR_PCM_ASSERT; } @@ -268,10 +268,10 @@ unsigned int __spm_output_wake_reason( WARN_ON(log_size >= LOG_BUF_OUT_SZ); if (!suspend) - printk_deferred("[name:spm&][SPM] %s", log_buf); + pr_debug("[name:spm&][SPM] %s", log_buf); else { aee_sram_printk("%s", log_buf); - printk_deferred("[name:spm&][SPM] %s", log_buf); + pr_debug("[name:spm&][SPM] %s", log_buf); } return wr; @@ -300,13 +300,13 @@ u32 __spm_get_wake_period(int pwake_time, unsigned int last_wr) period = get_dynamic_period(last_wr != WR_PCM_TIMER ? 1 : 0, SPM_WAKE_PERIOD, 1); if (period <= 0) { - printk_deferred("[name:spm&][SPM] CANNOT GET PERIOD FROM FUEL GAUGE\n"); + pr_debug("[name:spm&][SPM] CANNOT GET PERIOD FROM FUEL GAUGE\n"); period = SPM_WAKE_PERIOD; } } else { period = pwake_time; aee_sram_printk("pwake = %d\n", pwake_time); - printk_deferred("[name:spm&][SPM] pwake = %d\n", pwake_time); + pr_debug("[name:spm&][SPM] pwake = %d\n", pwake_time); } if (period > 36 * 3600) /* max period is 36.4 hours */ diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_irq.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_irq.c index c40653b4e7ffeb87f3f4c71276bcc6674bbc76f6..4ec84f5582c895e8a030a88cd40acccfc39cff35 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_irq.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_irq.c @@ -34,27 +34,27 @@ char __attribute__((weak)) *spm_vcorefs_dump_dvfs_regs(char *p) void __attribute__((weak)) mt_cirq_clone_gic(void) { - printk_deferred("[name:spm&][SPM] NO %s !!!\n", __func__); + pr_debug("[name:spm&][SPM] NO %s !!!\n", __func__); } void __attribute__((weak)) mt_cirq_enable(void) { - printk_deferred("[name:spm&][SPM] NO %s !!!\n", __func__); + pr_debug("[name:spm&][SPM] NO %s !!!\n", __func__); } void __attribute__((weak)) mt_cirq_flush(void) { - printk_deferred("[name:spm&][SPM] NO %s !!!\n", __func__); + pr_debug("[name:spm&][SPM] NO %s !!!\n", __func__); } void __attribute__((weak)) mt_cirq_disable(void) { - printk_deferred("[name:spm&][SPM] NO %s !!!\n", __func__); + pr_debug("[name:spm&][SPM] NO %s !!!\n", __func__); } void __attribute__((weak)) set_wakeup_sources(u32 *list, u32 num_events) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); } /*************************************************** diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_power.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_power.c index ff30ea0e5d22f2f0f01b738e8269718abcf08004..adab3b20da7d137566fb6141784a98e6e3735d5a 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_power.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_power.c @@ -41,7 +41,7 @@ void mtk_idle_power_pre_process(int idle_type, unsigned int op_cond) ret = spm_to_sspm_command_async(cmd, &spm_d); if (ret < 0) - printk_deferred("[name:spm&]%s: ret %d", __func__, ret); + pr_debug("[name:spm&]%s: ret %d", __func__, ret); } void mtk_idle_power_pre_process_async_wait(int idle_type, unsigned int op_cond) @@ -55,7 +55,7 @@ void mtk_idle_power_pre_process_async_wait(int idle_type, unsigned int op_cond) ret = spm_to_sspm_command_async_wait(cmd); if (ret < 0) - printk_deferred("[name:spm&]%s: ret %d", __func__, ret); + pr_debug("[name:spm&]%s: ret %d", __func__, ret); } void mtk_idle_power_post_process(int idle_type, unsigned int op_cond) @@ -84,7 +84,7 @@ void mtk_idle_power_post_process(int idle_type, unsigned int op_cond) ret = spm_to_sspm_command_async(cmd, &spm_d); if (ret < 0) - printk_deferred("[name:spm&]%s: ret %d", __func__, ret); + pr_debug("[name:spm&]%s: ret %d", __func__, ret); } void mtk_idle_power_post_process_async_wait(int idle_type, unsigned int op_cond) @@ -98,6 +98,6 @@ void mtk_idle_power_post_process_async_wait(int idle_type, unsigned int op_cond) ret = spm_to_sspm_command_async_wait(cmd); if (ret < 0) - printk_deferred("[name:spm&]%s: ret %d", __func__, ret); + pr_debug("[name:spm&]%s: ret %d", __func__, ret); } diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend.c index 76ebc574ffd81d60a095d3b29ae0cf39d0e3ac97..00337737b05a9f91d9750eee73760675a5f7cec3 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend.c @@ -57,19 +57,19 @@ unsigned int spm_sleep_count; int __attribute__ ((weak)) mtk_enter_idle_state(int idx) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return -1; } int __attribute__ ((weak)) vcorefs_get_curr_ddr(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return -1; } int __attribute__ ((weak)) vcorefs_get_curr_vcore(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return -1; } @@ -157,14 +157,14 @@ static int spm_suspend_pm_event(struct notifier_block *notifier, case PM_POST_HIBERNATION: return NOTIFY_DONE; case PM_SUSPEND_PREPARE: - printk_deferred( + pr_debug( "[name:spm&][SPM] PM: suspend entry %d-%02d-%02d %02d:%02d:%02d.%09lu UTC\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec); return NOTIFY_DONE; case PM_POST_SUSPEND: - printk_deferred( + pr_debug( "[name:spm&][SPM] PM: suspend exit %d-%02d-%02d %02d:%02d:%02d.%09lu UTC\n", tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec); @@ -209,7 +209,7 @@ static void spm_trigger_wfi_for_sleep(struct pwr_ctrl *pwrctrl) if (spm_dormant_sta < 0) { aee_sram_printk("spm_dormant_sta %d", spm_dormant_sta); - printk_deferred("[name:spm&][SPM] spm_dormant_sta %d" + pr_debug("[name:spm&][SPM] spm_dormant_sta %d" , spm_dormant_sta); } @@ -281,15 +281,15 @@ static unsigned int spm_output_wake_reason(struct wake_status *wakesta) log_wakesta_index = 0; aee_sram_printk("sleep_count = %d\n", spm_sleep_count); - printk_deferred("[name:spm&][SPM] sleep_count = %d\n", spm_sleep_count); + pr_debug("[name:spm&][SPM] sleep_count = %d\n", spm_sleep_count); if (spm_ap_mdsrc_req_cnt != 0) { aee_sram_printk("warning: spm_ap_mdsrc_req_cnt = %d, ", spm_ap_mdsrc_req_cnt); - printk_deferred("[name:spm&][SPM ]warning: spm_ap_mdsrc_req_cnt = %d, ", + pr_debug("[name:spm&][SPM ]warning: spm_ap_mdsrc_req_cnt = %d, ", spm_ap_mdsrc_req_cnt); aee_sram_printk("r7[ap_mdsrc_req] = 0x%x\n", spm_read(SPM_POWER_ON_VAL1) & (1 << 17)); - printk_deferred("r7[ap_mdsrc_req] = 0x%x\n", + pr_debug("r7[ap_mdsrc_req] = 0x%x\n", spm_read(SPM_POWER_ON_VAL1) & (1 << 17)); } @@ -402,7 +402,7 @@ bool spm_suspend_condition_check(void) /* extern int get_dlpt_imix_spm(void); */ int __attribute__((weak)) get_dlpt_imix_spm(void) { - printk_deferred("[name:spm&]NO %s !!!\n", __func__); + pr_debug("[name:spm&]NO %s !!!\n", __func__); return 0; } #endif @@ -457,7 +457,7 @@ unsigned int spm_go_to_sleep(void) wd_api->wd_spmwdt_mode_config(WD_REQ_EN, WD_REQ_RST_MODE); wd_api->wd_suspend_notify(); } else - printk_deferred("[name:spm&]FAILED TO GET WD API\n"); + pr_debug("[name:spm&]FAILED TO GET WD API\n"); #endif lockdep_off(); spin_lock_irqsave(&__spm_lock, flags); @@ -468,7 +468,7 @@ unsigned int spm_go_to_sleep(void) aee_sram_printk("sec = %u, wakesrc = 0x%x (%u)(%u)\n", sec, pwrctrl->wake_src, is_cpu_pdn(pwrctrl->pcm_flags), is_infra_pdn(pwrctrl->pcm_flags)); - printk_deferred("[name:spm&][SPM] sec = %u, wakesrc = 0x%x (%u)(%u)\n", + pr_debug("[name:spm&][SPM] sec = %u, wakesrc = 0x%x (%u)(%u)\n", sec, pwrctrl->wake_src, is_cpu_pdn(pwrctrl->pcm_flags), is_infra_pdn(pwrctrl->pcm_flags)); @@ -479,7 +479,7 @@ unsigned int spm_go_to_sleep(void) #if !defined(CONFIG_FPGA_EARLY_PORTING) && !defined(SECURE_SERIAL_8250) if (mtk8250_request_to_sleep()) { last_wr = WR_UART_BUSY; - printk_deferred("[name:spm&]Fail to request uart sleep\n"); + pr_debug("[name:spm&]Fail to request uart sleep\n"); goto RESTORE_IRQ; } #endif @@ -517,7 +517,7 @@ unsigned int spm_go_to_sleep(void) else { aee_sram_printk("pwrctrl->wdt_disable %d\n", pwrctrl->wdt_disable); - printk_deferred("[name:spm&][SPM] pwrctrl->wdt_disable %d\n", + pr_debug("[name:spm&][SPM] pwrctrl->wdt_disable %d\n", pwrctrl->wdt_disable); } wd_api->wd_spmwdt_mode_config(WD_REQ_DIS, WD_REQ_RST_MODE); @@ -535,7 +535,7 @@ unsigned int spm_go_to_sleep(void) if (pwrctrl->wakelock_timer_val) { aee_sram_printk("#@# %s(%d) calling spm_pm_stay_awake()\n", __func__, __LINE__); - printk_deferred("[name:spm&][SPM ]#@# %s(%d) calling spm_pm_stay_awake()\n", + pr_debug("[name:spm&][SPM ]#@# %s(%d) calling spm_pm_stay_awake()\n", __func__, __LINE__); spm_pm_stay_awake(pwrctrl->wakelock_timer_val); } diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend_process.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend_process.c index 651b5a0741f4dbc1cab01b815ddc3d1cdd8aeb23..5ec263adbb2a14a8b2a3f7a7f57934e6881f7924 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend_process.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_suspend_process.c @@ -35,7 +35,7 @@ void spm_dump_world_clk_cntcv(void) wlk_cntcv_l = _golden_read_reg(WORLD_CLK_CNTCV_L); wlk_cntcv_h = _golden_read_reg(WORLD_CLK_CNTCV_H); - printk_deferred("[name:spm&][SPM] wlk_cntcv_l = 0x%x, wlk_cntcv_h = 0x%x\n", + pr_debug("[name:spm&][SPM] wlk_cntcv_l = 0x%x, wlk_cntcv_h = 0x%x\n", wlk_cntcv_l, wlk_cntcv_h); } @@ -49,7 +49,7 @@ void spm_set_sysclk_settle(void) /* md_settle is keyword for suspend status */ aee_sram_printk("md_settle = %u, settle = %u\n", SPM_SYSCLK_SETTLE, settle); - printk_deferred("[name:spm&][SPM] md_settle = %u, settle = %u\n", + pr_debug("[name:spm&][SPM] md_settle = %u, settle = %u\n", SPM_SYSCLK_SETTLE, settle); } @@ -109,7 +109,7 @@ void spm_suspend_post_process(struct pwr_ctrl *pwrctrl) ret = spm_to_sspm_command(SPM_RESUME, &spm_d); if (ret < 0) { aee_sram_printk("ret %d", ret); - printk_deferred("[name:spm&][SPM] ret %d", ret); + pr_debug("[name:spm&][SPM] ret %d", ret); } #endif /* CONFIG_MTK_TINYSYS_SSPM_SUPPORT */ } diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_utils.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_utils.c index a7757ed596fb5eaafd99344853b52456b359f372..3ef2cbfef8ca3beefbd59a5511472114ff32c909 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_utils.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_spm_utils.c @@ -177,7 +177,7 @@ EXPORT_SYMBOL(get_spmfw_version); void spm_output_sleep_option(void) { - printk_deferred("[name:spm&][SPM] PWAKE_EN:%d, PCMWDT_EN:%d, BYPASS_SYSPWREQ:%d\n", + pr_debug("[name:spm&][SPM] PWAKE_EN:%d, PCMWDT_EN:%d, BYPASS_SYSPWREQ:%d\n", SPM_PWAKE_EN, SPM_PCMWDT_EN, SPM_BYPASS_SYSPWREQ); } EXPORT_SYMBOL(spm_output_sleep_option); diff --git a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_sspm.c b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_sspm.c index 7537b99a5c5febdf7a2ba707da10fdf8fb243640..26132788c9b87e8bf077f3c2a7dc1bd1ea64cf5b 100644 --- a/drivers/misc/mediatek/base/power/spm/mt6765/mtk_sspm.c +++ b/drivers/misc/mediatek/base/power/spm/mt6765/mtk_sspm.c @@ -33,11 +33,11 @@ int spm_to_sspm_command_async(u32 cmd, struct spm_data *spm_d) ret = sspm_ipi_send_async( IPI_ID_SPM_SUSPEND, IPI_OPT_DEFAUT, spm_d, SPM_D_LEN); if (ret != 0) - printk_deferred("[name:spm&]#@# %s(%d) sspm_ipi_send_async(cmd:0x%x) ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) sspm_ipi_send_async(cmd:0x%x) ret %d\n", __func__, __LINE__, cmd, ret); break; default: - printk_deferred("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", + pr_debug("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", __func__, __LINE__, cmd); break; } @@ -60,16 +60,16 @@ int spm_to_sspm_command_async_wait(u32 cmd) ret = sspm_ipi_send_async_wait( IPI_ID_SPM_SUSPEND, IPI_OPT_DEFAUT, &ack_data); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) sspm_ipi_send_async_wait(cmd:0x%x) ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) sspm_ipi_send_async_wait(cmd:0x%x) ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd(%d) return %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd(%d) return %d\n", __func__, __LINE__, cmd, ret); } break; default: - printk_deferred("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", + pr_debug("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", __func__, __LINE__, cmd); break; } @@ -97,11 +97,11 @@ int spm_to_sspm_command(u32 cmd, struct spm_data *spm_d) IPI_ID_SPM_SUSPEND, IPI_OPT_POLLING, spm_d, SPM_D_LEN, &ack_data, 1); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } break; @@ -111,11 +111,11 @@ int spm_to_sspm_command(u32 cmd, struct spm_data *spm_d) IPI_ID_SPM_SUSPEND, IPI_OPT_POLLING, spm_d, SPM_D_LEN, &ack_data, 1); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } break; @@ -126,11 +126,11 @@ int spm_to_sspm_command(u32 cmd, struct spm_data *spm_d) IPI_ID_SPM_SUSPEND, IPI_OPT_POLLING, spm_d, SPM_D_LEN, &ack_data, 1); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } break; @@ -141,11 +141,11 @@ int spm_to_sspm_command(u32 cmd, struct spm_data *spm_d) IPI_ID_SPM_SUSPEND, IPI_OPT_POLLING, spm_d, SPM_D_LEN, &ack_data, 1); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } break; @@ -157,16 +157,16 @@ int spm_to_sspm_command(u32 cmd, struct spm_data *spm_d) IPI_ID_SPM_SUSPEND, IPI_OPT_POLLING, spm_d, SPM_D_LEN, &ack_data, 1); if (ret != 0) { - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } else if (ack_data < 0) { ret = ack_data; - printk_deferred("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", + pr_debug("[name:spm&]#@# %s(%d) cmd:0x%x ret %d\n", __func__, __LINE__, cmd, ret); } break; default: - printk_deferred("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", + pr_debug("[name:spm&]#@# %s(%d) cmd(%d) wrong!!!\n", __func__, __LINE__, cmd); break; } diff --git a/drivers/misc/mediatek/blocktag/Kconfig b/drivers/misc/mediatek/blocktag/Kconfig index f6229f539898efaea6956b64c96e734b52915a84..51f00f230f1f121a8cf47caf50b986754dd57cd2 100644 --- a/drivers/misc/mediatek/blocktag/Kconfig +++ b/drivers/misc/mediatek/blocktag/Kconfig @@ -7,7 +7,7 @@ comment "Storage Block Tag" config MTK_BLOCK_TAG bool "Storage Block Tag" depends on BLOCK - default y + default n help Enable block tagging at block driver, tag requester pid to the accessing pages. This allows MMC/UFS Block IO log to obtian diff --git a/drivers/misc/mediatek/ccu/src/1.2/ccu_i2c.c b/drivers/misc/mediatek/ccu/src/1.2/ccu_i2c.c index 0d46ae67797b84034c0fb28399729ffb951c97e2..954f7f0f15304e37a418e9603d69534042911b23 100644 --- a/drivers/misc/mediatek/ccu/src/1.2/ccu_i2c.c +++ b/drivers/misc/mediatek/ccu/src/1.2/ccu_i2c.c @@ -329,9 +329,9 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) { /* I2CFUC(); */ /* int val=0; */ - pr_info("i2c_dump_info ++++++++++++++++++++++++++++++++++++++++++\n"); - pr_info("base address 0x%p\n", i2c->base); - pr_info("I2C register:\n" + pr_debug("i2c_dump_info ++++++++++++++++++++++++++++++++++++++++++\n"); + pr_debug("base address 0x%p\n", i2c->base); + pr_debug("I2C register:\n" I2CTAG "SLAVE_ADDR=%x,INTR_MASK=%x,INTR_STAT=%x," I2CTAG "CONTROL=%x,TRANSFER_LEN=%x\n" I2CTAG "TRANSAC_LEN=%x,DELAY_LEN=%x," @@ -355,7 +355,7 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) (i2c_readw(i2c, 0x200 + OFFSET_EXT_CONF)), (i2c_readw(i2c, 0x200 + OFFSET_TRANSFER_LEN_AUX))); - pr_info("DMA register(0x%p):\n" + pr_debug("DMA register(0x%p):\n" I2CTAG "INT_FLAG=%x,INT_EN=%x,EN=%x,RST=%x,\n" I2CTAG "STOP=%x,FLUSH=%x,CON=%x,TX_MEM_ADDR=%x, RX_MEM_ADDR=%x\n" I2CTAG "TX_LEN=%x,RX_LEN=%x,INT_BUF_SIZE=%x,DEBUG_STATUS=%x\n" @@ -376,6 +376,6 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) (i2c_readl_dma(i2c, 0x80 + OFFSET_DEBUG_STA)), (i2c_readl_dma(i2c, 0x80 + OFFSET_TX_MEM_ADDR2)), (i2c_readl_dma(i2c, 0x80 + OFFSET_RX_MEM_ADDR2))); - pr_info("i2c_dump_info ------------------------------------------\n"); + pr_debug("i2c_dump_info ------------------------------------------\n"); } diff --git a/drivers/misc/mediatek/ccu/src/2.1/ccu_i2c.c b/drivers/misc/mediatek/ccu/src/2.1/ccu_i2c.c index a295d95ff54ecf177eff2e3d2c047aca53d39b56..83329e6066cba2105537d805ed03b6f3f399a88f 100644 --- a/drivers/misc/mediatek/ccu/src/2.1/ccu_i2c.c +++ b/drivers/misc/mediatek/ccu/src/2.1/ccu_i2c.c @@ -505,8 +505,8 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) { /* I2CFUC(); */ /* int val=0; */ - pr_info("i2c_dump_info ++++++++++++++++++++++++++++++++++++++++++\n"); - pr_info("I2C structure:\n" + pr_debug("i2c_dump_info ++++++++++++++++++++++++++++++++++++++++++\n"); + pr_debug("I2C structure:\n" I2CTAG "Clk=%d,Id=%d,Op=%x,Irq_stat=%x,Total_len=%x\n" I2CTAG "Trans_len=%x,Trans_num=%x,Trans_auxlen=%x,speed=%d\n" I2CTAG "Trans_stop=%u\n", @@ -514,8 +514,8 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) i2c->msg_len, 1, i2c->msg_aux_len, i2c->speed_hz, i2c->trans_stop); - pr_info("base address 0x%p\n", i2c->base); - pr_info("I2C register:\n" + pr_debug("base address 0x%p\n", i2c->base); + pr_debug("I2C register:\n" I2CTAG "SLAVE_ADDR=%x,INTR_MASK=%x,INTR_STAT=%x,CONTROL=%x,TRANSFER_LEN=%x\n" I2CTAG "TRANSAC_LEN=%x,DELAY_LEN=%x,TIMING=%x,START=%x,FIFO_STAT=%x\n" I2CTAG "IO_CONFIG=%x,HS=%x,DCM_EN=%x,DEBUGSTAT=%x,EXT_CONF=%x,TRANSFER_LEN_AUX=%x\n", @@ -536,7 +536,7 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) (i2c_readw(i2c, OFFSET_EXT_CONF)), (i2c_readw(i2c, OFFSET_TRANSFER_LEN_AUX))); - pr_info("DMA register(0x%p):\n" + pr_debug("DMA register(0x%p):\n" I2CTAG "INT_FLAG=%x,INT_EN=%x,EN=%x,RST=%x,\n" I2CTAG "STOP=%x,FLUSH=%x,CON=%x,TX_MEM_ADDR=%x, RX_MEM_ADDR=%x\n" I2CTAG "TX_LEN=%x,RX_LEN=%x,INT_BUF_SIZE=%x,DEBUG_STATUS=%x\n" @@ -557,5 +557,5 @@ static void ccu_i2c_dump_info(struct mt_i2c *i2c) (i2c_readl_dma(i2c, OFFSET_DEBUG_STA)), (i2c_readl_dma(i2c, OFFSET_TX_MEM_ADDR2)), (i2c_readl_dma(i2c, OFFSET_RX_MEM_ADDR2))); - pr_info("i2c_dump_info ------------------------------------------\n"); + pr_debug("i2c_dump_info ------------------------------------------\n"); } diff --git a/drivers/misc/mediatek/cmdq/v2/cmdq_core.h b/drivers/misc/mediatek/cmdq/v2/cmdq_core.h index 3ce187330253d08a83f008ed1a77287182f065f7..e85cd0b5c91993c4b47d5105fe2a0dc700dfe711 100644 --- a/drivers/misc/mediatek/cmdq/v2/cmdq_core.h +++ b/drivers/misc/mediatek/cmdq/v2/cmdq_core.h @@ -136,14 +136,14 @@ struct DumpFirstErrorStruct { #define CMDQ_LOG(string, args...) \ do { \ - pr_notice("[CMDQ]"string, ##args); \ + pr_debug("[CMDQ]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ]"string, ##args); \ } while (0) #define CMDQ_MSG(string, args...) \ do { \ if (cmdq_core_should_print_msg()) { \ - pr_notice("[CMDQ]"string, ##args); \ + pr_debug("[CMDQ]"string, ##args); \ } \ } while (0) @@ -156,7 +156,7 @@ do { \ #define CMDQ_ERR(string, args...) \ do { \ - pr_notice("[CMDQ][ERR]"string, ##args); \ + pr_err("[CMDQ][ERR]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ][ERR]"string, ##args); \ } while (0) @@ -166,7 +166,7 @@ do { \ do { \ char dispatchedTag[50]; \ snprintf(dispatchedTag, 50, "CRDISPATCH_KEY:%s", tag); \ - pr_notice("[CMDQ][AEE]"string, ##args); \ + pr_warn("[CMDQ][AEE]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ][AEE]"string, ##args); \ cmdq_core_turnoff_first_dump(); \ aee_kernel_warning_api(__FILE__, __LINE__, \ diff --git a/drivers/misc/mediatek/cmdq/v3/cmdq_helper_ext.h b/drivers/misc/mediatek/cmdq/v3/cmdq_helper_ext.h index 2ae0bf349619f186bd22bbf751d999ce9d306ae3..70156bfd82277a91515923e8473ecd1214bdf169 100644 --- a/drivers/misc/mediatek/cmdq/v3/cmdq_helper_ext.h +++ b/drivers/misc/mediatek/cmdq/v3/cmdq_helper_ext.h @@ -72,14 +72,14 @@ struct DumpFirstErrorStruct { #define CMDQ_LOG(string, args...) \ do { \ - pr_notice("[CMDQ]"string, ##args); \ + pr_debug("[CMDQ]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ]"string, ##args); \ } while (0) #define CMDQ_MSG(string, args...) \ do { \ if (cmdq_core_should_print_msg()) { \ - pr_notice("[CMDQ]"string, ##args); \ + pr_debug("[CMDQ]"string, ##args); \ } \ } while (0) @@ -93,7 +93,7 @@ do { \ #define CMDQ_ERR(string, args...) \ do { \ - pr_notice("[CMDQ][ERR]"string, ##args); \ + pr_err("[CMDQ][ERR]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ][ERR]"string, ##args); \ } while (0) @@ -111,7 +111,7 @@ do { \ int len = snprintf(dispatchedTag, 50, "CRDISPATCH_KEY:%s", tag); \ if (len >= 50) \ pr_debug("%s:%d len:%d over 50\n", __func__, __LINE__, len); \ - pr_notice("[CMDQ][AEE]"string, ##args); \ + pr_debug("[CMDQ][AEE]"string, ##args); \ cmdq_core_save_first_dump("[CMDQ][AEE]"string, ##args); \ cmdq_core_turnoff_first_dump(); \ aee_kernel_warning_api(__FILE__, __LINE__, \ diff --git a/drivers/misc/mediatek/cmdq/v3/cmdq_mdp_common.c b/drivers/misc/mediatek/cmdq/v3/cmdq_mdp_common.c index b8a41e25f152deeb2ec0d154e13e657ac6057e82..119b5612ceb206cd9e01e07c7619f6d1a0aa8afb 100644 --- a/drivers/misc/mediatek/cmdq/v3/cmdq_mdp_common.c +++ b/drivers/misc/mediatek/cmdq/v3/cmdq_mdp_common.c @@ -57,7 +57,7 @@ static u32 step_size; #define CMDQ_LOG_PMQOS(string, args...) \ do { \ if (cmdq_core_should_pmqos_log()) { \ - pr_notice("[CMDQ][MDP]"string, ##args); \ + pr_debug("[CMDQ][MDP]"string, ##args); \ } \ } while (0) diff --git a/drivers/misc/mediatek/connectivity/wlan/core/gen4m/include/debug.h b/drivers/misc/mediatek/connectivity/wlan/core/gen4m/include/debug.h index 4c74d53620f908382605eaca0fb83fffafba6b9f..0a9d20f700af39a404f641c91349592bfe6290f5 100644 --- a/drivers/misc/mediatek/connectivity/wlan/core/gen4m/include/debug.h +++ b/drivers/misc/mediatek/connectivity/wlan/core/gen4m/include/debug.h @@ -107,14 +107,14 @@ extern struct MIB_INFO_STAT g_arMibInfo[ENUM_BAND_NUM]; #define DBG_CLASS_MASK BITS(0, 7) #define DBG_LOG_LEVEL_DEFAULT \ - (DBG_CLASS_ERROR | \ + (DBG_CLASS_ERROR) +#define DBG_LOG_LEVEL_MORE \ + (DBG_LOG_LEVEL_DEFAULT | \ + DBG_CLASS_TRACE | \ DBG_CLASS_WARN | \ DBG_CLASS_STATE | \ DBG_CLASS_EVENT | \ DBG_CLASS_INFO) -#define DBG_LOG_LEVEL_MORE \ - (DBG_LOG_LEVEL_DEFAULT | \ - DBG_CLASS_TRACE) #define DBG_LOG_LEVEL_EXTREME \ (DBG_LOG_LEVEL_MORE | \ DBG_CLASS_LOUD) diff --git a/drivers/misc/mediatek/m4u/mt6765/m4u_priv.h b/drivers/misc/mediatek/m4u/mt6765/m4u_priv.h index 3cea80c99d0892469d94f32390ffb9b33b6243ab..ec0326e8f8b7450a8f93b6ac93e1d46b3103aec7 100644 --- a/drivers/misc/mediatek/m4u/mt6765/m4u_priv.h +++ b/drivers/misc/mediatek/m4u/mt6765/m4u_priv.h @@ -40,7 +40,7 @@ extern int gM4U_log_to_uart; do {\ if (level > gM4U_log_level) {\ if (level > gM4U_log_to_uart)\ - pr_info("[M4U] "string, ##args);\ + pr_debug("[M4U] "string, ##args);\ else\ pr_debug("[M4U] "string, ##args);\ } \ @@ -90,7 +90,7 @@ extern int gM4U_log_to_uart; if (seq_file)\ seq_printf(seq_file, fmt, ##args);\ else\ - pr_info(fmt, ##args);\ + pr_debug(fmt, ##args);\ } #if (defined(CONFIG_TRUSTONIC_TEE_SUPPORT) || \ diff --git a/drivers/misc/mediatek/mmdvfs/Makefile b/drivers/misc/mediatek/mmdvfs/Makefile index 25c13386bcf362103864edb09a6549d0941cc76c..5b2575581e638c047b584cba303743f258145fb0 100644 --- a/drivers/misc/mediatek/mmdvfs/Makefile +++ b/drivers/misc/mediatek/mmdvfs/Makefile @@ -190,9 +190,6 @@ endif else obj-y += mmdvfs_plat_default.o endif -ifeq (true, $(APPLY_CLK_LOG)) -ccflags-y += -DAPPLY_CLK_LOG -endif ifeq ($(CONFIG_MTK_QOS_V2),y) ifeq (true, $(QOS_BOUND_DETECT)) diff --git a/drivers/misc/mediatek/mmdvfs/mmdvfs_pmqos.c b/drivers/misc/mediatek/mmdvfs/mmdvfs_pmqos.c index 63db13b219a76537db71bd3e5e59f211cd18244b..c903c6293b80977ca8ba1e00c2c76ac20743a1bc 100644 --- a/drivers/misc/mediatek/mmdvfs/mmdvfs_pmqos.c +++ b/drivers/misc/mediatek/mmdvfs/mmdvfs_pmqos.c @@ -280,7 +280,7 @@ static void mm_apply_vcore(s32 vopp) v_real = regulator_get_voltage(vcore_reg_id); v_target = mtk_dvfsrc_vcore_uv_table(vopp); if (v_real < v_target) - pr_info("err vcore %d < %d\n", + pr_err("err vcore %d < %d\n", v_real, v_target); } @@ -295,14 +295,14 @@ static s32 mm_set_mux_clk(s32 src_mux_id, const char *name, if (step_config->clk_mux == NULL || step_config->clk_source == NULL) { - pr_notice("CCF handle can't be NULL during MMDVFS\n"); + pr_debug("CCF handle can't be NULL during MMDVFS\n"); return -EINVAL; } ret = clk_prepare_enable(step_config->clk_mux); if (ret) { - pr_notice("prepare clk(%d): %s-%u\n", + pr_debug("prepare clk(%d): %s-%u\n", ret, name, step); return -EFAULT; } @@ -311,7 +311,7 @@ static s32 mm_set_mux_clk(s32 src_mux_id, const char *name, step_config->clk_mux, step_config->clk_source); if (ret) - pr_notice( + pr_debug( "set parent(%d): %s-%u\n", ret, name, step); #ifdef APPLY_CLK_LOG @@ -322,7 +322,7 @@ static s32 mm_set_mux_clk(s32 src_mux_id, const char *name, clk_disable_unprepare(step_config->clk_mux); if (ret) - pr_notice( + pr_debug( "unprepare clk(%d): %s-%u\n", ret, name, step); return ret; @@ -339,7 +339,7 @@ static s32 mm_set_freq_hopping_clk(const char *name, #endif if (ret) - pr_notice("hopping rate(%d):(%u)-0x%08x, %s-%u\n", + pr_debug("hopping rate(%d):(%u)-0x%08x, %s-%u\n", ret, step_config->pll_id, step_config->pll_value, name, step); return ret; @@ -368,7 +368,7 @@ static void mm_check_limit(struct mm_freq_config *config, limit_step = &config->limit_config.limit_steps[level-1][step]; *step_config = limit_step; if (log_level & 1 << log_limit) - pr_notice( + pr_debug( "limit %s: freq %llu -> %llu in step %u\n", config->prop_name, normal_step->freq_step, limit_step->freq_step, step); @@ -392,7 +392,7 @@ static s32 mm_apply_clk(s32 src_mux_id, u32 i; if (step >= MAX_FREQ_STEP) { - pr_notice( + pr_debug( "Invalid clk apply step %d in %s\n", step, config->prop_name); return -EINVAL; @@ -401,7 +401,7 @@ static s32 mm_apply_clk(s32 src_mux_id, mm_check_limit(config, &step_config, step); if (step_config->clk_type == CLK_TYPE_NONE) { - pr_notice("No need to change clk of %s\n", config->prop_name); + pr_debug("No need to change clk of %s\n", config->prop_name); return 0; } @@ -468,7 +468,7 @@ static void mm_apply_clk_for_all(u32 pm_qos_class, s32 src_mux_id, MMPROFILE_FLAG_PULSE, *((u32 *)&freq[0]), *((u32 *)&freq[4])); #endif if (log_level & 1 << log_freq) - pr_notice( + pr_debug( "freq change:%u class:%u step:%u f0:%x f1:%x\n", real_freq, pm_qos_class, step, *((u32 *)&freq[0]), *((u32 *)&freq[4])); @@ -526,13 +526,13 @@ void mm_qos_update_larb_bwl(u32 larb_update, bool bw_change) if (force_comm_bwl[comm][comm_port] != 0) { larb_bw = force_comm_bwl[comm][comm_port]; if (log_level & 1 << log_bw) - pr_notice("force comm:%d port:%d bwl:%#x\n", + pr_debug("force comm:%d port:%d bwl:%#x\n", comm, comm_port, larb_bw); } else if (comm_port_limit[comm][comm_port]) { larb_bw = (comm_port_limit[comm][comm_port] << 8) / freq[comm]; if (log_level & 1 << log_bw) - pr_notice("comm:%d port:%d bwl:%#x bw:%u\n", + pr_debug("comm:%d port:%d bwl:%#x bw:%u\n", comm, comm_port, larb_bw, comm_port_limit[comm][comm_port]); } @@ -575,7 +575,7 @@ static u32 mmdvfs_get_limit_status(u32 pm_qos_class) u32 i = pm_qos_class - PM_QOS_DISP_FREQ; if (i >= ARRAY_SIZE(all_freqs)) { - pr_notice("[GET]Invalid class: %u\n", pm_qos_class); + pr_debug("[GET]Invalid class: %u\n", pm_qos_class); return false; } @@ -588,12 +588,12 @@ static void update_step(u32 pm_qos_class, s32 src_mux_id) s32 old_max_step; if (!mmdvfs_enable || !mmdvfs_autok_enable) { - pr_notice("mmdvfs qos is disabled(%d)\n", pm_qos_class); + pr_debug("mmdvfs qos is disabled(%d)\n", pm_qos_class); return; } if (!step_size) { - pr_notice("no step available skip\n"); + pr_debug("no step available skip\n"); return; } @@ -655,7 +655,7 @@ static int mm_freq_notify(struct notifier_block *nb, mm_freq = container_of(nb, struct mm_freq_config, nb); if (!step_size) { - pr_notice( + pr_debug( "no step available in %s, skip\n", mm_freq->prop_name); return NOTIFY_OK; } @@ -865,7 +865,7 @@ static void simulate_dvfsrc(s32 next_hrt_bw) (!is_up && next_opp > current_opp)) { mtk_pm_qos_update_request(&ddr_request, next_opp); if (log_level & 1 << log_bw) - pr_notice("up=%d copp=%d nopp=%d cbw=%d nbw=%d\n", + pr_debug("up=%d copp=%d nopp=%d cbw=%d nbw=%d\n", is_up, current_opp, next_opp, current_hrt_bw, next_hrt_bw); } @@ -902,7 +902,7 @@ static void log_hrt_bw_info(u32 master_id) #endif if (log_level & 1 << log_bw) - pr_notice("%s larb=%d p1=%d ccu=%d disp=%d ddr_opp=%d\n", + pr_debug("%s larb=%d p1=%d ccu=%d disp=%d ddr_opp=%d\n", __func__, SMI_PMQOS_LARB_DEC(master_id), p1_hrt_bw, ccu_hrt_bw, disp_hrt_bw, ddr_opp); } @@ -918,7 +918,7 @@ static void update_hrt_bw_to_dvfsrc(s32 next_hrt_bw) mtk_pm_qos_update_request(&dvfsrc_isp_hrt_req, mm_used_hrt_bw); if (log_level & 1 << log_bw) - pr_notice("%s report dvfsrc mm_hrt_bw=%d\n", + pr_debug("%s report dvfsrc mm_hrt_bw=%d\n", __func__, mm_used_hrt_bw); #endif } @@ -935,11 +935,11 @@ static void blocking_camera(void) { u32 wait_result; - pr_notice("begin to blocking for camera_max_bw=%d\n", camera_max_bw); + pr_debug("begin to blocking for camera_max_bw=%d\n", camera_max_bw); wait_result = wait_event_timeout( hrt_wait, atomic_read(&lock_cam_count) == 0, msecs_to_jiffies(WAIT_TIMEOUT_MS)); - pr_notice("blocking wait_result=%d\n", wait_result); + pr_debug("blocking wait_result=%d\n", wait_result); } #endif @@ -988,15 +988,15 @@ s32 mm_qos_add_request(struct plist_head *owner_list, larb_id = SMI_PMQOS_LARB_DEC(smi_master_id); port_id = SMI_PMQOS_PORT_MASK(smi_master_id); if (!req) { - pr_notice("mm_add: Invalid req pointer\n"); + pr_debug("mm_add: Invalid req pointer\n"); return -EINVAL; } if (larb_id >= MAX_LARB_COUNT || port_id >= MAX_PORT_COUNT) { - pr_notice("mm_add(0x%08x) Invalid master_id\n", smi_master_id); + pr_debug("mm_add(0x%08x) Invalid master_id\n", smi_master_id); return -EINVAL; } if (req->init) { - pr_notice("mm_add(0x%08x) req is init\n", req->master_id); + pr_debug("mm_add(0x%08x) req is init\n", req->master_id); return -EINVAL; } @@ -1023,8 +1023,8 @@ s32 mm_qos_add_request(struct plist_head *owner_list, mutex_unlock(&bw_mutex); if (log_level & 1 << log_bw) { - pr_notice("mm_add larb=%u port=%d\n", larb_id, port_id); - pr_notice("req=%p\n", req); + pr_debug("mm_add larb=%u port=%d\n", larb_id, port_id); + pr_debug("req=%p\n", req); } return 0; } @@ -1052,20 +1052,20 @@ s32 mm_qos_set_request(struct mm_qos_request *req, u32 bw_value, port = SMI_PMQOS_PORT_MASK(req->master_id); if (!req->init || larb >= MAX_LARB_COUNT || port >= MAX_PORT_COUNT || comp_type >= BW_COMP_END) { - pr_notice("mm_set(0x%08x) init=%d larb=%d port=%d comp=%d\n", + pr_debug("mm_set(0x%08x) init=%d larb=%d port=%d comp=%d\n", req->master_id, req->init, larb, port, comp_type); dump_stack(); return -EINVAL; } if (!larb_req[larb].port_count || !larb_req[larb].ratio[port]) { - pr_notice("mm_set(0x%08x) invalid port_cnt=%d ratio=%d\n", + pr_debug("mm_set(0x%08x) invalid port_cnt=%d ratio=%d\n", req->master_id, larb_req[larb].port_count, larb_req[larb].ratio[port]); return -EINVAL; } if (bw_value > max_bw_bound || hrt_value > max_bw_bound) { - pr_notice("mm_set(0x%08x) invalid bw=%d hrt=%d bw_bound=%d\n", + pr_debug("mm_set(0x%08x) invalid bw=%d hrt=%d bw_bound=%d\n", req->master_id, bw_value, hrt_value, max_bw_bound); return -EINVAL; @@ -1075,7 +1075,7 @@ s32 mm_qos_set_request(struct mm_qos_request *req, u32 bw_value, req->bw_value == bw_value && req->comp_type == comp_type) { if (log_level & 1 << log_bw) - pr_notice("mm_set(0x%08x) no change\n", req->master_id); + pr_debug("mm_set(0x%08x) no change\n", req->master_id); return 0; } @@ -1142,13 +1142,13 @@ s32 mm_qos_set_request(struct mm_qos_request *req, u32 bw_value, } if (log_level & 1 << log_bw) { - pr_notice("set=0x%08x comp=%u,%u\n", req->master_id, + pr_debug("set=0x%08x comp=%u,%u\n", req->master_id, comp_type, req->comp_type); - pr_notice("set=0x%08x bw=%u,%u total_bw=%d\n", req->master_id, + pr_debug("set=0x%08x bw=%u,%u total_bw=%d\n", req->master_id, bw_value, req->bw_value, larb_req[larb].total_bw_data); - pr_notice("set=0x%08x hrt=%u,%u total_hrt=%d\n", req->master_id, + pr_debug("set=0x%08x hrt=%u,%u total_hrt=%d\n", req->master_id, hrt_value, req->hrt_value, larb_req[larb].total_hrt_data); - pr_notice("set=0x%08x o_mix=%u total_mix=%d\n", req->master_id, + pr_debug("set=0x%08x o_mix=%u total_mix=%d\n", req->master_id, old_larb_mix_value, larb_req[larb].total_mix_limit); } @@ -1187,7 +1187,7 @@ s32 mm_qos_set_request(struct mm_qos_request *req, u32 bw_value, enum_req->ostd = req->ostd; if (log_level & 1 << log_bw) - pr_notice("mm_set=0x%08x bw=%u ostd=%u hrt=%u comp=%u\n", + pr_debug("mm_set=0x%08x bw=%u ostd=%u hrt=%u comp=%u\n", req->master_id, req->bw_value, req->ostd, req->hrt_value, req->comp_type); @@ -1232,7 +1232,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) #endif if (!owner_list || plist_head_empty(owner_list)) { - pr_notice("%s: owner_list is invalid\n", __func__); + pr_debug("%s: owner_list is invalid\n", __func__); return; } @@ -1241,7 +1241,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) if (is_camera_larb(req->master_id)) { cam_bw = dram_write_weight(get_cam_hrt_bw()); if (cam_bw > camera_max_bw) { - pr_notice("cam_bw(%d) > camera_max_bw(%d)\n", + pr_debug("cam_bw(%d) > camera_max_bw(%d)\n", cam_bw, camera_max_bw); #ifdef MMDVFS_MMP mmprofile_log_ex( @@ -1256,7 +1256,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) #endif } if (cam_scen_change) { - pr_notice("scenario change time=%u cam_bw=%d\n", + pr_debug("scenario change time=%u cam_bw=%d\n", jiffies_to_msecs(jiffies-cam_scen_start_time), cam_bw); cam_scen_change = false; @@ -1267,7 +1267,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) #endif if (total_hrt_bw != UNINITIALIZED_VALUE && get_total_used_hrt_bw() > total_hrt_bw) - pr_notice("hrt bw overflow used=%d avail=%d\n", + pr_debug("hrt bw overflow used=%d avail=%d\n", get_total_used_hrt_bw(), total_hrt_bw); } @@ -1295,7 +1295,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) &comm, &comm_port); larb_update |= 1 << (comm * SMI_COMM_MASTER_NUM + comm_port); if (log_level & 1 << log_bw) - pr_notice("update(0x%08x) ostd=%d value=%d hrt=%d\n", + pr_debug("update(0x%08x) ostd=%d value=%d hrt=%d\n", req->master_id, req->ostd, req->bw_value, req->hrt_value); trace_mmqos__update_port(larb_id, port_id, @@ -1340,7 +1340,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) profile = sched_clock(); smi_ostd_update(owner_list, "MMDVFS"); if (log_level & 1 << log_bw) - pr_notice("config SMI (%d) cost: %llu us\n", + pr_debug("config SMI (%d) cost: %llu us\n", i, div_u64(sched_clock() - profile, 1000)); } @@ -1365,7 +1365,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) max_ch_hrt_bw = max_t(s32, final_chn_hrt_bw[comm][i], max_ch_hrt_bw); if (log_level & 1 << log_smi_freq) - pr_notice("comm:%d chn:%d s_bw:%d h_bw:%d\n", + pr_debug("comm:%d chn:%d s_bw:%d h_bw:%d\n", comm, i, channel_srt_bw[comm][i], final_chn_hrt_bw[comm][i]); #ifdef MMDVFS_MMP @@ -1385,7 +1385,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) mtk_pm_qos_update_request(&smi_freq_request[comm], max_t(s32, smi_srt_clk, smi_hrt_clk)); if (log_level & 1 << log_smi_freq) - pr_notice("comm:%d smi_srt_clk:%d smi_hrt_clk:%d\n", + pr_debug("comm:%d smi_srt_clk:%d smi_hrt_clk:%d\n", comm, smi_srt_clk, smi_hrt_clk); #ifdef MMDVFS_MMP mmprofile_log_ex( @@ -1411,7 +1411,7 @@ void mm_qos_update_all_request(struct plist_head *owner_list) larb_req[i].total_bw_data : 0; mtk_pm_qos_update_request(&mm_bw_request, mm_bw); if (log_level & 1 << log_bw) - pr_notice("config mm_bw=%d\n", mm_bw); + pr_debug("config mm_bw=%d\n", mm_bw); mutex_unlock(&bw_mutex); } EXPORT_SYMBOL_GPL(mm_qos_update_all_request); @@ -1433,7 +1433,7 @@ void mm_qos_remove_all_request(struct plist_head *owner_list) mutex_lock(&bw_mutex); plist_for_each_entry_safe(req, temp, owner_list, owner_node) { - pr_notice("mm_del(0x%08x)\n", req->master_id); + pr_debug("mm_del(0x%08x)\n", req->master_id); plist_del(&(req->owner_node), owner_list); list_del(&(req->larb_node)); list_del(&(req->port_node)); @@ -1513,7 +1513,7 @@ static int notify_bw_throttle(void *data) blocking_notifier_call_chain(&hrt_bw_throttle_notifier, (camera_max_bw > 0)?BW_THROTTLE_START:BW_THROTTLE_END, NULL); - pr_notice("notify_time=%u\n", + pr_debug("notify_time=%u\n", jiffies_to_msecs(jiffies-start_jiffies)); return 0; } @@ -1525,7 +1525,7 @@ static int notify_bw_throttle_blocking(void *data) atomic_dec(&lock_cam_count); wake_up(&hrt_wait); - pr_notice("decrease lock_cam_count=%d\n", + pr_debug("decrease lock_cam_count=%d\n", atomic_read(&lock_cam_count)); return 0; } @@ -1538,12 +1538,12 @@ static void set_camera_max_bw(u32 occ_bw) camera_max_bw = occ_bw; wait_next_max_cam_bw_set = false; - pr_notice("set cam max occupy_bw=%d\n", occ_bw); + pr_debug("set cam max occupy_bw=%d\n", occ_bw); #ifdef BLOCKING_MECHANISM /* No need to blocking if cam bw is decreasing */ if (camera_overlap_bw == 0) { atomic_inc(&lock_cam_count); - pr_notice("increase lock_cam_count=%d\n", + pr_debug("increase lock_cam_count=%d\n", atomic_read(&lock_cam_count)); pKThread = kthread_run(notify_bw_throttle_blocking, NULL, "notify bw throttle blocking"); @@ -1580,7 +1580,7 @@ void mmdvfs_set_max_camera_hrt_bw(u32 bw) set_camera_max_bw(mw_hrt_bw); } - pr_notice("middleware set max camera hrt bw:%d\n", bw); + pr_debug("middleware set max camera hrt bw:%d\n", bw); #endif } EXPORT_SYMBOL_GPL(mmdvfs_set_max_camera_hrt_bw); @@ -1618,7 +1618,7 @@ static void get_module_clock_by_index(struct device *dev, result = of_property_read_string_index(dev->of_node, "clock-names", index, &clk_name); if (unlikely(result)) { - pr_notice("Cannot get module name of index (%u), result (%d)\n", + pr_debug("Cannot get module name of index (%u), result (%d)\n", index, result); return; } @@ -1626,11 +1626,11 @@ static void get_module_clock_by_index(struct device *dev, *clk_module = devm_clk_get(dev, clk_name); if (IS_ERR(*clk_module)) { /* error status print */ - pr_notice("Cannot get module clock: %s\n", clk_name); + pr_debug("Cannot get module clock: %s\n", clk_name); *clk_module = NULL; } else { /* message print */ - pr_notice("Get module clock: %s\n", clk_name); + pr_debug("Get module clock: %s\n", clk_name); } } @@ -1662,12 +1662,12 @@ static void mmdvfs_get_step_node(struct device *dev, step_config->pll_value = step[mm_dp_pll_value]; } - pr_notice("%s: %lluMHz, clk:%u/%u/%u\n", + pr_debug("%s: %lluMHz, clk:%u/%u/%u\n", name, step_config->freq_step, step_config->clk_type, step[mm_dp_clk_param1], step[mm_dp_clk_param2]); } else { - pr_notice("read freq steps %s failed (%d)\n", name, result); + pr_debug("read freq steps %s failed (%d)\n", name, result); } } @@ -1680,7 +1680,7 @@ static void mmdvfs_get_larb_node(struct device *dev, u32 larb_id) s32 ret = 0; if (larb_id >= MAX_LARB_COUNT) { - pr_notice("larb_id:%d is over MAX_LARB_COUNT:%d\n", + pr_debug("larb_id:%d is over MAX_LARB_COUNT:%d\n", larb_id, MAX_LARB_COUNT); return; } @@ -1688,10 +1688,10 @@ static void mmdvfs_get_larb_node(struct device *dev, u32 larb_id) ret = snprintf(larb_name, MAX_LARB_NAME, "larb%d", larb_id); if (ret < 0) - pr_notice("snprintf return error, ret:%d, larb_id:%d\n", ret, larb_id); + pr_debug("snprintf return error, ret:%d, larb_id:%d\n", ret, larb_id); of_property_for_each_u32(dev->of_node, larb_name, prop, p, value) { if (count >= MAX_PORT_COUNT) { - pr_notice("port size is over (%d)\n", MAX_PORT_COUNT); + pr_debug("port size is over (%d)\n", MAX_PORT_COUNT); break; } @@ -1701,7 +1701,7 @@ static void mmdvfs_get_larb_node(struct device *dev, u32 larb_id) larb_req[larb_id].port_count = count; if (!count) - pr_notice("no data in larb (%s)\n", larb_name); + pr_debug("no data in larb (%s)\n", larb_name); else init_larb_list(larb_id); } @@ -1753,14 +1753,14 @@ static void mmdvfs_get_step_array_node(struct device *dev, const char *name; char ext_name[32] = {0}; - pr_notice("start get step node of %s\n", freq_name); + pr_debug("start get step node of %s\n", freq_name); of_property_for_each_string(dev->of_node, freq_name, prop, name) { if (count >= MAX_FREQ_STEP) { - pr_notice("freq setting %s is over the MAX_STEP (%d)\n", + pr_debug("freq setting %s is over the MAX_STEP (%d)\n", freq_name, MAX_FREQ_STEP); break; } - pr_notice(" node name %s\n", name); + pr_debug(" node name %s\n", name); mmdvfs_get_step_node(dev, name, &step_configs[count]); strncpy(ext_name, name, sizeof(ext_name)-1); strncat(ext_name, "_ext", @@ -1770,9 +1770,9 @@ static void mmdvfs_get_step_array_node(struct device *dev, count++; } if (count != step_size) - pr_notice("freq setting %s is not same as vcore_steps (%d)\n", + pr_debug("freq setting %s is not same as vcore_steps (%d)\n", freq_name, step_size); - pr_notice("%s: step size:%u\n", freq_name, step_size); + pr_debug("%s: step size:%u\n", freq_name, step_size); } static void mmdvfs_get_limit_step_node(struct device *dev, @@ -1791,7 +1791,7 @@ static void mmdvfs_get_limit_step_node(struct device *dev, if (result < 0 || !limit_size) return; - pr_notice("[limit]%s size: %u\n", freq_name, limit_size); + pr_debug("[limit]%s size: %u\n", freq_name, limit_size); limit_config->limit_size = limit_size; limit_config->limit_steps = kcalloc(limit_size, sizeof(*limit_config->limit_steps), GFP_KERNEL); @@ -1801,16 +1801,16 @@ static void mmdvfs_get_limit_step_node(struct device *dev, result = snprintf(ext_name, sizeof(ext_name) - 1, "%s_limit_%d", freq_name, i); if (result < 0) { - pr_notice("snprintf error(%d) limit name:%s id:%d\n", + pr_debug("snprintf error(%d) limit name:%s id:%d\n", result, freq_name, i); continue; } - pr_notice("[limit]%s-%d: %s\n", freq_name, i, ext_name); + pr_debug("[limit]%s-%d: %s\n", freq_name, i, ext_name); mmdvfs_get_step_array_node(dev, ext_name, limit_config->limit_steps[i]); } #else - pr_notice("MMDVFS limit is off\n"); + pr_debug("MMDVFS limit is off\n"); #endif } @@ -1861,7 +1861,7 @@ static int mmdvfs_probe(struct platform_device *pdev) step_size = 0; of_property_for_each_u32(node, VCORE_NODE_NAME, prop, p, value) { if (step_size >= MAX_FREQ_STEP) { - pr_notice( + pr_debug( "vcore_steps is over the MAX_STEP (%d)\n", MAX_FREQ_STEP); break; @@ -1873,7 +1873,7 @@ static int mmdvfs_probe(struct platform_device *pdev) mux_size = 0; of_property_for_each_u32(node, FMETER_MUX_NODE_NAME, prop, p, value) { if (mux_size >= MAX_MUX_SIZE) { - pr_notice( + pr_debug( "fmeter_mux_ids is over the MAX_MUX_SIZE (%d)\n", MAX_MUX_SIZE); break; @@ -1882,7 +1882,7 @@ static int mmdvfs_probe(struct platform_device *pdev) mux_size++; } - pr_notice("vcore_steps: [%u, %u, %u, %u, %u, %u], count:%u\n", + pr_debug("vcore_steps: [%u, %u, %u, %u, %u, %u], count:%u\n", vopp_steps[0], vopp_steps[1], vopp_steps[2], vopp_steps[3], vopp_steps[4], vopp_steps[5], step_size); @@ -1894,7 +1894,7 @@ static int mmdvfs_probe(struct platform_device *pdev) if (likely(mm_freq->pm_qos_class >= PM_QOS_DISP_FREQ)) { mtk_pm_qos_add_notifier(mm_freq->pm_qos_class, &mm_freq->nb); - pr_notice("%s: add notifier\n", mm_freq->prop_name); + pr_debug("%s: add notifier\n", mm_freq->prop_name); } mmdvfs_get_limit_step_node(&pdev->dev, mm_freq->prop_name, @@ -1903,7 +1903,7 @@ static int mmdvfs_probe(struct platform_device *pdev) of_property_for_each_string(node, "comm_freq", prop, mux_name) { if (comm_count >= MAX_COMM_NUM) { - pr_notice("comm_count > MAX_COMM_NUM (%d)\n", + pr_debug("comm_count > MAX_COMM_NUM (%d)\n", MAX_COMM_NUM); break; } @@ -1915,7 +1915,7 @@ static int mmdvfs_probe(struct platform_device *pdev) } } if (i == ARRAY_SIZE(all_freqs)) { - pr_notice("wrong comm_freq name:%s\n", mux_name); + pr_debug("wrong comm_freq name:%s\n", mux_name); break; } mtk_pm_qos_add_request(&smi_freq_request[comm_count], @@ -1927,7 +1927,7 @@ static int mmdvfs_probe(struct platform_device *pdev) cam_larb_size = 0; of_property_for_each_u32(node, CAM_LARB_NODE_NAME, prop, p, value) { if (cam_larb_size >= MAX_LARB_COUNT) { - pr_notice( + pr_debug( "cam_larb is over the MAX_LARB_COUNT (%d)\n", MAX_LARB_COUNT); break; @@ -1939,7 +1939,7 @@ static int mmdvfs_probe(struct platform_device *pdev) of_property_for_each_u32( node, MAX_OSTD_LARB_NODE_NAME, prop, p, value) { if (value >= MAX_LARB_COUNT) { - pr_notice( + pr_debug( "max_ostd_larb (%d) is over the MAX_LARB_COUNT (%d)\n", value, MAX_LARB_COUNT); continue; @@ -1971,14 +1971,14 @@ static int mmdvfs_probe(struct platform_device *pdev) if (value != SMI_COMM_MASTER_NUM) larb_req[i].channel = SMI_COMM_BUS_SEL[value & 0xffff]; - pr_notice("larb[%d].comm_port=%d channel=%d\n", + pr_debug("larb[%d].comm_port=%d channel=%d\n", i, value, larb_req[i].channel); } mmdvfs_qos_get_freq_steps(PM_QOS_DISP_FREQ, freq_steps, &value); - pr_notice("disp step size:%u\n", value); + pr_debug("disp step size:%u\n", value); for (i = 0; i < value && i < MAX_FREQ_STEP; i++) - pr_notice(" - step[%d]: %llu\n", i, freq_steps[i]); + pr_debug(" - step[%d]: %llu\n", i, freq_steps[i]); #ifdef BLOCKING_MECHANISM init_waitqueue_head(&hrt_wait); @@ -1986,7 +1986,7 @@ static int mmdvfs_probe(struct platform_device *pdev) vcore_reg_id = regulator_get(&pdev->dev, "vcore"); if (!vcore_reg_id) - pr_info("regulator_get vcore_reg_id failed\n"); + pr_err("regulator_get vcore_reg_id failed\n"); return 0; } @@ -2041,12 +2041,12 @@ static int __init mmdvfs_pmqos_init(void) status = platform_driver_register(&mmdvfs_pmqos_driver); if (status != 0) { - pr_notice( + pr_debug( "Failed to register MMDVFS-PMQOS driver(%d)\n", status); return -ENODEV; } - pr_notice("%s\n", __func__); + pr_debug("%s\n", __func__); return 0; #endif /* CONFIG_FPGA_EARLY_PORTING */ } @@ -2095,11 +2095,11 @@ static int __init mmdvfs_pmqos_late_init(void) #ifdef MMDVFS_FORCE_STEP0 mmdvfs_qos_force_step(0); mmdvfs_enable = false; - pr_notice("force set step0 when late_init\n"); + pr_debug("force set step0 when late_init\n"); #else mmdvfs_qos_force_step(0); mmdvfs_qos_force_step(-1); - pr_notice("force flip step0 when late_init\n"); + pr_debug("force flip step0 when late_init\n"); #endif total_hrt_bw = get_total_hrt_bw(false); total_ui_only_hrt_bw = get_total_hrt_bw(true); @@ -2134,18 +2134,18 @@ void mmdvfs_qos_limit_config(u32 pm_qos_class, u32 limit_value, s32 old_level = 0; if (unlikely(i >= ARRAY_SIZE(all_freqs))) { - pr_notice("[%d]Invalid class=%u %d\n", + pr_debug("[%d]Invalid class=%u %d\n", source, pm_qos_class, old_level); return; } if (!all_freqs[i]->limit_config.limit_size) { - pr_notice("[%d]Not support limit: %u\n", source, pm_qos_class); + pr_debug("[%d]Not support limit: %u\n", source, pm_qos_class); return; } if (log_level & log_limit) - pr_notice("[%d][%d]limit score update=(%d, %u, %u)\n", + pr_debug("[%d][%d]limit score update=(%d, %u, %u)\n", source, pm_qos_class, limit_value, all_freqs[i]->limit_config.limit_value, all_freqs[i]->limit_config.limit_level); @@ -2158,7 +2158,7 @@ void mmdvfs_qos_limit_config(u32 pm_qos_class, u32 limit_value, &all_freqs[i]->limit_config.limit_level); if (old_level != all_freqs[i]->limit_config.limit_level) { - pr_notice("MMDVFS limit level changed for %s %d->%d\n", + pr_debug("MMDVFS limit level changed for %s %d->%d\n", all_freqs[i]->prop_name, old_level, all_freqs[i]->limit_config.limit_level); mm_apply_clk(-1, all_freqs[i], current_max_step, @@ -2240,7 +2240,7 @@ MODULE_PARM_DESC(dump_setting, "dump mmdvfs current setting"); int mmdvfs_qos_force_step(int step) { if (step >= (s32)step_size || step < STEP_UNREQUEST) { - pr_notice("force set step invalid: %d\n", step); + pr_debug("force set step invalid: %d\n", step); return -EINVAL; } force_step = step; @@ -2261,7 +2261,7 @@ int set_force_step(const char *val, const struct kernel_param *kp) result = kstrtoint(val, 0, &new_force_step); if (result) { - pr_notice("force set step failed: %d\n", result); + pr_debug("force set step failed: %d\n", result); return result; } return mmdvfs_qos_force_step(new_force_step); @@ -2276,7 +2276,7 @@ MODULE_PARM_DESC(force_step, "force mmdvfs to specified step, -1 for unset"); void mmdvfs_autok_qos_enable(bool enable) { - pr_notice("%s: step_size=%d current_max_step=%d\n", + pr_debug("%s: step_size=%d current_max_step=%d\n", __func__, step_size, current_max_step); if (!enable && step_size > 0 && current_max_step == STEP_UNREQUEST) mmdvfs_qos_force_step(step_size - 1); @@ -2284,14 +2284,14 @@ void mmdvfs_autok_qos_enable(bool enable) mmdvfs_autok_enable = enable; if (enable && step_size > 0) mmdvfs_qos_force_step(-1); - pr_notice("mmdvfs_autok enabled? %d\n", enable); + pr_debug("mmdvfs_autok enabled? %d\n", enable); } EXPORT_SYMBOL_GPL(mmdvfs_autok_qos_enable); void mmdvfs_qos_enable(bool enable) { mmdvfs_enable = enable; - pr_notice("mmdvfs enabled? %d\n", enable); + pr_debug("mmdvfs enabled? %d\n", enable); } EXPORT_SYMBOL_GPL(mmdvfs_qos_enable); @@ -2302,7 +2302,7 @@ int set_enable(const char *val, const struct kernel_param *kp) result = kstrtobool(val, &enable); if (result) { - pr_notice("force set enable: %d\n", result); + pr_debug("force set enable: %d\n", result); return result; } mmdvfs_qos_enable(enable); @@ -2321,12 +2321,12 @@ void mmdvfs_prepare_action(enum mmdvfs_prepare_event event) { if (event == MMDVFS_PREPARE_CALIBRATION_START) { mmdvfs_autok_qos_enable(false); - pr_notice("mmdvfs service is disabled for calibration\n"); + pr_debug("mmdvfs service is disabled for calibration\n"); } else if (event == MMDVFS_PREPARE_CALIBRATION_END) { mmdvfs_autok_qos_enable(true); - pr_notice("mmdvfs service is enabled after calibration\n"); + pr_debug("mmdvfs service is enabled after calibration\n"); } else { - pr_notice("%s: unknown event code:%d\n", __func__, event); + pr_debug("%s: unknown event code:%d\n", __func__, event); } } @@ -2342,7 +2342,7 @@ s32 get_virtual_port(enum virtual_source_id id) case VIRTUAL_CCU_COMMON2: return PORT_VIRTUAL_CCU_COMMON2; default: - pr_notice("invalid source id:%u\n", id); + pr_debug("invalid source id:%u\n", id); return -1; } } @@ -2409,12 +2409,12 @@ void mmdvfs_print_larbs_info(void) tmp_str = log_str; if (len > 0) { while ((ptr = strsep(&tmp_str, "\n")) != NULL) - pr_notice("%s\n", ptr); + pr_debug("%s\n", ptr); } else - pr_notice("no larbs info to print\n"); + pr_debug("no larbs info to print\n"); kfree(log_str); } else - pr_notice("kmalloc fails!\n"); + pr_debug("kmalloc fails!\n"); } int get_dump_larbs(char *buf, const struct kernel_param *kp) @@ -2462,7 +2462,7 @@ int set_vote_freq(const char *val, const struct kernel_param *kp) result = kstrtoint(val, 0, &new_vote_freq); if (result) { - pr_notice("force set step failed: %d\n", result); + pr_debug("force set step failed: %d\n", result); return result; } @@ -2494,7 +2494,7 @@ static DECLARE_COMPLETION(comp); static int test_event(struct notifier_block *nb, unsigned long value, void *v) { - pr_notice("ut test notifier: value=%lu\n", value); + pr_debug("ut test notifier: value=%lu\n", value); /*msleep(50);*/ /* Use it when disp's notifier callback not ready*/ complete(&comp); return 0; @@ -2529,15 +2529,15 @@ int mmdvfs_qos_ut_set(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d %i %d", &qos_ut_case, &req_id, &master, &value); if (result != 4) { - pr_notice("invalid input: %s, result(%d)\n", val, result); + pr_debug("invalid input: %s, result(%d)\n", val, result); return -EINVAL; } if (req_id >= UT_MAX_REQUEST) { - pr_notice("invalid req_id: %u\n", req_id); + pr_debug("invalid req_id: %u\n", req_id); return -EINVAL; } - pr_notice("ut with (case_id,req_id,master,value)=(%d,%u,%#x,%d)\n", + pr_debug("ut with (case_id,req_id,master,value)=(%d,%u,%#x,%d)\n", qos_ut_case, req_id, master, value); log_level = 1 << log_bw | 1 << log_freq | 1 << log_smi_freq; if (!ut_req_init) { @@ -2585,14 +2585,14 @@ int mmdvfs_qos_ut_set(const char *val, const struct kernel_param *kp) pKThread = kthread_run(make_cam_hrt_bw, NULL, "make_cam_hrt_bw"); if (IS_ERR(pKThread)) - pr_notice("create cam hrt bw thread failed\n"); + pr_debug("create cam hrt bw thread failed\n"); /* Notifier will call complete */ wait_for_completion(&comp); reinit_completion(&comp); start_jiffies = jiffies; mmdvfs_set_max_camera_hrt_bw(0); wait_for_completion(&comp); - pr_notice("wait time should > 2000 msecs:%u\n", + pr_debug("wait time should > 2000 msecs:%u\n", jiffies_to_msecs(jiffies-start_jiffies)); mm_hrt_remove_bw_throttle_notifier(&test_notifier); break; @@ -2608,13 +2608,13 @@ int mmdvfs_qos_ut_set(const char *val, const struct kernel_param *kp) mm_qos_update_all_request_zero(&ut_req_list); break; default: - pr_notice("invalid case_id: %d\n", qos_ut_case); + pr_debug("invalid case_id: %d\n", qos_ut_case); break; } - pr_notice("Call SMI Dump API Begin\n"); + pr_debug("Call SMI Dump API Begin\n"); /* smi_debug_bus_hang_detect(false, "MMDVFS"); */ - pr_notice("Call SMI Dump API END\n"); + pr_debug("Call SMI Dump API END\n"); log_level = old_log_level; return 0; } @@ -2636,10 +2636,10 @@ int mmdvfs_ut_set(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d", &mmdvfs_ut_case, &value1); if (result != 2) { - pr_notice("invalid input: %s, result(%d)\n", val, result); + pr_debug("invalid input: %s, result(%d)\n", val, result); return -EINVAL; } - pr_notice("%s (case_id, value): (%d,%d)\n", + pr_debug("%s (case_id, value): (%d,%d)\n", __func__, mmdvfs_ut_case, value1); log_level = 1 << log_freq | @@ -2652,45 +2652,45 @@ int mmdvfs_ut_set(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d %d", &mmdvfs_ut_case, &value1, &value2); if (result != 3) { - pr_notice("invalid arguments: %s\n", val); + pr_debug("invalid arguments: %s\n", val); break; } - pr_notice("limit test score: %d\n", value2); - pr_notice("limit initial: %d\n", + pr_debug("limit test score: %d\n", value2); + pr_debug("limit initial: %d\n", mmdvfs_get_limit_status(value1)); /* limit enable then opp1 -> opp0 */ mmdvfs_qos_limit_config(value1, 1, MMDVFS_LIMIT_THERMAL); mmdvfs_qos_limit_config(value1, value2, MMDVFS_LIMIT_CAM); mtk_pm_qos_update_request(&disp_req, 1000); - pr_notice("limit enable then opp up: %d freq=%llu MHz\n", + pr_debug("limit enable then opp up: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); /* limit disable when opp0 */ mmdvfs_qos_limit_config(value1, 0, MMDVFS_LIMIT_THERMAL); - pr_notice("limit disable when opp up: %d freq=%llu MHz\n", + pr_debug("limit disable when opp up: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); /* limit enable when opp0 */ mmdvfs_qos_limit_config(value1, 1, MMDVFS_LIMIT_THERMAL); - pr_notice("limit enable when opp up: %d freq=%llu MHz\n", + pr_debug("limit enable when opp up: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); /* limit disable then opp0 -> opp1 */ mmdvfs_qos_limit_config(value1, 0, MMDVFS_LIMIT_THERMAL); mtk_pm_qos_update_request(&disp_req, 0); - pr_notice("limit disable then opp down: %d freq=%llu MHz\n", + pr_debug("limit disable then opp down: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); /* limit enable when opp1 */ mmdvfs_qos_limit_config(value1, 1, MMDVFS_LIMIT_THERMAL); mtk_pm_qos_update_request(&disp_req, 0); - pr_notice("limit enable when opp down: %d freq=%llu MHz\n", + pr_debug("limit enable when opp down: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); /* limit disable when opp1 */ mmdvfs_qos_limit_config(value1, 0, MMDVFS_LIMIT_THERMAL); mtk_pm_qos_update_request(&disp_req, 0); - pr_notice("limit disable when opp down: %d freq=%llu MHz\n", + pr_debug("limit disable when opp down: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); @@ -2699,30 +2699,30 @@ int mmdvfs_ut_set(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d %d", &mmdvfs_ut_case, &value1, &value2); if (result != 3) { - pr_notice("invalid arguments: %s\n", val); + pr_debug("invalid arguments: %s\n", val); mmdvfs_qos_limit_config(value1, 0, MMDVFS_LIMIT_THERMAL); break; } - pr_notice("limit test score: %d\n", value2); - pr_notice("limit initial: %d freq=%llu MHz\n", + pr_debug("limit test score: %d\n", value2); + pr_debug("limit initial: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); mmdvfs_qos_limit_config(value1, 1, MMDVFS_LIMIT_THERMAL); mmdvfs_qos_limit_config(value1, value2, MMDVFS_LIMIT_CAM); - pr_notice("limit now: %d freq=%llu MHz\n", + pr_debug("limit now: %d freq=%llu MHz\n", mmdvfs_get_limit_status(value1), mmdvfs_qos_get_freq(value1)); break; default: - pr_notice("invalid case_id: %d\n", mmdvfs_ut_case); + pr_debug("invalid case_id: %d\n", mmdvfs_ut_case); break; } mtk_pm_qos_remove_request(&disp_req); - pr_notice("%s END\n", __func__); + pr_debug("%s END\n", __func__); log_level = old_log_level; return 0; } @@ -2743,17 +2743,17 @@ int set_disp_bw_ceiling(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d", &disp_bw, &wait); if (result != 2) { - pr_notice("invalid input: %s, result(%d)\n", val, result); + pr_debug("invalid input: %s, result(%d)\n", val, result); return -EINVAL; } - pr_notice("%s (disp_bw, wait): (%d,%d)\n", + pr_debug("%s (disp_bw, wait): (%d,%d)\n", __func__, disp_bw, wait); disp_bw_ceiling = (disp_bw < 0)?0:disp_bw; wait_next_max_cam_bw_set = wait; disp_avail_hrt_bw = mm_hrt_get_available_hrt_bw(PORT_VIRTUAL_DISP); - pr_notice("disp_bw_ceiling=%d total_hrt_bw=%d disp_avail_hrt_bw=%d\n", + pr_debug("disp_bw_ceiling=%d total_hrt_bw=%d disp_avail_hrt_bw=%d\n", disp_bw_ceiling, total_hrt_bw, disp_avail_hrt_bw); if (!wait_next_max_cam_bw_set) @@ -2780,7 +2780,7 @@ int set_force_bwl(const char *val, const struct kernel_param *kp) result = sscanf(val, "%d %d %d", &comm, &port, &bwl); if (result != 3) { - pr_notice("invalid input: %s, result(%d)\n", val, result); + pr_debug("invalid input: %s, result(%d)\n", val, result); return -EINVAL; } diff --git a/drivers/misc/mediatek/performance/fpsgo_v3/fbt/src/xgf.c b/drivers/misc/mediatek/performance/fpsgo_v3/fbt/src/xgf.c index fa2208f57d4c631560dcc30848ae3b2836291e28..3627fad5b6d81f285e8c02337a728394c4af6384 100644 --- a/drivers/misc/mediatek/performance/fpsgo_v3/fbt/src/xgf.c +++ b/drivers/misc/mediatek/performance/fpsgo_v3/fbt/src/xgf.c @@ -1525,7 +1525,7 @@ static int xgf_enter_est_runtime(int rpid, struct xgf_render *render, { int ret; - WARN_ON(!xgf_est_runtime_fp); + //WARN_ON(!xgf_est_runtime_fp); if (xgf_est_runtime_fp) ret = xgf_est_runtime_fp(rpid, render, runtime, ts); diff --git a/drivers/misc/mediatek/pseudo_m4u/pseudo_m4u_log.h b/drivers/misc/mediatek/pseudo_m4u/pseudo_m4u_log.h index 97b04ad04f4d4483f5b4512ab6961054ce289237..0571b9aae4fbb3e9f91b4a2daab96c37bb6d4f61 100644 --- a/drivers/misc/mediatek/pseudo_m4u/pseudo_m4u_log.h +++ b/drivers/misc/mediatek/pseudo_m4u/pseudo_m4u_log.h @@ -17,7 +17,7 @@ extern int m4u_log_to_uart; do { \ if (level > m4u_log_level) { \ if (level > m4u_log_to_uart) \ - pr_info("[PSEUDO][%s #%d]: "string, \ + pr_debug("[PSEUDO][%s #%d]: "string, \ __func__, __LINE__, ##args); \ else\ pr_debug("[PSEUDO][%s #%d]: "string, \ @@ -37,7 +37,7 @@ do { \ #define M4UTRACE() \ do { \ if (!m4u_log_to_uart) \ - pr_info("[PSEUDO] %s, %d\n", __func__, __LINE__); \ + pr_debug("[PSEUDO] %s, %d\n", __func__, __LINE__); \ } while (0) #define M4U_PRINT_SEQ(seq_file, fmt, args...) \ diff --git a/drivers/misc/mediatek/smi/smi_drv.c b/drivers/misc/mediatek/smi/smi_drv.c index 348e5df53f55ab24777ddf64ed910dcca3fd8501..d67c934de08dbf3767dd94743f3beda0ec487466 100644 --- a/drivers/misc/mediatek/smi/smi_drv.c +++ b/drivers/misc/mediatek/smi/smi_drv.c @@ -80,15 +80,15 @@ static bool smi_sspm_ipi_register; do { \ if (cmdq != 0) \ cmdq_core_save_first_dump(string, ##args); \ - pr_info(string, ##args); \ + pr_warn(string, ##args); \ } while (0) #else -#define SMIWRN(cmdq, string, args...) pr_info(string, ##args) +#define SMIWRN(cmdq, string, args...) pr_warn(string, ##args) #endif #define SMIERR(string, args...) \ do { \ - pr_notice(string, ##args); \ + pr_err(string, ##args); \ aee_kernel_warning(DEV_NAME, string, ##args); \ } while (0) @@ -465,7 +465,7 @@ void smi_ostd_update(const struct plist_head *head, const char *user) #if defined (CONFIG_MACH_MT6833) // TODO Migration if (smi_dev[larb] == NULL){ - pr_notice("[SMI 6833] ERROR smi_ostd_update larb not ready \n"); + pr_err("[SMI 6833] ERROR smi_ostd_update larb not ready \n"); return; } #endif @@ -1408,7 +1408,7 @@ static inline void smi_dram_init(void) smi_dram.node = debugfs_create_file( "smi_mon", 0444, NULL, (void *)0, &smi_dram_file_opers); if (IS_ERR(smi_dram.node)) - pr_info("debugfs_create_file failed: %ld\n", + pr_warn("debugfs_create_file failed: %ld\n", PTR_ERR(smi_dram.node)); } diff --git a/drivers/misc/mediatek/systracker/Kconfig b/drivers/misc/mediatek/systracker/Kconfig index 0721678036dd02a45bb9bc8600fec2f56b45e9ba..9b56bdd1466968443aa081e9b5e9ba666b2ff384 100644 --- a/drivers/misc/mediatek/systracker/Kconfig +++ b/drivers/misc/mediatek/systracker/Kconfig @@ -1,3 +1,9 @@ +config MTK_SYSTRACKER_DISABLE + bool "Disable all systracker services" + default y + help + Disable the Mediatek systracker debugging feature + config MTK_SYSTRACKER_V2 bool "Enable MTK System Tracker Debugger V2" help diff --git a/drivers/misc/mediatek/systracker/Makefile b/drivers/misc/mediatek/systracker/Makefile index af09bb16ed6560bc67b078a7244879b013af8605..82e04d33ff1b962670d3f81ca5504c06d10be4a0 100644 --- a/drivers/misc/mediatek/systracker/Makefile +++ b/drivers/misc/mediatek/systracker/Makefile @@ -11,4 +11,6 @@ # GNU General Public License for more details. # -obj-y += systracker_interface_v2.o \ No newline at end of file +ifneq ($(CONFIG_MTK_SYSTRACKER_DISABLE),y) +obj-y += systracker_interface_v2.o +endif diff --git a/drivers/misc/mediatek/thermal/common/ap_thermal_limit.c b/drivers/misc/mediatek/thermal/common/ap_thermal_limit.c index 76ebd98f7ff541ca3dac484b6517871c16172d4a..88e175c9dba9c3b4a3cc41f78c3710504f2a9b30 100644 --- a/drivers/misc/mediatek/thermal/common/ap_thermal_limit.c +++ b/drivers/misc/mediatek/thermal/common/ap_thermal_limit.c @@ -100,13 +100,13 @@ static DEFINE_MUTEX(apthermolmt_cpu_mutex); void __attribute__ ((weak)) mt_ppm_cpu_thermal_protect(unsigned int limited_power) { - pr_notice(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); + pr_debug(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); } #else void __attribute__ ((weak)) mt_cpufreq_thermal_protect(unsigned int limited_power) { - pr_notice(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); + pr_debug(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); } #endif @@ -114,7 +114,7 @@ mt_cpufreq_thermal_protect(unsigned int limited_power) void __attribute__ ((weak)) mt_gpufreq_thermal_protect(unsigned int limited_power) { - pr_notice(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); + pr_debug(TSCPU_LOG_TAG "E_WF: %s doesn't exist\n", __func__); } diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_ISP.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_ISP.c index c735dad72dd0241efd587182b4ad7f5a38168214..a510435ac00931991a541d4d9532e61d18706a9e 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_ISP.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_ISP.c @@ -51,11 +51,11 @@ static struct proc_dir_entry *clVR_ISP_status; #define clVR_ISP_dprintk(fmt, args...) \ do { \ if (clVR_ISP_debug_log == 1) { \ - pr_notice(CLVR_ISP_LOG_TAG fmt, ##args); \ + pr_debug(CLVR_ISP_LOG_TAG fmt, ##args); \ } \ } while (0) -#define clVR_ISP_printk(fmt, args...) pr_notice(CLVR_ISP_LOG_TAG fmt, ##args) +#define clVR_ISP_printk(fmt, args...) pr_debug(CLVR_ISP_LOG_TAG fmt, ##args) @@ -63,7 +63,7 @@ void __attribute__ ((weak)) mmdvfs_qos_limit_config(u32 pm_qos_class, u32 limit_value, enum mmdvfs_limit_source source) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); } static ssize_t clVR_ISP_status_write( diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_NR.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_NR.c index e22d6f958c1f5e395ec632c5fdc730b8d20f1e9f..dab0b585560eaa35d1e9927b9a1c4bf8edea83b6 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_NR.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_NR.c @@ -33,11 +33,11 @@ #define clNR_dprintk(fmt, args...) \ do { \ if (clNR_debug_log == 1) { \ - pr_notice(CLNR_LOG_TAG fmt, ##args); \ + pr_debug(CLNR_LOG_TAG fmt, ##args); \ } \ } while (0) -#define clNR_printk(fmt, args...) pr_notice(CLNR_LOG_TAG fmt, ##args) +#define clNR_printk(fmt, args...) pr_debug(CLNR_LOG_TAG fmt, ##args) /*============================================================= *Local variable definition *============================================================= diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_VR_FPS.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_VR_FPS.c index 4def81db75b4fb2fdff997bb6a3dc62e5a617ad5..87614fc960b8f191f552bc7aff8fdc537b49e938 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_VR_FPS.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_VR_FPS.c @@ -33,11 +33,11 @@ #define clVR_FPS_dprintk(fmt, args...) \ do { \ if (clVR_FPS_debug_log == 1) { \ - pr_notice(CLVR_FPS_LOG_TAG fmt, ##args); \ + pr_debug(CLVR_FPS_LOG_TAG fmt, ##args); \ } \ } while (0) -#define clVR_FPS_printk(fmt, args...) pr_notice(CLVR_FPS_LOG_TAG fmt, ##args) +#define clVR_FPS_printk(fmt, args...) pr_debug(CLVR_FPS_LOG_TAG fmt, ##args) /*============================================================= *Local variable definition *============================================================= diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_amutt.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_amutt.c index d9e732cc5268dbff710cf82119d711d2712bb29b..4924349fb95059b72ea99f8b97f1a42eb19f0e77 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_amutt.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_amutt.c @@ -21,7 +21,7 @@ int __attribute__ ((weak)) exec_ccci_kern_func_by_md_id( int md_id, unsigned int id, char *buf, unsigned int len) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return -316; } diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_atm.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_atm.c index 416512afda5e020a16679f2976ef27da02428caf..545fecf8426f368552a020dbb8057a0ae32b88bb 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_atm.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_atm.c @@ -453,20 +453,20 @@ bool __attribute__((weak)) mtk_get_gpu_loading(unsigned int *pLoading) { #ifdef CONFIG_MTK_GPU_SUPPORT - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); #endif return 0; } unsigned int __attribute__((weak)) mt_gpufreq_get_min_power(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } unsigned int __attribute__((weak)) mt_gpufreq_get_max_power(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } void __attribute__ ((weak)) diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct.c index ea3de0ed35521d90a60110b6da118b0893371e46..f6b112874d7dd3292415bef6f538d533e33d7233 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct.c @@ -27,81 +27,81 @@ int __attribute__ ((weak)) get_bat_charging_current_level(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 500; } int __attribute__ ((weak)) mt_get_charger_type(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) set_bat_charging_current_limit(int current_limit) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } unsigned int __attribute__ ((weak)) set_chr_input_current_limit(int current_limit) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_soc(unsigned int *soc) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_ui_soc(unsigned int *ui_soc) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_vbat(unsigned int *vbat) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_ibat(unsigned int *ibat) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_vbus(unsigned int *vbus) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_aicr(unsigned int *aicr) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) mtk_chr_get_tchr(int *min_temp, int *max_temp) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } /* ************************************ */ #define mtk_cooler_bcct_dprintk_always(fmt, args...) \ - pr_notice("[Thermal/TC/bcct]" fmt, ##args) + pr_debug("[Thermal/TC/bcct]" fmt, ##args) #define mtk_cooler_bcct_dprintk(fmt, args...) \ do { \ diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_2nd.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_2nd.c index f49855fca76efd9cc6390b9a90022b538bac75b8..fc5ff5f0b50ef5e8fa04b434f460bad43aaa5061 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_2nd.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_2nd.c @@ -23,12 +23,12 @@ #define mtk_cooler_bcct_2nd_dprintk_always(fmt, args...) \ - pr_notice("[Thermal/TC/bcct_2nd]" fmt, ##args) + pr_debug("[Thermal/TC/bcct_2nd]" fmt, ##args) #define mtk_cooler_bcct_2nd_dprintk(fmt, args...) \ do { \ if (cl_bcct_2nd_klog_on == 1) \ - pr_notice("[Thermal/TC/bcct_2nd]" fmt, ##args); \ + pr_debug("[Thermal/TC/bcct_2nd]" fmt, ##args); \ } while (0) #define MAX_NUM_INSTANCE_MTK_COOLER_BCCT_2ND 3 @@ -171,7 +171,7 @@ static void x_chrlmt_set_limit_handler(struct work_struct *work) POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (ret != 0) { - pr_notice("%s bacur limit fail\n", + pr_debug("%s bacur limit fail\n", __func__); return; } @@ -435,7 +435,7 @@ struct thermal_cooling_device *cdev, unsigned long temp) if (chg_psy == NULL) chg_psy = power_supply_get_by_name("mtk-slave-charger"); if (chg_psy == NULL || IS_ERR(chg_psy)) { - pr_notice("%s Couldn't get chg_psy\n", __func__); + pr_debug("%s Couldn't get chg_psy\n", __func__); return 0; } diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_v1.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_v1.c index 550057f3a775764106d432163d5eb971fc58fd65..3f7b634e973c085d6847f2705082f87dbfcb0086 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_v1.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_bcct_v1.c @@ -27,12 +27,12 @@ static int cl_bcct_klog_on; /* ************************************ */ #define mtk_cooler_bcct_dprintk_always(fmt, args...) \ - pr_notice("[Thermal/TC/bcct]" fmt, ##args) + pr_debug("[Thermal/TC/bcct]" fmt, ##args) #define mtk_cooler_bcct_dprintk(fmt, args...) \ do { \ if (cl_bcct_klog_on == 1) \ - pr_notice("[Thermal/TC/bcct]" fmt, ##args); \ + pr_debug("[Thermal/TC/bcct]" fmt, ##args); \ } while (0) #define MAX_NUM_INSTANCE_MTK_COOLER_BCCT 3 @@ -176,7 +176,7 @@ static void chrlmt_set_limit_handler(struct work_struct *work) POWER_SUPPLY_PROP_CONSTANT_CHARGE_CURRENT_MAX, &prop); if (ret != 0) - pr_notice("%s bat curr fail\n", __func__); + pr_debug("%s bat curr fail\n", __func__); if (chrlmt_chr_input_curr_limit != -1) prop.intval = chrlmt_chr_input_curr_limit * 1000; @@ -185,7 +185,7 @@ static void chrlmt_set_limit_handler(struct work_struct *work) ret = power_supply_set_property(chg_psy, POWER_SUPPLY_PROP_INPUT_CURRENT_LIMIT, &prop); if (ret != 0) - pr_notice("%s input curr fail\n", __func__); + pr_debug("%s input curr fail\n", __func__); /* High Voltage (Vbus) control*/ /*Only master charger need to control Vbus*/ @@ -196,14 +196,14 @@ static void chrlmt_set_limit_handler(struct work_struct *work) ret = power_supply_set_property(chg_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (ret != 0) - pr_notice("%s vbus fail\n", __func__); + pr_debug("%s vbus fail\n", __func__); } if (chrlmt_bat_chr_curr_limit == -1) { prop.intval = 1; ret = power_supply_set_property(chg_psy, POWER_SUPPLY_PROP_VOLTAGE_MAX, &prop); if (ret != 0) - pr_notice("%s set vbus fail\n", + pr_debug("%s set vbus fail\n", __func__); } @@ -421,7 +421,7 @@ static void bat_chg_info_update(void) psy = power_supply_get_by_name("battery"); if (psy == NULL) { - pr_notice("%s Couldn't get psy\n", __func__); + pr_debug("%s Couldn't get psy\n", __func__); } else { ret = power_supply_get_property(psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &prop); @@ -446,7 +446,7 @@ static void bat_chg_info_update(void) chr_psy = power_supply_get_by_name("mtk-master-charger"); if (chr_psy == NULL) { - pr_notice("%s Couldn't get chr_psy\n", __func__); + pr_debug("%s Couldn't get chr_psy\n", __func__); } else { ret = power_supply_get_property(chr_psy, POWER_SUPPLY_PROP_VOLTAGE_NOW, &prop); diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_mutt.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_mutt.c index 175905182a238455b0dcc49e74d624987263249b..fc065767e4a2ac5fbfa8728eb0ceba7669712b2c 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_mutt.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_mutt.c @@ -195,7 +195,7 @@ static int triggered; unsigned long __attribute__ ((weak)) ccci_get_md_boot_count(int md_id) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } @@ -203,7 +203,7 @@ int __attribute__ ((weak)) exec_ccci_kern_func_by_md_id( int md_id, unsigned int id, char *buf, unsigned int len) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return -316; } @@ -1122,7 +1122,7 @@ static struct thermal_cooling_device_ops mtk_cl_adp_mutt_ops = { *do { \ * dentry_f = debugfs_create_u32(#name, S_IWUSR | S_IRUGO, _d, &name); \ * if (IS_ERR_OR_NULL(dentry_f)) { \ - * pr_notice("Unable to create debugfsfile: " #name "\n"); \ + * pr_debug("Unable to create debugfsfile: " #name "\n"); \ * return; \ * } \ *} while (0) @@ -1134,7 +1134,7 @@ static struct thermal_cooling_device_ops mtk_cl_adp_mutt_ops = { * * _d = debugfs_create_dir("cl_adp_mutt", NULL); * if (IS_ERR_OR_NULL(_d)) { - * pr_info("unable to create debugfs directory\n"); + * pr_debug("unable to create debugfs directory\n"); * return; * } * diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_sysrst.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_sysrst.c index ed9755e7871c64c2e8e2e0666de3996545da6543..c99b516e6d2d0789c52406a37a8f751e67d33d7d 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_sysrst.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_cooler_sysrst.c @@ -193,10 +193,10 @@ struct thermal_cooling_device *cdev, unsigned long state) cl_dev_sysrst_state_tsbif = state; if (cl_dev_sysrst_state_tsbif == 1) { - pr_notice("%s = 1\n", __func__); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); - pr_notice("*****************************************\n"); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("%s = 1\n", __func__); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("*****************************************\n"); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); /* To trigger data abort to reset the system * for thermal protection. diff --git a/drivers/misc/mediatek/thermal/common/coolers/mtk_ta.c b/drivers/misc/mediatek/thermal/common/coolers/mtk_ta.c index 6ffa82ed9d94649e5033564258afb77ecd037676..6cfb659ac1116e1de7cc2938998a29f098f76619 100644 --- a/drivers/misc/mediatek/thermal/common/coolers/mtk_ta.c +++ b/drivers/misc/mediatek/thermal/common/coolers/mtk_ta.c @@ -50,7 +50,7 @@ static int mtkts_ta_debug_log; } \ } while (0) -#define tsta_warn(fmt, args...) pr_notice("[Thermal/TC/TA]" fmt, ##args) +#define tsta_warn(fmt, args...) pr_debug("[Thermal/TC/TA]" fmt, ##args) /* ************************************ */ /* Weak functions */ @@ -315,7 +315,7 @@ static void ta_nl_send_to_user(int pid, int seq, struct tad_nl_msg_t *reply_msg) ret = netlink_unicast(daemo_nl_sk, skb, pid, MSG_DONTWAIT); if (ret < 0) { g_ta_status = g_ta_status | 0x00000010; - pr_notice("[%s] send failed %d\n", __func__, ret); + pr_debug("[%s] send failed %d\n", __func__, ret); return; } diff --git a/drivers/misc/mediatek/thermal/common/inc/mtk_monitor_tz.h b/drivers/misc/mediatek/thermal/common/inc/mtk_monitor_tz.h index 0994fe4f6ceab4d227c8811b54c31bcd34963245..a54f7c757393085c9ed7ff6459a66b0d6699e52f 100644 --- a/drivers/misc/mediatek/thermal/common/inc/mtk_monitor_tz.h +++ b/drivers/misc/mediatek/thermal/common/inc/mtk_monitor_tz.h @@ -22,10 +22,10 @@ extern int get_monitor_thermal_zone_temp(enum monitor_thermal_zone tz_id); #define monitor_tz_dprintk(fmt, args...) \ do { \ if (monitor_tz_debug_log == 1) { \ - pr_notice(MONITOR_TZ_LOG_TAG fmt, ##args); \ + pr_debug(MONITOR_TZ_LOG_TAG fmt, ##args); \ } \ } while (0) #define monitor_tz_printk(fmt, args...) \ - pr_notice(MONITOR_TZ_LOG_TAG fmt, ##args) + pr_debug(MONITOR_TZ_LOG_TAG fmt, ##args) #endif /* __MTK_MONITOR_TZ_H__ */ diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_tsAll.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_tsAll.c index 3e1dc87170bedbb82178e32d260df0e430de5005..54f362c1bc7a8d6500a53d1bb724c1b879d6dfcc 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_tsAll.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_tsAll.c @@ -58,13 +58,13 @@ struct cooler_data { static struct cooler_data g_coolerData[RESERVED_TZS]; #endif -static int tsallts_debug_log; +static int tsallts_debug_log = 0; #define TSALLTS_TEMP_CRIT 120000 /* 120.000 degree Celsius */ #define tsallts_dprintk(fmt, args...) \ do { \ - if (tsallts_debug_log) { \ + if (tsallts_debug_log != 0) { \ pr_debug("[Thermal/TZ/CPUALL]" fmt, ##args);\ } \ } while (0) @@ -72,7 +72,7 @@ static int tsallts_debug_log; #if AUTO_GEN_COOLERS #define clnothings_dprintk(fmt, args...) \ do { \ - if (tsallts_debug_log) { \ + if (tsallts_debug_log != 0) { \ pr_debug("[Thermal/TZ/CLNOTHINGS]" fmt, ##args);\ } \ } while (0) diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_battery.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_battery.c index 542176b5138485f12d799a1f3b470fb972a79e75..3c7261dee1b9341245b30afc90459b334e00adaa 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_battery.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_battery.c @@ -38,7 +38,7 @@ static void tsbattery_exit(void); int __attribute__ ((weak)) read_tbat_value(void) { - pr_notice("[Thermal] E_WF: %s doesn't exist\n", __func__); + pr_debug("[Thermal] E_WF: %s doesn't exist\n", __func__); return 30; } @@ -48,7 +48,7 @@ battery_get_bat_temperature(void) int i; for (i = 0; i < 5; i++) - pr_notice("[Thermal] E_WF: %s doesn't exist\n", __func__); + pr_debug("[Thermal] E_WF: %s doesn't exist\n", __func__); tsbattery_exit(); return -127000; diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_bts.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_bts.c index 681dbf45a5af9f211cd7b552f49f312633ca27a2..f5e8f4aef75e4924e0f63613d176676da227c1ca 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_bts.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_bts.c @@ -37,13 +37,13 @@ int __attribute__ ((weak)) IMM_IsAdcInitReady(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) IMM_GetOneChannelValue(int dwChannel, int data[4], int *rawdata) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return -1; } @@ -99,7 +99,7 @@ int bts_cur_temp = 1; #define mtkts_bts_dprintk(fmt, args...) \ do { \ if (mtkts_bts_debug_log) { \ - pr_notice("[Thermal/TZ/BTS]" fmt, ##args); \ + pr_debug("[Thermal/TZ/BTS]" fmt, ##args); \ } \ } while (0) @@ -703,7 +703,7 @@ int mtkts_bts_get_hw_temp(void) t_ret2 = wakeup_ta_algo(TA_CATMPLUS_TTJ); if (t_ret2 < 0) - pr_notice("[Thermal/TZ/BTS]wakeup_ta_algo out of memory\n"); + pr_debug("[Thermal/TZ/BTS]wakeup_ta_algo out of memory\n"); bts_cur_temp = t_ret; @@ -1121,7 +1121,7 @@ void mtkts_bts_prepare_table(int table_num) break; } - pr_notice("[Thermal/TZ/BTS] %s table_num=%d\n", __func__, table_num); + pr_debug("[Thermal/TZ/BTS] %s table_num=%d\n", __func__, table_num); } diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btscharger.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btscharger.c index 7578e927fbf5b0e877ba54c630478bc18528398c..09ccb2bec960efbc92383f1558ed86d79425d8cf 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btscharger.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btscharger.c @@ -26,13 +26,13 @@ int __attribute__ ((weak)) IMM_IsAdcInitReady(void) { - pr_notice("E_WF: thermal_charger: %s doesn't exist\n", __func__); + pr_debug("E_WF: thermal_charger: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) IMM_GetOneChannelValue(int dwChannel, int data[4], int *rawdata) { - pr_notice("E_WF: thermal_charger: %s doesn't exist\n", __func__); + pr_debug("E_WF: thermal_charger: %s doesn't exist\n", __func__); return -1; } @@ -46,10 +46,10 @@ do { \ } while (0) #define mtktscharger_dprintk_always(fmt, args...) \ - pr_notice("[Thermal/tzcharger]" fmt, ##args) + pr_debug("[Thermal/tzcharger]" fmt, ##args) -#define mtktscharger_pr_notice(fmt, args...) \ - pr_notice("[Thermal/tzcharger]" fmt, ##args) +#define mtktscharger_pr_debug(fmt, args...) \ + pr_debug("[Thermal/tzcharger]" fmt, ##args) #if defined(CONFIG_MEDIATEK_MT6577_AUXADC) struct iio_channel *thermistor_ch2; @@ -812,10 +812,10 @@ struct thermal_cooling_device *cdev, unsigned long state) { cl_dev_sysrst_state = state; if (cl_dev_sysrst_state == 1) { - pr_notice("[Thermal/mtktscharger_sysrst] reset, reset, reset!!!\n"); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); - pr_notice("*****************************************\n"); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("[Thermal/mtktscharger_sysrst] reset, reset, reset!!!\n"); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("*****************************************\n"); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); /* To trigger data abort to reset the system * for thermal protection. @@ -885,7 +885,7 @@ void mtkts_btscharger_prepare_table(int table_num) break; } - pr_notice("[Thermal/TZ/BTSCHARGER] %s table_num=%d\n", + pr_debug("[Thermal/TZ/BTSCHARGER] %s table_num=%d\n", __func__, table_num); } static int mtktscharger_read(struct seq_file *m, void *v) @@ -1273,7 +1273,7 @@ static int mtktscharger_pdrv_probe(struct platform_device *pdev) mtktscharger_dir = mtk_thermal_get_proc_drv_therm_dir_entry(); if (!mtktscharger_dir) { - mtktscharger_pr_notice("%s get /proc/driver/thermal failed\n", + mtktscharger_pr_debug("%s get /proc/driver/thermal failed\n", __func__); } else { entry = proc_create("tzcharger", 0664, mtktscharger_dir, diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btsmdpa.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btsmdpa.c index 83d9676d835b467f47674c1df7c2188d208eb8cb..f9c250e1b4e8d220a5c8f710eb83abd37763567a 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btsmdpa.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_btsmdpa.c @@ -36,14 +36,14 @@ int __attribute__ ((weak)) IMM_IsAdcInitReady(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } int __attribute__ ((weak)) IMM_GetOneChannelValue(int dwChannel, int data[4], int *rawdata) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return -1; } #endif @@ -91,12 +91,12 @@ static int polling_factor2 = 10000; #define mtkts_btsmdpa_dprintk(fmt, args...) \ do { \ if (mtkts_btsmdpa_debug_log) { \ - pr_notice("[Thermal/TZ/BTSMDPA]" fmt, ##args); \ + pr_debug("[Thermal/TZ/BTSMDPA]" fmt, ##args); \ } \ } while (0) #define mtkts_btsmdpa_printk(fmt, args...) \ -pr_notice("[Thermal/TZ/BTSMDPA]" fmt, ##args) +pr_debug("[Thermal/TZ/BTSMDPA]" fmt, ##args) #if defined(CONFIG_MEDIATEK_MT6577_AUXADC) @@ -1166,7 +1166,7 @@ void mtkts_btsmdpa_prepare_table(int table_num) break; } - pr_notice("[Thermal/TZ/BTSMDPA] %s table_num=%d\n", + pr_debug("[Thermal/TZ/BTSMDPA] %s table_num=%d\n", __func__, table_num); } diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger.c index c6c712445d79657d0b496aaa68e912e28ce075a1..da30ec155c24040d5b30369b1e4d0362bfbe9025 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger.c @@ -35,8 +35,8 @@ do { \ #define mtktscharger_dprintk_always(fmt, args...) \ pr_debug("[Thermal/tzcharger]" fmt, ##args) -#define mtktscharger_pr_notice(fmt, args...) \ - pr_notice("[Thermal/tzcharger]" fmt, ##args) +#define mtktscharger_pr_debug(fmt, args...) \ + pr_debug("[Thermal/tzcharger]" fmt, ##args) static kuid_t uid = KUIDT_INIT(0); static kgid_t gid = KGIDT_INIT(1000); @@ -333,10 +333,10 @@ struct thermal_cooling_device *cdev, unsigned long state) { cl_dev_sysrst_state = state; if (cl_dev_sysrst_state == 1) { - pr_notice("[Thermal/mtktscharger_sysrst] reset, reset, reset!!!\n"); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); - pr_notice("*****************************************\n"); - pr_notice("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("[Thermal/mtktscharger_sysrst] reset, reset, reset!!!\n"); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); + pr_debug("*****************************************\n"); + pr_debug("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@\n"); /* To trigger data abort to reset the system * for thermal protection. @@ -565,7 +565,7 @@ static int mtktscharger_pdrv_probe(struct platform_device *pdev) mtktscharger_dir = mtk_thermal_get_proc_drv_therm_dir_entry(); if (!mtktscharger_dir) { - mtktscharger_pr_notice("%s get /proc/driver/thermal failed\n", + mtktscharger_pr_debug("%s get /proc/driver/thermal failed\n", __func__); } else { entry = proc_create("tzcharger", 0664, mtktscharger_dir, diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger2.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger2.c index 1c01dc9903b3009b9cee3edeac0835592fe9801f..ee0363f6c3e44207bb28ee59d3d0c3d54c16c4f0 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger2.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_charger2.c @@ -26,14 +26,14 @@ #define mtktscharger2_dprintk(fmt, args...) \ do { \ if (mtktscharger2_debug_log) \ - pr_notice("[Thermal/tzcharger2]" fmt, ##args); \ + pr_debug("[Thermal/tzcharger2]" fmt, ##args); \ } while (0) #define mtktscharger2_dprintk_always(fmt, args...) \ - pr_notice("[Thermal/tzcharger2]" fmt, ##args) + pr_debug("[Thermal/tzcharger2]" fmt, ##args) -#define mtktscharger2_pr_notice(fmt, args...) \ - pr_notice("[Thermal/tzcharger2]" fmt, ##args) +#define mtktscharger2_pr_debug(fmt, args...) \ + pr_debug("[Thermal/tzcharger2]" fmt, ##args) static kuid_t uid = KUIDT_INIT(0); static kgid_t gid = KGIDT_INIT(1000); @@ -110,7 +110,7 @@ static struct power_supply *get_charger2_handle(void) if (m_psy) return m_psy; } - pr_notice("%s is not dual charger project\n", + pr_debug("%s is not dual charger project\n", __func__); return NULL; } @@ -336,7 +336,7 @@ struct thermal_cooling_device *cdev, unsigned long state) { cl_dev_sysrst_state = state; if (cl_dev_sysrst_state == 1) { - mtktscharger2_pr_notice( + mtktscharger2_pr_debug( "[Thermal/mtktscharger2_sysrst] reset, reset, reset!!!\n"); @@ -584,7 +584,7 @@ static int mtktscharger2_pdrv_probe(struct platform_device *pdev) mtktscharger2_dir = mtk_thermal_get_proc_drv_therm_dir_entry(); if (!mtktscharger2_dir) { - mtktscharger2_pr_notice("%s get /proc/driver/thermal failed\n", + mtktscharger2_pr_debug("%s get /proc/driver/thermal failed\n", __func__); } else { entry = proc_create("tzcharger2", 0664, mtktscharger2_dir, diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_cpu_noBank.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_cpu_noBank.c index 87fd2e777f87eed6bb16e965659a8f715090ab3d..607f9bea48cdc96b7c425437daee01e5913b3c48 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_cpu_noBank.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_cpu_noBank.c @@ -268,7 +268,7 @@ static int g_is_TempOutsideNormalRange; unsigned int __attribute__((weak)) mt_gpufreq_get_max_power(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } @@ -276,7 +276,7 @@ mt_gpufreq_get_max_power(void) int __attribute__ ((weak)) IMM_IsAdcInitReady(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } #endif @@ -285,7 +285,7 @@ IMM_IsAdcInitReady(void) mtk_get_gpu_loading(unsigned int *pLoading) { #ifdef CONFIG_MTK_GPU_SUPPORT - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); #endif return 0; } @@ -293,46 +293,46 @@ mtk_get_gpu_loading(unsigned int *pLoading) void __attribute__ ((weak)) mt_ptp_lock(unsigned long *flags) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); } void __attribute__ ((weak)) mt_ptp_unlock(unsigned long *flags) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); } void __attribute__ ((weak)) mt_cpufreq_thermal_5A_limit(bool enable) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); } unsigned int __attribute__ ((weak)) mt_gpufreq_get_cur_freq(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } unsigned int __attribute__ ((weak)) mt_ppm_thermal_get_max_power(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } unsigned int __attribute__((weak)) mt_gpufreq_get_seg_max_opp_index(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } unsigned int __attribute__((weak)) mt_gpufreq_get_dvfs_table_num(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } @@ -1669,7 +1669,7 @@ static int tscpu_thermal_suspend do { temp = (readl(THAHBST0) >> 16); if ((cnt + 1) % 10 == 0) - pr_notice("THAHBST0 = 0x%x, cnt = %d, %d\n", + pr_debug("THAHBST0 = 0x%x, cnt = %d, %d\n", temp, cnt, __LINE__); udelay(50); @@ -1683,7 +1683,7 @@ static int tscpu_thermal_suspend do { temp = (readl(THAHBST0) >> 16); if ((cnt + 1) % 10 == 0) - pr_notice("THAHBST0 = 0x%x, cnt = %d, %d\n", + pr_debug("THAHBST0 = 0x%x, cnt = %d, %d\n", temp, cnt, __LINE__); udelay(2); @@ -1724,7 +1724,7 @@ static int tscpu_thermal_suspend do_gettimeofday(&end); /* Get milliseconds */ - pr_notice("suspend time spent, sec : %lu , usec : %lu\n", + pr_debug("suspend time spent, sec : %lu , usec : %lu\n", (end.tv_sec - begin.tv_sec), (end.tv_usec - begin.tv_usec)); #endif @@ -1819,7 +1819,7 @@ static int tscpu_thermal_resume(struct platform_device *dev) do { temp = (readl(THAHBST0) >> 16); if ((cnt + 1) % 10 == 0) - pr_notice("THAHBST0 = 0x%x, cnt = %d, %d\n", + pr_debug("THAHBST0 = 0x%x, cnt = %d, %d\n", temp, cnt, __LINE__); udelay(50); @@ -1833,7 +1833,7 @@ static int tscpu_thermal_resume(struct platform_device *dev) do { temp = (readl(THAHBST0) >> 16); if ((cnt + 1) % 10 == 0) - pr_notice("THAHBST0 = 0x%x, cnt = %d, %d\n", + pr_debug("THAHBST0 = 0x%x, cnt = %d, %d\n", temp, cnt, __LINE__); udelay(2); @@ -2554,7 +2554,7 @@ static void init_thermal(void) while (cnt < 50) { temp = (readl(THAHBST0) >> 16); if ((cnt + 1) % 10 == 0) - pr_notice("THAHBST0 = 0x%x,cnt=%d, %d\n", temp, cnt, + pr_debug("THAHBST0 = 0x%x,cnt=%d, %d\n", temp, cnt, __LINE__); if (temp == 0x0) { diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_dctm.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_dctm.c index 2fa02681fbe3d1a7b111fd9d427d22470e2cc24c..a1e0181382e89abe6f95555d1f8e14323a174237 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_dctm.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_dctm.c @@ -283,7 +283,7 @@ static int mtkts_dctm_get_temp(struct thermal_zone_device *thermal, int *t) } if (t_ret < 0) - pr_notice("%s, wakeup_ta_algo out of memory\n", __func__); + pr_debug("%s, wakeup_ta_algo out of memory\n", __func__); if ((int)*t >= polling_trip_temp1) thermal->polling_delay = interval * 1000; @@ -972,7 +972,7 @@ static int __init mtkts_dctm_init(void) #ifdef CONFIG_PM ret = register_pm_notifier(&dctm_pm_notifier_func); if (ret) - pr_notice("Failed to register dctm PM notifier.\n"); + pr_debug("Failed to register dctm PM notifier.\n"); #endif return 0; } diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_imgsensor.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_imgsensor.c index 4454b6d8f04caf879476484e3a110f5c1fc17ef5..8c44e7f74c7418edcc2be65f7edeb66110dce46a 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_imgsensor.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_imgsensor.c @@ -35,7 +35,7 @@ enum CAMERA_DUAL_CAMERA_SENSOR_ENUM senDevId, MUINT8 *valid, MUINT32 *temp) { *valid = SENSOR_TEMPERATURE_CANNOT_SEARCH_SENSOR; *temp = -127; - pr_notice("[Thermal/TZ/IMGS] E_WF: %s doesn't exist\n", __func__); + pr_debug("[Thermal/TZ/IMGS] E_WF: %s doesn't exist\n", __func__); return -1; } @@ -54,12 +54,12 @@ enum CAMERA_DUAL_CAMERA_SENSOR_ENUM senDevId, MUINT8 *valid, MUINT32 *temp) #define mtk_imgs_dprintk(fmt, args...) \ do { \ if (mtk_imgs_debug_log) { \ - pr_notice("[Thermal/TZ/IMGS]" fmt, ##args);\ + pr_debug("[Thermal/TZ/IMGS]" fmt, ##args);\ } \ } while (0) #define mtk_imgs_printk(fmt, args...) \ - pr_notice("[Thermal/TZ/IMGS]" fmt, ##args) + pr_debug("[Thermal/TZ/IMGS]" fmt, ##args) /*============================================================= * Function prototype *============================================================= diff --git a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_wmt.c b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_wmt.c index cd21c298e523e47b601aa511ce266d64b01a1572..91a247a4927f8219edb31471cd10b2042840b106 100644 --- a/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_wmt.c +++ b/drivers/misc/mediatek/thermal/common/thermal_zones/mtk_ts_wmt.c @@ -30,7 +30,7 @@ int __attribute__ ((weak)) mtk_wcn_cmb_stub_query_ctrl(void) { - pr_notice("E_WF: %s doesn't exist\n", __func__); + pr_debug("E_WF: %s doesn't exist\n", __func__); return 0; } /*=============================================================*/ diff --git a/drivers/misc/mediatek/thermal/mt6765/inc/tscpu_settings.h b/drivers/misc/mediatek/thermal/mt6765/inc/tscpu_settings.h index f7d130fb1b46f48f484a9fc0c2c9ea5959c0ee6c..b6b4bb9d782066ce06765ec9c87894cc53331045 100644 --- a/drivers/misc/mediatek/thermal/mt6765/inc/tscpu_settings.h +++ b/drivers/misc/mediatek/thermal/mt6765/inc/tscpu_settings.h @@ -38,10 +38,10 @@ do { \ thermal_diff_us = thermal_cTime_us - thermal_pTime_us; \ if (thermal_diff_us > THERMAL_TIME_TH) { \ - pr_notice(TSCPU_LOG_TAG "%s: %llu us\n", \ + pr_debug(TSCPU_LOG_TAG "%s: %llu us\n", \ __func__, thermal_diff_us); \ } else if (thermal_diff_us < 0) { \ - pr_notice(TSCPU_LOG_TAG "Warning: tProfiling " \ + pr_debug(TSCPU_LOG_TAG "Warning: tProfiling " \ "uses incorrect %s %d\n", __func__, __LINE__); \ } \ } while (0) @@ -232,12 +232,12 @@ #define tscpu_dprintk(fmt, args...) \ do { \ if (tscpu_debug_log == 1) { \ - pr_notice(TSCPU_LOG_TAG fmt, ##args); \ + pr_debug(TSCPU_LOG_TAG fmt, ##args); \ } \ } while (0) -#define tscpu_printk(fmt, args...) pr_notice(TSCPU_LOG_TAG fmt, ##args) -#define tscpu_warn(fmt, args...) pr_notice(TSCPU_LOG_TAG fmt, ##args) +#define tscpu_printk(fmt, args...) pr_debug(TSCPU_LOG_TAG fmt, ##args) +#define tscpu_warn(fmt, args...) pr_debug(TSCPU_LOG_TAG fmt, ##args) /*============================================================= * Structures diff --git a/drivers/misc/mediatek/thermal/mt6765/inc/tspmic_settings.h b/drivers/misc/mediatek/thermal/mt6765/inc/tspmic_settings.h index 258b5333c0dbf5f3631c114907f6dfcc552e4eb5..ff7c28e1fcaf01fa876a8119a746f5a6d0238db3 100644 --- a/drivers/misc/mediatek/thermal/mt6765/inc/tspmic_settings.h +++ b/drivers/misc/mediatek/thermal/mt6765/inc/tspmic_settings.h @@ -30,9 +30,6 @@ pr_notice("[Thermal/TZ/PMIC] " fmt, ##args) #define mtktspmic_dprintk(fmt, args...) \ do { \ - if (mtktspmic_debug_log == 1) { \ - pr_notice("[Thermal/TZ/PMIC] " fmt, ##args); \ - } \ } while (0) #define THERMAL_USE_IIO_CHANNEL diff --git a/drivers/misc/mediatek/thermal/mt6765/src/mtk_pmic_efuse.c b/drivers/misc/mediatek/thermal/mt6765/src/mtk_pmic_efuse.c index b2a2feadd7c1bc11ffb2dde920708a4ee342c563..22e8183bbced255fd0b1580d19956d403dadc45e 100644 --- a/drivers/misc/mediatek/thermal/mt6765/src/mtk_pmic_efuse.c +++ b/drivers/misc/mediatek/thermal/mt6765/src/mtk_pmic_efuse.c @@ -33,7 +33,7 @@ *Local variable definition *============================================================= */ -int mtktspmic_debug_log = 1; +int mtktspmic_debug_log = 0; /* Cali */ static __s32 g_o_vts; static __s32 g_o_vts_2; @@ -282,19 +282,19 @@ void mtktspmic_get_from_dts(struct platform_device *pdev) chan_chip_temp = devm_iio_channel_get(&pdev->dev, "pmic_chip_temp"); if (IS_ERR(chan_chip_temp)) { ret = PTR_ERR(chan_chip_temp); - pr_notice("AUXADC_CHIP_TEMP get fail, ret=%d\n", ret); + pr_debug("AUXADC_CHIP_TEMP get fail, ret=%d\n", ret); } chan_vcore_temp = devm_iio_channel_get(&pdev->dev, "pmic_buck1_temp"); if (IS_ERR(chan_vcore_temp)) { ret = PTR_ERR(chan_vcore_temp); - pr_notice("AUXADC_VCORE_TEMP get fail, ret=%d\n", ret); + pr_debug("AUXADC_VCORE_TEMP get fail, ret=%d\n", ret); } chan_vproc_temp = devm_iio_channel_get(&pdev->dev, "pmic_buck2_temp"); if (IS_ERR(chan_vproc_temp)) { ret = PTR_ERR(chan_vproc_temp); - pr_notice("AUXADC_VPROC_TEMP get fail, ret=%d\n", ret); + pr_debug("AUXADC_VPROC_TEMP get fail, ret=%d\n", ret); } } #endif @@ -311,7 +311,7 @@ int mtktspmic_get_hw_temp(void) if (!IS_ERR(chan_chip_temp)) { ret = iio_read_channel_processed(chan_chip_temp, &temp); if (ret < 0) - pr_notice("pmic_chip_temp read fail, ret=%d\n", ret); + pr_debug("pmic_chip_temp read fail, ret=%d\n", ret); } #else temp = pmic_get_auxadc_value(AUXADC_LIST_MT6357_CHIP_TEMP); @@ -361,7 +361,7 @@ int mt6357tsbuck1_get_hw_temp(void) if (!IS_ERR(chan_vcore_temp)) { ret = iio_read_channel_processed(chan_vcore_temp, &temp); if (ret < 0) - pr_notice("pmic_vcore_temp read fail, ret=%d\n", ret); + pr_debug("pmic_vcore_temp read fail, ret=%d\n", ret); } #else temp = pmic_get_auxadc_value(AUXADC_LIST_MT6357_BUCK1_TEMP); @@ -409,7 +409,7 @@ int mt6357tsbuck2_get_hw_temp(void) if (!IS_ERR(chan_vproc_temp)) { ret = iio_read_channel_processed(chan_vproc_temp, &temp); if (ret < 0) - pr_notice("pmic_vproc_temp read fail, ret=%d\n", ret); + pr_debug("pmic_vproc_temp read fail, ret=%d\n", ret); } #else temp = pmic_get_auxadc_value(AUXADC_LIST_MT6357_BUCK2_TEMP); diff --git a/drivers/misc/mediatek/thermal/mt6765/src/mtk_tc.c b/drivers/misc/mediatek/thermal/mt6765/src/mtk_tc.c index 234d4ccc26b97770ba46e959f96ed15ea0c6567c..f308b1a0ad1a2754c1581da0cdfcbad4a230f884 100644 --- a/drivers/misc/mediatek/thermal/mt6765/src/mtk_tc.c +++ b/drivers/misc/mediatek/thermal/mt6765/src/mtk_tc.c @@ -214,13 +214,13 @@ static void set_tc_trigger_hw_protect void __attribute__ ((weak)) mt_ptp_lock(unsigned long *flags) { - pr_notice("[Power/CPU_Thermal]%s doesn't exist\n", __func__); + pr_debug("[Power/CPU_Thermal]%s doesn't exist\n", __func__); } void __attribute__ ((weak)) mt_ptp_unlock(unsigned long *flags) { - pr_notice("[Power/CPU_Thermal]%s doesn't exist\n", __func__); + pr_debug("[Power/CPU_Thermal]%s doesn't exist\n", __func__); } /*=============================================================*/ @@ -466,7 +466,7 @@ void tscpu_thermal_cal_prepare(void) temp1 = thermal_efuse[0]; temp0 = thermal_efuse[1]; temp2 = thermal_efuse[2]; - pr_notice("[calibration] temp0=0x%x, temp1=0x%x, temp2=0x%x\n", + pr_debug("[calibration] temp0=0x%x, temp1=0x%x, temp2=0x%x\n", temp0, temp1, temp2); /* * chip dependent @@ -544,7 +544,7 @@ void tscpu_thermal_cal_prepare(void) lvtsdevinfo2 = get_devinfo_with_index(119); lvtsdevinfo3 = get_devinfo_with_index(139); - pr_notice("[lvts_cal] 0: 0x%x, 1: 0x%x, 2: 0x%x\n", lvtsdevinfo1, + pr_debug("[lvts_cal] 0: 0x%x, 1: 0x%x, 2: 0x%x\n", lvtsdevinfo1, lvtsdevinfo2, lvtsdevinfo3); lvts_count1_b30c = (lvtsdevinfo1 & _BITMASK_(23:0)); @@ -1235,7 +1235,7 @@ int tscpu_thermal_fast_init(int tc_num) temp = readl(offset + TEMPMSR0) & 0x0fff; while (temp != THERMAL_INIT_VALUE && cunt < 20) { cunt++; - /* pr_notice("[Power/CPU_Thermal]0 temp=%d,cunt=%d\n", + /* pr_debug("[Power/CPU_Thermal]0 temp=%d,cunt=%d\n", * temp,cunt); */ temp = readl(offset + TEMPMSR0) & 0x0fff; @@ -1245,7 +1245,7 @@ int tscpu_thermal_fast_init(int tc_num) temp = readl(offset + TEMPMSR1) & 0x0fff; while (temp != THERMAL_INIT_VALUE && cunt < 20) { cunt++; - /* pr_notice("[Power/CPU_Thermal]1 temp=%d,cunt=%d\n", + /* pr_debug("[Power/CPU_Thermal]1 temp=%d,cunt=%d\n", * temp,cunt); */ temp = readl(offset + TEMPMSR1) & 0x0fff; @@ -1255,7 +1255,7 @@ int tscpu_thermal_fast_init(int tc_num) temp = readl(offset + TEMPMSR2) & 0x0fff; while (temp != THERMAL_INIT_VALUE && cunt < 20) { cunt++; - /* pr_notice("[Power/CPU_Thermal]2 temp=%d,cunt=%d\n", + /* pr_debug("[Power/CPU_Thermal]2 temp=%d,cunt=%d\n", * temp,cunt); */ temp = readl(offset + TEMPMSR2) & 0x0fff; @@ -1265,7 +1265,7 @@ int tscpu_thermal_fast_init(int tc_num) temp = readl(offset + TEMPMSR3) & 0x0fff; while (temp != THERMAL_INIT_VALUE && cunt < 20) { cunt++; - /* pr_notice("[Power/CPU_Thermal]3 temp=%d,cunt=%d\n", + /* pr_debug("[Power/CPU_Thermal]3 temp=%d,cunt=%d\n", * temp,cunt); */ temp = readl(offset + TEMPMSR3) & 0x0fff; @@ -1468,7 +1468,7 @@ void tscpu_config_all_tc_hw_protect(int temperature, int temperature2) do_gettimeofday(&end); /* Get milliseconds */ - pr_notice("resume time spent, sec : %lu , usec : %lu\n", + pr_debug("resume time spent, sec : %lu , usec : %lu\n", (end.tv_sec - begin.tv_sec), (end.tv_usec - begin.tv_usec)); #endif @@ -1676,13 +1676,13 @@ int get_io_reg_base(void) /* TODO: If this is required, it needs to confirm which node to read. */ node = of_find_compatible_node(NULL, NULL, "mediatek,infrasys"); /**/ if (!node) { - pr_notice("[CLK_INFRACFG_AO] find node failed\n"); + pr_debug("[CLK_INFRACFG_AO] find node failed\n"); return 0; } therm_clk_infracfg_ao_base = of_iomap(node, 0); if (!therm_clk_infracfg_ao_base) { - pr_notice("[CLK_INFRACFG_AO] base failed\n"); + pr_debug("[CLK_INFRACFG_AO] base failed\n"); return 0; } #endif diff --git a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c index 310dde329ce838537c7085af1447123ad6f29156..886901ef9cbef44ef8e8763bbcfb4bce6eeaf628 100644 --- a/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c +++ b/drivers/misc/mediatek/thermal/mtk_cooler_shutdown.c @@ -37,7 +37,7 @@ #if 1 #define mtk_cooler_shutdown_dprintk(fmt, args...) \ - pr_notice("thermal/cooler/shutdown " fmt, ##args) + pr_debug("thermal/cooler/shutdown " fmt, ##args) #else #define mtk_cooler_shutdown_dprintk(fmt, args...) #endif diff --git a/drivers/misc/mediatek/thermal/platform/inc/tscpu_settings.h b/drivers/misc/mediatek/thermal/platform/inc/tscpu_settings.h index 1927429046995f2df746ca51612dbc80cc1f9db0..1c5fa2362ddaff320b2b69cfaf1f5adb321b5053 100644 --- a/drivers/misc/mediatek/thermal/platform/inc/tscpu_settings.h +++ b/drivers/misc/mediatek/thermal/platform/inc/tscpu_settings.h @@ -40,10 +40,10 @@ do { \ thermal_diff_us = thermal_cTime_us - thermal_pTime_us; \ if (thermal_diff_us > THERMAL_TIME_TH) { \ - pr_notice(TSCPU_LOG_TAG "%s: %llu us\n", __func__, \ + pr_debug(TSCPU_LOG_TAG "%s: %llu us\n", __func__, \ thermal_diff_us); \ } else if (thermal_diff_us < 0) { \ - pr_notice(TSCPU_LOG_TAG \ + pr_debug(TSCPU_LOG_TAG \ "Warning: tProfiling uses incorrect %s %d\n", \ __func__, __LINE__); \ } \ @@ -590,12 +590,12 @@ extern void lvts_dump_time_profiling_result(struct seq_file *m); #define tscpu_dprintk(fmt, args...) \ do { \ if (tscpu_debug_log == 1) { \ - pr_notice(TSCPU_LOG_TAG fmt, ##args); \ + pr_debug(TSCPU_LOG_TAG fmt, ##args); \ } \ } while (0) -#define tscpu_printk(fmt, args...) pr_notice(TSCPU_LOG_TAG fmt, ##args) -#define tscpu_warn(fmt, args...) pr_notice(TSCPU_LOG_TAG fmt, ##args) +#define tscpu_printk(fmt, args...) pr_debug(TSCPU_LOG_TAG fmt, ##args) +#define tscpu_warn(fmt, args...) pr_debug(TSCPU_LOG_TAG fmt, ##args) /* * Support LVTS @@ -604,14 +604,14 @@ extern void lvts_dump_time_profiling_result(struct seq_file *m); #define LVTS_LOG_TAG "[Thermal/TZ/LVTS]" #define LVTS_LOG_REG_TAG "[Thermal/TZ/LVTSREG]" -#define lvts_reg_print(fmt, args...) pr_notice(LVTS_LOG_REG_TAG fmt, ##args) -#define lvts_printk(fmt, args...) pr_notice(LVTS_LOG_TAG fmt, ##args) -#define lvts_warn(fmt, args...) pr_notice(LVTS_LOG_TAG fmt, ##args) +#define lvts_reg_print(fmt, args...) pr_debug(LVTS_LOG_REG_TAG fmt, ##args) +#define lvts_printk(fmt, args...) pr_debug(LVTS_LOG_TAG fmt, ##args) +#define lvts_warn(fmt, args...) pr_debug(LVTS_LOG_TAG fmt, ##args) #define lvts_dbg_printk(fmt, args...) \ do { \ if (lvts_debug_log == 1) { \ - pr_notice(LVTS_LOG_TAG fmt, ##args); \ + pr_debug(LVTS_LOG_TAG fmt, ##args); \ } \ } while (0) #endif diff --git a/drivers/misc/mediatek/thermal/platform/inc/tspmic_settings.h b/drivers/misc/mediatek/thermal/platform/inc/tspmic_settings.h index 9a065f8e5142ebf749df5e11dfdf5193d5e7fb05..9349e91c2b51609bffd42cb78333f4f6d04a9fb4 100644 --- a/drivers/misc/mediatek/thermal/platform/inc/tspmic_settings.h +++ b/drivers/misc/mediatek/thermal/platform/inc/tspmic_settings.h @@ -23,14 +23,11 @@ #define y_pmic_repeat_times 1 #define THERMAL_USE_IIO_CHANNEL -#define mtktspmic_info(fmt, args...) pr_info("[Thermal/TZ/PMIC] " fmt, ##args) +#define mtktspmic_info(fmt, args...) pr_debug("[Thermal/TZ/PMIC] " fmt, ##args) #define mtktspmic_dprintk(fmt, args...) \ do { \ - if (mtktspmic_debug_log == 1) { \ - pr_notice("[Thermal/TZ/PMIC] " fmt, ##args); \ - } \ } while (0) extern int mtktspmic_debug_log; diff --git a/drivers/misc/mediatek/video/mt6765/videox/disp_drv_log.h b/drivers/misc/mediatek/video/mt6765/videox/disp_drv_log.h index 9cd8580a37f845a85506b52e802d8185d4aa81a5..60711875e19c2f4b613502625dd420a973e55455 100644 --- a/drivers/misc/mediatek/video/mt6765/videox/disp_drv_log.h +++ b/drivers/misc/mediatek/video/mt6765/videox/disp_drv_log.h @@ -37,14 +37,14 @@ #define DISPWARN(string, args...) \ do { \ dprec_logger_pr(DPREC_LOGGER_ERROR, string, ##args); \ - pr_info("[DISP][%s #%d]warn:"string, \ + pr_warn("[DISP][%s #%d]warn:"string, \ __func__, __LINE__, ##args); \ } while (0) #define DISPERR(string, args...) \ do { \ dprec_logger_pr(DPREC_LOGGER_ERROR, string, ##args); \ - pr_info("[DISP][%s #%d]ERROR:"string, \ + pr_err("[DISP][%s #%d]ERROR:"string, \ __func__, __LINE__, ##args); \ } while (0) @@ -52,7 +52,7 @@ do { \ dprec_logger_pr(DPREC_LOGGER_FENCE, string, ##args); \ if (g_mobilelog) \ - pr_info("fence/"string, ##args); \ + pr_debug("fence/"string, ##args); \ } while (0) #define DISPDBG(string, args...) \ @@ -66,7 +66,7 @@ do { \ dprec_logger_pr(DPREC_LOGGER_DEBUG, "func|%s\n", __func__); \ if (g_mobilelog) \ - pr_info("[DISP]func|%s\n", __func__); \ + pr_debug("[DISP]func|%s\n", __func__); \ } while (0) #define DISPDBGFUNC() DISPFUNC() @@ -81,25 +81,25 @@ DB_OPT_DEFAULT | DB_OPT_MMPROFILE_BUFFER | \ DB_OPT_DISPLAY_HANG_DUMP | DB_OPT_DUMP_DISPLAY, \ disp_name, "[DISP] error"string, ##args); \ - pr_info("DISP error: "string, ##args); \ + pr_err("DISP error: "string, ##args); \ } while (0) #else #define disp_aee_print(string, args...) do { \ char disp_name[100]; \ (void)snprintf(disp_name, 100, "[DISP]"string, ##args); \ - pr_info("DISP error: "string, ##args); \ + pr_err("DISP error: "string, ##args); \ } while (0) #endif #ifdef CONFIG_MTK_AEE_FEATURE #define disp_aee_db_print(string, args...) \ do { \ - pr_info("DISP error:"string, ##args);\ + pr_err("DISP error:"string, ##args);\ aee_kernel_exception("DISP", "[DISP]error:%s, %d\n"\ , __FILE__, __LINE__);\ } while (0) #else -#define disp_aee_db_print(string, args...) pr_info("DISP error:"string, ##args) +#define disp_aee_db_print(string, args...) pr_err("DISP error:"string, ##args) #endif #define _DISP_PRINT_FENCE_OR_ERR(is_err, string, args...) \ diff --git a/drivers/power/supply/eta6937.c b/drivers/power/supply/eta6937.c index 245bb71a36bf56e62830149c94731b000adcfa24..c154bfd21c30d7d3d05b4a1ecb561df24f94b4d1 100755 --- a/drivers/power/supply/eta6937.c +++ b/drivers/power/supply/eta6937.c @@ -111,21 +111,21 @@ void eta6937_otg_start_timer(void) { ktime_t ktime = ktime_set(10, 0); - printk("eta6937_otg_start_timer\n"); + pr_debug("eta6937_otg_start_timer\n"); hrtimer_start(&eta6937_otg_kthread_timer, ktime, HRTIMER_MODE_REL); } int eta6937_otg_routine_thread(void *arg) { - printk("eta6937_otg_routine_thread enter\n"); + pr_debug("eta6937_otg_routine_thread enter\n"); while (1) { - printk("eta6937_otg_routine_thread while(1)\n"); + pr_debug("eta6937_otg_routine_thread while(1)\n"); wait_event(eta6937_otg_wait_que, (otg_set_tmr_flag == 1)); otg_set_tmr_flag =0; if(eta6937_otg_status_flag ==1) { //xjl 20200528 - printk("eta6937_otg_routine_thread eta6937_set_tmr_rst(1)\n"); + pr_debug("eta6937_otg_routine_thread eta6937_set_tmr_rst(1)\n"); eta6937_set_tmr_rst(1); eta6937_otg_start_timer(); } @@ -211,7 +211,7 @@ static unsigned int charging_value_to_parameter(const unsigned int *parameter, c if (val < array_size) return parameter[val]; - printk("eta6937 Can't find the parameter\n"); + pr_debug("eta6937 Can't find the parameter\n"); return parameter[0]; } @@ -227,7 +227,7 @@ static unsigned int charging_parameter_to_value(const unsigned int *parameter, c return i; } - printk("eta6937 NO register value match\n"); + pr_debug("eta6937 NO register value match\n"); /* TODO: ASSERT(0); // not find the value */ return 0; } @@ -251,7 +251,7 @@ static unsigned int bmt_find_closest_level(const unsigned int *pList, unsigned i } } - printk("eta6937 Can't find closest level\n"); + pr_debug("eta6937 Can't find closest level\n"); return pList[0]; /* return CHARGE_CURRENT_0_00_MA; */ } else { @@ -260,7 +260,7 @@ static unsigned int bmt_find_closest_level(const unsigned int *pList, unsigned i return pList[i]; } - printk("eta6937 Can't find closest level\n"); + pr_debug("eta6937 Can't find closest level\n"); return pList[number - 1]; /* return CHARGE_CURRENT_0_00_MA; */ } @@ -361,7 +361,7 @@ unsigned int eta6937_read_byte(unsigned char cmd, unsigned char *returnData) ret = i2c_transfer(new_client->adapter, msgs, xfers); if (ret == -ENXIO) { - printk("eta6937 skipping non-existent adapter %s\n", new_client->adapter->name); + pr_debug("eta6937 skipping non-existent adapter %s\n", new_client->adapter->name); break; } } while (ret != xfers && --retries); @@ -399,7 +399,7 @@ unsigned int eta6937_write_byte(unsigned char cmd, unsigned char writeData) ret = i2c_transfer(new_client->adapter, msgs, xfers); if (ret == -ENXIO) { - printk("eta6937 skipping non-existent adapter %s\n", new_client->adapter->name); + pr_debug("eta6937 skipping non-existent adapter %s\n", new_client->adapter->name); break; } } while (ret != xfers && --retries); @@ -423,12 +423,12 @@ unsigned int eta6937_read_interface(unsigned char RegNum, unsigned char *val, un ret = eta6937_read_byte(RegNum, &eta6937_reg); - printk("eta6937 [eta6937_read_interface] Reg[%x]=0x%x\n", RegNum, eta6937_reg); + pr_debug("eta6937 [eta6937_read_interface] Reg[%x]=0x%x\n", RegNum, eta6937_reg); eta6937_reg &= (MASK << SHIFT); *val = (eta6937_reg >> SHIFT); - printk("eta6937 [eta6937_read_interface] val=0x%x\n", *val); + pr_debug("eta6937 [eta6937_read_interface] val=0x%x\n", *val); return ret; } @@ -449,7 +449,7 @@ unsigned int eta6937_config_interface(unsigned char RegNum, unsigned char val, u ret = eta6937_write_byte(RegNum, eta6937_reg); mutex_unlock(&eta6937_access_lock); - printk("eta6937 [eta6937_config_interface] write Reg[%x]=0x%x from 0x%x\n", RegNum, + pr_debug("eta6937 [eta6937_config_interface] write Reg[%x]=0x%x from 0x%x\n", RegNum, eta6937_reg, eta6937_reg_ori); return ret; @@ -839,7 +839,7 @@ static void eta6937_hw_component_detect(void) //xjl 20200526 else g_eta6937_hw_exist = 1; - printk("[eta6937_hw_component_detect] exist=%d, Reg[0x03]=0x%x\n", + pr_debug("[eta6937_hw_component_detect] exist=%d, Reg[0x03]=0x%x\n", g_eta6937_hw_exist, val); } @@ -862,12 +862,12 @@ static int eta6937_enable_charging(struct charger_device *chg_dev, bool en) set_gpio_charge_en(0); //ret = pinctrl_select_state(info->pinctrl, info->psc_chg_en_low); //if (ret){ - // printk("eta6937 mycat Error pinctrl_select_state low"); + // pr_debug("eta6937 mycat Error pinctrl_select_state low"); //} //else{ - // printk("eta6937 mycat Ok pinctrl_select_state low"); + // pr_debug("eta6937 mycat Ok pinctrl_select_state low"); //} - printk("eta6937 eta6937 calm enable charging\n"); + pr_debug("eta6937 eta6937 calm enable charging\n"); } else { eta6937_set_ce(1); eta6937_set_hz_mode(1); @@ -875,12 +875,12 @@ static int eta6937_enable_charging(struct charger_device *chg_dev, bool en) set_gpio_charge_en(1); //ret = pinctrl_select_state(info->pinctrl, info->psc_chg_en_high); //if (ret){ - // printk("eta6937 mycat Error pinctrl_select_state high"); + // pr_debug("eta6937 mycat Error pinctrl_select_state high"); //} //else{ - // printk("eta6937 mycat Ok pinctrl_select_state high"); + // pr_debug("eta6937 mycat Ok pinctrl_select_state high"); //} - printk("eta6937 eta6937 calm disable charging\n"); + pr_debug("eta6937 eta6937 calm disable charging\n"); } return status; @@ -910,7 +910,7 @@ static int eta6937_set_current(struct charger_device *chg_dev, u32 current_value u32 array_size; u32 register_value; - printk("liml_bat eta6937_set_current=%d\n",current_value); + pr_debug("liml_bat eta6937_set_current=%u\n",current_value); #if 1//defined(defined(YK676_V60_CUSTOMER_TRX_S607_HDPLUS) if(chr_current_limi) return status; @@ -933,10 +933,9 @@ static int eta6937_set_current(struct charger_device *chg_dev, u32 current_value eta6937_set_io_level(0); array_size = ARRAY_SIZE(eta6937_CS_VTH); set_chr_current = bmt_find_closest_level(eta6937_CS_VTH, array_size, current_value); - printk("eta6937 charging_set_current set_chr_current=%d\n", set_chr_current); - + pr_debug("eta6937 charging_set_current set_chr_current=%u\n", set_chr_current); register_value = charging_parameter_to_value(eta6937_CS_VTH, array_size, set_chr_current); - printk("eta6937 charging_set_current register_value=%d\n", register_value); + pr_debug("eta6937 charging_set_current register_value=%u\n", register_value); eta6937_set_iocharge(register_value); } return status; @@ -955,9 +954,7 @@ static int eta6937_set_input_current(struct charger_device *chg_dev, u32 current u32 set_chr_current; u32 array_size; u32 register_value; - - printk("liml_bat eta6937_set_input_current=%d\n",current_value); - + pr_debug("liml_bat eta6937_set_input_current=%d\n",current_value); mutex_lock(&g_input_current_mutex); current_value /= 10; if (current_value > 80000) { @@ -969,7 +966,6 @@ static int eta6937_set_input_current(struct charger_device *chg_dev, u32 current } g_input_current = set_chr_current; //eta6937_set_input_charging_current(register_value); - mutex_unlock(&g_input_current_mutex); return status; } @@ -984,7 +980,7 @@ static int eta6937_set_cv_voltage(struct charger_device *chg_dev, u32 cv) array_size = ARRAY_SIZE(eta6937_VBAT_CV_VTH); set_cv_voltage = bmt_find_closest_level(eta6937_VBAT_CV_VTH, array_size, cv); register_value = charging_parameter_to_value(eta6937_VBAT_CV_VTH, ARRAY_SIZE(eta6937_VBAT_CV_VTH), set_cv_voltage); - printk("eta6937 eta6937_set_cv_voltage register_value=%d,set_cv_voltage=%d\n", register_value,set_cv_voltage); + pr_debug("eta6937 eta6937_set_cv_voltage register_value=%u,set_cv_voltage=%u\n", register_value,set_cv_voltage); eta6937_set_oreg(register_value); return status; @@ -998,7 +994,7 @@ void eta6937_set_otg_enable(void) eta6937_otg_status_flag = 1; eta6937_otg_start_timer(); #endif - printk("eta6937_enable_otg enable\n"); + pr_debug("%s L%d enable\n",__func__,__LINE__); } EXPORT_SYMBOL(eta6937_set_otg_enable); @@ -1008,7 +1004,7 @@ void eta6937_set_otg_disable(void) #ifdef ETA6937_TIMER_DEBUG eta6937_otg_status_flag = 0; #endif - printk("eta6937_enable_otg unable\n"); + pr_debug("eta6937_enable_otg unable\n"); } EXPORT_SYMBOL(eta6937_set_otg_disable); @@ -1018,12 +1014,12 @@ static int eta6937_enable_otg(struct charger_device *chg_dev, bool en) if (en) { eta6937_set_opa_mode(1); - printk("eta6937_enable_otg enable\n"); + pr_debug("eta6937_enable_otg enable\n"); } else { eta6937_set_opa_mode(0); - printk("eta6937_enable_otg unable\n"); + pr_debug("eta6937_enable_otg unable\n"); } #ifdef ETA6937_TIMER_DEBUG //add by esky_liml_2018_02_23 @@ -1043,7 +1039,7 @@ static int eta6937_do_event(struct charger_device *chg_dev, u32 event, u32 args) if (chg_dev == NULL) return -EINVAL; - printk("eta6937 %s: event = %d\n", __func__, event); + pr_debug("eta6937 %s: event = %d\n", __func__, event); switch (event) { case EVENT_EOC: charger_dev_notify(chg_dev, CHARGER_DEV_NOTIFY_EOC); @@ -1069,7 +1065,7 @@ static int eta6937_do_event(struct charger_device *chg_dev, u32 event, u32 args) ret = eta6937_read_interface((unsigned char) (eta6937_CON0), (&val), (unsigned char) (CON0_STAT_MASK),(unsigned char) (CON0_STAT_SHIFT)); - printk("eta6937 %s: val = %d\n", __func__, val); + pr_debug("eta6937 %s: val = %d\n", __func__, val); switch (val) { case 2: @@ -1086,21 +1082,6 @@ static int eta6937_do_event(struct charger_device *chg_dev, u32 event, u32 args) } #endif -static int eta6937_dump_register(struct charger_device *chg_dev) -{ - int i = 0; - - printk("eta6937 [eta6937] "); - for (i = 0; i <= eta6937_REG_NUM; i++) { - eta6937_read_byte(i, &eta6937_reg[i]); - printk("eta6937 [0x%x]=0x%x ", i, eta6937_reg[i]); - } - eta6937_set_tmr_rst(1); - printk("eta6937 \n"); - - return 0; -} - static int eta6937_reset_watch_dog_timer(struct charger_device *chg_dev) { eta6937_set_tmr_rst(1); @@ -1109,7 +1090,6 @@ static int eta6937_reset_watch_dog_timer(struct charger_device *chg_dev) static struct charger_ops eta6937_chg_ops = { /* Normal charging */ - .dump_registers = eta6937_dump_register, .enable = eta6937_enable_charging, .get_charging_current = eta6937_get_current, .set_charging_current = eta6937_set_current, @@ -1128,7 +1108,7 @@ static int eta6937_driver_probe(struct i2c_client *client, const struct i2c_devi int ret = 0; struct eta6937_info *info = NULL; - printk("eta6937 [eta6937_driver_probe] enter\n"); + pr_debug("eta6937 [eta6937_driver_probe] enter\n"); info = devm_kzalloc(&client->dev, sizeof(struct eta6937_info), GFP_KERNEL); if (!info) @@ -1149,7 +1129,7 @@ static int eta6937_driver_probe(struct i2c_client *client, const struct i2c_devi info->chg_dev = charger_device_register(info->chg_dev_name, &client->dev, info, &eta6937_chg_ops, &eta6937_chg_props); if (IS_ERR_OR_NULL(info->chg_dev)) { - printk("eta6937 %s: register charger device failed\n", __func__); + pr_debug("eta6937 %s: register charger device failed\n", __func__); ret = PTR_ERR(info->chg_dev); return ret; } @@ -1157,7 +1137,7 @@ static int eta6937_driver_probe(struct i2c_client *client, const struct i2c_devi /* --------------------- */ eta6937_hw_component_detect(); eta6937_changer_vender_code = eta6937_get_vender_code(); - printk("eta6937 get vendor id: (0x%x)\n", eta6937_changer_vender_code); + pr_debug("eta6937 get vendor id: (0x%x)\n", eta6937_changer_vender_code); /* eta6937_hw_init(); //move to charging_hw_xxx.c */ #if defined(HIGH_BATTERY_VOLTAGE_SUPPORT) @@ -1179,19 +1159,18 @@ static int eta6937_driver_probe(struct i2c_client *client, const struct i2c_devi /* info->psy = power_supply_get_by_name("charger"); if (!info->psy) { - printk("eta6937 %s: get power supply failed\n", __func__); + pr_debug("eta6937 %s: get power supply failed\n", __func__); return -EINVAL; } */ - eta6937_dump_register(info->chg_dev); #ifdef ETA6937_TIMER_DEBUG //add by esky_liml_2018_02_23 init_waitqueue_head(&eta6937_otg_wait_que); kthread_run(eta6937_otg_routine_thread, 0, "eta6937_otg_thread"); eta6937_otg_init_timer(); #endif - printk("eta6937 [eta6937_driver_probe] successful\n"); + pr_debug("eta6937 [eta6937_driver_probe] successful\n"); return 0; } @@ -1204,7 +1183,7 @@ static int eta6937_driver_probe(struct i2c_client *client, const struct i2c_devi unsigned char g_reg_value_eta6937; static ssize_t show_eta6937_access(struct device *dev, struct device_attribute *attr, char *buf) { - printk("eta6937 [show_eta6937_access] 0x%x\n", g_reg_value_eta6937); + pr_debug("eta6937 [show_eta6937_access] 0x%x\n", g_reg_value_eta6937); return sprintf(buf, "%u\n", g_reg_value_eta6937); } @@ -1216,7 +1195,7 @@ static ssize_t store_eta6937_access(struct device *dev, struct device_attribute unsigned int reg_value = 0; unsigned int reg_address = 0; - printk("eta6937 [store_eta6937_access]\n"); + pr_debug("eta6937 [store_eta6937_access]\n"); if (buf != NULL && size != 0) { @@ -1231,17 +1210,9 @@ static ssize_t store_eta6937_access(struct device *dev, struct device_attribute val = strsep(&pvalue, " "); ret = kstrtou32(val, 16, (unsigned int *)®_value); - pr_info( - "[store_eta6937_access] write eta6937 reg 0x%x with value 0x%x !\n", - reg_address, reg_value); ret = eta6937_config_interface(reg_address, reg_value, 0xFF, 0x0); } else { ret = eta6937_read_interface(reg_address, &g_reg_value_eta6937, 0xFF, 0x0); - pr_info( - "[store_eta6937_access] read eta6937 reg 0x%x with value 0x%x !\n", - reg_address, g_reg_value_eta6937); - pr_info( - "[store_eta6937_access] Please use \"cat eta6937_access\" to get value\r\n"); } } return size; @@ -1253,7 +1224,7 @@ static int eta6937_user_space_probe(struct platform_device *dev) { int ret_device_file = 0; - printk("eta6937 ******** eta6937_user_space_probe!! ********\n"); + pr_debug("eta6937 ******** eta6937_user_space_probe!! ********\n"); ret_device_file = device_create_file(&(dev->dev), &dev_attr_eta6937_access); @@ -1300,9 +1271,9 @@ static int __init eta6937_init(void) /* i2c registeration using DTS instead of boardinfo*/ #ifdef CONFIG_OF - printk("eta6937 [eta6937_init] init start with i2c DTS"); + pr_debug("eta6937 [eta6937_init] init start with i2c DTS"); #else - printk("eta6937 [eta6937_init] init start. ch=%d\n", eta6937_BUSNUM); + pr_debug("eta6937 [eta6937_init] init start. ch=%d\n", eta6937_BUSNUM); i2c_register_board_info(eta6937_BUSNUM, &i2c_eta6937, 1); #endif if (i2c_add_driver(&eta6937_driver) != 0) { @@ -1316,13 +1287,13 @@ static int __init eta6937_init(void) /* eta6937 user space access interface */ ret = platform_device_register(&eta6937_user_space_device); if (ret) { - printk("eta6937 ****[eta6937_init] Unable to device register(%d)\n", + pr_debug("eta6937 ****[eta6937_init] Unable to device register(%d)\n", ret); return ret; } ret = platform_driver_register(&eta6937_user_space_driver); if (ret) { - printk("eta6937 ****[eta6937_init] Unable to register driver (%d)\n", + pr_debug("eta6937 ****[eta6937_init] Unable to register driver (%d)\n", ret); return ret; } @@ -1332,7 +1303,7 @@ static int __init eta6937_init(void) static void __exit eta6937_exit(void) { - printk("[eta6937_exit] enter\n"); + pr_debug("[eta6937_exit] enter\n"); i2c_del_driver(&eta6937_driver); } diff --git a/drivers/power/supply/mt6357-charger-type.c b/drivers/power/supply/mt6357-charger-type.c index a01e35cbf3c7cab743cd85617e90a7d6a04ff8e4..9e2027ebc02ec5236101473d7f25256c8176bd63 100755 --- a/drivers/power/supply/mt6357-charger-type.c +++ b/drivers/power/supply/mt6357-charger-type.c @@ -637,7 +637,7 @@ static int psy_chr_type_get_property(struct power_supply *psy, struct mtk_charger_type *info; int vbus = 0; - pr_notice("%s: prop:%d\n", __func__, psp); + //pr_notice("%s: prop:%d\n", __func__, psp); info = (struct mtk_charger_type *)power_supply_get_drvdata(psy); switch (psp) { @@ -670,7 +670,7 @@ int psy_chr_type_set_property(struct power_supply *psy, { struct mtk_charger_type *info; - pr_notice("%s: prop:%d %d\n", __func__, psp, val->intval); + //pr_notice("%s: prop:%d %d\n", __func__, psp, val->intval); info = (struct mtk_charger_type *)power_supply_get_drvdata(psy); switch (psp) { @@ -773,9 +773,9 @@ static int check_boot_mode(struct mtk_charger_type *info, struct device *dev) if (!tag) pr_notice("%s: failed to get atag,boot\n", __func__); else { - pr_notice("%s: size:0x%x tag:0x%x bootmode:0x%x boottype:0x%x\n", - __func__, tag->size, tag->tag, - tag->bootmode, tag->boottype); + //pr_notice("%s: size:0x%x tag:0x%x bootmode:0x%x boottype:0x%x\n", + // __func__, tag->size, tag->tag, + // tag->bootmode, tag->boottype); info->bootmode = tag->bootmode; info->boottype = tag->boottype; } @@ -791,7 +791,7 @@ static int mt6357_charger_type_probe(struct platform_device *pdev) struct device_node *np = dev->of_node; int ret = 0; - pr_notice("%s: starts\n", __func__); + //pr_notice("%s: starts\n", __func__); chan_vbus = devm_iio_channel_get( &pdev->dev, "pmic_vbus"); @@ -866,7 +866,7 @@ static int mt6357_charger_type_probe(struct platform_device *pdev) if (of_property_read_u32(np, "bc12_active", &info->bc12_active) < 0) pr_notice("%s: no bc12_active\n", __func__); - pr_notice("%s: bc12_active:%d\n", __func__, info->bc12_active); + //pr_notice("%s: bc12_active:%d\n", __func__, info->bc12_active); if (info->bc12_active) { info->ac_psy = power_supply_register(&pdev->dev, diff --git a/drivers/power/supply/mtk_battery.h b/drivers/power/supply/mtk_battery.h index 8e36829ccd9a442e067fc18617d9c4fa81b7a069..30b0025bb5d3cd5afcced175d1d1141eb6992ba5 100755 --- a/drivers/power/supply/mtk_battery.h +++ b/drivers/power/supply/mtk_battery.h @@ -36,42 +36,42 @@ #define bm_err(fmt, args...) \ do {\ if (bat_get_debug_level() >= BMLOG_ERROR_LEVEL) {\ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define bm_warn(fmt, args...) \ do {\ if (bat_get_debug_level() >= BMLOG_WARNING_LEVEL) {\ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define bm_notice(fmt, args...) \ do {\ if (bat_get_debug_level() >= BMLOG_NOTICE_LEVEL) {\ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define bm_info(fmt, args...) \ do {\ if (bat_get_debug_level() >= BMLOG_INFO_LEVEL) {\ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define bm_debug(fmt, args...) \ do {\ if (bat_get_debug_level() >= BMLOG_DEBUG_LEVEL) {\ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define bm_trace(fmt, args...)\ do {\ if (bat_get_debug_level() >= BMLOG_TRACE_LEVEL) {\ - pr_notice(fmt, ##args);\ + pr_debug(fmt, ##args);\ } \ } while (0) diff --git a/drivers/power/supply/mtk_charger.c b/drivers/power/supply/mtk_charger.c index 27007988c125972093ae1b8fe9724646280969a8..b7822bd207306a644c99c4325d7e4ec7ad923373 100755 --- a/drivers/power/supply/mtk_charger.c +++ b/drivers/power/supply/mtk_charger.c @@ -2418,7 +2418,7 @@ static int mtk_charger_probe(struct platform_device *pdev) chr_err("register psy2 fail:%d\n", PTR_ERR(info->psy2)); - info->log_level = CHRLOG_DEBUG_LEVEL; + info->log_level = CHRLOG_ERROR_LEVEL; info->pd_adapter = get_adapter_by_name("pd_adapter"); if (!info->pd_adapter) diff --git a/drivers/power/supply/mtk_charger.h b/drivers/power/supply/mtk_charger.h index 22e1547035e462f685111a3c731f3ab02168dc2f..d4836fd26ee5fbf1cdd3bcf95e9529a477464808 100755 --- a/drivers/power/supply/mtk_charger.h +++ b/drivers/power/supply/mtk_charger.h @@ -23,21 +23,21 @@ extern int chr_get_debug_level(void); #define chr_err(fmt, args...) \ do { \ if (chr_get_debug_level() >= CHRLOG_ERROR_LEVEL) { \ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) #define chr_info(fmt, args...) \ do { \ if (chr_get_debug_level() >= CHRLOG_INFO_LEVEL) { \ - pr_notice_ratelimited(fmt, ##args); \ + pr_debug_ratelimited(fmt, ##args); \ } \ } while (0) #define chr_debug(fmt, args...) \ do { \ if (chr_get_debug_level() >= CHRLOG_DEBUG_LEVEL) { \ - pr_notice(fmt, ##args); \ + pr_debug(fmt, ##args); \ } \ } while (0) diff --git a/drivers/power/supply/mtk_charger_intf.c b/drivers/power/supply/mtk_charger_intf.c index 266916f96a3709558541479df4618598b78cde44..6b338b0acbc59d5001526b84d19975d29f4d131f 100644 --- a/drivers/power/supply/mtk_charger_intf.c +++ b/drivers/power/supply/mtk_charger_intf.c @@ -191,8 +191,8 @@ static int get_pmic_vbus(struct mtk_charger *info, int *vchr) } *vchr = prop.intval; - pr_notice("%s vbus:%d\n", __func__, - prop.intval); + //pr_notice("%s vbus:%d\n", __func__, + // prop.intval); return ret; } @@ -320,10 +320,10 @@ int get_charger_type(struct mtk_charger *info) prop2.intval = POWER_SUPPLY_TYPE_USB_FLOAT; } - pr_notice("%s online:%d type:%d usb_type:%d\n", __func__, - prop.intval, - prop2.intval, - prop3.intval); + //pr_notice("%s online:%d type:%d usb_type:%d\n", __func__, + // prop.intval, + // prop2.intval, + // prop3.intval); return prop2.intval; } diff --git a/drivers/tee/teei/300/tz_driver/Makefile b/drivers/tee/teei/300/tz_driver/Makefile index 28a5eba24576fd46aee80a2a95f989c91bc9f9a8..01a6100dc108c41ff2e8ffead8e801c178c99468 100644 --- a/drivers/tee/teei/300/tz_driver/Makefile +++ b/drivers/tee/teei/300/tz_driver/Makefile @@ -28,6 +28,5 @@ obj-$(CONFIG_MICROTRUST_TZ_DRIVER) += teei.o ccflags-$(CONFIG_MTK_ENG_BUILD) += -DENABLED_TEEI_BOOT_LOG -ccflags-y += -D DEBUG_DO ccflags-y += -Wno-error ccflags-y += -D UT_DMA_ZONE diff --git a/drivers/tee/teei/Kconfig b/drivers/tee/teei/Kconfig index 226ce368573e969115a82aeeca8c7f77b58037af..611d8079081b846b0d93bdc79a97e13c9ceaf24f 100644 --- a/drivers/tee/teei/Kconfig +++ b/drivers/tee/teei/Kconfig @@ -70,7 +70,7 @@ config MICROTRUST_TZ_DRIVER_MTK_BOOTPROF bool "Enable MTK bootprof to track boot progress of TEEI" depends on MICROTRUST_TZ_DRIVER depends on MTPROF - default y + default n help Enables the support of Mediatek bootprof feature in Microtrust tz_driver. This feature is for tracking boot progress by @@ -146,7 +146,7 @@ config MICROTRUST_UNITTEST_SUPPORT config MICROTRUST_TZ_LOG bool "Enable Microtrust TrustZone logger" depends on MICROTRUST_TEE_SUPPORT || MICROTRUST_TEE_LITE_SUPPORT - default y + default n help Enable Microtrust TrustZone logger to dump TEE logs in kernel log buffer. This driver will read out log buffer and direct to console each diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 7a4e8e20ef178c4b721a2b863939b6206b597605..a1ad4dbfc6dd2bc6ea4ee83a3a1815fe1085f93b 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -686,6 +686,9 @@ do { \ * let gcc optimize the rest. */ +#ifdef CONFIG_DISABLE_TRACE_PRINTK +void trace_printk(const char *fmt, ...); +#else #define trace_printk(fmt, ...) \ do { \ char _______STR[] = __stringify((__VA_ARGS__)); \ @@ -708,6 +711,7 @@ do { \ else \ __trace_printk(_THIS_IP_, fmt, ##args); \ } while (0) +#endif extern __printf(2, 3) int __trace_bprintk(unsigned long ip, const char *fmt, ...); diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig index 920967ca5655820fc65f18120555355ebac6f9ed..16efd776f96b6d0e9b48c6c86cf2f84f6d671ba7 100644 --- a/kernel/trace/Kconfig +++ b/kernel/trace/Kconfig @@ -117,6 +117,20 @@ config GENERIC_TRACER bool select TRACING +if TRACING + +config DISABLE_TRACE_PRINTK + bool "Force disable trace_printk() usage" + default y + help + When trace_printk() is used in any of the kernel source, it enables + debugging functions which are not desired for production kernel. + Enabling this option will replace trace_printk() with pr_debug(). + + If in doubt, say Y. + +endif + # # Minimum requirements an architecture has to meet for us to # be able to offer generic tracing facilities: diff --git a/kernel/trace/trace_printk.c b/kernel/trace/trace_printk.c index 8ed9d614afd25983d50fb3e777985b24801eaec5..848b88c0dc0512a932db341aaf4c6342c725d7e8 100644 --- a/kernel/trace/trace_printk.c +++ b/kernel/trace/trace_printk.c @@ -191,6 +191,11 @@ void trace_printk_control(bool enabled) trace_printk_enabled = enabled; } +#if defined(CONFIG_DISABLE_TRACE_PRINTK) +void trace_printk(const char *fmt, ...) { } +EXPORT_SYMBOL_GPL(trace_printk); +#endif + __initdata_or_module static struct notifier_block module_trace_bprintk_format_nb = { .notifier_call = module_trace_bprintk_format_notify,