linaro-dev October 2012

linaro-dev@lists.linaro.org

76 participants
108 discussions

[PATCH v2] ARCH: EXYNOS: add support to match product id

by Chander Kashyap

From: Minkyu Kang <mk7.kang(a)samsung.com> Based upon single SoC there can be multiple varients. This patch add support to match the complete product ID. Signed-off-by: Chander Kashyap <chander.kashyap(a)linaro.org> --- Changes from v1: - Author name changed arch/arm/include/asm/arch-exynos/cpu.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/include/asm/arch-exynos/cpu.h b/arch/arm/include/asm/arch-exynos/cpu.h index 2cd4ae1..2bde10c 100644 --- a/arch/arm/include/asm/arch-exynos/cpu.h +++ b/arch/arm/include/asm/arch-exynos/cpu.h @@ -139,6 +139,15 @@ static inline int cpu_is_##type(void) \ IS_SAMSUNG_TYPE(exynos4, 0x4) IS_SAMSUNG_TYPE(exynos5, 0x5) +#define IS_EXYNOS_TYPE(type, id) \ +static inline int proid_is_##type(void) \ +{ \ + return s5p_cpu_id == id; \ +} + +IS_EXYNOS_TYPE(exynos4210, 0x4210) +IS_EXYNOS_TYPE(exynos5250, 0x5250) + #define SAMSUNG_BASE(device, base) \ static inline unsigned int samsung_get_base_##device(void) \ { \ -- 1.7.9.5

11 years, 9 months

[PATCH V2] cpufreq: Move common part from governors to separate file

by Viresh Kumar

Multiple cpufreq governers have defined similar get_cpu_idle_time_***() routines. These routines must be moved to some common place, so that all governors can use them. So moving them to cpufreq_governor.c, which seems to be a better place for keeping these routines. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- V1->V2: ----- - Instead of moving get_cpu_idle_time_*() routines to tick-sched, move them to common governor specific file. drivers/cpufreq/Makefile | 4 +-- drivers/cpufreq/cpufreq_conservative.c | 34 ---------------------- drivers/cpufreq/cpufreq_governor.c | 52 ++++++++++++++++++++++++++++++++++ drivers/cpufreq/cpufreq_ondemand.c | 34 ---------------------- include/linux/cpufreq.h | 5 ++++ 5 files changed, 59 insertions(+), 70 deletions(-) create mode 100644 drivers/cpufreq/cpufreq_governor.c diff --git a/drivers/cpufreq/Makefile b/drivers/cpufreq/Makefile index 7c620a8..fe4cd26 100644 --- a/drivers/cpufreq/Makefile +++ b/drivers/cpufreq/Makefile @@ -7,8 +7,8 @@ obj-$(CONFIG_CPU_FREQ_STAT) += cpufreq_stats.o obj-$(CONFIG_CPU_FREQ_GOV_PERFORMANCE) += cpufreq_performance.o obj-$(CONFIG_CPU_FREQ_GOV_POWERSAVE) += cpufreq_powersave.o obj-$(CONFIG_CPU_FREQ_GOV_USERSPACE) += cpufreq_userspace.o -obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o -obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o +obj-$(CONFIG_CPU_FREQ_GOV_ONDEMAND) += cpufreq_ondemand.o cpufreq_governor.o +obj-$(CONFIG_CPU_FREQ_GOV_CONSERVATIVE) += cpufreq_conservative.o cpufreq_governor.o # CPUfreq cross-arch helpers obj-$(CONFIG_CPU_FREQ_TABLE) += freq_table.o diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index 55f0354..93b02f4 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -95,40 +95,6 @@ static struct dbs_tuners { .freq_step = 5, }; -static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) -{ - u64 idle_time; - u64 cur_wall_time; - u64 busy_time; - - cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); - - busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; - - idle_time = cur_wall_time - busy_time; - if (wall) - *wall = jiffies_to_usecs(cur_wall_time); - - return jiffies_to_usecs(idle_time); -} - -static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) -{ - u64 idle_time = get_cpu_idle_time_us(cpu, NULL); - - if (idle_time == -1ULL) - return get_cpu_idle_time_jiffy(cpu, wall); - else - idle_time += get_cpu_iowait_time_us(cpu, wall); - - return idle_time; -} - /* keep track of frequency transitions */ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, diff --git a/drivers/cpufreq/cpufreq_governor.c b/drivers/cpufreq/cpufreq_governor.c new file mode 100644 index 0000000..0001071 --- /dev/null +++ b/drivers/cpufreq/cpufreq_governor.c @@ -0,0 +1,52 @@ +/* + * drivers/cpufreq/cpufreq_governor.c + * + * CPUFREQ governors common code + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include <asm/cputime.h> +#include <linux/export.h> +#include <linux/kernel_stat.h> +#include <linux/tick.h> +#include <linux/types.h> +/* + * Code picked from earlier governer implementations + */ +static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) +{ + u64 idle_time; + u64 cur_wall_time; + u64 busy_time; + + cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); + + busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; + + idle_time = cur_wall_time - busy_time; + if (wall) + *wall = jiffies_to_usecs(cur_wall_time); + + return jiffies_to_usecs(idle_time); +} + +cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) +{ + u64 idle_time = get_cpu_idle_time_us(cpu, NULL); + + if (idle_time == -1ULL) + return get_cpu_idle_time_jiffy(cpu, wall); + else + idle_time += get_cpu_iowait_time_us(cpu, wall); + + return idle_time; +} +EXPORT_SYMBOL_GPL(get_cpu_idle_time); diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 14c1af5..964918b 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -119,40 +119,6 @@ static struct dbs_tuners { .powersave_bias = 0, }; -static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) -{ - u64 idle_time; - u64 cur_wall_time; - u64 busy_time; - - cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); - - busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; - - idle_time = cur_wall_time - busy_time; - if (wall) - *wall = jiffies_to_usecs(cur_wall_time); - - return jiffies_to_usecs(idle_time); -} - -static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) -{ - u64 idle_time = get_cpu_idle_time_us(cpu, NULL); - - if (idle_time == -1ULL) - return get_cpu_idle_time_jiffy(cpu, wall); - else - idle_time += get_cpu_iowait_time_us(cpu, wall); - - return idle_time; -} - static inline cputime64_t get_cpu_iowait_time(unsigned int cpu, cputime64_t *wall) { u64 iowait_time = get_cpu_iowait_time_us(cpu, wall); diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index fc4b785..d03c219 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -11,6 +11,7 @@ #ifndef _LINUX_CPUFREQ_H #define _LINUX_CPUFREQ_H +#include <asm/cputime.h> #include <linux/mutex.h> #include <linux/notifier.h> #include <linux/threads.h> @@ -407,5 +408,9 @@ void cpufreq_frequency_table_get_attr(struct cpufreq_frequency_table *table, void cpufreq_frequency_table_put_attr(unsigned int cpu); +/********************************************************************* + * Governor Helpers * + *********************************************************************/ +cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall); #endif /* _LINUX_CPUFREQ_H */ -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

