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

Commit 90494893 authored by Shaohua Li's avatar Shaohua Li Committed by Bartlomiej Zolnierkiewicz
Browse files

ide: workaround suspend bug for ACPI IDE 

http://bugzilla.kernel.org/show_bug.cgi?id=9673



ACPI _PS3 cause S4 breaks in the second attempt. The system has a _PS3
method for IDE, which will call into SMM mode. Currently we haven't clue
why just the second attempt fails, as it's totally in BIOS code, so
blacklist the system so far for 2.6.24.

A possible suspect is ACPI NVS isn't save/restore, we will revisit the
bug after linux does ACPI NVS save/restore.

Bart:
- fix scripts/checkpatch.pl complaints
- const-ify ide_acpi_dmi_table[]

Signed-off-by: default avatarShaohua Li <shaohua.li@intel.com>
Cc: "Rafael J. Wysocki" <rjw@sisk.pl>
Reported-by: default avatarMikko Vinni <mmvinni@yahoo.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent fd0b45df

drivers/ide/ide-acpi.c

+35 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <acpi/acpi.h>

#include <linux/ide.h>

#include <linux/pci.h>

#include <linux/dmi.h>



#include <acpi/acpi_bus.h>

#include <acpi/acnames.h>
@@ -65,6 +66,37 @@ extern int ide_noacpi; 
extern int ide_noacpitfs;

extern int ide_noacpionboot;



static bool ide_noacpi_psx;

static int no_acpi_psx(const struct dmi_system_id *id)

{

	ide_noacpi_psx = true;

	printk(KERN_NOTICE"%s detected - disable ACPI _PSx.\n", id->ident);

	return 0;

}



static const struct dmi_system_id ide_acpi_dmi_table[] = {

	/* Bug 9673. */

	/* We should check if this is because ACPI NVS isn't save/restored. */

	{

		.callback = no_acpi_psx,

		.ident    = "HP nx9005",

		.matches  = {

			DMI_MATCH(DMI_BIOS_VENDOR, "Phoenix Technologies Ltd."),

			DMI_MATCH(DMI_BIOS_VERSION, "KAM1.60")

		},

	},

};



static int ide_acpi_blacklist(void)

{

	static int done;

	if (done)

		return 0;

	done = 1;

	dmi_check_system(ide_acpi_dmi_table);

	return 0;

}



/**

 * ide_get_dev_handle - finds acpi_handle and PCI device.function

 * @dev: device to locate
@@ -623,7 +655,7 @@ void ide_acpi_set_state(ide_hwif_t *hwif, int on) 
{

	int unit;



	if (ide_noacpi)

	if (ide_noacpi || ide_noacpi_psx)

		return;



	DEBPRINT("ENTER:\n");
@@ -668,6 +700,8 @@ void ide_acpi_init(ide_hwif_t *hwif) 
	struct ide_acpi_drive_link	*master;

	struct ide_acpi_drive_link	*slave;



	ide_acpi_blacklist();



	hwif->acpidata = kzalloc(sizeof(struct ide_acpi_hwif_link), GFP_KERNEL);

	if (!hwif->acpidata)

		return;