From mboxrd@z Thu Jan 1 00:00:00 1970 From: robherring2@gmail.com (Rob Herring) Date: Thu, 15 Dec 2011 07:56:41 -0600 Subject: [PATCH 3/9] irq: convert generic-chip to use irq_domain In-Reply-To: <4EE9F899.7010402@gmail.com> References: <1323876538-20406-1-git-send-email-robherring2@gmail.com> <1323876538-20406-4-git-send-email-robherring2@gmail.com> <20111215052512.GB21815@S2101-09.ap.freescale.net> <20111215055501.GC21815@S2101-09.ap.freescale.net> <4EE9F899.7010402@gmail.com> Message-ID: <4EE9FC99.6030905@gmail.com> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org Shawn, On 12/15/2011 07:39 AM, Rob Herring wrote: > On 12/14/2011 11:55 PM, Shawn Guo wrote: >> On Thu, Dec 15, 2011 at 01:25:20PM +0800, Shawn Guo wrote: >>> On Wed, Dec 14, 2011 at 09:28:52AM -0600, Rob Herring wrote: >>>> From: Rob Herring >>>> >>>> Add irq domain support to irq generic-chip. This enables users of >>>> generic-chip to support dynamic irq assignment needed for DT interrupt >>>> binding. Users must be converted to use irq_data.hwirq for determining >>>> local interrupt numbers rather than using the Linux irq number. >>>> >>>> irq_base is kept for now as there are a few users of it. Once they >>>> are converted to use the irq domain, it can be removed. >>>> >>>> Signed-off-by: Rob Herring >>>> Cc: Thomas Gleixner >>>> --- >>> >>> Tested-by: Shawn Guo >>> >> Sorry, I have to take that tag back after I correct my test setup. >> It does not work for imx5 TZIC case, because the following change >> I suggested before is missed. >> >> diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c >> index eb763f7..2a2aac1 100644 >> --- a/kernel/irq/irqdomain.c >> +++ b/kernel/irq/irqdomain.c >> @@ -39,7 +39,7 @@ void irq_domain_add(struct irq_domain *domain) >> return; >> } >> d->domain = domain; >> - d->hwirq = hwirq; >> + d->hwirq = hwirq - domain->hwirq_base; > > This is a problem. It entirely defeats the point of hwirq_base and it > would break the GIC. We need to fix this in the generic irq chip. > I think I found a fix. Can you try 's/d->hwirq/(d->hwirq % 32)/' in generic-chip.c. Rob