[PATCH][RFC] Mali: Add devfreq support

by Rajagopal Venkat

This patch adds devfreq support for Mali driver. Though mali driver has its own mechanism for load monitoring, this patch makes use of devfreq framework to achieve same functionality. The goal is to export gpu dvfs information to user space. Depends on devfreq patchset - https://lkml.org/lkml/2012/10/4/95 Patch is based on git://git.linaro.org/people/chunsangjeong/mali-dev.git tree. Signed-off-by: Rajagopal Venkat <rajagopal.venkat(a)linaro.org> --- drivers/gpu/arm/mali/Kconfig | 7 + drivers/gpu/arm/mali/Makefile | 11 ++ drivers/gpu/arm/mali/linux/mali_kernel_devfreq.c | 188 +++++++++++++++++++++ drivers/gpu/arm/mali/linux/mali_kernel_devfreq.h | 51 ++++++ drivers/gpu/arm/mali/linux/mali_kernel_pm.c | 10 ++ .../gpu/arm/mali/platform/default/mali_platform.c | 5 +- drivers/gpu/arm/mali/platform/mali_platform.h | 8 + 7 files changed, 279 insertions(+), 1 deletion(-) create mode 100644 drivers/gpu/arm/mali/linux/mali_kernel_devfreq.c create mode 100644 drivers/gpu/arm/mali/linux/mali_kernel_devfreq.h diff --git a/drivers/gpu/arm/mali/Kconfig b/drivers/gpu/arm/mali/Kconfig index 416c231..41634f9 100644 --- a/drivers/gpu/arm/mali/Kconfig +++ b/drivers/gpu/arm/mali/Kconfig @@ -39,6 +39,13 @@ config USING_GPU_UTILIZATION ---help--- This enables GPU utilization information. +config USING_GPU_DEVFREQ + bool "GPU devfreq" + depends on MALI400MP && USING_GPU_UTILIZATION + default n + ---help--- + This enables GPU devfreq. + config USING_MALI_RUN_TIME_PM bool "Using Run time Power Management" depends on MALI400MP diff --git a/drivers/gpu/arm/mali/Makefile b/drivers/gpu/arm/mali/Makefile index 525a23e..6c854b1 100755 --- a/drivers/gpu/arm/mali/Makefile +++ b/drivers/gpu/arm/mali/Makefile @@ -45,6 +45,10 @@ ifeq ($(CONFIG_USING_GPU_UTILIZATION),y) USING_GPU_UTILIZATION =1 endif +ifeq ($(CONFIG_USING_GPU_DEVFREQ),y) +USING_GPU_DEVFREQ =1 +endif + ifeq ($(CONFIG_USING_MALI_RUN_TIME_PM),y) USING_MALI_RUN_TIME_PM =1 endif @@ -64,6 +68,7 @@ USING_UMP ?= 0 USING_OS_MEMORY ?= 0 USING_PMM ?= 0 USING_GPU_UTILIZATION ?= 0 +USING_GPU_DEVFREQ ?= 0 USING_MALI_RUN_TIME_PM ?= 0 USING_MALI_PMM_TESTSUITE ?= 0 OS_MEMORY_KERNEL_BUFFER_SIZE_IN_MB ?= 6 @@ -105,6 +110,7 @@ endif DEFINES += -DUSING_MALI_PMM=$(USING_PMM) DEFINES += -DMALI_GPU_UTILIZATION=$(USING_GPU_UTILIZATION) +DEFINES += -DMALI_GPU_DEVFREQ=$(USING_GPU_DEVFREQ) ifeq ($(CONFIG_DEBUG_BUILD),y) DEFINES += -DDEBUG @@ -201,9 +207,14 @@ mali-y += \ endif ifeq ($(USING_GPU_UTILIZATION),1) +ifeq ($(USING_GPU_DEVFREQ),1) +mali-y += \ + linux/mali_kernel_devfreq.o +else mali-y += \ common/mali_kernel_utilization.o endif +endif ifneq ($(call submodule_enabled, $M, MALI400PP),0) # Mali-400 PP in use diff --git a/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.c b/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.c new file mode 100644 index 0000000..1213e7b --- /dev/null +++ b/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.c @@ -0,0 +1,188 @@ +/* + * Copyright (C) 2010-2011 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained from Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include <linux/devfreq.h> +#include <linux/platform_device.h> +#include "mali_kernel_devfreq.h" +#include "mali_osk.h" +#include "mali_platform.h" +#include "mali_linux_pm.h" + +#define MALI_GPU_UTILIZATION_PERIOD 500 + +static _mali_osk_lock_t *time_data_lock; + +static _mali_osk_atomic_t num_running_cores; + +static u64 period_start_time = 0; +static u64 work_start_time = 0; +static u64 accumulated_work_time = 0; +static mali_bool timer_running = MALI_FALSE; + +static struct devfreq *mali_devfreq; + +static int mali_get_dev_status(struct device *dev, + struct devfreq_dev_status *stat) +{ + u64 time_now; + u64 time_period; + + _mali_osk_lock_wait(time_data_lock, _MALI_OSK_LOCKMODE_RW); + + if (accumulated_work_time == 0 && work_start_time == 0) + { + /* No work done for this period, report zero usage */ + stat->total_time = 0; + stat->busy_time = 0; + stat->current_frequency = get_mali_platform_cur_freq(); + + _mali_osk_lock_signal(time_data_lock, _MALI_OSK_LOCKMODE_RW); + + return 0; + } + + time_now = _mali_osk_time_get_ns(); + time_period = time_now - period_start_time; + + /* If we are currently busy, update working period up to now */ + if (work_start_time != 0) + { + accumulated_work_time += (time_now - work_start_time); + work_start_time = time_now; + } + + stat->total_time = time_period; + stat->busy_time = accumulated_work_time; + stat->current_frequency = get_mali_platform_cur_freq(); + + accumulated_work_time = 0; + /* start a new period */ + period_start_time = time_now; + _mali_osk_lock_signal(time_data_lock, _MALI_OSK_LOCKMODE_RW); + + return 0; +} + +static int mali_set_target_freq(struct device *dev, + unsigned long *freq, + u32 flags) +{ + mali_gpu_utilization_handler(*freq); + return 0; +} + +static int mali_get_cur_freq(struct device *dev, unsigned long *freq) +{ + *freq = get_mali_platform_cur_freq(); + return 0; +} + +static struct devfreq_dev_profile mali_devfreq_profile = { + .polling_ms = MALI_GPU_UTILIZATION_PERIOD, + .initial_freq = 0, + .target = mali_set_target_freq, + .get_dev_status = mali_get_dev_status, + .get_cur_freq = mali_get_cur_freq, +}; + +_mali_osk_errcode_t mali_utilization_init(void) +{ + /* Register mali devfreq with ondemand governor */ + mali_devfreq = devfreq_add_device(&mali_gpu_device.dev, + &mali_devfreq_profile, + &devfreq_simple_ondemand, + NULL); + if (NULL == mali_devfreq) + { + return _MALI_OSK_ERR_FAULT; + } + + time_data_lock = _mali_osk_lock_init( 0, 0, 0 ); + if (NULL == time_data_lock) + { + return _MALI_OSK_ERR_FAULT; + } + + _mali_osk_atomic_init(&num_running_cores, 0); + + return _MALI_OSK_ERR_OK; +} + +void mali_utilization_suspend(void) +{ + if (timer_running == MALI_TRUE) + { + devfreq_suspend_device(mali_devfreq); + _mali_osk_lock_wait(time_data_lock, _MALI_OSK_LOCKMODE_RW); + timer_running = MALI_FALSE; + work_start_time = 0; + period_start_time = 0; + accumulated_work_time = 0; + _mali_osk_lock_signal(time_data_lock, _MALI_OSK_LOCKMODE_RW); + } +} + +void mali_utilization_resume(void) +{ + devfreq_resume_device(mali_devfreq); +} + +void mali_utilization_term(void) +{ + devfreq_remove_device(mali_devfreq); + mali_devfreq = NULL; + + timer_running = MALI_FALSE; + + _mali_osk_atomic_term(&num_running_cores); + + _mali_osk_lock_term(time_data_lock); +} + +void mali_utilization_core_start(void) +{ + if (_mali_osk_atomic_inc_return(&num_running_cores) == 1) + { + /* + * We went from zero cores working, to one core working, + * we now consider the entire GPU for being busy + */ + _mali_osk_lock_wait(time_data_lock, _MALI_OSK_LOCKMODE_RW); + + work_start_time = _mali_osk_time_get_ns(); + + if (timer_running != MALI_TRUE) + { + timer_running = MALI_TRUE; + period_start_time = work_start_time; + } + + _mali_osk_lock_signal(time_data_lock, _MALI_OSK_LOCKMODE_RW); + } +} + +void mali_utilization_core_end(void) +{ + if (_mali_osk_atomic_dec_return(&num_running_cores) == 0) + { + /* + * No more cores are working, so accumulate the time we was busy. + */ + u64 time_now; + + _mali_osk_lock_wait(time_data_lock, _MALI_OSK_LOCKMODE_RW); + + time_now = _mali_osk_time_get_ns(); + accumulated_work_time += (time_now - work_start_time); + work_start_time = 0; + + _mali_osk_lock_signal(time_data_lock, _MALI_OSK_LOCKMODE_RW); + } +} diff --git a/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.h b/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.h new file mode 100644 index 0000000..e0a76dc --- /dev/null +++ b/drivers/gpu/arm/mali/linux/mali_kernel_devfreq.h @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2010-2011 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained from Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef __MALI_KERNEL_DEVFREQ_H__ +#define __MALI_KERNEL_DEVFREQ_H__ + +#include "mali_osk.h" + +/** + * Initialize/start the Mali GPU utilization metrics reporting. + * + * @return _MALI_OSK_ERR_OK on success, otherwise failure. + */ +_mali_osk_errcode_t mali_utilization_init(void); + +/** + * Terminate the Mali GPU utilization metrics reporting + */ +void mali_utilization_term(void); + +/** + * Should be called when a job is about to execute a job + */ +void mali_utilization_core_start(void); + +/** + * Should be called to suspend the utilization monitoring during + * system suspend or device pm-runtime suspend + */ +void mali_utilization_suspend(void); + +/** + * Should be called to resume the utilization monitoring during + * system resume or device pm-runtime resume + */ +void mali_utilization_resume(void); + +/** + * Should be called when a job has completed executing a job + */ +void mali_utilization_core_end(void); + + +#endif /* __MALI_KERNEL_DEVFREQ_H__ */ diff --git a/drivers/gpu/arm/mali/linux/mali_kernel_pm.c b/drivers/gpu/arm/mali/linux/mali_kernel_pm.c index 0c03678..958164e 100644 --- a/drivers/gpu/arm/mali/linux/mali_kernel_pm.c +++ b/drivers/gpu/arm/mali/linux/mali_kernel_pm.c @@ -40,6 +40,10 @@ #include "mali_kernel_utilization.h" #endif /* MALI_GPU_UTILIZATION */ +#if MALI_GPU_DEVFREQ +#include "mali_kernel_devfreq.h" +#endif /* MALI_GPU_DEVFREQ */ + #if MALI_POWER_MGMT_TEST_SUITE #ifdef CONFIG_PM #include "mali_linux_pm_testsuite.h" @@ -418,6 +422,9 @@ static int mali_pm_os_resume_on_hibernation(struct device *dev) */ static int mali_device_runtime_suspend(struct device *dev) { +#if MALI_GPU_DEVFREQ + mali_utilization_suspend(); +#endif /* MALI_GPU_DEVFREQ */ MALI_DEBUG_PRINT(4, ("PMMDEBUG: Mali device Run time suspended \n" )); return 0; } @@ -426,6 +433,9 @@ static int mali_device_runtime_suspend(struct device *dev) */ static int mali_device_runtime_resume(struct device *dev) { +#if MALI_GPU_DEVFREQ + mali_utilization_resume(); +#endif /* MALI_GPU_DEVFREQ */ MALI_DEBUG_PRINT(4, ("PMMDEBUG: Mali device Run time Resumed \n" )); return 0; } diff --git a/drivers/gpu/arm/mali/platform/default/mali_platform.c b/drivers/gpu/arm/mali/platform/default/mali_platform.c index d966f25..8247856 100644 --- a/drivers/gpu/arm/mali/platform/default/mali_platform.c +++ b/drivers/gpu/arm/mali/platform/default/mali_platform.c @@ -40,4 +40,7 @@ void set_mali_parent_power_domain(void* dev) { } - +unsigned long get_mali_platform_cur_freq(void) +{ + return 0; +} diff --git a/drivers/gpu/arm/mali/platform/mali_platform.h b/drivers/gpu/arm/mali/platform/mali_platform.h index 078bcef..f1bb2b5 100644 --- a/drivers/gpu/arm/mali/platform/mali_platform.h +++ b/drivers/gpu/arm/mali/platform/mali_platform.h @@ -93,6 +93,14 @@ void mali_gpu_utilization_handler(u32 utilization); */ void set_mali_parent_power_domain(void* dev); +/** @brief Get MALI current running frequency + * + * This function gets the current running frequency of MALI + * + * @return frequency in Hz + */ +unsigned long get_mali_platform_cur_freq(void); + #ifdef __cplusplus } #endif -- 1.7.11.3

