From: Youngtae Lee Date: Fri, 15 Jun 2018 07:59:35 +0000 (+0900) Subject: driver: Change P-state boost name X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=13df88b137a9ef65212896b335552e96a80d3184;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git driver: Change P-state boost name Change-Id: I18799a3e36cac1501d0e2385bffe7c4752502e9d Signed-off-by: Youngtae Lee --- diff --git a/drivers/cpufreq/Kconfig.arm b/drivers/cpufreq/Kconfig.arm index 3d7f645707eb..8a3aedbcb39c 100644 --- a/drivers/cpufreq/Kconfig.arm +++ b/drivers/cpufreq/Kconfig.arm @@ -304,7 +304,7 @@ config ARM_EXYNOS_ACME config ARM_EXYNOS_FF bool "SAMSUNG EXYNOS FF(Frequency Filter) driver" - depends on ARCH_EXYNOS && (PSTATE_EXYNOS_HAFM || PSTATE_EXYNOS_HAFM_TB) + depends on ARCH_EXYNOS && (EXYNOS_PSTATE_HAFM || EXYNOS_PSTATE_HAFM_TB) default y help This adds the CPUFreq driver for exynos chipsets which needs diff --git a/drivers/cpufreq/exynos-acme.c b/drivers/cpufreq/exynos-acme.c index 5e2da3343feb..e701bfc8af9c 100644 --- a/drivers/cpufreq/exynos-acme.c +++ b/drivers/cpufreq/exynos-acme.c @@ -1518,7 +1518,7 @@ static __init int init_domain(struct exynos_cpufreq_domain *domain, if (!of_property_read_u32(dn, "min-freq", &val)) domain->min_freq = max(domain->min_freq, val); -#ifdef CONFIG_EXYNOS_MODE_CHANGER +#ifdef CONFIG_EXYNOS_PSTATE_MODE_CHANGER /* If this domain has boost freq, change max */ val = emc_get_boost_freq(cpumask_first(&domain->cpus)); if (val) diff --git a/drivers/cpufreq/exynos-ff.c b/drivers/cpufreq/exynos-ff.c index b4c828f5e2c1..f541a7c8181f 100644 --- a/drivers/cpufreq/exynos-ff.c +++ b/drivers/cpufreq/exynos-ff.c @@ -36,7 +36,7 @@ static bool policy_need_filter(struct cpufreq_policy *policy) return cpumask_intersects(policy->cpus, &eff_driver->cpus); } -#ifdef CONFIG_PSTATE_EXYNOS_HAFM_TB +#ifdef CONFIG_EXYNOS_PSTATE_HAFM_TB static bool check_filtering(unsigned int target_freq, unsigned int flag) { unsigned int cur_freq; @@ -89,7 +89,7 @@ int __cpufreq_driver_target(struct cpufreq_policy *policy, if (policy_need_filter(policy)) { mutex_lock(&eff_driver->lock); -#ifdef CONFIG_PSTATE_EXYNOS_HAFM_TB +#ifdef CONFIG_EXYNOS_PSTATE_HAFM_TB if (check_filtering(target_freq, flag)) goto out; @@ -134,7 +134,7 @@ out: void cpufreq_policy_apply_limits(struct cpufreq_policy *policy) { -#ifdef CONFIG_PSTATE_EXYNOS_HAFM_TB +#ifdef CONFIG_EXYNOS_PSTATE_HAFM_TB if (policy_need_filter(policy)) { if (check_boost_freq_throttled(policy)) { pr_debug("exynos-ff: wait for boost freq throttling completion\n"); diff --git a/drivers/soc/samsung/Kconfig b/drivers/soc/samsung/Kconfig index d36e589b670e..19837cf16db0 100644 --- a/drivers/soc/samsung/Kconfig +++ b/drivers/soc/samsung/Kconfig @@ -67,16 +67,6 @@ config GNSS_PMUCAL help Support GNSS_PMUCAL for Exynos SoC. -config EXYNOS_MODE_CHANGER - bool "Exynos Mode Changer" - default n - depends on ARCH_EXYNOS - depends on CPU_FREQ - depends on HOTPLUG_CPU - help - Enable EXYNOS MODE CHANGER for Exynos SoC. - This module controls number of online cpu. - config SHUB_PMUCAL bool "Exynos PMU(for SHUB) Chip Abstraction Layer" depends on CAL_IF diff --git a/drivers/soc/samsung/Makefile b/drivers/soc/samsung/Makefile index d679356531f3..6254e36ea1f1 100644 --- a/drivers/soc/samsung/Makefile +++ b/drivers/soc/samsung/Makefile @@ -34,7 +34,7 @@ obj-$(CONFIG_EXYNOS_PD) += exynos-pd.o exynos-pd-dbg.o obj-$(CONFIG_EXYNOS_PM_DOMAINS) += pm_domains.o #CPUHOTPLUG obj-$(CONFIG_ARCH_EXYNOS) += exynos-cpuhp.o -obj-$(CONFIG_EXYNOS_MODE_CHANGER) += exynos-emc.o +obj-$(CONFIG_EXYNOS_PSTATE_MODE_CHANGER) += exynos-emc.o # CPU Topology obj-$(CONFIG_ARCH_EXYNOS) += exynos-topology.o @@ -68,5 +68,5 @@ obj-$(CONFIG_ARCH_EXYNOS) += secmem.o obj-$(CONFIG_EXYNOS_HIU) += exynos-hiu.o # HAFM & HAFM-TB -obj-$(CONFIG_PSTATE_EXYNOS_HAFM) += exynos-hafm.o -obj-$(CONFIG_PSTATE_EXYNOS_HAFM_TB) += exynos-hafm-tb.o +obj-$(CONFIG_EXYNOS_PSTATE_HAFM) += exynos-hafm.o +obj-$(CONFIG_EXYNOS_PSTATE_HAFM_TB) += exynos-hafm-tb.o diff --git a/drivers/soc/samsung/exynos-hiu.h b/drivers/soc/samsung/exynos-hiu.h index f121153d4719..89dfab10c8fe 100644 --- a/drivers/soc/samsung/exynos-hiu.h +++ b/drivers/soc/samsung/exynos-hiu.h @@ -155,7 +155,7 @@ struct exynos_hiu_data { struct hiu_stats * stats; }; -#if defined(CONFIG_PSTATE_EXYNOS_HAFM) || defined(CONFIG_PSTATE_EXYNOS_HAFM_TB) +#if defined(CONFIG_EXYNOS_PSTATE_HAFM) || defined(CONFIG_EXYNOS_PSTATE_HAFM_TB) extern int exynos_hiu_set_freq(unsigned int id, unsigned int req_freq); extern int exynos_hiu_get_freq(unsigned int id); extern int exynos_hiu_get_max_freq(void); diff --git a/include/soc/samsung/exynos-emc.h b/include/soc/samsung/exynos-emc.h index e666a6663898..73885fadc9a4 100644 --- a/include/soc/samsung/exynos-emc.h +++ b/include/soc/samsung/exynos-emc.h @@ -9,10 +9,10 @@ * published by the Free Software Foundation. */ -#ifndef __EXYNOS_MODE_CHANGER_H -#define __EXYNOS_MODE_CHANGER_H __FILE__ +#ifndef __EXYNOS_PSTATE_MODE_CHANGER_H +#define __EXYNOS_PSTATE_MODE_CHANGER_H __FILE__ -#ifdef CONFIG_EXYNOS_MODE_CHANGER +#ifdef CONFIG_EXYNOS_PSTATE_MODE_CHANGER void exynos_emc_update(int cpu); int exynos_emc_update_cpu_pwr(unsigned int cpu, bool on); int emc_get_boost_freq(int cpu); @@ -28,5 +28,5 @@ static inline int emc_cpu_pre_off_callback(unsigned int cpu) { return 0; }; unsigned int exynos_cpufreq_get_locked(unsigned int cpu); -#endif /* __EXYNOS_MODE_CHANGER_H */ +#endif /* __EXYNOS_PSTATE_MODE_CHANGER_H */ diff --git a/kernel/sched/fair.c b/kernel/sched/fair.c index 6bb68fd91c64..07e375908f2f 100644 --- a/kernel/sched/fair.c +++ b/kernel/sched/fair.c @@ -10674,7 +10674,7 @@ void nohz_balance_enter_idle(int cpu) if (on_null_domain(cpu_rq(cpu))) return; -#ifdef CONFIG_EXYNOS_MODE_CHANGER +#ifdef CONFIG_EXYNOS_PSTATE_MODE_CHANGER exynos_emc_update(cpu); #endif cpumask_set_cpu(cpu, nohz.idle_cpus_mask); @@ -11082,7 +11082,7 @@ static void task_tick_fair(struct rq *rq, struct task_struct *curr, int queued) update_overutilized_status(rq); -#ifdef CONFIG_EXYNOS_MODE_CHANGER +#ifdef CONFIG_EXYNOS_PSTATE_MODE_CHANGER exynos_emc_update(rq->cpu); #endif }