diff options
author | Nate Lawson <njl@FreeBSD.org> | 2004-04-14 16:50:32 +0000 |
---|---|---|
committer | Nate Lawson <njl@FreeBSD.org> | 2004-04-14 16:50:32 +0000 |
commit | 5391902bdfae16dcc97f58a1c77a41c738f5f2f5 (patch) | |
tree | 88f5e001ec283f3a4240da0617860fed34ea2bd4 | |
parent | e0ef747b8917c3229c0e9d69b9eca49b05e2c0e5 (diff) | |
download | src-5391902bdfae16dcc97f58a1c77a41c738f5f2f5.tar.gz src-5391902bdfae16dcc97f58a1c77a41c738f5f2f5.zip |
Only avoid disabling bus mastering on the sleep path. This should fix
power off for some users. The patch has been submitted to Intel.
Bug: http://bugme.osdl.org/show_bug.cgi?id=2109
Notes
Notes:
svn path=/vendor-sys/acpica/dist/; revision=128245
-rw-r--r-- | sys/contrib/dev/acpica/hwsleep.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sys/contrib/dev/acpica/hwsleep.c b/sys/contrib/dev/acpica/hwsleep.c index 13224c72494c..488e765667ba 100644 --- a/sys/contrib/dev/acpica/hwsleep.c +++ b/sys/contrib/dev/acpica/hwsleep.c @@ -349,22 +349,22 @@ AcpiEnterSleepState ( SleepTypeRegInfo = AcpiHwGetBitRegisterInfo (ACPI_BITREG_SLEEP_TYPE_A); SleepEnableRegInfo = AcpiHwGetBitRegisterInfo (ACPI_BITREG_SLEEP_ENABLE); - if (SleepState != ACPI_STATE_S5) - { - /* Clear wake status */ + /* Clear wake status */ - Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + Status = AcpiSetRegister (ACPI_BITREG_WAKE_STATUS, 1, ACPI_MTX_DO_NOT_LOCK); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } - Status = AcpiHwClearAcpiStatus (ACPI_MTX_DO_NOT_LOCK); - if (ACPI_FAILURE (Status)) - { - return_ACPI_STATUS (Status); - } + Status = AcpiHwClearAcpiStatus (ACPI_MTX_DO_NOT_LOCK); + if (ACPI_FAILURE (Status)) + { + return_ACPI_STATUS (Status); + } + if (SleepState != ACPI_STATE_S5) + { /* Disable BM arbitration */ Status = AcpiSetRegister (ACPI_BITREG_ARB_DISABLE, 1, ACPI_MTX_DO_NOT_LOCK); |