11 years, 9 months

[PATCH] cpufreq: timer: Move tick-sched specific code outside of cpufreq governors

by Viresh Kumar

Multiple cpufreq governers have defined similar get_cpu_idle_time_***() routines. These routines must be moved to some common place, so that all governors can use them. So moving them to tick-sched.c, which seems to be a better place for keeping these routines. Signed-off-by: Viresh Kumar <viresh.kumar(a)linaro.org> --- drivers/cpufreq/cpufreq_conservative.c | 34 --------------------------------- drivers/cpufreq/cpufreq_ondemand.c | 34 --------------------------------- include/linux/tick.h | 3 +++ kernel/time/tick-sched.c | 35 ++++++++++++++++++++++++++++++++++ 4 files changed, 38 insertions(+), 68 deletions(-) diff --git a/drivers/cpufreq/cpufreq_conservative.c b/drivers/cpufreq/cpufreq_conservative.c index a152af7..181abad 100644 --- a/drivers/cpufreq/cpufreq_conservative.c +++ b/drivers/cpufreq/cpufreq_conservative.c @@ -95,40 +95,6 @@ static struct dbs_tuners { .freq_step = 5, }; -static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) -{ - u64 idle_time; - u64 cur_wall_time; - u64 busy_time; - - cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); - - busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; - - idle_time = cur_wall_time - busy_time; - if (wall) - *wall = jiffies_to_usecs(cur_wall_time); - - return jiffies_to_usecs(idle_time); -} - -static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) -{ - u64 idle_time = get_cpu_idle_time_us(cpu, NULL); - - if (idle_time == -1ULL) - return get_cpu_idle_time_jiffy(cpu, wall); - else - idle_time += get_cpu_iowait_time_us(cpu, wall); - - return idle_time; -} - /* keep track of frequency transitions */ static int dbs_cpufreq_notifier(struct notifier_block *nb, unsigned long val, diff --git a/drivers/cpufreq/cpufreq_ondemand.c b/drivers/cpufreq/cpufreq_ondemand.c index 396322f..d7f774b 100644 --- a/drivers/cpufreq/cpufreq_ondemand.c +++ b/drivers/cpufreq/cpufreq_ondemand.c @@ -119,40 +119,6 @@ static struct dbs_tuners { .powersave_bias = 0, }; -static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) -{ - u64 idle_time; - u64 cur_wall_time; - u64 busy_time; - - cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); - - busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; - busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; - - idle_time = cur_wall_time - busy_time; - if (wall) - *wall = jiffies_to_usecs(cur_wall_time); - - return jiffies_to_usecs(idle_time); -} - -static inline cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) -{ - u64 idle_time = get_cpu_idle_time_us(cpu, NULL); - - if (idle_time == -1ULL) - return get_cpu_idle_time_jiffy(cpu, wall); - else - idle_time += get_cpu_iowait_time_us(cpu, wall); - - return idle_time; -} - static inline cputime64_t get_cpu_iowait_time(unsigned int cpu, cputime64_t *wall) { u64 iowait_time = get_cpu_iowait_time_us(cpu, wall); diff --git a/include/linux/tick.h b/include/linux/tick.h index f37fceb..79ca824 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h @@ -6,6 +6,7 @@ #ifndef _LINUX_TICK_H #define _LINUX_TICK_H +#include <asm/cputime.h> #include <linux/clockchips.h> #include <linux/irqflags.h> @@ -142,4 +143,6 @@ static inline u64 get_cpu_idle_time_us(int cpu, u64 *unused) { return -1; } static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; } # endif /* !NO_HZ */ +cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall); + #endif diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c index a402608..b458402 100644 --- a/kernel/time/tick-sched.c +++ b/kernel/time/tick-sched.c @@ -271,6 +271,41 @@ u64 get_cpu_iowait_time_us(int cpu, u64 *last_update_time) } EXPORT_SYMBOL_GPL(get_cpu_iowait_time_us); +static inline u64 get_cpu_idle_time_jiffy(unsigned int cpu, u64 *wall) +{ + u64 idle_time; + u64 cur_wall_time; + u64 busy_time; + + cur_wall_time = jiffies64_to_cputime64(get_jiffies_64()); + + busy_time = kcpustat_cpu(cpu).cpustat[CPUTIME_USER]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SYSTEM]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_IRQ]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_SOFTIRQ]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_STEAL]; + busy_time += kcpustat_cpu(cpu).cpustat[CPUTIME_NICE]; + + idle_time = cur_wall_time - busy_time; + if (wall) + *wall = jiffies_to_usecs(cur_wall_time); + + return jiffies_to_usecs(idle_time); +} + +cputime64_t get_cpu_idle_time(unsigned int cpu, cputime64_t *wall) +{ + u64 idle_time = get_cpu_idle_time_us(cpu, NULL); + + if (idle_time == -1ULL) + return get_cpu_idle_time_jiffy(cpu, wall); + else + idle_time += get_cpu_iowait_time_us(cpu, wall); + + return idle_time; +} +EXPORT_SYMBOL_GPL(get_cpu_idle_time); + static ktime_t tick_nohz_stop_sched_tick(struct tick_sched *ts, ktime_t now, int cpu) { -- 1.7.12.rc2.18.g61b472e

11 years, 9 months

[PATCH][RESEND] power: opp: rcu reclaim

by Vincent Guittot

synchronize_rcu blocks the caller of opp_enable/disbale for a complete grace period. This blocking duration prevents any intensive use of the functions. Replace synchronize_rcu by call_rcu which will call our function for freeing the old opp element. The duration of opp_enable and opp_disable will be no more dependant of the grace period. Signed-off-by: Vincent Guittot <vincent.guittot(a)linaro.org> --- drivers/base/power/opp.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c index ac993ea..49e4626 100644 --- a/drivers/base/power/opp.c +++ b/drivers/base/power/opp.c @@ -64,6 +64,7 @@ struct opp { unsigned long u_volt; struct device_opp *dev_opp; + struct rcu_head head; }; /** @@ -441,6 +442,17 @@ int opp_add(struct device *dev, unsigned long freq, unsigned long u_volt) } /** + * opp_free_rcu() - helper to clear the struct opp when grace period has + * elapsed without blocking the the caller of opp_set_availability + */ +static void opp_free_rcu(struct rcu_head *head) +{ + struct opp *opp = container_of(head, struct opp, head); + + kfree(opp); +} + +/** * opp_set_availability() - helper to set the availability of an opp * @dev: device for which we do this operation * @freq: OPP frequency to modify availability @@ -511,7 +523,7 @@ static int opp_set_availability(struct device *dev, unsigned long freq, list_replace_rcu(&opp->node, &new_opp->node); mutex_unlock(&dev_opp_list_lock); - synchronize_rcu(); + call_rcu(&opp->head, opp_free_rcu); /* Notify the change of the OPP availability */ if (availability_req) @@ -521,13 +533,10 @@ static int opp_set_availability(struct device *dev, unsigned long freq, srcu_notifier_call_chain(&dev_opp->head, OPP_EVENT_DISABLE, new_opp); - /* clean up old opp */ - new_opp = opp; - goto out; + return 0; unlock: mutex_unlock(&dev_opp_list_lock); -out: kfree(new_opp); return r; } -- 1.7.9.5

11 years, 9 months

by Zach Pfeffer

See: http://summit.linaro.org/lce12/meeting/20937/android-mini-summit/ Sessions: http://summit.linaro.org/lce12/meeting/21164/android-dalvik-v8-and-bionic-o… http://summit.linaro.org/lce12/meeting/21165/android-graphics/ http://summit.linaro.org/lce12/meeting/21166/android-kernel-and-power-featu… http://summit.linaro.org/lce12/meeting/21167/embedded-android/ See ya there! Sign up for Linaro Connect at: http://connect.linaro.org/wp-login.php?redirect_to=/register-connect/ -- Zach Pfeffer Android Platform Team Lead, Linaro Platform Teams Linaro.org | Open source software for ARM SoCs Follow Linaro: http://www.facebook.com/pages/Linaro http://twitter.com/#!/linaroorg - http://www.linaro.org/linaro-blog

11 years, 9 months

[GIT PULL]: big LITTLE MP v10

by Viresh Kumar

Hi Andrey, Please PULL b.L MP V10 branch from my tree. Updates: ------- - Based on v3.6 - Stats: - Total Patches: 77 (V9 had incorrect count) - New Patches: 7 - task-placement-v2: sched: Enable HMP priority filter by default - arm-multi_pmu_v2 updated existing patches: http://permalink.gmane.org/gmane.linux.linaro.devel/13707 - hw-bkp-v7.1-debug-v1: new branch (1 patch) - Dropped Patches: 2 - branch cpu-hotplug-get_online_cpus-v1 removed as patches are already there in rcu-hotplug-v1 - Updated Patches: - per-task-load-average-v3-fixed updated with minor fixes. from: git://git.kernel.org/pub/scm/linux/kernel/git/pjt/sched.git ------------------------8<------------------------------------------------ The following changes since commit c6617199117105f771463be72e69017303c9fe54: config-frag/big-LITTLE: Use device-tree to provide fast/slow CPU list for HMP (2012-10-03 16:00:21 +0530) are available in the git repository at: git://git.linaro.org/arm/big.LITTLE/mp.git big-LITTLE-MP-v10 for you to fetch changes up to 2027d925f44d49835beff1b4917d8fd91f8805d7: Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v2', 'scheduler-misc-v1', 'hw-bkp-v7.1-debug-v1' and 'config-fragments' into big-LITTLE-MP-v10 (2012-10-12 14:14:20 +0530) ---------------------------------------------------------------- Axel Lin (1): ARM: ux500: Fix build error due to missing include of asm/pmu.h in cpu-db8500.c Ben Segall (1): sched: maintain per-rq runnable averages Dietmar Eggemann (1): ARM: hw_breakpoint: v7.1 self-hosted debug powerdown support Jon Hunter (1): ARM: PMU: Add runtime PM Support Lorenzo Pieralisi (1): ARM: kernel: provide cluster to logical cpu mask mapping API Marc Zyngier (1): ARM: perf: add guest vs host discrimination Mark Rutland (1): ARM: perf: register cpu_notifier at driver init Morten Rasmussen (12): sched: entity load-tracking load_avg_ratio sched: Task placement for heterogeneous systems based on task load-tracking sched: Forced task migration on heterogeneous systems sched: Introduce priority-based task migration filter ARM: Add HMP scheduling support for ARM architecture ARM: sched: Use device-tree to provide fast/slow CPU list for HMP ARM: sched: Setup SCHED_HMP domains sched: Add ftrace events for entity load-tracking sched: Add HMP task migration ftrace event sched: SCHED_HMP multi-domain task migration control sched: Enable HMP priority filter by default linaro/configs: Enable HMP priority filter by default Paul Turner (15): sched: track the runnable average on a per-task entity basis sched: aggregate load contributed by task entities on parenting cfs_rq sched: maintain the load contribution of blocked entities sched: add an rq migration call-back to sched_class sched: account for blocked load waking back up sched: aggregate total task_group load sched: compute load contribution by a group entity sched: normalize tg load contributions against runnable time sched: maintain runnable averages across throttled periods sched: replace update_shares weight distribution with per-entity computation sched: refactor update_shares_cpu() -> update_blocked_avgs() sched: update_cfs_shares at period edge sched: make __update_entity_runnable_avg() fast sched: implement usage tracking sched: introduce temporary FAIR_GROUP_SCHED dependency for load-tracking Sudeep KarkadaNagesha (11): ARM: pmu: remove arm_pmu_type enumeration ARM: perf: move irq registration into pmu implementation ARM: perf: allocate CPU PMU dynamically at probe time ARM: perf: consistently use struct perf_event in arm_pmu functions ARM: perf: check ARMv7 counter validity on a per-pmu basis ARM: perf: replace global CPU PMU pointer with per-cpu pointers ARM: perf: register CPU PMUs with idr types ARM: perf: set cpu affinity to support multiple PMUs ARM: perf: set cpu affinity for the irqs correctly ARM: perf: remove spaces in CPU PMU names ARM: perf: save/restore pmu registers in pm notifier Viresh Kumar (1): Merge branches 'per-cpu-thread-hotplug-v3-fixed', 'task-placement-v2', 'arm-asymmetric-support-v3-v3.6-rc1', 'rcu-hotplug-v1', 'arm-multi_pmu_v2', 'scheduler-misc-v1', 'hw-bkp-v7.1-debug-v1' and 'config-fragments' into big-LITTLE-MP-v10 Will Deacon (8): ARM: perf: add devicetree bindings for 11MPcore, A5, A7 and A15 PMUs ARM: pmu: remove unused reservation mechanism ARM: perf: remove mysterious compiler barrier ARM: perf: probe devicetree in preference to current CPU ARM: perf: prepare for moving CPU PMU code into separate file ARM: perf: move CPU-specific PMU handling code into separate file ARM: perf: return NOTIFY_DONE from cpu notifier when no available PMU ARM: perf: consistently use arm_pmu->name for PMU name

11 years, 9 months

Test Result Summary of Calendar Week 41 for Linaro ubuntu.

by Botao Sun

Calendar Week 41: Here is test result summary for Linaro ubuntu image on following boards: 1) ARM Versatile Express A9; 2) Samsung Origen; 3) TI Panda Board 4430; 4) TI Panda Board 4460. Synopsis: No change on feature status for vexpress A9 & Samsung Origen boards. Both HDMI & DVI-D back to work on Panda 4430 & 4460. For SD card flashing, now command "dd" backs to work on all images. 1. vexpress A9 + ubuntu (Column AD): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdFNmV… Features' status is exactly same as previous week. 2. Origen + ubuntu (Column Y): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEowN… Features' status is exactly same as previous week. 3. Panda 4430 + ubuntu (Column AA): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEwwZ… Audio over HDMI doesn't work, and this causes no sound can be heard when using "rhythmbox" to play music. Bluetooth now let system crashes again, after pairing process. Also, system crashes during the Power Management test "lava-test run pwrmgmt", with log output flushing in serial console. 4. Panda 4460 + ubuntu (Column Y): https://docs.google.com/a/linaro.org/spreadsheet/ccc?key=0AroPySpr4FnEdEwwZ… The test result on Panda 4460 is quite different with Panda 4430. On TI Panda 4460 board, Audio over HDMI works well, Bluetooth headset works well, and Power Management test works well. Even suspend / resume starts to work, although many error log output flushes in serial console. For the previous week (Calendar week 40) summary, please refer to attachment. Thank you. Best Regards Botao Sun

