Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 8bfc5e36619e8464bf529137f834f55bd75de381

Authored by Scott Wood
Committed by Benjamin Herrenschmidt
1 parent cb046de758
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

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: Scott Wood <scottwood@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

arch/powerpc/sysdev/mpic.c
Diff comments   View file @ 8bfc5e3
... ... @@ -674,7 +674,8 @@
674 674 /* make sure mask gets to controller before we return to user */
675 675 do {
676 676 if (!loops--) {
677   - printk(KERN_ERR "mpic_enable_irq timeout\n");
  677 + printk(KERN_ERR "%s: timeout on hwirq %u\n",
  678 + __func__, src);
678 679 break;
679 680 }
680 681 } while(mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)) & MPIC_VECPRI_MASK);
... ... @@ -695,7 +696,8 @@
695 696 /* make sure mask gets to controller before we return to user */
696 697 do {
697 698 if (!loops--) {
698   - printk(KERN_ERR "mpic_enable_irq timeout\n");
  699 + printk(KERN_ERR "%s: timeout on hwirq %u\n",
  700 + __func__, src);
699 701 break;
700 702 }
701 703 } while(!(mpic_irq_read(src, MPIC_INFO(IRQ_VECTOR_PRI)) & MPIC_VECPRI_MASK));