Skip to contentSkip to conversation

Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

PATCH New Marc Zyngier 3 participants 8 messages Nov 3, 2009 – Nov 5, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on PXA-27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (PXA-270).

---
 arch/arm/mach-pxa/include/mach/entry-macro.S |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/include/mach/entry-macro.S +3 -0
index 2418806..f7eb9d8 100644
@@ -46,5 +46,8 @@
 		beq	1001f
 		bic	\irqstat, \irqstat, #0x80000000
 		mov	\irqnr, \irqstat, lsr #16
+#ifdef CONFIG_PXA_HAVE_ISA_IRQS
+		add	\irqnr, \irqnr, #(PXA_IRQ(0))
+#endif
 1001:
 		.endm
Signature · 4 lines
1.6.0.4

-- 
I'm the slime oozin' out from your TV set...
maintainer
#1 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Quoted 26 lines · Marc Zyngier

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on PXA-27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (PXA-270).

---
?arch/arm/mach-pxa/include/mach/entry-macro.S | ? ?3 +++ ?1 files changed, 3 insertions(+), 0 deletions(-)

arch/arm/mach-pxa/include/mach/entry-macro.S +0 -0
index 2418806..f7eb9d8 100644
@@ -46,5 +46,8 @@

? ? ? ? ? ? ? ?beq ? ? 1001f
? ? ? ? ? ? ? ?bic ? ? \irqstat, \irqstat, #0x80000000 ? ? ? ? ? ? ? ?mov ? ? \irqnr, \irqstat, lsr #16

arch/arm/mach-pxa/include/mach/entry-macro.S +3 -0
+#ifdef CONFIG_PXA_HAVE_ISA_IRQS
+ ? ? ? ? ? ? ? add ? ? \irqnr, \irqnr, #(PXA_IRQ(0))
+#endif
Quoted 4 lines

?1001:
? ? ? ? ? ? ? ?.endm
--
1.6.0.4

Hi Marc,

I have a question on this. Do you use CONFIG_PXA_HAVE_ISA_IRQS in pxa270? In my patch, I only enable interrupt priority in pxa27x and pxa3xx since silicon can support this feature. And this feature isn't supported by pxa25x.

I also find that CONFIG_PXA_HAVE_ISA_IRQS is only used in pxa25x. Is it right? So I think that we needn't add this into pxa27x and pxa3xx. What's your opinion?

Thanks
Haojian

#2 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Quoted 16 lines · Haojian Zhuang
Quoted 15 lines · Marc Zyngier

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on PXA-27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (PXA-270).

---
?arch/arm/mach-pxa/include/mach/entry-macro.S | ? ?3 +++ ?1 files changed, 3 insertions(+), 0 deletions(-)

Quoted 11 lines

arch/arm/mach-pxa/include/mach/entry-macro.S line 51

Quoted 11 lines
arch/arm/mach-pxa/include/mach/entry-macro.S +0 -0
index 2418806..f7eb9d8 100644
@@ -46,5 +46,8 @@

? ? ? ? ? ? ? ?beq ? ? 1001f
? ? ? ? ? ? ? ?bic ? ? \irqstat, \irqstat, #0x80000000 ? ? ? ? ? ? ? ?mov ? ? \irqnr, \irqstat, lsr #16

arch/arm/mach-pxa/include/mach/entry-macro.S +3 -0
+#ifdef CONFIG_PXA_HAVE_ISA_IRQS
+ ? ? ? ? ? ? ? add ? ? \irqnr, \irqnr, #(PXA_IRQ(0))
+#endif

The #ifdef here might not be necessary since PXA_IRQ() has already encoded the difference, check arch/arm/mach-pxa/include/mach/irqs.h

Quoted 6 lines
Quoted 4 lines

?1001:
? ? ? ? ? ? ? ?.endm
--
1.6.0.4

Hi Marc,

Quoted 9 lines

I have a question on this. Do you use CONFIG_PXA_HAVE_ISA_IRQS in pxa270? In my patch, I only enable interrupt priority in pxa27x and pxa3xx since silicon can support this feature. And this feature isn't supported by pxa25x.

I also find that CONFIG_PXA_HAVE_ISA_IRQS is only used in pxa25x. Is it right? So I think that we needn't add this into pxa27x and pxa3xx. What's your opinion?

Haojian,

