Skip to contentSkip to conversation

Implementing CONFIG_IDE_POLL

PATCH Marc Singer 2 participants 3 messages Apr 7, 2004 – Apr 22, 2004

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

I've taken a stab at implementing a polling mode for an IDE implementation that lacks interrupts. Yes, yes, I know, I know. Changing the hardware *is* the right answer. Well, that doesn't appear to be happening before I need to ship some running code.

So, I've made something that works. It turns out not to be too difficult nor invasive. Essentially, I'm allowing the the hardware initialization to pass IDE_NO_IRQ such that there is no IRQ probing and no one attempts to enable or disable that interrupt. Then there is an ide_poll() function which is called at a couple of different places. It does what it can if the device is ready, or it sets a timer if there is more to be done and it looks like it might be a long wait. This code is working on my target platform. I can use a CF card for the root filesystem.

I'm looking for some constructive criticism. Overall, this implementation was more complex that I would have liked. Am I missing anything important? Is there a better way?

There is one part that is missing. IDE_POLL is set true when the ARCH_LPD7A40X architecture is defined.

arch/arm/mach-lh7a40x/ide-lpd7a40x.c +166 -0
Index: arch/arm/mach-lh7a40x/ide-lpd7a40x.c
===================================================================
@@ -0,0 +1,166 @@
+/* arch/arm/mach-lh7a40x/ide-lpd7a40x.c
+ *
+ *  Copyright (C) 2004 Logic Product Development
+ *
+ *  This program is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU General Public License
+ *  version 2 as published by the Free Software Foundation.
+ *
+ */
+
+
+#include <linux/config.h>
+#include <linux/ide.h>
+
+#include <asm/io.h>
+
+#define IOBARRIER_READ		readl (IOBARRIER_VIRT)
+
+static u8 lpd7a40x_ide_inb (unsigned long port)
+{
+	u16 v = (u16) readw (port & ~0x1);
+	IOBARRIER_READ;
+	if (port & 0x1)
+		v >>= 8;
+	return v & 0xff;
+}
+
+static u16 lpd7a40x_ide_inw (unsigned long port)
+{
+	u16 v = (u16) readw (port);
+	IOBARRIER_READ;
+	return v;
+}
+
+static void lpd7a40x_ide_insw (unsigned long port, void *addr, u32 count)
+{
+	while (count--) {
+		*((u16*) addr)++ = (u16) readw (port);
+		IOBARRIER_READ;
+	}
+}
+
+static u32 lpd7a40x_ide_inl (unsigned long port)
+{
+	u32 v = (u16) readw (port);
+	IOBARRIER_READ;
+	v |= (u16) readw (port + 2);
+	IOBARRIER_READ;
+
+	return v;
+}
+
+static void lpd7a40x_ide_insl (unsigned long port, void *addr, u32 count)
+{
+	while (count--) {
+		*((u16*) addr)++ = (u16) readw (port);
+		IOBARRIER_READ;
+		*((u16*) addr)++ = (u16) readw (port + 2);
+		IOBARRIER_READ;
+	}
+}
+
+/* lpd7a40x_ide_outb -- this function is complicated by the fact that
+ * the user wants to be able to do byte IO and the hardware cannot.
+ * In order to write the high byte, we need to write a short.  So, we
+ * read before writing in order to maintain the register values that
+ * shouldn't change.  This isn't a good idea for the data IO registers
+ * since reading from them will not return the current value.  We
+ * expect that this function handles the control register adequately.
+*/
+
+static void lpd7a40x_ide_outb (u8 valueUser, unsigned long port)
+{
+	/* Block writes to SELECT register.  Draconian, but the only
+	 * way to cope with this hardware configuration without
+	 * modifying the SELECT_DRIVE call in the ide driver. */
+	if ((port & 0xf) == 0x6)
+		return;
+
+	if (port & 0x1) {	/* Perform read before write.  Only
+				 * the COMMAND register needs
+				 * this.  */
+		u16 value = (u16) readw (port & ~0x1);
+		IOBARRIER_READ;
+		value = (value & 0x00ff) | (valueUser << 8);
+		writew (value, port & ~0x1);
+		IOBARRIER_READ;
+	}
+	else {			/* Allow low-byte writes which seem to
+				 * be OK. */
+		writeb (valueUser, port);
+		IOBARRIER_READ;
+	}
+}
+
+static void lpd7a40x_ide_outbsync (ide_drive_t *drive, u8 value, 
+				   unsigned long port)
+{
+	lpd7a40x_ide_outb (value, port);
+}
+
+static void lpd7a40x_ide_outw (u16 value, unsigned long port)
+{
+	writew (value, port);
+	IOBARRIER_READ;
+}
+
+static void lpd7a40x_ide_outsw (unsigned long port, void *addr, u32 count)
+{
+	while (count-- > 0) {
+		writew (*((u16*) addr)++, port);
+		IOBARRIER_READ;
+	}
+}
+
+static void lpd7a40x_ide_outl (u32 value, unsigned long port)
+{
+	writel (value, port);
+	IOBARRIER_READ;
+}
+
+static void lpd7a40x_ide_outsl (unsigned long port, void *addr, u32 count)
+{
+	while (count-- > 0) {
+		writel (*((u32*) addr)++, port);
+		IOBARRIER_READ;
+	}
+}
+
+void lpd7a40x_SELECT_DRIVE (ide_drive_t *drive)
+{
+	unsigned jifStart = jiffies;
+#define WAIT_TIME	(30*HZ/1000)
+
+	/* Check for readiness. */
+	while ((HWIF(drive)->INB(IDE_STATUS_REG) & 0x40) == 0)
+		if (jifStart <= jiffies + WAIT_TIME)
+			return;
+
+	/* Only allow one drive.  
+	   For more information, see Documentation/arm/Sharp-LH/ */
+	if (drive->select.all & (1<<4))
+		return;
+
+	/* OUTW so that the IDLE_IMMEDIATE (and not NOP) command is sent. */
+	HWIF(drive)->OUTW(drive->select.all | 0xe100, IDE_SELECT_REG);
+}
+
+void lpd7a40x_hwif_ioops (ide_hwif_t *hwif)
+{
+	hwif->mmio      = 2;	/* Just for show */
+	hwif->irq	= IDE_NO_IRQ;	/* Stop this probing */
+
+	hwif->OUTB	= lpd7a40x_ide_outb;
+	hwif->OUTBSYNC	= lpd7a40x_ide_outbsync;
+	hwif->OUTW	= lpd7a40x_ide_outw;
+	hwif->OUTL	= lpd7a40x_ide_outl;
+	hwif->OUTSW	= lpd7a40x_ide_outsw;
+	hwif->OUTSL	= lpd7a40x_ide_outsl;
+	hwif->INB	= lpd7a40x_ide_inb;
+	hwif->INW	= lpd7a40x_ide_inw;
+	hwif->INL	= lpd7a40x_ide_inl;
+	hwif->INSW	= lpd7a40x_ide_insw;
+	hwif->INSL	= lpd7a40x_ide_insl;
+	hwif->selectproc = lpd7a40x_SELECT_DRIVE;
+}
include/asm-arm/arch-lh7a40x/ide.h +66 -0

66 lines not on this page · raw message

include/linux/ide.h +9 -0
Index: include/linux/ide.h
===================================================================
@@ -1034,6 +1034,10 @@
 	int pio_clock;
 
 	unsigned char cmd_buf[4];
+
+#ifdef CONFIG_IDE_POLL
+	struct timer_list timer_poll; /* Timer for IRQ-less polling */
+#endif
 } ide_hwgroup_t;
 
 /* structure attached to the request for IDE_TASK_CMDS */
@@ -1703,4 +1707,9 @@
 
 extern struct bus_type ide_bus_type;
 
+#ifdef CONFIG_IDE_POLL
+extern void ide_poll (ide_hwgroup_t* hwif);
+extern void ide_poll_timer (unsigned long data);
+#endif
+
 #endif /* _IDE_H */
drivers/ide/Kconfig +3 -0
Index: drivers/ide/Kconfig
===================================================================
@@ -294,6 +294,9 @@
 
 	  It is safe to say Y to this question, in most cases.
 
+config IDE_POLL
+	bool
+
 comment "IDE chipset support/bugfixes"
 
 config IDE_GENERIC
drivers/ide/ide-probe.c +10 -4
Index: drivers/ide/ide-probe.c
===================================================================
@@ -396,7 +396,7 @@
 		udelay(5);
 		irq = probe_irq_off(cookie);
 		if (!hwif->irq) {
-			if (irq > 0) {
+			if (irq != 0) {
 				hwif->irq = irq;
 			} else {
 				/* Mmmm.. multiple IRQs..
@@ -729,7 +729,7 @@
 	 * we'll install our IRQ driver much later...
 	 */
 	irqd = hwif->irq;
-	if (irqd)
+	if (irqd && irqd != IDE_NO_IRQ)
 		disable_irq(hwif->irq);
 
 	local_irq_set(flags);
@@ -794,7 +794,7 @@
 	 * Use cached IRQ number. It might be (and is...) changed by probe
 	 * code above
 	 */
-	if (irqd)
+	if (irqd && irqd != IDE_NO_IRQ)
 		enable_irq(irqd);
 
 	if (!hwif->present) {
@@ -1045,12 +1045,18 @@
 		init_timer(&hwgroup->timer);
 		hwgroup->timer.function = &ide_timer_expiry;
 		hwgroup->timer.data = (unsigned long) hwgroup;
+
+#ifdef CONFIG_IDE_POLL
+		init_timer (&hwgroup->timer_poll);
+		hwgroup->timer_poll.function = &ide_poll_timer;
+		hwgroup->timer_poll.data = (unsigned long) hwgroup;
+#endif
 	}
 
 	/*
 	 * Allocate the irq, if not already obtained for another hwif
 	 */
-	if (!match || match->irq != hwif->irq) {
+	if ((!match || match->irq != hwif->irq) && hwif->irq != IDE_NO_IRQ) {
 		int sa = SA_INTERRUPT;
 #if defined(__mc68000__) || defined(CONFIG_APUS)
 		sa = SA_SHIRQ;
drivers/ide/ide-io.c +56 -2

79 lines not on this page · raw message

drivers/ide/ide-iops.c +5 -0
Index: drivers/ide/ide-iops.c
===================================================================
@@ -1016,6 +1016,11 @@
 	*/
 	ndelay(400);
 	spin_unlock_irqrestore(&ide_lock, flags);
+
+#if defined (CONFIG_IDE_POLL)
+	if (hwif->irq == IDE_NO_IRQ)
+		ide_poll (hwgroup);
+#endif
 }
 
 EXPORT_SYMBOL(ide_execute_command);
drivers/ide/ide-disk.c +6 -0
Index: drivers/ide/ide-disk.c
===================================================================
@@ -518,6 +518,12 @@
 			taskfile_output_data(drive, to, SECTOR_WORDS);
 			ide_unmap_buffer(rq, to, &flags);
 		}
+
+#if defined (CONFIG_IDE_POLL)
+		if (hwif->irq == IDE_NO_IRQ)
+			ide_poll (HWGROUP (drive));
+#endif
+
 		return ide_started;
 	}
 	blk_dump_rq_flags(rq, "__ide_do_rw_disk - bad command");
#1 lore raw

Yes, it was way too long delay, sorry...

Quoted 15 lines · Marc Singer

I've taken a stab at implementing a polling mode for an IDE implementation that lacks interrupts. Yes, yes, I know, I know. Changing the hardware *is* the right answer. Well, that doesn't appear to be happening before I need to ship some running code.

So, I've made something that works. It turns out not to be too difficult nor invasive. Essentially, I'm allowing the the hardware initialization to pass IDE_NO_IRQ such that there is no IRQ probing and no one attempts to enable or disable that interrupt. Then there is an ide_poll() function which is called at a couple of different places. It does what it can if the device is ready, or it sets a timer if there is more to be done and it looks like it might be a long wait. This code is working on my target platform. I can use a CF card for the root filesystem.

Quoted 6 lines

I'm looking for some constructive criticism. Overall, this implementation was more complex that I would have liked. Am I missing anything important? Is there a better way?

There is one part that is missing. IDE_POLL is set true when the ARCH_LPD7A40X architecture is defined.

ide-lpd7a40x.c and arch-lh7a40x/ide.h should be merged into a IDE driver.

drivers/ide/arm/ is the right place for this code

ide_register_hw() is obsolete, please use &ide_hwifs[0] directly for now...

Why you can't reuse hwgroup->timer for polling?

Regards,
Bartlomiej

#2 lore raw
In reply to Marc Singer
Quoted 3 lines

is an ide_poll() function which is called at a couple of different places. It does what it can if the device is ready, or it sets a

ide_poll() is also needed in do_rw_taskfile() in ide-taskfile.c and maybe in some other places too...