Commit 621084cd authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull timer fixes from Thomas Gleixner:
 "A small set of fixes for timekeepoing and clocksource drivers:

   - VDSO data was updated conditional on the availability of a VDSO
     capable clocksource. This causes the VDSO functions which do not
     depend on a VDSO capable clocksource to operate on stale data.
     Always update unconditionally.

   - Prevent a double free in the mediatek driver

   - Use the proper helper in the sh_mtu2 driver so it won't attempt to
     initialize non-existing interrupts"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  timekeeping/vsyscall: Update VDSO data unconditionally
  clocksource/drivers/sh_mtu2: Do not loop using platform_get_irq_by_name()
  clocksource/drivers/mediatek: Fix error handling
parents 81388c2b 52338415
...@@ -30,13 +30,6 @@ int __arm64_get_clock_mode(struct timekeeper *tk) ...@@ -30,13 +30,6 @@ int __arm64_get_clock_mode(struct timekeeper *tk)
} }
#define __arch_get_clock_mode __arm64_get_clock_mode #define __arch_get_clock_mode __arm64_get_clock_mode
static __always_inline
int __arm64_use_vsyscall(struct vdso_data *vdata)
{
return !vdata[CS_HRES_COARSE].clock_mode;
}
#define __arch_use_vsyscall __arm64_use_vsyscall
static __always_inline static __always_inline
void __arm64_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk) void __arm64_update_vsyscall(struct vdso_data *vdata, struct timekeeper *tk)
{ {
......
...@@ -28,13 +28,6 @@ int __mips_get_clock_mode(struct timekeeper *tk) ...@@ -28,13 +28,6 @@ int __mips_get_clock_mode(struct timekeeper *tk)
} }
#define __arch_get_clock_mode __mips_get_clock_mode #define __arch_get_clock_mode __mips_get_clock_mode
static __always_inline
int __mips_use_vsyscall(struct vdso_data *vdata)
{
return (vdata[CS_HRES_COARSE].clock_mode != VDSO_CLOCK_NONE);
}
#define __arch_use_vsyscall __mips_use_vsyscall
/* The asm-generic header needs to be included after the definitions above */ /* The asm-generic header needs to be included after the definitions above */
#include <asm-generic/vdso/vsyscall.h> #include <asm-generic/vdso/vsyscall.h>
......
...@@ -328,12 +328,13 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, const char *name) ...@@ -328,12 +328,13 @@ static int sh_mtu2_register(struct sh_mtu2_channel *ch, const char *name)
return 0; 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, static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch, unsigned int index,
struct sh_mtu2_device *mtu) struct sh_mtu2_device *mtu)
{ {
static const unsigned int channel_offsets[] = {
0x300, 0x380, 0x000,
};
char name[6]; char name[6];
int irq; int irq;
int ret; int ret;
...@@ -356,7 +357,7 @@ static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch, unsigned int index, ...@@ -356,7 +357,7 @@ static int sh_mtu2_setup_channel(struct sh_mtu2_channel *ch, unsigned int index,
return ret; return ret;
} }
ch->base = mtu->mapbase + channel_offsets[index]; ch->base = mtu->mapbase + sh_mtu2_channel_offsets[index];
ch->index = index; ch->index = index;
return sh_mtu2_register(ch, dev_name(&mtu->pdev->dev)); return sh_mtu2_register(ch, dev_name(&mtu->pdev->dev));
...@@ -408,7 +409,12 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu, ...@@ -408,7 +409,12 @@ static int sh_mtu2_setup(struct sh_mtu2_device *mtu,
} }
/* Allocate and setup the channels. */ /* 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), mtu->channels = kcalloc(mtu->num_channels, sizeof(*mtu->channels),
GFP_KERNEL); GFP_KERNEL);
......
...@@ -268,15 +268,12 @@ static int __init mtk_syst_init(struct device_node *node) ...@@ -268,15 +268,12 @@ static int __init mtk_syst_init(struct device_node *node)
ret = timer_of_init(node, &to); ret = timer_of_init(node, &to);
if (ret) if (ret)
goto err; return ret;
clockevents_config_and_register(&to.clkevt, timer_of_rate(&to), clockevents_config_and_register(&to.clkevt, timer_of_rate(&to),
TIMER_SYNC_TICKS, 0xffffffff); TIMER_SYNC_TICKS, 0xffffffff);
return 0; return 0;
err:
timer_of_cleanup(&to);
return ret;
} }
static int __init mtk_gpt_init(struct device_node *node) static int __init mtk_gpt_init(struct device_node *node)
...@@ -293,7 +290,7 @@ 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); ret = timer_of_init(node, &to);
if (ret) if (ret)
goto err; return ret;
/* Configure clock source */ /* Configure clock source */
mtk_gpt_setup(&to, TIMER_CLK_SRC, GPT_CTRL_OP_FREERUN); 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) ...@@ -311,9 +308,6 @@ static int __init mtk_gpt_init(struct device_node *node)
mtk_gpt_enable_irq(&to, TIMER_CLK_EVT); mtk_gpt_enable_irq(&to, TIMER_CLK_EVT);
return 0; return 0;
err:
timer_of_cleanup(&to);
return ret;
} }
TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_gpt_init); TIMER_OF_DECLARE(mtk_mt6577, "mediatek,mt6577-timer", mtk_gpt_init);
TIMER_OF_DECLARE(mtk_mt6765, "mediatek,mt6765-timer", mtk_syst_init); TIMER_OF_DECLARE(mtk_mt6765, "mediatek,mt6765-timer", mtk_syst_init);
...@@ -25,13 +25,6 @@ static __always_inline int __arch_get_clock_mode(struct timekeeper *tk) ...@@ -25,13 +25,6 @@ static __always_inline int __arch_get_clock_mode(struct timekeeper *tk)
} }
#endif /* __arch_get_clock_mode */ #endif /* __arch_get_clock_mode */
#ifndef __arch_use_vsyscall
static __always_inline int __arch_use_vsyscall(struct vdso_data *vdata)
{
return 1;
}
#endif /* __arch_use_vsyscall */
#ifndef __arch_update_vsyscall #ifndef __arch_update_vsyscall
static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata, static __always_inline void __arch_update_vsyscall(struct vdso_data *vdata,
struct timekeeper *tk) struct timekeeper *tk)
......
...@@ -110,8 +110,7 @@ void update_vsyscall(struct timekeeper *tk) ...@@ -110,8 +110,7 @@ void update_vsyscall(struct timekeeper *tk)
nsec = nsec + tk->wall_to_monotonic.tv_nsec; nsec = nsec + tk->wall_to_monotonic.tv_nsec;
vdso_ts->sec += __iter_div_u64_rem(nsec, NSEC_PER_SEC, &vdso_ts->nsec); vdso_ts->sec += __iter_div_u64_rem(nsec, NSEC_PER_SEC, &vdso_ts->nsec);
if (__arch_use_vsyscall(vdata)) update_vdso_data(vdata, tk);
update_vdso_data(vdata, tk);
__arch_update_vsyscall(vdata, tk); __arch_update_vsyscall(vdata, tk);
...@@ -124,10 +123,8 @@ void update_vsyscall_tz(void) ...@@ -124,10 +123,8 @@ void update_vsyscall_tz(void)
{ {
struct vdso_data *vdata = __arch_get_k_vdso_data(); struct vdso_data *vdata = __arch_get_k_vdso_data();
if (__arch_use_vsyscall(vdata)) { vdata[CS_HRES_COARSE].tz_minuteswest = sys_tz.tz_minuteswest;
vdata[CS_HRES_COARSE].tz_minuteswest = sys_tz.tz_minuteswest; vdata[CS_HRES_COARSE].tz_dsttime = sys_tz.tz_dsttime;
vdata[CS_HRES_COARSE].tz_dsttime = sys_tz.tz_dsttime;
}
__arch_sync_vdso_data(vdata); __arch_sync_vdso_data(vdata);
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment