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

Commit a5ef2e70 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86: Sanitize apb timer interrupt handling 



Disable the interrupt in CPU_DEAD where it belongs. Remove the
open coded irq_desc manipulation.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Cc: Jacob Pan <jacob.jun.pan@linux.intel.com>
parent a3c08e5d

arch/x86/kernel/apb_timer.c

+24 −30
Original line number Original line Diff line number Diff line
@@ -231,34 +231,6 @@ static void apbt_restart_clocksource(struct clocksource *cs) 
	apbt_start_counter(phy_cs_timer_id);

	apbt_start_counter(phy_cs_timer_id);

}

}





/* Setup IRQ routing via IOAPIC */

#ifdef CONFIG_SMP

static void apbt_setup_irq(struct apbt_dev *adev)

{

	struct irq_chip *chip;

	struct irq_desc *desc;



	/* timer0 irq has been setup early */

	if (adev->irq == 0)

		return;

	desc = irq_to_desc(adev->irq);

	chip = get_irq_chip(adev->irq);

	disable_irq(adev->irq);

	desc->status |= IRQ_MOVE_PCNTXT;

	irq_set_affinity(adev->irq, cpumask_of(adev->cpu));

	/* APB timer irqs are set up as mp_irqs, timer is edge triggerred */

	set_irq_chip_and_handler_name(adev->irq, chip, handle_edge_irq, "edge");

	enable_irq(adev->irq);

	if (system_state == SYSTEM_BOOTING)

		if (request_irq(adev->irq, apbt_interrupt_handler,

				IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,

				adev->name, adev)) {

			printk(KERN_ERR "Failed request IRQ for APBT%d\n",

			       adev->num);

		}

}

#endif



static void apbt_enable_int(int n)

static void apbt_enable_int(int n)

{

{

	unsigned long ctrl = apbt_readl(n, APBTMR_N_CONTROL);

	unsigned long ctrl = apbt_readl(n, APBTMR_N_CONTROL);
@@ -334,6 +306,27 @@ static int __init apbt_clockevent_register(void) 
}

}





#ifdef CONFIG_SMP

#ifdef CONFIG_SMP



static void apbt_setup_irq(struct apbt_dev *adev)

{

	/* timer0 irq has been setup early */

	if (adev->irq == 0)

		return;



	if (system_state == SYSTEM_BOOTING) {

		irq_modify_status(adev->irq, 0, IRQ_MOVE_PCNTXT);

		/* APB timer irqs are set up as mp_irqs, timer is edge type */

		__set_irq_handler(adev->irq, handle_edge_irq, 0, "edge");

		if (request_irq(adev->irq, apbt_interrupt_handler,

				IRQF_TIMER | IRQF_DISABLED | IRQF_NOBALANCING,

				adev->name, adev)) {

			printk(KERN_ERR "Failed request IRQ for APBT%d\n",

			       adev->num);

		}

	} else

		enable_irq(adev->irq);

}



/* Should be called with per cpu */

/* Should be called with per cpu */

void apbt_setup_secondary_clock(void)

void apbt_setup_secondary_clock(void)

{

{
@@ -389,10 +382,11 @@ static int apbt_cpuhp_notify(struct notifier_block *n, 




	switch (action & 0xf) {

	switch (action & 0xf) {

	case CPU_DEAD:

	case CPU_DEAD:

		disable_irq(adev->irq);

		apbt_disable_int(cpu);

		apbt_disable_int(cpu);

		if (system_state == SYSTEM_RUNNING)

		if (system_state == SYSTEM_RUNNING) {

			pr_debug("skipping APBT CPU %lu offline\n", cpu);

			pr_debug("skipping APBT CPU %lu offline\n", cpu);

		else if (adev) {

		} else if (adev) {

			pr_debug("APBT clockevent for cpu %lu offline\n", cpu);

			pr_debug("APBT clockevent for cpu %lu offline\n", cpu);

			free_irq(adev->irq, adev);

			free_irq(adev->irq, adev);

		}

		}