[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4F27E96E.9010204@gmail.com>
Date: Tue, 31 Jan 2012 07:15:26 -0600
From: Rob Herring <robherring2@...il.com>
To: Shawn Guo <shawn.guo@...aro.org>
CC: Grant Likely <grant.likely@...retlab.ca>,
linux-kernel@...r.kernel.org,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Thomas Gleixner <tglx@...utronix.de>,
Milton Miller <miltonm@....com>,
Stephen Rothwell <sfr@...b.auug.org.au>,
devicetree-discuss@...ts.ozlabs.org,
linux-arm-kernel@...ts.infradead.org, linuxppc-dev@...ts.ozlabs.org
Subject: Re: [PATCH v3 14/25] irq_domain: Remove irq_domain_add_simple()
Shawn,
On 01/31/2012 06:45 AM, Shawn Guo wrote:
> On Fri, Jan 27, 2012 at 02:36:08PM -0700, Grant Likely wrote:
>> irq_domain_add_simple() was a stop-gap measure until complete irq_domain
>> support was complete. This patch removes the irq_domain_add_simple()
>> interface.
>>
>> v2: Updated to pass in host_data pointer on irq_domain allocation.
>>
>> Signed-off-by: Grant Likely <grant.likely@...retlab.ca>
>> Cc: Rob Herring <rob.herring@...xeda.com>
>> Cc: Thomas Gleixner <tglx@...utronix.de>
>> Cc: Milton Miller <miltonm@....com>
>> ---
>> arch/arm/mach-imx/mach-imx6q.c | 3 ++-
>> arch/arm/mach-msm/board-msm8x60.c | 8 ++------
>> arch/arm/mach-mx5/imx51-dt.c | 4 ++--
>> arch/arm/mach-mx5/imx53-dt.c | 4 ++--
>> arch/arm/mach-omap2/board-generic.c | 2 +-
>> arch/arm/mach-prima2/irq.c | 2 +-
>> drivers/mfd/twl-core.c | 2 +-
>> include/linux/irqdomain.h | 1 -
>> kernel/irq/irqdomain.c | 10 ++--------
>> 9 files changed, 13 insertions(+), 23 deletions(-)
>>
> ...
>> --- a/arch/arm/mach-mx5/imx51-dt.c
>> +++ b/arch/arm/mach-mx5/imx51-dt.c
>> @@ -47,7 +47,7 @@ static const struct of_dev_auxdata imx51_auxdata_lookup[] __initconst = {
>> static int __init imx51_tzic_add_irq_domain(struct device_node *np,
>> struct device_node *interrupt_parent)
>> {
>> - irq_domain_add_simple(np, 0);
>> + irq_domain_add_legacy(np, 32, 0, 0, &irq_domain_simple_ops, NULL);
>> return 0;
>> }
>>
>> @@ -57,7 +57,7 @@ static int __init imx51_gpio_add_irq_domain(struct device_node *np,
>> static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
>>
>> gpio_irq_base -= 32;
>> - irq_domain_add_simple(np, gpio_irq_base);
>> + irq_domain_add_legacy(np, 32, gpio_irq_base, 0, &irq_domain_simple_ops, NULL);
>
> The tzic on imx5 gets 128 irq lines rather than 32 here. The current
> code will make any hwirq that is > 32 hit the WARN_ON below in
> irq_domain_legacy_revmap().
But this is the gpio controller code? Really this should be 4 domains,
but this temp fix is probably fine until you use my generic irq chip
support.
Rob
>
> WARN_ON(hwirq < first_hwirq || hwirq >= first_hwirq + size)
>
> The first_hwirq is 0 and size is 32 in this case.
>
> Changing 32 to 128 seems fixing the problem.
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists