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

Commit 8bfc5e36 authored by Scott Wood's avatar Scott Wood Committed by Benjamin Herrenschmidt
Browse files

powerpc/mpic: Fix mask/unmask timeout message 



Don't say that enable timed out when it was disable, and
show which IRQ had the problem.

Signed-off-by: default avatarScott Wood <scottwood@freescale.com>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent cb046de7

arch/powerpc/sysdev/mpic.c

+4 −2
Original line number Diff line number Diff line
@@ -674,7 +674,8 @@ void mpic_unmask_irq(unsigned int irq) 
	/* make sure mask gets to controller before we return to user */

	do {

		if (!loops--) {

			printk(KERN_ERR "mpic_enable_irq timeout\n");

			printk(KERN_ERR "%s: timeout on hwirq %u\n",

			       __func__, src);

			break;

		}

	} while(mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)) & MPIC_VECPRI_MASK);
@@ -695,7 +696,8 @@ void mpic_mask_irq(unsigned int irq) 
	/* make sure mask gets to controller before we return to user */

	do {

		if (!loops--) {

			printk(KERN_ERR "mpic_enable_irq timeout\n");

			printk(KERN_ERR "%s: timeout on hwirq %u\n",

			       __func__, src);

			break;

		}

	} while(!(mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)) & MPIC_VECPRI_MASK));