[src/trunk]: src/sys/arch/x86/acpi The second parameter to AcpiSetFirmwareWak...

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b5c6adc6a681
branches:  trunk
changeset: 452068:b5c6adc6a681
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Mon Jun 17 16:34:02 2019 +0000

description:
The second parameter to AcpiSetFirmwareWakingVector sets the
X_Firmware_Waking_Vector field (where supported), which will cause firmware
to resume in protected mode. Since our wake code assumes real mode, always
set X_Firmware_Waking_Vector to 0.

diffstat:

 sys/arch/x86/acpi/acpi_wakeup.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r b25af9d16084 -r b5c6adc6a681 sys/arch/x86/acpi/acpi_wakeup.c
--- a/sys/arch/x86/acpi/acpi_wakeup.c   Mon Jun 17 15:53:20 2019 +0000
+++ b/sys/arch/x86/acpi/acpi_wakeup.c   Mon Jun 17 16:34:02 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $    */
+/*     $NetBSD: acpi_wakeup.c,v 1.50 2019/06/17 16:34:02 jmcneill Exp $        */
 
 /*-
  * Copyright (c) 2002, 2011 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.49 2017/09/23 10:38:59 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_wakeup.c,v 1.50 2019/06/17 16:34:02 jmcneill Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -310,7 +310,7 @@
                return -1;
        }
 
-       AcpiSetFirmwareWakingVector(acpi_wakeup_paddr, acpi_wakeup_paddr);
+       AcpiSetFirmwareWakingVector(acpi_wakeup_paddr, 0);
 
        s = splhigh();
        fpusave_cpu(true);