[src/trunk]: src/sys/arch PR kern/56853: add a dummy acpi_md_vbios_reset vari...

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

details:   https://anonhg.NetBSD.org/src/rev/1c9b2950a6c3
branches:  trunk
changeset: 366384:1c9b2950a6c3
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Tue May 24 17:06:08 2022 +0000

description:
PR kern/56853: add a dummy acpi_md_vbios_reset variable so that we
can again enable vga at pci for Xen.
Note that this only works in BIOS mode, not UEFI mode.

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0       |  7 +++----
 sys/arch/xen/xen/xen_acpi_machdep.c |  6 ++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (51 lines):

diff -r 64036906a182 -r 1c9b2950a6c3 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Tue May 24 16:01:25 2022 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Tue May 24 17:06:08 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.195 2022/05/24 16:01:25 bouyer Exp $
+# $NetBSD: XEN3_DOM0,v 1.196 2022/05/24 17:06:08 bouyer Exp $
 
 # XEN3_DOM0 machine description file
 #
@@ -14,7 +14,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "XEN3_DOM0-$Revision: 1.195 $"
+#ident         "XEN3_DOM0-$Revision: 1.196 $"
 
 maxusers       32              # estimated number of users
 
@@ -438,8 +438,7 @@
 options        PMS_SYNAPTICS_TOUCHPAD  # Enable support for Synaptics Touchpads
 options        PMS_ELANTECH_TOUCHPAD   # Enable support for Elantech Touchpads
 options        PMS_ALPS_TOUCHPAD       # Enable support for Alps Touchpads
-#vga*          at pci? dev ? function ?# Needs acpi_md_vbios_reset 
-                                       # in acpi_wakeup.c (!xenpv)
+vga*           at pci? dev ? function ?
 #genfb*                at pci? dev ? function ?# Needs acpi_md_vesa_modenum
                                        # in acpi_wakeup.c (!xenpv)
 #options       VCONS_DRAW_INTR
diff -r 64036906a182 -r 1c9b2950a6c3 sys/arch/xen/xen/xen_acpi_machdep.c
--- a/sys/arch/xen/xen/xen_acpi_machdep.c       Tue May 24 16:01:25 2022 +0000
+++ b/sys/arch/xen/xen/xen_acpi_machdep.c       Tue May 24 17:06:08 2022 +0000
@@ -1,15 +1,17 @@
-/*     $NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $    */
+/*     $NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $      */
 
 #include "acpica.h"
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.5 2009/08/18 16:41:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xen_acpi_machdep.c,v 1.6 2022/05/24 17:06:08 bouyer Exp $");
 
 #include <dev/acpi/acpica.h>
 #include <dev/acpi/acpivar.h>
 #define ACPI_MACHDEP_PRIVATE
 #include <machine/acpi_machdep.h>
 
+int acpi_md_vbios_reset = 0;
+
 int
 acpi_md_sleep(int state)
 {