CONFIG_PXA_HAVE_ISA_IRQS is used on some platforms which emulates ISA expansion slots so some legacy ISA cards can still be used on pxa platforms, not necessarily related to pxa25x, could be pxa27x and pxa3xx. We need to take a look into the patch indeed.

#3 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Quoted 50 lines · On Wed, 4 Nov 2009 11:20:53 +0800 Eric Miao <[email protected]> wrote:
Quoted 17 lines · Haojian Zhuang
Quoted 15 lines · Marc Zyngier

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on PXA-27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (PXA-270).

---
?arch/arm/mach-pxa/include/mach/entry-macro.S | ? ?3 +++ ?1 files changed, 3 insertions(+), 0 deletions(-)

Quoted 11 lines

arch/arm/mach-pxa/include/mach/entry-macro.S line 51

Quoted 11 lines
(quoted diff) +0 -0

b/arch/arm/mach-pxa/include/mach/entry-macro.S index 2418806..f7eb9d8 100644 --- a/arch/arm/mach-pxa/include/mach/entry-macro.S +++ b/arch/arm/mach-pxa/include/mach/entry-macro.S @@ -46,5 +46,8 @@ ? ? ? ? ? ? ? ?beq ? ? 1001f
? ? ? ? ? ? ? ?bic ? ? \irqstat, \irqstat, #0x80000000 ? ? ? ? ? ? ? ?mov ? ? \irqnr, \irqstat, lsr #16

arch/arm/mach-pxa/include/mach/entry-macro.S +3 -0
+#ifdef CONFIG_PXA_HAVE_ISA_IRQS
+ ? ? ? ? ? ? ? add ? ? \irqnr, \irqnr, #(PXA_IRQ(0))
+#endif

The #ifdef here might not be necessary since PXA_IRQ() has already encoded the difference, check arch/arm/mach-pxa/include/mach/irqs.h

Quoted 6 lines
Quoted 4 lines

?1001:
? ? ? ? ? ? ? ?.endm
--
1.6.0.4

Hi Marc,

Quoted 9 lines

I have a question on this. Do you use CONFIG_PXA_HAVE_ISA_IRQS in pxa270? In my patch, I only enable interrupt priority in pxa27x and pxa3xx since silicon can support this feature. And this feature isn't supported by pxa25x.

I also find that CONFIG_PXA_HAVE_ISA_IRQS is only used in pxa25x. Is it right? So I think that we needn't add this into pxa27x and pxa3xx. What's your opinion?

Quoted 7 lines

Haojian,

CONFIG_PXA_HAVE_ISA_IRQS is used on some platforms which emulates ISA expansion slots so some legacy ISA cards can still be used on pxa platforms, not necessarily related to pxa25x, could be pxa27x and pxa3xx. We need to take a look into the patch indeed.

Haojian, Eric,

Eric is right indeed, and I should probably have given more details about the context.

The Arcom Zeus is a pxa270 based system with a PC-104 bus (basically an ISA bus with a different form-factor). On such a system, the first 16 interrupts are reserved to ISA interrupts, so ISA drivers don't get confused with an IRQ number from outer space... Hence the need to add PXA_IRQ(0) to the IRQ number.

While the only in-tree user of this feature is the Arcom Viper (pxa255), I want to submit support for the Arcom Zeus "real soon now", and this patch (or any variation on the same theme) is needed for the system to simply boot.

Note that it was doing fine up to 2.6.31, so this is actually a regression from commit 57a7a62eb65b35f51814382b0841ff99be242880.

	M.
Signature · 1 line
I'm the slime oozin' out from your TV set...
maintainer
#4 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

In reply to Eric Miao
Quoted 49 lines · Eric Miao
Quoted 16 lines · Haojian Zhuang
Quoted 15 lines · Marc Zyngier

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on PXA-27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (PXA-270).

---
?arch/arm/mach-pxa/include/mach/entry-macro.S | ? ?3 +++ ?1 files changed, 3 insertions(+), 0 deletions(-)

Quoted 11 lines

arch/arm/mach-pxa/include/mach/entry-macro.S line 51

Quoted 11 lines
arch/arm/mach-pxa/include/mach/entry-macro.S +0 -0
index 2418806..f7eb9d8 100644
@@ -46,5 +46,8 @@

? ? ? ? ? ? ? ?beq ? ? 1001f
? ? ? ? ? ? ? ?bic ? ? \irqstat, \irqstat, #0x80000000 ? ? ? ? ? ? ? ?mov ? ? \irqnr, \irqstat, lsr #16

arch/arm/mach-pxa/include/mach/entry-macro.S +3 -0
+#ifdef CONFIG_PXA_HAVE_ISA_IRQS
+ ? ? ? ? ? ? ? add ? ? \irqnr, \irqnr, #(PXA_IRQ(0))
+#endif

The #ifdef here might not be necessary since PXA_IRQ() has already encoded the difference, check arch/arm/mach-pxa/include/mach/irqs.h

Quoted 6 lines
Quoted 4 lines

?1001:
? ? ? ? ? ? ? ?.endm
--
1.6.0.4

Hi Marc,

Quoted 9 lines

I have a question on this. Do you use CONFIG_PXA_HAVE_ISA_IRQS in pxa270? In my patch, I only enable interrupt priority in pxa27x and pxa3xx since silicon can support this feature. And this feature isn't supported by pxa25x.

I also find that CONFIG_PXA_HAVE_ISA_IRQS is only used in pxa25x. Is it right? So I think that we needn't add this into pxa27x and pxa3xx. What's your opinion?

Quoted 7 lines

Haojian,

CONFIG_PXA_HAVE_ISA_IRQS is used on some platforms which emulates ISA expansion slots so some legacy ISA cards can still be used on pxa platforms, not necessarily related to pxa25x, could be pxa27x and pxa3xx. We need to take a look into the patch indeed.

I'm OK on this patch. It works well on my platform.

#5 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Quoted 8 lines
Quoted 5 lines

CONFIG_PXA_HAVE_ISA_IRQS is used on some platforms which emulates ISA expansion slots so some legacy ISA cards can still be used on pxa platforms, not necessarily related to pxa25x, could be pxa27x and pxa3xx. We need to take a look into the patch indeed.

I'm OK on this patch. It works well on my platform.

So Marc,

Could you please check without that #ifdef .. #endif it still works fine since my assmption is PXA_IRQ() has taken that into account.

#6 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

On Thu, 5 Nov 2009 11:14:33 +0800
Eric Miao <[email protected]> wrote:

Eric,

Quoted 2 lines

Could you please check without that #ifdef .. #endif it still works fine since my assmption is PXA_IRQ() has taken that into account.

Indeed, PXA_IRQ() knows about PXA_HAVE_ISA_IRQ, and we can unconditionally have this fix.

Please find below the updated patch.

	M.
Quoted 1 line

From 50390cb82a10921b91a25f5908fdcacdf624017c Mon Sep 17 00:00:00 2001

From: Marc Zyngier <[email protected]>
Date: Tue, 3 Nov 2009 20:35:19 +0100
Subject: [PATCH] Fix pxa27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on pxa27x/3xx.

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (pxa270), with both CONFIG_PXA_HAVE_ISA_IRQS enabled and disabled.

---
 arch/arm/mach-pxa/include/mach/entry-macro.S |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)
arch/arm/mach-pxa/include/mach/entry-macro.S +1 -0
index 2418806..a73bc86 100644
@@ -46,5 +46,6 @@
 		beq	1001f
 		bic	\irqstat, \irqstat, #0x80000000
 		mov	\irqnr, \irqstat, lsr #16
+		add	\irqnr, \irqnr, #(PXA_IRQ(0))
 1001:
 		.endm
Signature · 5 lines
1.6.0.4


-- 
I'm the slime oozin' out from your TV set...
Applied
#7 lore raw

PATCH 1/1 Fix PXA-27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Quoted 9 lines

From 50390cb82a10921b91a25f5908fdcacdf624017c Mon Sep 17 00:00:00 2001
From: Marc Zyngier <[email protected]>
Date: Tue, 3 Nov 2009 20:35:19 +0100
Subject: [PATCH] Fix pxa27x/3xx interrupts when CONFIG_PXA_HAVE_ISA_IRQS=y

Commit d2c37068429b29d6549cf3486fc84b836689e122 ([ARM] pxa:
initialize default interrupt priority and use ICHP for IRQ handling) broke ISA interrupt support on pxa27x/3xx.

Quoted 7 lines

In such a case, PXA_IRQ(0) != 0, and the IRQ number computed from ICHP must be offset by PXA_IRQ(0).

Tested on an Arcom Zeus (pxa270), with both CONFIG_PXA_HAVE_ISA_IRQS enabled and disabled.

Applied to 'fix.