libata hibernation fixes
Subsystems (4)
PATCH 1/1 libata hibernation fixes
Please pull from 'hibern_fixes' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev.git hibern_fixes
to receive the following updates:
drivers/ata/ahci.c | 32 ++++++++++++++++++ drivers/ata/ata_piix.c | 34 +++++++++++++++++++ drivers/ata/libata-scsi.c | 20 ++++++++++-- drivers/ata/sata_sil.c | 36 ++++++++++++++++++++- drivers/firmware/dmi_scan.c | 74 ++++++++++++++++++++++++++++++++----------- include/linux/dmi.h | 1 + include/linux/libata.h | 2 + include/linux/suspend.h | 2 + kernel/power/disk.c | 10 ++++++ 9 files changed, 188 insertions(+), 23 deletions(-)
Rafael J. Wysocki (6):
Hibernation: Introduce system_entering_hibernation
DMI: Introduce dmi_first_match to make the interface more flexible
SATA: Blacklisting of systems that spin off disks during ACPI power off SATA AHCI: Blacklist system that spins off disks during ACPI power off SATA Sil: Blacklist system that spins off disks during ACPI power off SATA PIIX: Blacklist system that spins off disks during ACPI power off
drivers/ata/ahci.c +32 -0
@@ -2548,6 +2548,32 @@ static void ahci_p5wdh_workaround(struct ata_host *host) } } +static bool ahci_broken_system_poweroff (struct pci_dev *pdev) +{ +static const struct dmi_system_id broken_systems[] = { + { + .ident ="HP Compaq nx6310" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP Compaq nx6310" ), + }, +/* PCI slot number of the controller */ + .driver_data = (void *)0x1FUL , + }, + + { }/* terminate list */ + }; +const struct dmi_system_id *dmi =dmi_first_match (broken_systems); + +if (dmi) { +unsigned long slot = (unsigned long )dmi->driver_data; +/* apply the quirk only to on-board controllers */ +return slot ==PCI_SLOT (pdev->devfn); + } + +return false; +} +static int ahci_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static int printed_version;
@@ -2647,6 +2673,12 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) } } +if (ahci_broken_system_poweroff (pdev)) { + pi.flags |=ATA_FLAG_NO_POWEROFF_SPINDOWN ; +dev_info (&pdev->dev, +"quirky BIOS, skipping spindown on poweroff\n" ); + } +/* CAP.NP sometimes indicate the index of the last enabled * port, at other times, that of the last possible port, so * determining the maximum port number requires looking at
drivers/ata/ata_piix.c +34 -0
@@ -1387,6 +1387,32 @@ static void piix_iocfg_bit18_quirk(struct ata_host *host) } } +static bool piix_broken_system_poweroff (struct pci_dev *pdev) +{ +static const struct dmi_system_id broken_systems[] = { + { + .ident ="HP Compaq 2510p" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP Compaq 2510p" ), + }, +/* PCI slot number of the controller */ + .driver_data = (void *)0x1FUL , + }, + + { }/* terminate list */ + }; +const struct dmi_system_id *dmi =dmi_first_match (broken_systems); + +if (dmi) { +unsigned long slot = (unsigned long )dmi->driver_data; +/* apply the quirk only to on-board controllers */ +return slot ==PCI_SLOT (pdev->devfn); + } + +return false; +} +/** * piix_init_one - Register PIIX ATA PCI device with kernel services * @pdev: PCI device to register
@@ -1422,6 +1448,14 @@ static int __devinit piix_init_one(struct pci_dev *pdev,if (!in_module_init)return -ENODEV ; +if (piix_broken_system_poweroff (pdev)) { + piix_port_info[ent->driver_data].flags |= +ATA_FLAG_NO_POWEROFF_SPINDOWN | +ATA_FLAG_NO_HIBERNATE_SPINDOWN ; +dev_info (&pdev->dev,"quirky BIOS, skipping spindown " +"on poweroff and hibernation\n" ); + } + port_info[0 ] = piix_port_info[ent->driver_data]; port_info[1 ] = piix_port_info[ent->driver_data];
drivers/ata/libata-scsi.c +17 -3
@@ -46,6 +46,7 @@#include <linux/libata.h> #include <linux/hdreg.h> #include <linux/uaccess.h> +#include <linux/suspend.h> #include "libata.h"
@@ -1303,6 +1304,17 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc) tf->command =ATA_CMD_VERIFY ;/* READ VERIFY */ }else { +/* Some odd clown BIOSen issue spindown on power off (ACPI S4 +* or S5) causing some drives to spin up and down again. +*/ +if ((qc->ap->flags &ATA_FLAG_NO_POWEROFF_SPINDOWN ) && + system_state ==SYSTEM_POWER_OFF ) + goto skip; + +if ((qc->ap->flags &ATA_FLAG_NO_HIBERNATE_SPINDOWN ) && +system_entering_hibernation ()) + goto skip; +/* XXX: This is for backward compatibility, will be * removed. Read Documentation/feature-removal-schedule.txt * for more info.
@@ -1326,8 +1338,7 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc) scmd->scsi_done = qc->scsidone; qc->scsidone = ata_delayed_done; } - scmd->result =SAM_STAT_GOOD ; -return 1 ; + goto skip; }/* Issue ATA STANDBY IMMEDIATE command */
@@ -1343,10 +1354,13 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc)return 0 ; -invalid_fld: + invalid_fld:ata_scsi_set_sense (scmd,ILLEGAL_REQUEST ,0x24 ,0x0 );/* "Invalid field in cbd" */ return 1 ; + skip: + scmd->result =SAM_STAT_GOOD ; +return 1 ; }
drivers/ata/sata_sil.c +35 -1
@@ -695,11 +695,38 @@ static void sil_init_controller(struct ata_host *host) } } +static bool sil_broken_system_poweroff (struct pci_dev *pdev) +{ +static const struct dmi_system_id broken_systems[] = { + { + .ident ="HP Compaq nx6325" , + .matches = { +DMI_MATCH (DMI_SYS_VENDOR ,"Hewlett-Packard" ), +DMI_MATCH (DMI_PRODUCT_NAME ,"HP Compaq nx6325" ), + }, +/* PCI slot number of the controller */ + .driver_data = (void *)0x12UL , + }, + + { }/* terminate list */ + }; +const struct dmi_system_id *dmi =dmi_first_match (broken_systems); + +if (dmi) { +unsigned long slot = (unsigned long )dmi->driver_data; +/* apply the quirk only to on-board controllers */ +return slot ==PCI_SLOT (pdev->devfn); + } + +return false; +} +static int sil_init_one (struct pci_dev *pdev,const struct pci_device_id *ent) {static int printed_version;int board_id = ent->driver_data; -const struct ata_port_info *ppi[] = { &sil_port_info[board_id],NULL }; +struct ata_port_info pi = sil_port_info[board_id]; +const struct ata_port_info *ppi[] = { &pi,NULL };struct ata_host *host;void __iomem *mmio_base;int n_ports, rc;
@@ -713,6 +740,13 @@ static int sil_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)if (board_id == sil_3114) n_ports =4 ; +if (sil_broken_system_poweroff (pdev)) { + pi.flags |=ATA_FLAG_NO_POWEROFF_SPINDOWN | +ATA_FLAG_NO_HIBERNATE_SPINDOWN ; +dev_info (&pdev->dev,"quirky BIOS, skipping spindown " +"on poweroff and hibernation\n" ); + } + host =ata_host_alloc_pinfo (&pdev->dev, ppi, n_ports);if (!host)return -ENOMEM ;
drivers/firmware/dmi_scan.c +55 -19
93 lines not on this page · raw message
include/linux/dmi.h +1 -0
@@ -38,6 +38,7 @@ struct dmi_device {#ifdef CONFIG_DMI extern int dmi_check_system (const struct dmi_system_id *list); +const struct dmi_system_id *dmi_first_match (const struct dmi_system_id *list);extern const char *dmi_get_system_info (int field);extern const struct dmi_device *dmi_find_device (int type,const char *name,const struct dmi_device *from);
include/linux/libata.h +2 -0
@@ -187,6 +187,8 @@ enum {ATA_FLAG_PIO_POLLING = (1 <<9 ),/* use polling PIO if LLD * doesn't handle PIO interrupts */ ATA_FLAG_NCQ = (1 <<10 ),/* host supports NCQ */ +ATA_FLAG_NO_POWEROFF_SPINDOWN = (1 <<11 ),/* don't spindown before poweroff */ +ATA_FLAG_NO_HIBERNATE_SPINDOWN = (1 <<12 ),/* don't spindown before hibernation */ ATA_FLAG_DEBUGMSG = (1 <<13 ),ATA_FLAG_IGN_SIMPLEX = (1 <<15 ),/* ignore SIMPLEX */ ATA_FLAG_NO_IORDY = (1 << 16), /* controller lacks iordy */
include/linux/suspend.h +2 -0
@@ -237,6 +237,7 @@ extern int hibernate_nvs_alloc(void);extern void hibernate_nvs_free (void );extern void hibernate_nvs_save (void );extern void hibernate_nvs_restore (void ); +extern bool system_entering_hibernation (void );#else /* CONFIG_HIBERNATION */ static inline int swsusp_page_is_forbidden (struct page *p) {return 0 ; }static inline void swsusp_set_page_free (struct page *p) {}
@@ -252,6 +253,7 @@ static inline int hibernate_nvs_alloc(void) { return 0; }static inline void hibernate_nvs_free (void ) {}static inline void hibernate_nvs_save (void ) {}static inline void hibernate_nvs_restore (void ) {} +static inline bool system_entering_hibernation (void ) {return false; }#endif /* CONFIG_HIBERNATION */ #ifdef CONFIG_PM_SLEEP
kernel/power/disk.c +10 -0
@@ -71,6 +71,14 @@ void hibernation_set_ops(struct platform_hibernation_ops *ops)mutex_unlock (&pm_mutex); } +static bool entering_platform_hibernation; + +bool system_entering_hibernation (void ) +{ +return entering_platform_hibernation; +} +EXPORT_SYMBOL (system_entering_hibernation); +#ifdef CONFIG_PM_DEBUG static void hibernation_debug_sleep (void ) {
@@ -411,6 +419,7 @@ int hibernation_platform_enter(void)if (error) goto Close; + entering_platform_hibernation = true;suspend_console (); error =device_suspend (PMSG_HIBERNATE );if (error) {
@@ -445,6 +454,7 @@ int hibernation_platform_enter(void) Finish: hibernation_ops->finish (); Resume_devices: + entering_platform_hibernation = false;device_resume (PMSG_RESTORE );resume_console (); Close: