Skip to contentSkip to conversation

ATA convert GSI to irq on ia64

PATCH Applied Zhang, Yanmin 5 participants 11 messages Feb 8, 2007 – Feb 15, 2007

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

PATCH 1/1 ATA convert GSI to irq on ia64

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

---

include/asm-generic/libata-portmap.h +10 -0
diff -Nraup linux-2.6.20/include/asm-generic/libata-portmap.h linux-2.6.20_fix/include/asm-generic/libata-portmap.h
@@ -3,10 +3,20 @@
 
 #define ATA_PRIMARY_CMD		0x1F0
 #define ATA_PRIMARY_CTL		0x3F6
+#if defined(__ia64__)
+#define ATA_PRIMARY_IRQ(dev)	isa_irq_to_vector(14)
+#else
 #define ATA_PRIMARY_IRQ(dev)	14
+#endif
+
 
 #define ATA_SECONDARY_CMD	0x170
 #define ATA_SECONDARY_CTL	0x376
+#if defined(__ia64__)
+#define ATA_SECONDARY_IRQ(dev)	isa_irq_to_vector(15)
+#else
 #define ATA_SECONDARY_IRQ(dev)	15
+#endif
+
 
 #endif
#1 lore raw

if use ide_default_irq , then I guess the #if defined can be removed.
#define ATA_PRIMARY_IRQ(dev) isa_irq_to_vector(0x1F0)

Quoted 40 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

---

diff -Nraup linux-2.6.20/include/asm-generic/libata-portmap.h linux-2.6.20_fix/include/asm-generic/libata-portmap.h

include/asm-generic/libata-portmap.h 2007-02-08 15:20:13.000000000 +0800 renamed from include/asm-generic/libata-portmap.h 2007-02-08 15:13:44.000000000 +0800 +10 -1
@@ -3,10 +3,20 @@
 
 #define ATA_PRIMARY_CMD                0x1F0
 #define ATA_PRIMARY_CTL                0x3F6
+#if defined(__ia64__)
+#define ATA_PRIMARY_IRQ(dev)   isa_irq_to_vector(14)
+#else
 #define ATA_PRIMARY_IRQ(dev)   14
+#endif
+
 
 #define ATA_SECONDARY_CMD      0x170
 #define ATA_SECONDARY_CTL      0x376
+#if defined(__ia64__)
+#define ATA_SECONDARY_IRQ(dev) isa_irq_to_vector(15)
+#else
 #define ATA_SECONDARY_IRQ(dev) 15
+#endif
+
 
 #endif
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#2 lore raw

sorry, it should be
#define ATA_PRIMARY_IRQ(dev) ide_default_irq(0x1F0)

Quoted 46 lines · Luming Yu

if use ide_default_irq , then I guess the #if defined can be removed.
#define ATA_PRIMARY_IRQ(dev) isa_irq_to_vector(0x1F0)

Quoted 40 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

---

diff -Nraup linux-2.6.20/include/asm-generic/libata-portmap.h linux-2.6.20_fix/include/asm-generic/libata-portmap.h

include/asm-generic/libata-portmap.h 2007-02-08 15:20:13.000000000 +0800 renamed from include/asm-generic/libata-portmap.h 2007-02-08 15:13:44.000000000 +0800 +10 -1
@@ -3,10 +3,20 @@
 
 #define ATA_PRIMARY_CMD                0x1F0
 #define ATA_PRIMARY_CTL                0x3F6
+#if defined(__ia64__)
+#define ATA_PRIMARY_IRQ(dev)   isa_irq_to_vector(14)
+#else
 #define ATA_PRIMARY_IRQ(dev)   14
+#endif
+
 
 #define ATA_SECONDARY_CMD      0x170
 #define ATA_SECONDARY_CTL      0x376
+#if defined(__ia64__)
+#define ATA_SECONDARY_IRQ(dev) isa_irq_to_vector(15)
+#else
 #define ATA_SECONDARY_IRQ(dev) 15
+#endif
+
 
 #endif
-

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

#3 lore raw
Quoted 6 lines · Luming Yu

sorry, it should be
#define ATA_PRIMARY_IRQ(dev) ide_default_irq(0x1F0)

Quoted 2 lines · Luming Yu

if use ide_default_irq , then I guess the #if defined can be removed.
#define ATA_PRIMARY_IRQ(dev) isa_irq_to_vector(0x1F0)

ata driver will replace old ide driver, so I don't use ide codes in ata driver.

Quoted 37 lines
Quoted 37 lines · Yanmin
Quoted 34 lines

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

---

diff -Nraup linux-2.6.20/include/asm-generic/libata-portmap.h linux-2.6.20_fix/include/asm-generic/libata-portmap.h

include/asm-generic/libata-portmap.h 2007-02-08 15:20:13.000000000 +0800 renamed from include/asm-generic/libata-portmap.h 2007-02-08 15:13:44.000000000 +0800 +10 -0
@@ -3,10 +3,20 @@
 
 #define ATA_PRIMARY_CMD                0x1F0
 #define ATA_PRIMARY_CTL                0x3F6
+#if defined(__ia64__)
+#define ATA_PRIMARY_IRQ(dev)   isa_irq_to_vector(14)
+#else
 #define ATA_PRIMARY_IRQ(dev)   14
