Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2615a38f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 few small fixes for timer drivers:

   - Prevent infinite recursion in the arm architected timer driver with
     ftrace

   - Propagate error codes to the caller in case of failure in EM STI
     driver

   - Adjust a bogus loop iteration in the arm architected timer driver

   - Add a missing Kconfig dependency to the pistachio clocksource to
     prevent build failures

   - Correctly check for IS_ERR() instead of NULL in the shared timer-of
     code"

* 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  clocksource/drivers/arm_arch_timer: Avoid infinite recursion when ftrace is enabled
  clocksource/drivers/Kconfig: Fix CLKSRC_PISTACHIO dependencies
  clocksource/drivers/timer-of: Checking for IS_ERR() instead of NULL
  clocksource/drivers/em_sti: Fix error return codes in em_sti_probe()
  clocksource/drivers/arm_arch_timer: Fix mem frame loop initialization
parents e46db8d2 b60bf53a

arch/arm64/include/asm/arch_timer.h

+2 −2
Original line number Diff line number Diff line
@@ -65,13 +65,13 @@ DECLARE_PER_CPU(const struct arch_timer_erratum_workaround *, 
	u64 _val;							\

	if (needs_unstable_timer_counter_workaround()) {		\

		const struct arch_timer_erratum_workaround *wa;		\

		preempt_disable();					\

		preempt_disable_notrace();				\

		wa = __this_cpu_read(timer_unstable_counter_workaround); \

		if (wa && wa->read_##reg)				\

			_val = wa->read_##reg();			\

		else							\

			_val = read_sysreg(reg);			\

		preempt_enable();					\

		preempt_enable_notrace();				\

	} else {							\

		_val = read_sysreg(reg);				\

	}								\

drivers/clocksource/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ config CLKSRC_LPC32XX 


config CLKSRC_PISTACHIO

	bool "Clocksource for Pistachio SoC" if COMPILE_TEST

	depends on HAS_IOMEM

	depends on GENERIC_CLOCKEVENTS && HAS_IOMEM

	select TIMER_OF

	help

	  Enables the clocksource for the Pistachio SoC.

drivers/clocksource/arm_arch_timer.c

+1 −1
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static int __init arch_timer_mem_acpi_init(int platform_timer_count) 
	 * While unlikely, it's theoretically possible that none of the frames

	 * in a timer expose the combination of feature we want.

	 */

	for (i = i; i < timer_count; i++) {

	for (i = 0; i < timer_count; i++) {

		timer = &timers[i];



		frame = arch_timer_mem_find_best_frame(timer);

drivers/clocksource/em_sti.c

+6 −5
Original line number Diff line number Diff line
@@ -305,7 +305,7 @@ static int em_sti_probe(struct platform_device *pdev) 
	irq = platform_get_irq(pdev, 0);

	if (irq < 0) {

		dev_err(&pdev->dev, "failed to get irq\n");

		return -EINVAL;

		return irq;

	}



	/* map memory, let base point to the STI instance */
@@ -314,11 +314,12 @@ static int em_sti_probe(struct platform_device *pdev) 
	if (IS_ERR(p->base))

		return PTR_ERR(p->base);



	if (devm_request_irq(&pdev->dev, irq, em_sti_interrupt,

	ret = devm_request_irq(&pdev->dev, irq, em_sti_interrupt,

			       IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,

			     dev_name(&pdev->dev), p)) {

			       dev_name(&pdev->dev), p);

	if (ret) {

		dev_err(&pdev->dev, "failed to request low IRQ\n");

		return -ENOENT;

		return ret;

	}



	/* get hold of clock */

drivers/clocksource/timer-of.c

+2 −2
Original line number Diff line number Diff line
@@ -128,9 +128,9 @@ static __init int timer_base_init(struct device_node *np, 
	const char *name = of_base->name ? of_base->name : np->full_name;



	of_base->base = of_io_request_and_map(np, of_base->index, name);

	if (!of_base->base) {

	if (IS_ERR(of_base->base)) {

		pr_err("Failed to iomap (%s)\n", name);

		return -ENXIO;

		return PTR_ERR(of_base->base);

	}



	return 0;