From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S262762AbVAQKdE (ORCPT ); Mon, 17 Jan 2005 05:33:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S262763AbVAQKdE (ORCPT ); Mon, 17 Jan 2005 05:33:04 -0500 Received: from mailout.stusta.mhn.de ([141.84.69.5]:21766 "HELO mailout.stusta.mhn.de") by vger.kernel.org with SMTP id S262762AbVAQKc6 (ORCPT ); Mon, 17 Jan 2005 05:32:58 -0500 Date: Mon, 17 Jan 2005 11:32:53 +0100 From: Adrian Bunk To: Andrew Morton Cc: Alan Cox , Bartlomiej Zolnierkiewicz , Linux Kernel Mailing List Subject: [2.6 patch] IDE: remove WAIT_READY dependency on APM Message-ID: <20050117103253.GL4274@stusta.de> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.6+20040907i Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org 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: > 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. Signed-off-by: Adrian Bunk --- This patch as already sent on: - 11 Dec 2004 --- linux-2.6.10-rc2-mm4-full/include/linux/ide.h.old 2004-12-11 18:11:20.000000000 +0100 +++ linux-2.6.10-rc2-mm4-full/include/linux/ide.h 2004-12-11 18:11:32.000000000 +0100 @@ -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 */