Re: Suspend to ram regression (2.6.24-rc1-git)

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Jeff Garzik <jeff@...>
Cc: <linux-kernel@...>, <kristen.c.accardi@...>, <linux-ide@...>
Date: Thursday, November 1, 2007 - 8:01 am

On Thu, Nov 01 2007, Jeff Garzik wrote:

OK, so you just want the option to be temporary? In that case I think a
config option is better, since you don't risk breaking peoples setups
later when removing the option. That can be quite annoying. Ala the
below.

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index ba63619..e276ab6 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -48,6 +48,14 @@ config SATA_AHCI
 
 	  If unsure, say N.
 
+config SATA_AHCI_IPM
+	bool "AHCI power management"
+	depends on EXPERIMENTAL && SATA_AHCI
+	help
+	  This option adds support for AHCI power management. It current
+	  breaks suspend on some laptops. This option is temporary and will
+	  go away once those issues are fully resolved.
+
 config SATA_SVW
 	tristate "ServerWorks Frodo / Apple K2 SATA support"
 	depends on PCI
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c
index ed9b407..37266ce 100644
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
@@ -190,8 +190,11 @@ enum {
 
 	AHCI_FLAG_COMMON		= ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
 					  ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA |
-					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN |
-					  ATA_FLAG_IPM,
+					  ATA_FLAG_ACPI_SATA | ATA_FLAG_AN
+#ifdef CONFIG_SATA_AHCI_IPM
+					  | ATA_FLAG_IPM
+#endif
+					,
 	AHCI_LFLAG_COMMON		= ATA_LFLAG_SKIP_D2H_BSY,
 };
 

-- 
Jens Axboe

-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Wed Oct 31, 4:13 pm)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Thu Nov 1, 4:41 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Kristen Carlson Accardi, (Fri Nov 2, 7:37 pm)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Mon Nov 5, 8:47 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Jeff Garzik, (Mon Nov 5, 8:53 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Kristen Carlson Accardi, (Mon Nov 5, 1:21 pm)
Re: Suspend to ram regression (2.6.24-rc1-git), Theodore Tso, (Sat Nov 3, 2:23 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Arjan van de Ven, (Sat Nov 3, 1:02 pm)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Thu Nov 1, 5:21 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Jeff Garzik, (Thu Nov 1, 7:20 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Thu Nov 1, 7:24 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Jeff Garzik, (Thu Nov 1, 7:55 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Thu Nov 1, 8:01 am)
Re: Suspend to ram regression (2.6.24-rc1-git), Kristen Carlson Accardi, (Thu Nov 1, 12:58 pm)
Re: Suspend to ram regression (2.6.24-rc1-git), Jens Axboe, (Thu Nov 1, 5:25 am)