I updated the original patch according to the discussion with Thomas and Baruch.
Furthermore, I noticed that the driver includes the clk-provider header for no
apparent reason and removed it.
Sören
v2:
- adding patch to remove unused header to the series
- #include linux/sched_clock.h instead of asm/sched_clock.h
- remove Kconfig options and #ifdefs around sched_clock related code
The reasons for having those are obsolete, since ARM deprecated its
custom sched_clock framework and migrated to the common one.
Soren Brinkmann (2):
clocksource/cadence_ttc: Remove unused header
clocksource/cadence_ttc: Reuse clocksource as sched_clock
drivers/clocksource/cadence_ttc_timer.c | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
--
1.8.3.2
The clk-provider.h header is not required by this driver.
Signed-off-by: Soren Brinkmann <[email protected]>
---
drivers/clocksource/cadence_ttc_timer.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 4cbe28c..0eefc8d 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -21,7 +21,6 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/slab.h>
-#include <linux/clk-provider.h>
/*
* This driver configures the 2 16-bit count-up timers as follows:
--
1.8.3.2
Reuse the TTC clocksource timer as sched clock provider.
Signed-off-by: Soren Brinkmann <[email protected]>
---
v2:
- #include linux/sched_clock.h instead of asm/sched_clock.h
- remove Kconfig options and #ifdefs around sched_clock related code
The reasons for having those are obsolete, since ARM deprecated its
custom sched_clock framework and migrated to the common one.
drivers/clocksource/cadence_ttc_timer.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
index 0eefc8d..b2bb3a4b 100644
--- a/drivers/clocksource/cadence_ttc_timer.c
+++ b/drivers/clocksource/cadence_ttc_timer.c
@@ -21,6 +21,7 @@
#include <linux/of_address.h>
#include <linux/of_irq.h>
#include <linux/slab.h>
+#include <linux/sched_clock.h>
/*
* This driver configures the 2 16-bit count-up timers as follows:
@@ -94,6 +95,8 @@ struct ttc_timer_clockevent {
#define to_ttc_timer_clkevent(x) \
container_of(x, struct ttc_timer_clockevent, ce)
+static void __iomem *ttc_sched_clock_val_reg;
+
/**
* ttc_set_interval - Set the timer interval value
*
@@ -155,6 +158,11 @@ static cycle_t __ttc_clocksource_read(struct clocksource *cs)
TTC_COUNT_VAL_OFFSET);
}
+static u32 notrace ttc_sched_clock_read(void)
+{
+ return __raw_readl(ttc_sched_clock_val_reg);
+}
+
/**
* ttc_set_next_event - Sets the time interval for next event
*
@@ -296,6 +304,10 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base)
kfree(ttccs);
return;
}
+
+ ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;
+ setup_sched_clock(ttc_sched_clock_read, 16,
+ clk_get_rate(ttccs->ttc.clk) / PRESCALE);
}
static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
--
1.8.3.2
On 07/08/2013 06:51 PM, Soren Brinkmann wrote:
> Reuse the TTC clocksource timer as sched clock provider.
>
> Signed-off-by: Soren Brinkmann <[email protected]>
> ---
> v2:
> - #include linux/sched_clock.h instead of asm/sched_clock.h
> - remove Kconfig options and #ifdefs around sched_clock related code
> The reasons for having those are obsolete, since ARM deprecated its
> custom sched_clock framework and migrated to the common one.
>
> drivers/clocksource/cadence_ttc_timer.c | 12 ++++++++++++
> 1 file changed, 12 insertions(+)
>
> diff --git a/drivers/clocksource/cadence_ttc_timer.c b/drivers/clocksource/cadence_ttc_timer.c
> index 0eefc8d..b2bb3a4b 100644
> --- a/drivers/clocksource/cadence_ttc_timer.c
> +++ b/drivers/clocksource/cadence_ttc_timer.c
> @@ -21,6 +21,7 @@
> #include <linux/of_address.h>
> #include <linux/of_irq.h>
> #include <linux/slab.h>
> +#include <linux/sched_clock.h>
>
> /*
> * This driver configures the 2 16-bit count-up timers as follows:
> @@ -94,6 +95,8 @@ struct ttc_timer_clockevent {
> #define to_ttc_timer_clkevent(x) \
> container_of(x, struct ttc_timer_clockevent, ce)
>
> +static void __iomem *ttc_sched_clock_val_reg;
> +
> /**
> * ttc_set_interval - Set the timer interval value
> *
> @@ -155,6 +158,11 @@ static cycle_t __ttc_clocksource_read(struct clocksource *cs)
> TTC_COUNT_VAL_OFFSET);
> }
>
> +static u32 notrace ttc_sched_clock_read(void)
> +{
> + return __raw_readl(ttc_sched_clock_val_reg);
> +}
> +
> /**
> * ttc_set_next_event - Sets the time interval for next event
> *
> @@ -296,6 +304,10 @@ static void __init ttc_setup_clocksource(struct clk *clk, void __iomem *base)
> kfree(ttccs);
> return;
> }
> +
> + ttc_sched_clock_val_reg = base + TTC_COUNT_VAL_OFFSET;
> + setup_sched_clock(ttc_sched_clock_read, 16,
> + clk_get_rate(ttccs->ttc.clk) / PRESCALE);
> }
>
> static int ttc_rate_change_clockevent_cb(struct notifier_block *nb,
>
Acked-by: Michal Simek <[email protected]>
Thomas, John: Can you please add this patch to your queue?
IRC all these timer patches should go through your trees.
Thanks,
Michal
--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform
On 07/12/2013 02:08 PM, Michal Simek wrote:
> Acked-by: Michal Simek <[email protected]>
Applied to my tree for 3.12
Thanks
-- Daniel
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
On Tue, Jul 16, 2013 at 05:32:41PM +0200, Daniel Lezcano wrote:
> On 07/12/2013 02:08 PM, Michal Simek wrote:
> > Acked-by: Michal Simek <[email protected]>
>
> Applied to my tree for 3.12
thanks