clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
PATCH 1/3 clockevents: asm9260: Fix compilation error with sparc/sparc64 allyesconfig
In reply to a message not in the archiveThe Kconfig options for the asm9260 timer is wrong as it can be selected by another platform with allyes config and thus leading to a compilation failure as some non arch related code is pulled by the compilation.
Fix this by having the platform Kconfig to select the timer as it is done for the others drivers.
Conflicts:
drivers/clocksource/Kconfig
--- arch/arm/mach-asm9260/Kconfig | 2 ++ drivers/clocksource/Kconfig | 16 +++++----------- 2 files changed, 7 insertions(+), 11 deletions(-)
arch/arm/mach-asm9260/Kconfig +2 -0
@@ -2,5 +2,7 @@ config MACH_ASM9260 bool "Alphascale ASM9260" depends on ARCH_MULTI_V5 select CPU_ARM926T + select ASM9260_TIMER + select GENERIC_CLOCKEVENTS help Support for Alphascale ASM9260 based platform.
drivers/clocksource/Kconfig +5 -11
@@ -63,6 +63,11 @@ config VT8500_TIMER config CADENCE_TTC_TIMER bool +config ASM9260_TIMER + bool + select CLKSRC_MMIO + select CLKSRC_OF + config CLKSRC_NOMADIK_MTU bool depends on (ARCH_NOMADIK || ARCH_U8500)
@@ -245,15 +250,4 @@ config CLKSRC_PXA help This enables OST0 support available on PXA and SA-11x0 platforms. - -config ASM9260_TIMER - bool "Alphascale ASM9260 timer driver" - depends on GENERIC_CLOCKEVENTS - select CLKSRC_MMIO - select CLKSRC_OF - default y if MACH_ASM9260 - help - This enables build of a clocksource and clockevent driver for - the 32-bit System Timer hardware available on a Alphascale ASM9260. - endmenu
Signature · 1 line
1.9.1
PATCH 2/3 clocksource: mtk: Fix race conditions in probe code
From: Matthias Brugger <[email protected]>
We have two race conditions in the probe code which could lead to a null pointer dereference in the interrupt handler.
The interrupt handler accesses the clockevent device, which may not yet be registered.
First race condition happens when the interrupt handler gets registered before the interrupts get disabled. The second race condition happens when the interrupts get enabled, but the clockevent device is not yet registered.
Fix that by disabling the interrupts before we register the interrupt and enable the interrupts after the clockevent device got registered.
--- drivers/clocksource/mtk_timer.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/clocksource/mtk_timer.c +5 -4
@@ -224,6 +224,8 @@ static void __init mtk_timer_init(struct device_node *node) } rate =clk_get_rate (clk); +mtk_timer_global_reset (evt); +if (request_irq (evt->dev.irq, mtk_timer_interrupt,IRQF_TIMER |IRQF_IRQPOLL ,"mtk_timer" , evt)) {pr_warn ("failed to setup irq %d\n" , evt->dev.irq);
@@ -232,8 +234,6 @@ static void __init mtk_timer_init(struct device_node *node) evt->ticks_per_jiffy =DIV_ROUND_UP (rate,HZ ); -mtk_timer_global_reset (evt); -/* Configure clock source */ mtk_timer_setup (evt,GPT_CLK_SRC ,TIMER_CTRL_OP_FREERUN ); clocksource_mmio_init(evt->gpt_base + TIMER_CNT_REG(GPT_CLK_SRC),
@@ -241,10 +241,11 @@ static void __init mtk_timer_init(struct device_node *node)/* Configure clock event */ mtk_timer_setup (evt,GPT_CLK_EVT ,TIMER_CTRL_OP_REPEAT ); -mtk_timer_enable_irq (evt,GPT_CLK_EVT ); -clockevents_config_and_register (&evt->dev, rate,0x3 ,0xffffffff ); + +mtk_timer_enable_irq (evt,GPT_CLK_EVT ); +return ; err_clk_disable:
Signature · 1 line
1.9.1
PATCH 3/3 clocksource: pxa: Fix section mismatch
In reply to Daniel LezcanoFrom: Robert Jarzmik <[email protected]>
As pxa_timer_common_init() is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING: vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the function pxa_timer_common_init() to the function .init.text:sched_clock_register()
WARNING: vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the function pxa_timer_common_init() to the function .init.text:clocksource_mmio_init()
--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clocksource/pxa_timer.c +1 -1
@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );
Signature · 1 line
1.9.1
Re: [PATCH 3/3] clocksource: pxa: Fix section mismatch
Quoted 23 lines · Daniel Lezcano
From: Robert Jarzmik <[email protected]>
As
pxa_timer_common_init()is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING:vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:sched_clock_register()WARNING:
vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:clocksource_mmio_init()Signed-off-by Robert Jarzmik <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clocksource/pxa_timer.c +0
-0
drivers/clocksource/pxa_timer.c static struct irqaction pxa_ost0_irq = { · line 169
Quoted 8 lines
drivers/clocksource/pxa_timer.c +1
-1@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );
So this is then used indirectly by:
CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);
which should probably be marked __initdata?
Thanks,
Ingo
Re: [PATCH 3/3] clocksource: pxa: Fix section mismatch
Quoted 37 lines · Ingo Molnar
Quoted 23 lines · Daniel Lezcano
From: Robert Jarzmik <[email protected]>
As
pxa_timer_common_init()is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING:vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:sched_clock_register()WARNING:
vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:clocksource_mmio_init()Signed-off-by Robert Jarzmik <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clocksource/pxa_timer.c +0
-0drivers/clocksource/pxa_timer.c static struct irqaction pxa_ost0_irq = { · line 169
Quoted 8 lines
drivers/clocksource/pxa_timer.c +1
-1@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );So this is then used indirectly by:
Quoted 3 lines
CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);which should probably be marked
__initdata?
Sorry, I miss the point. What should be marked __initdata ?
Signature · 5 lines
<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
Re: [PATCH 3/3] clocksource: pxa: Fix section mismatch
Quoted 38 lines · Daniel Lezcano
Quoted 37 lines · Ingo Molnar
Quoted 23 lines · Daniel Lezcano
From: Robert Jarzmik <[email protected]>
As
pxa_timer_common_init()is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING:vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:sched_clock_register()WARNING:
vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:clocksource_mmio_init()Signed-off-by Robert Jarzmik <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clocksource/pxa_timer.c +0
-0drivers/clocksource/pxa_timer.c static struct irqaction pxa_ost0_irq = { · line 169
Quoted 8 lines
drivers/clocksource/pxa_timer.c +1
-1@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );So this is then used indirectly by:
Quoted 6 lines
Quoted 3 lines
CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);which should probably be marked
__initdata?Sorry, I miss the point. What should be marked
__initdata?
so CLOCKSOURCE_OF_DECLARE() defines 'struct of_device_id' entries, right? Those, if they are only used during initialization, should be marked __initdata.
Or are they mixed use?
Thnks,
Ingo
Re: [PATCH 3/3] clocksource: pxa: Fix section mismatch
Quoted 46 lines · Ingo Molnar
Quoted 43 lines · Daniel Lezcano
Quoted 40 lines · Ingo Molnar
Quoted 23 lines · Daniel Lezcano
From: Robert Jarzmik <[email protected]>
As
pxa_timer_common_init()is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING:vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:sched_clock_register()WARNING:
vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:clocksource_mmio_init()Signed-off-by Robert Jarzmik <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clocksource/pxa_timer.c +0
-0drivers/clocksource/pxa_timer.c static struct irqaction pxa_ost0_irq = { · line 169
Quoted 8 lines
drivers/clocksource/pxa_timer.c +1
-1@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );So this is then used indirectly by:
CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);which should probably be marked
__initdata?
Quoted 7 lines
Quoted 1 line
Sorry, I miss the point. What should be marked
__initdata?so
CLOCKSOURCE_OF_DECLARE()defines 'structof_device_id' entries, right? Those, if they are only used during initialization, should be marked__initdata.Or are they mixed use?
Ah, ok. Thanks for the clarification. I thought there was an issue with the patch and I was hanging the PR.
Let me look in details.
Signature · 5 lines
<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
Re: [PATCH 3/3] clocksource: pxa: Fix section mismatch
Quoted 49 lines · Daniel Lezcano
Quoted 48 lines · Ingo Molnar
Quoted 44 lines · Daniel Lezcano
Quoted 37 lines · Ingo Molnar
Quoted 23 lines · Daniel Lezcano
From: Robert Jarzmik <[email protected]>
As
pxa_timer_common_init()is only called in init context, mark it as such, and quiesce the compiler warnings :
WARNING:vmlinux.o(.text.unlikely+0x45d4): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:sched_clock_register()WARNING:
vmlinux.o(.text.unlikely+0x4610): Section mismatch in reference from the functionpxa_timer_common_init()to the function .init.text:clocksource_mmio_init()Signed-off-by Robert Jarzmik <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>--- drivers/clocksource/pxa_timer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/clocksource/pxa_timer.c +0
-0drivers/clocksource/pxa_timer.c static struct irqaction pxa_ost0_irq = { · line 169
Quoted 8 lines
drivers/clocksource/pxa_timer.c +1
-1@@ -163,7 +163,7 @@ static struct irqaction pxa_ost0_irq = { .dev_id = &ckevt_pxa_osmr0, }; -static void pxa_timer_common_init (int irq,unsigned long clock_tick_rate) +static void __init pxa_timer_common_init (int irq,unsigned long clock_tick_rate) {timer_writel (0 ,OIER );timer_writel (OSSR_M0 |OSSR_M1 |OSSR_M2 |OSSR_M3 ,OSSR );So this is then used indirectly by:
Quoted 3 lines
CLOCKSOURCE_OF_DECLARE(pxa_timer, "marvell,pxa-timer", pxa_timer_dt_init);which should probably be marked
__initdata?Sorry, I miss the point. What should be marked
__initdata?
Quoted 8 lines
Quoted 5 lines
so
CLOCKSOURCE_OF_DECLARE()defines 'structof_device_id' entries, right? Those, if they are only used during initialization, should be marked__initdata.Or are they mixed use?
Ah, ok. Thanks for the clarification. I thought there was an issue with the patch and I was hanging the PR.
No, the patch is fine I think, I was just double checking it and noticed that nobody really marks CLOCKSOURCE_OF_DECLARE() as __initdata in practice.
Quoted 1 line
Let me look in details.
might not be worth doing, and it will quickly bitrot anyway, as new drivers might not pick it up.
Plus, should that structure ever get modularized, it will have to be removed again.
Thanks,
Ingo