Skip to contentSkip to conversation

sgiioc4: use mmio ops instead of port io

PATCH In review Jeremy Higdon 2 participants 2 messages May 30, 2006 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 sgiioc4: use mmio ops instead of port io

I sent this a couple of weeks ago to linux-ide, but I didn't see any response. This patch fixes a bug in sgiioc4 where it was using the default IDE port I/O operations instead of MMIO. I don't know who's maintaining linux-ide these days, so I'm forwarding directly to Linux and Andrew.

The IDE part of the IOC4 chip uses MMIO to map the chip registers. Unfortunately, the sgiioc4 driver uses the default port IO operations, which happens to have worked for the past few years. That's about to change, however, thus this change from inX/outX to readX/writeX.

Signed-off-by [email protected]
drivers/ide/pci/sgiioc4.c +11 -5
@@ -345,17 +345,17 @@
 static u8
 sgiioc4_INB(unsigned long port)
 {
-	u8 reg = (u8) inb(port);
+	u8 reg = (u8) readb((void __iomem *) port);
 
 	if ((port & 0xFFF) == 0x11C) {	/* Status register of IOC4 */
 		if (reg & 0x51) {	/* Not busy...check for interrupt */
 			unsigned long other_ir = port - 0x110;
-			unsigned int intr_reg = (u32) inl(other_ir);
+			unsigned int intr_reg = (u32) readl((void __iomem *) other_ir);
 
 			/* Clear the Interrupt, Error bits on the IOC4 */
 			if (intr_reg & 0x03) {
-				outl(0x03, other_ir);
-				intr_reg = (u32) inl(other_ir);
+				writel(0x03, (void __iomem *) other_ir);
+				intr_reg = (u32) readl((void __iomem *) other_ir);
 			}
 		}
 	}
@@ -606,6 +606,12 @@
 	hwif->ide_dma_host_off = &sgiioc4_ide_dma_host_off;
 	hwif->ide_dma_lostirq = &sgiioc4_ide_dma_lostirq;
 	hwif->ide_dma_timeout = &__ide_dma_timeout;
+
+	/*
+	 * The IOC4 uses MMIO rather than Port IO.
+	 * It also needs special workarounds for INB.
+	 */
+	default_hwif_mmiops(hwif);
 	hwif->INB = &sgiioc4_INB;
 }
 
@@ -743,6 +749,6 @@
 module_init(ioc4_ide_init);
 module_exit(ioc4_ide_exit);
 
-MODULE_AUTHOR("Aniket Malatpure - Silicon Graphics Inc. (SGI)");
+MODULE_AUTHOR("Aniket Malatpure/Jeremy Higdon");
 MODULE_DESCRIPTION("IDE PCI driver module for SGI IOC4 Base-IO Card");
 MODULE_LICENSE("GPL");
#1 lore raw
Quoted 2 lines · On Mon, 29 May 2006 18:32:19 -0700 Jeremy Higdon <[email protected]> wrote:

I sent this a couple of weeks ago to linux-ide, but I didn't see any response.

It's not exactly a hive of activity lately.

Quoted 9 lines

This patch fixes a bug in sgiioc4 where it was using
the default IDE port I/O operations instead of MMIO. I don't know who's maintaining linux-ide these days, so I'm forwarding directly to Linux and Andrew.

The IDE part of the IOC4 chip uses MMIO to map the chip registers. Unfortunately, the sgiioc4 driver uses the default port IO operations, which happens to have worked for the past few years. That's about to change, however, thus this change from inX/outX to readX/writeX.

The typecasts in there are getting out of control. But this patch is a victim, not a perpetrator ;)

I'll queue it for the next Linus batch, thanks.