11 years, 9 months

[RFC] Config Fragment for kernel debug features

by Viresh Kumar

Hi Andrey, I was just thinking, it would be good if we have another config fragment in linaro/ to enable kernel debug config options like: CONFIG_DEBUG_INFO. What do you think? -- viresh

11 years, 9 months

[PATCH v2] ARM: hw_breakpoint: v7.1 self-hosted debug powerdown support

by Dietmar Eggemann

This patch introduces os save and restore mechanism for v7.1 debug and self-hosted debuggers. It enables the os to save DBGDSCR before powerdown and restore it when power is restored. The clearing of the os lock in the restore function kick-starts the debug logic again. The os save and restore routines are hooked into the CPU PM event notifier chain. CPU PM events are used to save and restore per-cpu context when a single CPU is preparing to enter or has exited a low power state. Signed-off-by: Dietmar Eggemann <dietmar.eggemann(a)arm.com> --- Hi Viresh, this patch is for the upcoming Linaro release. Tested on TC2 big.LITTLE testchip (cpuidle, on both A7 and A15 clusters). The patch is against 8f18a4e pdsw-ci:29418/kernel, branch origin/linaro-lt-integration-linaro-vexpress. Review comment from Liviu fixed. arch/arm/kernel/hw_breakpoint.c | 57 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index 281bf33..eed4d0c 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -28,6 +28,7 @@ #include <linux/perf_event.h> #include <linux/hw_breakpoint.h> #include <linux/smp.h> +#include <linux/cpu_pm.h> #include <asm/cacheflush.h> #include <asm/cputype.h> @@ -42,6 +43,11 @@ static DEFINE_PER_CPU(struct perf_event *, bp_on_reg[ARM_MAX_BRP]); /* Watchpoint currently in use for each WRP. */ static DEFINE_PER_CPU(struct perf_event *, wp_on_reg[ARM_MAX_WRP]); +#ifdef CONFIG_CPU_PM +/* Storage for OS Save and Restore. */ +static DEFINE_PER_CPU(u32, cpu_dscr); +#endif + /* Number of BRP/WRP registers on this CPU. */ static int core_num_brps; static int core_num_wrps; @@ -990,6 +996,55 @@ static struct notifier_block __cpuinitdata dbg_reset_nb = { .notifier_call = dbg_reset_notify, }; +#ifdef CONFIG_CPU_PM +static void os_save(int cpu) +{ + /* Set OS Lock. */ + asm volatile("mcr p14, 0, %0, c1, c0, 4" : : "r" (0xC5ACCE55)); + isb(); + + /* Save DSCRext. */ + ARM_DBG_READ(c2, 2, per_cpu(cpu_dscr, cpu)); +} + +static void os_restore(int cpu) +{ + /* Restore DSCRext. */ + ARM_DBG_WRITE(c2, 2, per_cpu(cpu_dscr, cpu)); + + /* Clear OS Lock. */ + asm volatile("mcr p14, 0, %0, c1, c0, 4" : : "r" (0)); + isb(); +} + +static int dbg_cpu_pm_notify(struct notifier_block *self, unsigned long action, + void *v) +{ + int cpu = smp_processor_id(); + + if (action == CPU_PM_ENTER) + os_save(cpu); + else if (action == CPU_PM_EXIT) + os_restore(cpu); + + return NOTIFY_OK; +} + +static struct notifier_block __cpuinitdata dbg_cpu_pm_nb = { + .notifier_call = dbg_cpu_pm_notify, +}; + +static void __init pm_init(void) +{ + if (get_debug_arch() == ARM_DEBUG_ARCH_V7_1) + cpu_pm_register_notifier(&dbg_cpu_pm_nb); +} +#else +static inline void pm_init(void) +{ +} +#endif + static int __init arch_hw_breakpoint_init(void) { u32 dscr; @@ -1048,6 +1103,8 @@ static int __init arch_hw_breakpoint_init(void) /* Register hotplug notifier. */ register_cpu_notifier(&dbg_reset_nb); + + pm_init(); return 0; } arch_initcall(arch_hw_breakpoint_init); -- 1.7.9.5

11 years, 9 months

← Newer
1
...
4
5
6
7
8
9
10
11
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

linaro-dev October 2012