clockevents v5.4-rc6
Subsystems (2)
The following changes since commit b9023b91dd020ad7e093baa5122b6968c48cc9e0:
tick: broadcast-hrtimer: Fix a race in bc_set_next (2019-09-27
14:45:55 +0200)
are available in the Git repository at:
https://git.linaro.org/people/daniel.lezcano/linux.git
tags/timers-v5.4-rc6
for you to fetch changes up to 7693de9f7aa4e2993fbd7094863304be6a4bbe16:
clocksource/drivers/sh_mtu2: Do not loop usingplatform_get_irq_by_name() (2019-10-18 07:55:16 +0200)
----------------------------------------------------------------
- Fix scary messages in sh_mtu2 by using platform_irq_count() helper function (Geert Uytterhoeven)
- Fix double free when using timer-of in the mediatek timer driver (Fabien Parent)
----------------------------------------------------------------
Fabien Parent (1):
clocksource/drivers/mediatek: Fix error handling
Geert Uytterhoeven (1):
clocksource/drivers/sh_mtu2: Do not loop usingplatform_get_irq_by_name()
drivers/clocksource/sh_mtu2.c | 16 +++++++++++----- drivers/clocksource/timer-mediatek.c | 10 ++-------- 2 files changed, 13 insertions(+), 13 deletions(-)
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
PATCH 1/2 clocksource/drivers/mediatek: Fix error handling
From: Fabien Parent <[email protected]>
When timer_of_init fails, it cleans up after itself by undoing everything it did during the initialization function.
mtk_syst_init and mtk_gpt_init both call timer_of_cleanup if timer_of_init fails. timer_of_cleanup try to release the resource taken. Since these resources have already been cleaned up by timer_of_init, we end up getting a few warnings printed:
[ 0.001935] WARNING: CPU: 0 PID: 0 at __clk_put+0xe8/0x128 [ 0.002650] Modules linked in: [ 0.003058] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 4.19.67+ #1 [ 0.003852] Hardware name: MediaTek MT8183 (DT) [ 0.004446] pstate: 20400085 (nzCv daIf +PAN -UAO) [ 0.005073] pc : __clk_put+0xe8/0x128 [ 0.005555] lr : clk_put+0xc/0x14 [ 0.005988] sp : ffffff80090b3ea0 [ 0.006422] x29: ffffff80090b3ea0 x28: 0000000040e20018 [ 0.007121] x27: ffffffc07bfff780 x26: 0000000000000001 [ 0.007819] x25: ffffff80090bda80 x24: ffffff8008ec5828 [ 0.008517] x23: ffffff80090bd000 x22: ffffff8008d8b2e8 [ 0.009216] x21: 0000000000000001 x20: fffffffffffffdfb [ 0.009914] x19: ffffff8009166180 x18: 00000000002bffa8 [ 0.010612] x17: ffffffc012996980 x16: 0000000000000000 [ 0.011311] x15: ffffffbf004a6800 x14: 3536343038393334 [ 0.012009] x13: 2079726576652073 x12: 7eb9c62c5c38f100 [ 0.012707] x11: ffffff80090b3ba0 x10: ffffff80090b3ba0 [ 0.013405] x9 : 0000000000000004 x8 : 0000000000000040 [ 0.014103] x7 : ffffffc079400270 x6 : 0000000000000000 [ 0.014801] x5 : ffffffc079400248 x4 : 0000000000000000 [ 0.015499] x3 : 0000000000000000 x2 : 0000000000000000 [ 0.016197] x1 : ffffff80091661c0 x0 : fffffffffffffdfb [ 0.016896] Call trace: [ 0.017218] __clk_put+0xe8/0x128 [ 0.017654] clk_put+0xc/0x14 [ 0.018048] timer_of_cleanup+0x60/0x7c [ 0.018551] mtk_syst_init+0x8c/0x9c [ 0.019020] timer_probe+0x6c/0xe0 [ 0.019469] time_init+0x14/0x44 [ 0.019893] start_kernel+0x2d0/0x46c [ 0.020378] ---[ end trace 8c1efabea1267649 ]--- [ 0.020982] ------------[ cut here ]------------ [ 0.021586] Trying to vfree() nonexistent vm area ((____ptrval____)) [ 0.022427] WARNING: CPU: 0 PID: 0 at __vunmap+0xd0/0xd8 [ 0.023119] Modules linked in: [ 0.023524] CPU: 0 PID: 0 Comm: swapper/0 Tainted: G W 4.19.67+ #1 [ 0.024498] Hardware name: MediaTek MT8183 (DT) [ 0.025091] pstate: 60400085 (nZCv daIf +PAN -UAO) [ 0.025718] pc : __vunmap+0xd0/0xd8 [ 0.026176] lr : __vunmap+0xd0/0xd8 [ 0.026632] sp : ffffff80090b3e90 [ 0.027066] x29: ffffff80090b3e90 x28: 0000000040e20018 [ 0.027764] x27: ffffffc07bfff780 x26: 0000000000000001 [ 0.028462] x25: ffffff80090bda80 x24: ffffff8008ec5828 [ 0.029160] x23: ffffff80090bd000 x22: ffffff8008d8b2e8 [ 0.029858] x21: 0000000000000000 x20: 0000000000000000 [ 0.030556] x19: ffffff800800d000 x18: 00000000002bffa8 [ 0.031254] x17: 0000000000000000 x16: 0000000000000000 [ 0.031952] x15: ffffffbf004a6800 x14: 3536343038393334 [ 0.032651] x13: 2079726576652073 x12: 7eb9c62c5c38f100 [ 0.033349] x11: ffffff80090b3b40 x10: ffffff80090b3b40 [ 0.034047] x9 : 0000000000000005 x8 : 5f5f6c6176727470 [ 0.034745] x7 : 5f5f5f5f28282061 x6 : ffffff80091c86ef [ 0.035443] x5 : ffffff800852b690 x4 : 0000000000000000 [ 0.036141] x3 : 0000000000000002 x2 : 0000000000000002 [ 0.036839] x1 : 7eb9c62c5c38f100 x0 : 7eb9c62c5c38f100 [ 0.037536] Call trace: [ 0.037859] __vunmap+0xd0/0xd8 [ 0.038271] vunmap+0x24/0x30 [ 0.038664] __iounmap+0x2c/0x34 [ 0.039088] timer_of_cleanup+0x70/0x7c [ 0.039591] mtk_syst_init+0x8c/0x9c [ 0.040060] timer_probe+0x6c/0xe0 [ 0.040507] time_init+0x14/0x44 [ 0.040932] start_kernel+0x2d0/0x46c
This commit remove the calls to timer_of_cleanup when timer_of_init fails since it is unnecessary and actually cause warnings to be printed.
--- drivers/clocksource/timer-mediatek.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/clocksource/timer-mediatek.c +2 -8
@@ -268,15 +268,12 @@ static int __init mtk_syst_init(struct device_node *node) ret =timer_of_init (node, &to);if (ret) - goto err; +return ret;clockevents_config_and_register (&to.clkevt,timer_of_rate (&to),TIMER_SYNC_TICKS ,0xffffffff );return 0 ; -err: -timer_of_cleanup (&to); -return ret; }static int __init mtk_gpt_init (struct device_node *node)
@@ -293,7 +290,7 @@ static int __init mtk_gpt_init(struct device_node *node) ret =timer_of_init (node, &to);if (ret) - goto err; +return ret;/* Configure clock source */ mtk_gpt_setup (&to,TIMER_CLK_SRC ,GPT_CTRL_OP_FREERUN );
@@ -311,9 +308,6 @@ static int __init mtk_gpt_init(struct device_node *node)mtk_gpt_enable_irq (&to,TIMER_CLK_EVT );return 0 ; -err: -timer_of_cleanup (&to); -return ret; }TIMER_OF_DECLARE (mtk_mt6577,"mediatek,mt6577-timer" , mtk_gpt_init);TIMER_OF_DECLARE (mtk_mt6765,"mediatek,mt6765-timer" , mtk_syst_init);
Signature · 7 lines
2.17.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH 2/2 clocksource/drivers/sh_mtu2: Do not loop using platform_get_irq_by_name()
From: Geert Uytterhoeven <[email protected]>
As platform_get_irq_by_name() now prints an error when the interrupt does not exist, looping over possibly non-existing interrupts causes the printing of scary messages like:
sh_mtu2 fcff0000.timer: IRQ tgi1a not found
sh_mtu2 fcff0000.timer: IRQ tgi2a not found
Fix this by using the platform_irq_count() helper, to avoid touching non-existent interrupts. Limit the returned number of interrupts to the maximum number of channels currently supported by the driver in a future-proof way, i.e. using ARRAY_SIZE() instead of a hardcoded number.
--- drivers/clocksource/sh_mtu2.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/clocksource/sh_mtu2.c +11 -5
@@ -328,12 +328,13 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, const char *name)return 0 ; } +static const unsigned int sh_mtu2_channel_offsets[] = { +0x300 ,0x380 ,0x000 , +}; +static int sh_mtu2_setup_channel (struct sh_mtu2_channel *ch,unsigned int index,struct sh_mtu2_device *mtu) { -static const unsigned int channel_offsets[] = { -0x300 ,0x380 ,0x000 , - };char name[6 ];int irq;int ret;
@@ -356,7 +357,7 @@ static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch, unsigned int index,return ret; } - ch->base = mtu->mapbase + channel_offsets[index]; + ch->base = mtu->mapbase + sh_mtu2_channel_offsets[index]; ch->index = index;return sh_mtu2_register (ch,dev_name (&mtu->pdev->dev));
@@ -408,7 +409,12 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, }/* Allocate and setup the channels. */ - mtu->num_channels =3 ; + ret =platform_irq_count (pdev); +if (ret <0 ) + goto err_unmap; + + mtu->num_channels = min_t(unsigned int, ret, +ARRAY_SIZE (sh_mtu2_channel_offsets)); mtu->channels =kcalloc (mtu->num_channels,sizeof (*mtu->channels),GFP_KERNEL );
Signature · 1 line
2.17.1