[PATCH v2] powerpc: 52xx: nop out unsupported critical IRQs

[Wolfram Sang]

On Thu, Oct 11, 2012 at 11:19:15AM +0200, Wolfram Sang wrote:
> Currently, when booting MPC52xx based platforms, we get:
> 
>         mpc52xx_irqhost_map: invalid irq: virq=16, l1=0, l2=3
>         irq: irq-16==>hwirq-0x3 mapping failed: -22
>         [WARNing skipped]
> 
> The warning is wrong since the mapping itself is valid. However, there is no
> support for that type of IRQ currently. Print a proper warning and bind the irq
> to a no_irq chip.
> 
> Signed-off-by: Wolfram Sang <w.sang at pengutronix.de>
> Cc: John Bonesio <bones at secretlab.ca>
> Cc: Anatolij Gustschin <agust at denx.de>
> Cc: Grant Likely <grant.likely at secretlab.ca>

Ping. I'd really like to get rid of the WARNing for all MPC52xx boards.
It looks pretty scary to people who don't know the issues behind it.

> ---
> 
> Change since V1: drop the default state since all possibilities for l1 are now
> 		 covered in the switch-statement.
> 
>  arch/powerpc/platforms/52xx/mpc52xx_pic.c |    9 +++++----
>  1 file changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
> index 8520b58..b89ef65 100644
> --- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
> +++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
> @@ -372,10 +372,11 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
>  	case MPC52xx_IRQ_L1_MAIN: irqchip = &mpc52xx_main_irqchip; break;
>  	case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
>  	case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
> -	default:
> -		pr_err("%s: invalid irq: virq=%i, l1=%i, l2=%i\n",
> -		       __func__, virq, l1irq, l2irq);
> -		return -EINVAL;
> +	case MPC52xx_IRQ_L1_CRIT:
> +		pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
> +			__func__, l2irq);
> +		irq_set_chip(virq, &no_irq_chip);
> +		return 0;
>  	}
>  
>  	irq_set_chip_and_handler(virq, irqchip, handle_level_irq);
> -- 
> 1.7.10.4
> 

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20121020/558a163e/attachment.sig>