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

Commit a6629105 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki Committed by Len Brown
Browse files

ACPI suspend: Always use the 32-bit waking vector 

According to the ACPI specification 2.0c and later, the 64-bit waking vector
should be cleared and the 32-bit waking vector should be used, unless we want
the wake-up code to be called by the BIOS in Protected Mode.  Moreover, some
systems (for example HP dv5-1004nr) are known to fail to resume if the 64-bit
waking vector is used.  Therefore, modify the code to clear the 64-bit waking
vector, for FACS version 1 or greater, and set the 32-bit one before suspend.

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



Signed-off-by: default avatarRafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent e49f711c

drivers/acpi/hardware/hwsleep.c

+11 −26
Original line number Diff line number Diff line
@@ -78,19 +78,17 @@ acpi_set_firmware_waking_vector(acpi_physical_address physical_address) 
		return_ACPI_STATUS(status);

	}



	/* Set the vector */



	if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {

	/*

		 * ACPI 1.0 FACS or short table or optional X_ field is zero

	 * According to the ACPI specification 2.0c and later, the 64-bit

	 * waking vector should be cleared and the 32-bit waking vector should

	 * be used, unless we want the wake-up code to be called by the BIOS in

	 * Protected Mode.  Some systems (for example HP dv5-1004nr) are known

	 * to fail to resume if the 64-bit vector is used.

	 */

	if (facs->version >= 1)

		facs->xfirmware_waking_vector = 0;



	facs->firmware_waking_vector = (u32)physical_address;

	} else {

		/*

		 * ACPI 2.0 FACS with valid X_ field

		 */

		facs->xfirmware_waking_vector = physical_address;

	}



	return_ACPI_STATUS(AE_OK);

}
@@ -134,20 +132,7 @@ acpi_get_firmware_waking_vector(acpi_physical_address * physical_address) 
	}



	/* Get the vector */



	if ((facs->length < 32) || (!(facs->xfirmware_waking_vector))) {

		/*

		 * ACPI 1.0 FACS or short table or optional X_ field is zero

		 */

		*physical_address =

		    (acpi_physical_address) facs->firmware_waking_vector;

	} else {

		/*

		 * ACPI 2.0 FACS with valid X_ field

		 */

		*physical_address =

		    (acpi_physical_address) facs->xfirmware_waking_vector;

	}

	*physical_address = (acpi_physical_address)facs->firmware_waking_vector;



	return_ACPI_STATUS(AE_OK);

}