+#endif
+
 
 #define ATA_SECONDARY_CMD      0x170
 #define ATA_SECONDARY_CTL      0x376
+#if defined(__ia64__)
+#define ATA_SECONDARY_IRQ(dev) isa_irq_to_vector(15)
+#else
 #define ATA_SECONDARY_IRQ(dev) 15
+#endif
+
 
 #endif
#4 lore raw
In reply to Zhang, Yanmin
Quoted 5 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

These direct arch ifdefs in core aren't acceptable. The again I'm pretty sure we have patches floating around to turn these two macros into architecture-supplied ones, IIRC it came from the powerpc side.

#5 lore raw
Quoted 8 lines · On Thu, 8 Feb 2007 19:42:04 +0000 Christoph Hellwig <[email protected]> wrote:
Quoted 5 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

These direct arch ifdefs in core aren't acceptable.

For 2.6.21 that's true. But this is a suitable fix for 2.6.20.x, no?

#6 lore raw
Quoted 8 lines · Andrew Morton
Quoted 5 lines · On Thu, 8 Feb 2007 19:42:04 +0000 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Quoted 5 lines
Quoted 3 lines
Quoted 1 line

Below patch against kernel 2.6.20 fixes it.

These direct arch ifdefs in core aren't acceptable.

For 2.6.21 that's true. But this is a suitable fix for 2.6.20.x, no?

Just putting in an #ifndef and allow to to set it up in asm/ata.h is almost as trivial and a lot nice conceptually. Then again what happened to the idea of putting fixes into mainline before -stable?

#7 lore raw
Quoted 9 lines · On Thu, 8 Feb 2007 20:34:53 +0000 Christoph Hellwig <[email protected]> wrote:
Quoted 8 lines · Andrew Morton
Quoted 5 lines · On Thu, 8 Feb 2007 19:42:04 +0000 Christoph Hellwig <[email protected]> wrote:
Quoted 4 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
Quoted 1 line

Below patch against kernel 2.6.20 fixes it.

These direct arch ifdefs in core aren't acceptable.

For 2.6.21 that's true. But this is a suitable fix for 2.6.20.x, no?

Just putting in an #ifndef and allow to to set it up in asm/ata.h is almost as trivial and a lot nice conceptually.

Well if that's what the 2.6.21 solution looks like then OK. Would want to see the patch though.

Quoted 3 lines

Then again
what happened to the idea of putting fixes into mainline before -stable?

If the preferred mainline patch involves a lot of not-really-needed restructuring then an alternative short-but-obvious fix for -stable is sometimes more appropriate.

#8 lore raw
In reply to Zhang, Yanmin
Quoted 7 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

IA64 should create its own libata-portmap.h, rather than modifying the one in asm-generic with arch-specific choices.

powerpc is a current example of this (and currently the only non-asm-generic user) found in kernel 2.6.20.

Jeff

#9 lore raw
Quoted 7 lines · Jeff Garzik
Quoted 6 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

Quoted 7 lines
Quoted 1 line

IA64 should create its own libata-portmap.h, rather than modifying the one in asm-generic with arch-specific choices.

powerpc is a current example of this (and currently the only non-asm-generic user) found in kernel 2.6.20.

Thank Jeff. I worked out a new patch.

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

---

arch/ia64/Kconfig +1 -0
diff -Nraup linux-2.6.20/arch/ia64/Kconfig linux-2.6.20_fix/arch/ia64/Kconfig
@@ -11,6 +11,7 @@ menu "Processor type and features"
 
 config IA64
 	bool
+	select ATA_NONSTANDARD if ATA
 	default y
 	help
 	  The Itanium Processor Family is Intel's 64-bit successor to
include/asm-ia64/libata-portmap.h +12 -0
diff -Nraup linux-2.6.20/include/asm-ia64/libata-portmap.h linux-2.6.20_fix/include/asm-ia64/libata-portmap.h
@@ -0,0 +1,12 @@
+#ifndef __ASM_IA64_LIBATA_PORTMAP_H
+#define __ASM_IA64_LIBATA_PORTMAP_H
+
+#define ATA_PRIMARY_CMD		0x1F0
+#define ATA_PRIMARY_CTL		0x3F6
+#define ATA_PRIMARY_IRQ(dev)	isa_irq_to_vector(14)
+
+#define ATA_SECONDARY_CMD	0x170
+#define ATA_SECONDARY_CTL	0x376
+#define ATA_SECONDARY_IRQ(dev)	isa_irq_to_vector(15)
+
+#endif
Applied
#10 lore raw
Quoted 14 lines · Yanmin
Quoted 11 lines · Jeff Garzik
Quoted 7 lines · Yanmin

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

IA64 should create its own libata-portmap.h, rather than modifying the one in asm-generic with arch-specific choices.

powerpc is a current example of this (and currently the only non-asm-generic user) found in kernel 2.6.20.

Thank Jeff. I worked out a new patch.

Quoted 7 lines

If an ATA drive uses legacy mode, ata driver will choose 14 and 15 as the fixed irq number. On ia64 platform, such numbers are GSI and should be converted to irq vector.

Below patch against kernel 2.6.20 fixes it.

applied