ARM: OMAP: gptimer based event monitor driver for oprofile
PATCH v2 1/1 ARM: OMAP: gptimer based event monitor driver for oprofile
---
A second revision of gptimer oprofile patch
http://marc.info/?l=linux-omap&m=123143937515088&w=2
with the fixes suggested by Tony Lindgren
Timers from the CORE domain seem to work best on OMAP3. Also tested the patch on Nokia 770 (OMAP1710).
Please let me know if anything else needs to be fixed.
arch/arm/Kconfig | 6 ++ arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 5 ++ arch/arm/oprofile/op_arm_model.h | 2 + arch/arm/oprofile/op_model_omap_gptimer.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 arch/arm/oprofile/op_model_omap_gptimer.c
arch/arm/Kconfig +6 -0
@@ -160,6 +160,12 @@ config GENERIC_HARDIRQS_NO__DO_IRQ if OPROFILE +config OPROFILE_OMAP_GPTIMER + def_bool y + depends on ARCH_OMAP + select CONFIG_OMAP_32K_TIMER + select CONFIG_OMAP_DM_TIMER + config OPROFILE_ARMV6 def_bool y depends on CPU_V6 && !SMP
arch/arm/oprofile/Makefile +1 -0
@@ -8,6 +8,7 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o +oprofile-$(CONFIG_OPROFILE_OMAP_GPTIMER) += op_model_omap_gptimer.o oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o
arch/arm/oprofile/common.c +5 -0
@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = arm_backtrace; +/* comes first, so that it can be overrided by a better implementation */ +#ifdef CONFIG_OPROFILE_OMAP_GPTIMER + spec = &op_omap_gptimer_spec; +#endif +#ifdef CONFIG_CPU_XSCALE spec = &op_xscale_spec;#endif
arch/arm/oprofile/op_arm_model.h +2 -0
@@ -24,6 +24,8 @@ struct op_arm_model_spec {extern struct op_arm_model_spec op_xscale_spec;#endif +extern struct op_arm_model_spec op_omap_gptimer_spec; +extern struct op_arm_model_spec op_armv6_spec;extern struct op_arm_model_spec op_mpcore_spec;extern struct op_arm_model_spec op_armv7_spec;
arch/arm/oprofile/op_model_omap_gptimer.c new file +93 -0
93 lines not on this page · raw message
Signature · 1 line
1.5.6.5
Quoted 11 lines · Siarhei Siamashka
Signed-off-by Siarhei Siamashka <[email protected]>---
A second revision of gptimer oprofile patch
http://marc.info/?l=linux-omap&m=123143937515088&w=2
with the fixes suggested by Tony LindgrenTimers from the CORE domain seem to work best on OMAP3. Also tested the patch on Nokia 770 (OMAP1710).
Please let me know if anything else needs to be fixed.
Sorry to review this so late, but...
Why do you need to use a hardware timer for this? If you just need a periodic event to fire, you should just use an hrtimer.
This would be a good way to make an oprofile model that is generic and would not need any HW timer support.
Kevin
Quoted 172 lines
arch/arm/Kconfig | 6 ++ arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 5 ++ arch/arm/oprofile/op_arm_model.h | 2 + arch/arm/oprofile/op_model_omap_gptimer.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 arch/arm/oprofile/op_model_omap_gptimer.carch/arm/Kconfig +6
-0@@ -160,6 +160,12 @@ config GENERIC_HARDIRQS_NO__DO_IRQ if OPROFILE +config OPROFILE_OMAP_GPTIMER + def_bool y + depends on ARCH_OMAP + select CONFIG_OMAP_32K_TIMER + select CONFIG_OMAP_DM_TIMER + config OPROFILE_ARMV6 def_bool y depends on CPU_V6 && !SMParch/arm/oprofile/Makefile +1
-0@@ -8,6 +8,7 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o +oprofile-$(CONFIG_OPROFILE_OMAP_GPTIMER) += op_model_omap_gptimer.o oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.oarch/arm/oprofile/common.c +5
-0@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = arm_backtrace; +/* comes first, so that it can be overrided by a better implementation */ +#ifdef CONFIG_OPROFILE_OMAP_GPTIMER + spec = &op_omap_gptimer_spec; +#endif +#ifdef CONFIG_CPU_XSCALE spec = &op_xscale_spec;#endif arch/arm/oprofile/op_arm_model.h +2
-0@@ -24,6 +24,8 @@ struct op_arm_model_spec {extern struct op_arm_model_spec op_xscale_spec;#endif +extern struct op_arm_model_spec op_omap_gptimer_spec; +extern struct op_arm_model_spec op_armv6_spec;extern struct op_arm_model_spec op_mpcore_spec;extern struct op_arm_model_spec op_armv7_spec;arch/arm/oprofile/op_model_omap_gptimer.c new file +93
-0@@ -0,0 +1,93 @@ +/** +* OMAP gptimer based event monitor driver for oprofile +* +* Copyright (C) 2009 Nokia Corporation +* Author: Siarhei Siamashka <[email protected]> +* +* 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 <linux/types.h> +#include <linux/oprofile.h> +#include <linux/interrupt.h> +#include <linux/irq.h> + +#include <mach/dmtimer.h> + +#include "op_counter.h" +#include "op_arm_model.h" + +static struct omap_dm_timer *gptimer; + +static int gptimer_init (void ) +{ +return 0 ; +} + +static int gptimer_setup (void ) +{ +return 0 ; +} + +static irqreturn_t gptimer_interrupt (int irq,void *arg) +{ +omap_dm_timer_write_status (gptimer,OMAP_TIMER_INT_OVERFLOW ); +oprofile_add_sample (get_irq_regs (),0 ); +return IRQ_HANDLED ; +} + +static int gptimer_start (void ) +{ +int err; +u32 count = counter_config[0 ].count; + +BUG_ON (gptimer !=NULL ); +/* First try to request timers from CORE power domain for OMAP3 */ +if (cpu_is_omap34xx ()) { + gptimer =omap_dm_timer_request_specific (10 ); +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request_specific (11 ); + } +/* Just any timer would be fine */ +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request (); +if (gptimer ==NULL ) +return -ENODEV ; + +omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_32_KHZ ); + err =request_irq (omap_dm_timer_get_irq (gptimer), gptimer_interrupt, +IRQF_DISABLED ,"oprofile gptimer" ,NULL ); +if (err) { +omap_dm_timer_free (gptimer); + gptimer =NULL ; +printk (KERN_ERR "oprofile: unable to request gptimer IRQ\n" ); +return err; + } + +if (count <1 ) + count =1 ; + +omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - count); +omap_dm_timer_set_int_enable (gptimer,OMAP_TIMER_INT_OVERFLOW ); +return 0 ; +} + +static void gptimer_stop (void ) +{ +omap_dm_timer_set_int_enable (gptimer,0 ); +free_irq (omap_dm_timer_get_irq (gptimer),NULL ); +omap_dm_timer_free (gptimer); + gptimer =NULL ; +} + +struct op_arm_model_spec op_omap_gptimer_spec = { + .init = gptimer_init, + .num_counters =1 , + .setup_ctrs = gptimer_setup, + .start = gptimer_start, + .stop = gptimer_stop, + .name ="hrtimer" , +};Signature · 6 lines
1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 8 lines · On Thursday 29 January 2009 22:10:06 ext Kevin Hilman wrote:
Quoted 7 lines · Siarhei Siamashka
Signed-off-by Siarhei Siamashka <[email protected]>---
A second revision of gptimer oprofile patch
http://marc.info/?l=linux-omap&m=123143937515088&w=2
with the fixes suggested by Tony Lindgren
Quoted 6 lines
Quoted 4 lines
Timers from the CORE domain seem to work best on OMAP3. Also tested the patch on Nokia 770 (OMAP1710).
Please let me know if anything else needs to be fixed.
Sorry to review this so late, but...
Don't worry about this. Any kind of feedback is very much welcome. Thanks for your comments.
Quoted 2 lines
Why do you need to use a hardware timer for this? If you just need a periodic event to fire, you should just use an hrtimer.
A bit more control about how the timer behaves is definitely not critical, but nice to have nevertheless.
Quoted 2 lines
This would be a good way to make an oprofile model that is generic and would not need any HW timer support.
Are there many other platforms which need it? For OMAP3 probably nobody would even care about any kind generic model if PMU was working reliably.
I will try to check hrtimer and compare it to gptimer based implementation.The most interesting thing to verify is whether there could be any noticeable extra overhead related to the use of hrtimer framework.
Another thing to decide is what kind of configurability should be available? Should the frequency of periodic event specified in Hz, milliseconds, ticks of the timer, or whatever else?
Quoted 171 lines
Kevin
Quoted 169 lines
arch/arm/Kconfig | 6 ++ arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 5 ++ arch/arm/oprofile/op_arm_model.h | 2 + arch/arm/oprofile/op_model_omap_gptimer.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-) create mode 100644 arch/arm/oprofile/op_model_omap_gptimer.carch/arm/Kconfig +6
-0@@ -160,6 +160,12 @@ config GENERIC_HARDIRQS_NO__DO_IRQ if OPROFILE +config OPROFILE_OMAP_GPTIMER + def_bool y + depends on ARCH_OMAP + select CONFIG_OMAP_32K_TIMER + select CONFIG_OMAP_DM_TIMER + config OPROFILE_ARMV6 def_bool y depends on CPU_V6 && !SMParch/arm/oprofile/Makefile +1
-0@@ -8,6 +8,7 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \ oprofile-y := $(DRIVER_OBJS) common.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o +oprofile-$(CONFIG_OPROFILE_OMAP_GPTIMER) += op_model_omap_gptimer.o oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.oarch/arm/oprofile/common.c +4
-0@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = arm_backtrace; +/* comes first, so that it can be overrided by a better implementation */ +#ifdef CONFIG_OPROFILE_OMAP_GPTIMER + spec = &op_omap_gptimer_spec; +#endif +#ifdef CONFIG_CPU_XSCALE spec = &op_xscale_spec;#endif (quoted diff) +0
-0
b/arch/arm/oprofile/op_arm_model.hindex 8c4e4f6..db936da 100644arch/arm/oprofile/op_arm_model.h +2
-0@@ -24,6 +24,8 @@ struct op_arm_model_spec {extern struct op_arm_model_spec op_xscale_spec;#endif +extern struct op_arm_model_spec op_omap_gptimer_spec; +extern struct op_arm_model_spec op_armv6_spec;extern struct op_arm_model_spec op_mpcore_spec;extern struct op_arm_model_spec op_armv7_spec;(quoted diff) +0
-0
b/arch/arm/oprofile/op_model_omap_gptimer.cnew file mode 100644 index 0000000..98f7d2barch/arm/oprofile/op_model_omap_gptimer.c new file +93
-1@@ -0,0 +1,93 @@ +/** +* OMAP gptimer based event monitor driver for oprofile +* +* Copyright (C) 2009 Nokia Corporation +* Author: Siarhei Siamashka <[email protected]> +* +* 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 <linux/types.h> +#include <linux/oprofile.h> +#include <linux/interrupt.h> +#include <linux/irq.h> + +#include <mach/dmtimer.h> + +#include "op_counter.h" +#include "op_arm_model.h" + +static struct omap_dm_timer *gptimer; + +static int gptimer_init (void ) +{ +return 0 ; +} + +static int gptimer_setup (void ) +{ +return 0 ; +} + +static irqreturn_t gptimer_interrupt (int irq,void *arg) +{ +omap_dm_timer_write_status (gptimer,OMAP_TIMER_INT_OVERFLOW ); +oprofile_add_sample (get_irq_regs (),0 ); +return IRQ_HANDLED ; +} + +static int gptimer_start (void ) +{ +int err; +u32 count = counter_config[0 ].count; + +BUG_ON (gptimer !=NULL ); +/* First try to request timers from CORE power domain for OMAP3 */ +if (cpu_is_omap34xx ()) { + gptimer =omap_dm_timer_request_specific (10 ); +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request_specific (11 ); + } +/* Just any timer would be fine */ +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request (); +if (gptimer ==NULL ) +return -ENODEV ; + +omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_32_KHZ ); + err =request_irq (omap_dm_timer_get_irq (gptimer), gptimer_interrupt, +IRQF_DISABLED ,"oprofile gptimer" ,NULL ); +if (err) { +omap_dm_timer_free (gptimer); + gptimer =NULL ; +printk (KERN_ERR "oprofile: unable to request gptimer IRQ\n" ); +return err; + } + +if (count <1 ) + count =1 ; + +omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - count); +omap_dm_timer_set_int_enable (gptimer,OMAP_TIMER_INT_OVERFLOW ); +return 0 ; +} + +static void gptimer_stop (void ) +{ +omap_dm_timer_set_int_enable (gptimer,0 ); +free_irq (omap_dm_timer_get_irq (gptimer),NULL ); +omap_dm_timer_free (gptimer); + gptimer =NULL ; +} + +struct op_arm_model_spec op_omap_gptimer_spec = { + .init = gptimer_init, + .num_counters =1 , + .setup_ctrs = gptimer_setup, + .start = gptimer_start, + .stop = gptimer_stop, + .name ="hrtimer" , +}; --1.5.6.5
Hi Siarhei,
Could you let me know the advantage of the this patch over timer interrupt based profiling already supported by oprofile. I tested timer interrupt based profiling on omap3 platform and found that it works well.
Thanks
Hemanth
http://oprofile.sourceforge.net/doc/detailed-parameters.html#timer
4.3. OProfile in timer interrupt mode
Note
This section applies to 2.6 kernels and above only.
In 2.6 kernels on CPUs without OProfile support for the hardware performance counters, the driver falls back to using the timer interrupt for profiling. Like the RTC mode in 2.4 kernels, this is not able to profile code that has interrupts disabled. Note that there are no configuration parameters for setting this, unlike the RTC and hardware performance counter setup.
You can force use of the timer interrupt by using the timer=1 module parameter (or oprofile.timer=1 on the boot command line if OProfile is built-in).
----- Original Message ----- From: "Siarhei Siamashka" <[email protected]>
To: <[email protected]>
Cc: <[email protected]>; <[email protected]>
Sent: Thursday, January 29, 2009 8:51 AM
Subject: [PATCHv2] ARM: OMAP: gptimer based event monitor driver for oprofile
Quoted 189 lines
Signed-off-by Siarhei Siamashka <[email protected]>---
A second revision of gptimer oprofile patch
http://marc.info/?l=linux-omap&m=123143937515088&w=2
with the fixes suggested by Tony LindgrenTimers from the CORE domain seem to work best on OMAP3. Also tested the patch on Nokia 770 (OMAP1710).
Please let me know if anything else needs to be fixed.
arch/arm/Kconfig | 6 ++ arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 5 ++ arch/arm/oprofile/op_arm_model.h | 2 + arch/arm/oprofile/op_model_omap_gptimer.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-)create mode 100644
arch/arm/oprofile/op_model_omap_gptimer.carch/arm/Kconfig +0
-0@@ -160,6 +160,12 @@ config GENERIC_HARDIRQS_NO__DO_IRQif OPROFILE
arch/arm/Kconfig +6
-0+config OPROFILE_OMAP_GPTIMER + def_bool y + depends on ARCH_OMAP + select CONFIG_OMAP_32K_TIMER + select CONFIG_OMAP_DM_TIMER +config
OPROFILE_ARMV6
def_booly
depends onCPU_V6&& !SMParch/arm/oprofile/Makefile +0
-0@@ -8,6 +8,7 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \oprofile-y := $(DRIVER_OBJS) common.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o +oprofile-$(CONFIG_OPROFILE_OMAP_GPTIMER) += op_model_omap_gptimer.o oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o
arch/arm/oprofile/common.c +5
-0@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = arm_backtrace; +/* comes first, so that it can be overrided by a better implementation */ +#ifdef CONFIG_OPROFILE_OMAP_GPTIMER + spec = &op_omap_gptimer_spec; +#endif +#ifdef CONFIG_CPU_XSCALE spec = &op_xscale_spec;#endif
arch/arm/oprofile/op_arm_model.h +2
-0@@ -24,6 +24,8 @@ struct op_arm_model_spec {extern struct op_arm_model_spec op_xscale_spec;#endif +extern struct op_arm_model_spec op_omap_gptimer_spec; +extern struct op_arm_model_spec op_armv6_spec;extern struct op_arm_model_spec op_mpcore_spec;extern struct op_arm_model_spec op_armv7_spec;arch/arm/oprofile/op_model_omap_gptimer.c new file +93
-0@@ -0,0 +1,93 @@ +/** +* OMAP gptimer based event monitor driver for oprofile +* +* Copyright (C) 2009 Nokia Corporation +* Author: Siarhei Siamashka <[email protected]> +* +* 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 <linux/types.h> +#include <linux/oprofile.h> +#include <linux/interrupt.h> +#include <linux/irq.h> + +#include <mach/dmtimer.h> + +#include "op_counter.h" +#include "op_arm_model.h" + +static struct omap_dm_timer *gptimer; + +static int gptimer_init (void ) +{ +return 0 ; +} + +static int gptimer_setup (void ) +{ +return 0 ; +} + +static irqreturn_t gptimer_interrupt (int irq,void *arg) +{ +omap_dm_timer_write_status (gptimer,OMAP_TIMER_INT_OVERFLOW ); +oprofile_add_sample (get_irq_regs (),0 ); +return IRQ_HANDLED ; +} + +static int gptimer_start (void ) +{ +int err; +u32 count = counter_config[0 ].count; + +BUG_ON (gptimer !=NULL ); +/* First try to request timers from CORE power domain for OMAP3 */ +if (cpu_is_omap34xx ()) { + gptimer =omap_dm_timer_request_specific (10 ); +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request_specific (11 ); + } +/* Just any timer would be fine */ +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request (); +if (gptimer ==NULL ) +return -ENODEV ; + +omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_32_KHZ ); + err =request_irq (omap_dm_timer_get_irq (gptimer), gptimer_interrupt, +IRQF_DISABLED ,"oprofile gptimer" ,NULL ); +if (err) { +omap_dm_timer_free (gptimer); + gptimer =NULL ; +printk (KERN_ERR "oprofile: unable to request gptimer IRQ\n" ); +return err; + } + +if (count <1 ) + count =1 ; + +omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - count); +omap_dm_timer_set_int_enable (gptimer,OMAP_TIMER_INT_OVERFLOW ); +return 0 ; +} + +static void gptimer_stop (void ) +{ +omap_dm_timer_set_int_enable (gptimer,0 ); +free_irq (omap_dm_timer_get_irq (gptimer),NULL ); +omap_dm_timer_free (gptimer); + gptimer =NULL ; +} + +struct op_arm_model_spec op_omap_gptimer_spec = { + .init = gptimer_init, + .num_counters =1 , + .setup_ctrs = gptimer_setup, + .start = gptimer_start, + .stop = gptimer_stop, + .name ="hrtimer" , +};Signature · 6 lines
1.5.6.5 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 6 lines · On Thursday 30 April 2009 09:08:12 ext Hemanth V wrote:
Hi Siarhei,
Could you let me know the advantage of the this patch over timer interrupt based profiling already supported by oprofile. I tested timer interrupt based
profiling on omap3 platform and found that it works well.
A standard timer interrupt is reliable. But it only provides a single non-configurable samples collection frequency, which is way too low for the real practical use.
If you or anybody else knows a way to boost standard oprofile timer samples collection frequency to something like 2-4KHz or higher without impacting the rest of the system at all when oprofile is not active (and having very low overhead when oprofile is used), this would solve all the problems.
Best regards,
Siarhei Siamashka
Quoted 203 lines
Thanks
Hemanthhttp://oprofile.sourceforge.net/doc/detailed-parameters.html#timer
4.3. OProfile in timer interrupt mode
Note
This section applies to 2.6 kernels and above only.In 2.6 kernels on CPUs without OProfile support for the hardware performance counters, the driver falls back to using the timer interrupt for profiling. Like the RTC mode in 2.4 kernels, this is not able to profile code that has interrupts disabled. Note that there are no configuration parameters for setting this, unlike the RTC and hardware performance counter setup.
You can force use of the timer interrupt by using the timer=1 module parameter (or oprofile.timer=1 on the boot command line if OProfile is built-in).
----- Original Message -----
From: "Siarhei Siamashka" <[email protected]>
To: <[email protected]>
Cc: <[email protected]>; <[email protected]>
Sent: Thursday, January 29, 2009 8:51 AM
Subject: [PATCHv2] ARM: OMAP: gptimer based event monitor driver for oprofileQuoted 176 lines
Signed-off-by Siarhei Siamashka <[email protected]>---
A second revision of gptimer oprofile patch
http://marc.info/?l=linux-omap&m=123143937515088&w=2
with the fixes suggested by Tony LindgrenTimers from the CORE domain seem to work best on OMAP3. Also tested the patch on Nokia 770 (OMAP1710).
Please let me know if anything else needs to be fixed.
arch/arm/Kconfig | 6 ++ arch/arm/oprofile/Makefile | 1 + arch/arm/oprofile/common.c | 5 ++ arch/arm/oprofile/op_arm_model.h | 2 + arch/arm/oprofile/op_model_omap_gptimer.c | 93 +++++++++++++++++++++++++++++ 5 files changed, 107 insertions(+), 0 deletions(-)create mode 100644
arch/arm/oprofile/op_model_omap_gptimer.carch/arm/Kconfig +0
-0@@ -160,6 +160,12 @@ config GENERIC_HARDIRQS_NO__DO_IRQif OPROFILE
arch/arm/Kconfig +6
-0+config OPROFILE_OMAP_GPTIMER + def_bool y + depends on ARCH_OMAP + select CONFIG_OMAP_32K_TIMER + select CONFIG_OMAP_DM_TIMER +config
OPROFILE_ARMV6
def_booly
depends onCPU_V6&& !SMParch/arm/oprofile/Makefile +0
-0@@ -8,6 +8,7 @@ DRIVER_OBJS = $(addprefix ../../../drivers/oprofile/, \oprofile-y := $(DRIVER_OBJS) common.o backtrace.o oprofile-$(CONFIG_CPU_XSCALE) += op_model_xscale.o +oprofile-$(CONFIG_OPROFILE_OMAP_GPTIMER) += op_model_omap_gptimer.o oprofile-$(CONFIG_OPROFILE_ARM11_CORE) += op_model_arm11_core.o oprofile-$(CONFIG_OPROFILE_ARMV6) += op_model_v6.o oprofile-$(CONFIG_OPROFILE_MPCORE) += op_model_mpcore.o
arch/arm/oprofile/common.c +4
-0@@ -133,6 +133,11 @@ int __init oprofile_arch_init(struct oprofile_operations *ops) ops->backtrace = arm_backtrace; +/* comes first, so that it can be overrided by a better implementation */ +#ifdef CONFIG_OPROFILE_OMAP_GPTIMER + spec = &op_omap_gptimer_spec; +#endif +#ifdef CONFIG_CPU_XSCALE spec = &op_xscale_spec;#endif
arch/arm/oprofile/op_arm_model.h +2
-0@@ -24,6 +24,8 @@ struct op_arm_model_spec {extern struct op_arm_model_spec op_xscale_spec;#endif +extern struct op_arm_model_spec op_omap_gptimer_spec; +extern struct op_arm_model_spec op_armv6_spec;extern struct op_arm_model_spec op_mpcore_spec;extern struct op_arm_model_spec op_armv7_spec;arch/arm/oprofile/op_model_omap_gptimer.c new file +88
-0@@ -0,0 +1,93 @@ +/** +* OMAP gptimer based event monitor driver for oprofile +* +* Copyright (C) 2009 Nokia Corporation +* Author: Siarhei Siamashka <[email protected]> +* +* 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 <linux/types.h> +#include <linux/oprofile.h> +#include <linux/interrupt.h> +#include <linux/irq.h> + +#include <mach/dmtimer.h> + +#include "op_counter.h" +#include "op_arm_model.h" + +static struct omap_dm_timer *gptimer; + +static int gptimer_init (void ) +{ +return 0 ; +} + +static int gptimer_setup (void ) +{ +return 0 ; +} + +static irqreturn_t gptimer_interrupt (int irq,void *arg) +{ +omap_dm_timer_write_status (gptimer,OMAP_TIMER_INT_OVERFLOW ); +oprofile_add_sample (get_irq_regs (),0 ); +return IRQ_HANDLED ; +} + +static int gptimer_start (void ) +{ +int err; +u32 count = counter_config[0 ].count; + +BUG_ON (gptimer !=NULL ); +/* First try to request timers from CORE power domain for OMAP3 */ +if (cpu_is_omap34xx ()) { + gptimer =omap_dm_timer_request_specific (10 ); +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request_specific (11 ); + } +/* Just any timer would be fine */ +if (gptimer ==NULL ) + gptimer =omap_dm_timer_request (); +if (gptimer ==NULL ) +return -ENODEV ; + +omap_dm_timer_set_source (gptimer,OMAP_TIMER_SRC_32_KHZ ); + err =request_irq (omap_dm_timer_get_irq (gptimer), gptimer_interrupt, +IRQF_DISABLED ,"oprofile gptimer" ,NULL ); +if (err) { +omap_dm_timer_free (gptimer); + gptimer =NULL ; +printk (KERN_ERR "oprofile: unable to request gptimer IRQ\n" ); +return err; + } + +if (count <1 ) + count =1 ; + +omap_dm_timer_set_load_start (gptimer,1 ,0xffffffff - count); +omap_dm_timer_set_int_enable (gptimer,OMAP_TIMER_INT_OVERFLOW ); +return 0 ; +} + +static void gptimer_stop (void ) +{ +omap_dm_timer_set_int_enable (gptimer,0 ); +free_irq (omap_dm_timer_get_irq (gptimer),NULL ); +omap_dm_timer_free (gptimer); + gptimer =NULL ; +} + +struct op_arm_model_spec op_omap_gptimer_spec = { + .init = gptimer_init, + .num_counters =1 ,
Quoted 8 lines
Quoted 8 lines
arch/arm/oprofile/op_model_omap_gptimer.c new file +5
-1+ .setup_ctrs = gptimer_setup, + .start = gptimer_start, + .stop = gptimer_stop, + .name = "hrtimer", +}; --1.5.6.5
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations Conference from O'Reilly Media. Velocity features a full day of expert-led, hands-on workshops and two days of sessions from industry leaders in dedicated Performance & Operations tracks. Use code vel09scf and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf