Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 490a8d70 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev 

* 'hibern_fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  SATA PIIX: Blacklist system that spins off disks during ACPI power off
  SATA Sil: Blacklist system that spins off disks during ACPI power off
  SATA AHCI: Blacklist system that spins off disks during ACPI power off
  SATA: Blacklisting of systems that spin off disks during ACPI power off
  DMI: Introduce dmi_first_match to make the interface more flexible
  Hibernation: Introduce system_entering_hibernation
parents 8c022fdd 5f451fe1

drivers/ata/ahci.c

+32 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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 */
@@ -1347,6 +1358,9 @@ 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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -414,6 +414,29 @@ void __init dmi_scan_machine(void) 
	dmi_initialized = 1;

}



/**

 *	dmi_matches - check if dmi_system_id structure matches system DMI data

 *	@dmi: pointer to the dmi_system_id structure to check

 */

static bool dmi_matches(const struct dmi_system_id *dmi)

{

	int i;



	WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");



	for (i = 0; i < ARRAY_SIZE(dmi->matches); i++) {

		int s = dmi->matches[i].slot;

		if (s == DMI_NONE)

			continue;

		if (dmi_ident[s]

		    && strstr(dmi_ident[s], dmi->matches[i].substr))

			continue;

		/* No match */

		return false;

	}

	return true;

}



/**

 *	dmi_check_system - check system DMI data

 *	@list: array of dmi_system_id structures to match against
@@ -429,31 +452,44 @@ void __init dmi_scan_machine(void) 
 */

int dmi_check_system(const struct dmi_system_id *list)

{

	int i, count = 0;

	const struct dmi_system_id *d = list;

	int count = 0;

	const struct dmi_system_id *d;



	WARN(!dmi_initialized, KERN_ERR "dmi check: not initialized yet.\n");



	while (d->ident) {

		for (i = 0; i < ARRAY_SIZE(d->matches); i++) {

			int s = d->matches[i].slot;

			if (s == DMI_NONE)

				continue;

			if (dmi_ident[s] && strstr(dmi_ident[s], d->matches[i].substr))

				continue;

			/* No match */

			goto fail;

		}

	for (d = list; d->ident; d++)

		if (dmi_matches(d)) {

			count++;

			if (d->callback && d->callback(d))

				break;

fail:		d++;

		}



	return count;

}

EXPORT_SYMBOL(dmi_check_system);



/**

 *	dmi_first_match - find dmi_system_id structure matching system DMI data

 *	@list: array of dmi_system_id structures to match against

 *		All non-null elements of the list must match

 *		their slot's (field index's) data (i.e., each

 *		list string must be a substring of the specified

 *		DMI slot's string data) to be considered a

 *		successful match.

 *

 *	Walk the blacklist table until the first match is found.  Return the

 *	pointer to the matching entry or NULL if there's no match.

 */

const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list)

{

	const struct dmi_system_id *d;



	for (d = list; d->ident; d++)

		if (dmi_matches(d))

			return d;



	return NULL;

}

EXPORT_SYMBOL(dmi_first_match);



/**

 *	dmi_get_system_info - return DMI data value

 *	@field: data index (see enum dmi_field)