Skip to contentSkip to conversation

IDE: remove WAIT_READY dependency on APM

PATCH New Adrian Bunk 1 participant 1 message Jan 17, 2005

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 IDE: remove WAIT_READY dependency on APM

On the one hand APM isn't enabled on all laptops.
On the other hand, this also affects regular PCs with APM support (or using a distribution kernel with APM support).

The time for the !APM case was already increased from 30msec in 2.4 . Isn't there a timeout that is suitable for all cases?

Alan Cox answered:

Quoted 4 lines

The five seconds should be just fine for all cases. The smaller value with no
power manglement should help speed up recovery however. It probably doesn't belong CONFIG_APM now ACPI and friends are involved either.

Until someone has a real good solution (consider e.g. that most PC users might have ACPI support enabled), this patch unconditionally sets WAIT_READY to 5 seconds.

---

This patch as already sent on:
- 11 Dec 2004

include/linux/ide.h renamed from include/linux/ide.h.old +0 -4
@@ -187,11 +187,7 @@
  * Timeouts for various operations:
  */
 #define WAIT_DRQ	(HZ/10)		/* 100msec - spec allows up to 20ms */
-#if defined(CONFIG_APM) || defined(CONFIG_APM_MODULE)
 #define WAIT_READY	(5*HZ)		/* 5sec - some laptops are very slow */
-#else
-#define WAIT_READY	(HZ/10)		/* 100msec - should be instantaneous */
-#endif /* CONFIG_APM || CONFIG_APM_MODULE */
 #define WAIT_PIDENTIFY	(10*HZ)	/* 10sec  - should be less than 3ms (?), if all ATAPI CD is closed at boot */
 #define WAIT_WORSTCASE	(30*HZ)	/* 30sec  - worst case when spinning up */
 #define WAIT_CMD	(10*HZ)	/* 10sec  - maximum wait for an IRQ to happen */