Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/amd64/conf Move XEN3_DOM0 as close as possible to G...



details:   https://anonhg.NetBSD.org/src/rev/4ae47a7b43d6
branches:  trunk
changeset: 1023707:4ae47a7b43d6
user:      manu <manu%NetBSD.org@localhost>
date:      Fri Sep 24 00:29:46 2021 +0000

description:
Move XEN3_DOM0 as close as possible to GENERIC.
Document why some options are disabled
Set NO_PCI_MSI_MSIX to work around crashes reported in multiple PR

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0 |  603 +++++++++++++++++------------------------
 1 files changed, 245 insertions(+), 358 deletions(-)

diffs (truncated from 1095 to 300 lines):

diff -r 3476f61418b7 -r 4ae47a7b43d6 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Thu Sep 23 22:54:09 2021 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Fri Sep 24 00:29:46 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.193 2021/06/29 10:22:34 nia Exp $
+# $NetBSD: XEN3_DOM0,v 1.194 2021/09/24 00:29:46 manu 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.193 $"
+#ident         "XEN3_DOM0-$Revision: 1.194 $"
 
 maxusers       32              # estimated number of users
 
@@ -86,14 +86,15 @@
 options        SYSVSHM         # System V-like memory sharing
 
 options        MODULAR         # new style module(7) framework
-#options       MODULAR_DEFAULT_AUTOLOAD
+options        MODULAR_DEFAULT_AUTOLOAD
 options        USERCONF        # userconf(4) support
 #options       PIPE_SOCKETPAIR # smaller, but slower pipe(2)
 options        SYSCTL_INCLUDE_DESCR    # Include sysctl descriptions in kernel
 
 # CPU features
 #acpicpu*      at cpu?         # ACPI CPU (including frequency scaling)
-#coretemp*     at cpu?         # Intel on-die thermal sensor
+                               # needs x86_cpu_idle_halt in cpu.c (!xenpv)
+coretemp*      at cpu?         # Intel on-die thermal sensor
 est0           at cpu0         # Intel Enhanced SpeedStep (non-ACPI)
 #hyperv0       at cpu0         # Microsoft Hyper-V
 #odcm0         at cpu0         # On-demand clock modulation
@@ -117,16 +118,17 @@
 #
 makeoptions    COPTS="-O2 -fno-omit-frame-pointer"
 options        DDB             # in-kernel debugger
-options                DDB_COMMANDONENTER="show registers"
-options        DDB_ONPANIC=1   # see also sysctl(7): `ddb.onpanic'
+#options       DDB_COMMANDONENTER="bt" # execute command when ddb is entered
+#options       DDB_ONPANIC=1   # see also sysctl(7): `ddb.onpanic'
 options        DDB_HISTORY_SIZE=512    # enable history editing in DDB
 #options       KGDB            # remote debugger
 #options       KGDB_DEVNAME="\"com\"",KGDB_DEVADDR=0x2f8,KGDB_DEVRATE=57600
-#makeoptions   DEBUG="-g"      # compile full symbol table
+makeoptions    DEBUG="-g"      # compile full symbol table for CTF
+options DDB_COMMANDONENTER="trace;show registers"
 #options       SYSCALL_STATS   # per syscall counts
 #options       SYSCALL_TIMES   # per syscall times
 #options       SYSCALL_TIMES_HASCOUNTER        # use 'broken' rdtsc (soekris)
-#options       KDTRACE_HOOKS   # kernel DTrace hooks
+options        KDTRACE_HOOKS   # kernel DTrace hooks
 
 # Kernel Undefined Behavior Sanitizer (kUBSan).
 #options       KUBSAN                  # mandatory
@@ -195,19 +197,19 @@
 # ffs
 options        QUOTA           # legacy UFS quotas
 options        QUOTA2          # new, in-filesystem UFS quotas
-#options       FFS_EI          # FFS Endian Independent support
+options        FFS_EI          # FFS Endian Independent support
 options        WAPBL           # File system journaling support
 # Note that UFS_DIRHASH is suspected of causing kernel memory corruption.
 # It is not recommended for general use.
 #options       UFS_DIRHASH     # UFS Large Directory Hashing - Experimental
-#options               UFS_ACL         # UFS Access Control Lists
+options                UFS_ACL         # UFS Access Control Lists
 #options       FFS_NO_SNAPSHOT # No FFS snapshot support
 options        UFS_EXTATTR     # Extended attribute support for UFS1
 # ext2fs
 #options       EXT2FS_SYSTEM_FLAGS # makes ext2fs file flags (append and
                                # immutable) behave as system flags.
 # other
-#options       DISKLABEL_EI    # disklabel Endian Independent support
+options        DISKLABEL_EI    # disklabel Endian Independent support
 options        NFSSERVER       # Network File System server
 
 # Networking options
@@ -252,12 +254,6 @@
 #options       HDAUDIOVERBOSE  # verbose HDAUDIO driver messages
 
 options        NFS_BOOT_DHCP,NFS_BOOT_BOOTPARAM
-#options       NFS_BOOT_BOOTSTATIC
-#options       NFS_BOOTSTATIC_MYIP="\"169.254.1.2\""
-#options       NFS_BOOTSTATIC_GWIP="\"169.254.1.1\""
-#options       NFS_BOOTSTATIC_MASK="\"255.255.255.0\""
-#options       NFS_BOOTSTATIC_SERVADDR="\"169.254.1.1\""
-#options       NFS_BOOTSTATIC_SERVER="\"server:/path/to/root\""
 
 #
 # wscons options
@@ -329,11 +325,7 @@
 #options       PCI_BUS_FIXUP           # fixup PCI bus numbering
 #options       PCI_ADDR_FIXUP          # fixup PCI I/O addresses
 #options       ACPI_ACTIVATE_DEV       # If set, activate inactive devices
-#options       VGA_POST                # in-kernel support for VGA POST
-
-#options       ACPICA_PEDANTIC         # force strict conformance to the Spec.
-#options       MPDEBUG                 # MPBIOS configures PCI roots
-#options       MPVERBOSE               # verbose MPBIOS autoconfig messages
+options        VGA_POST                # in-kernel support for VGA POST
 
 # ACPI devices
 acpiacad*      at acpi?                # ACPI AC Adapter
@@ -342,49 +334,48 @@
 acpidalb*      at acpi?                # ACPI Direct Application Launch Button
 acpiec*        at acpi?                # ACPI Embedded Controller (late)
 acpiecdt*      at acpi?                # ACPI Embedded Controller (early)
-#acpifan*      at acpi?                # ACPI Fan
+acpifan*       at acpi?                # ACPI Fan
 acpilid*       at acpi?                # ACPI Lid Switch
 #acpipmtr*     at acpi?                # ACPI Power Meter (experimental)
 #acpismbus*    at acpi?                # ACPI SMBus CMI (experimental)
 acpitz*        at acpi?                # ACPI Thermal Zone
-#acpivga*      at acpi?                # ACPI Display Adapter
-#acpiout*      at acpivga?             # ACPI Display Output Device
-#acpiwdrt*     at acpi?                # ACPI Watchdog Resource Table
-#acpiwmi*      at acpi?                # ACPI WMI Mapper
+acpivga*       at acpi?                # ACPI Display Adapter
+acpiout*       at acpivga?             # ACPI Display Output Device
+acpiwdrt*      at acpi?                # ACPI Watchdog Resource Table
+acpiwmi*       at acpi?                # ACPI WMI Mapper
 
 # Mainboard devices
 aibs*          at acpi?                # ASUSTeK AI Booster hardware monitor
-#asus*         at acpi?                # ASUS hotkeys
-#attimer*      at acpi?                # AT Timer
+asus*          at acpi?                # ASUS hotkeys
+attimer*       at acpi?                # AT Timer
 #com*          at acpi?                # Serial communications interface
 #fdc*          at acpi?                # Floppy disk controller
-#fujbp*                at acpi?                # Fujitsu Brightness & Pointer
-#fujhk*                at acpi?                # Fujitsu Hotkeys
+fujbp*         at acpi?                # Fujitsu Brightness & Pointer
+fujhk*         at acpi?                # Fujitsu Hotkeys
 #hpacel*       at acpi?                # HP 3D DriveGuard accelerometer
-hpqlb*         at acpi?                # HP Quick Launch Buttons
-#hpet*         at acpihpetbus?         # High Precision Event Timer (table)
-#hpet*         at acpinodebus?         # High Precision Event Timer (device)
-#joy*          at acpi?                # Joystick/Game port
+#hpqlb*                at acpi?                # HP Quick Launch Buttons
+hpet*          at acpihpetbus?         # High Precision Event Timer (table)
+hpet*          at acpinodebus?         # High Precision Event Timer (device)
+joy*           at acpi?                # Joystick/Game port
 #lpt*          at acpi?                # Parallel port
-#mpu*          at acpi?                # Roland MPU-401 MIDI UART
-#lpt*          at acpi?                # Parallel port
+mpu*           at acpi?                # Roland MPU-401 MIDI UART
 pckbc*         at acpi?                # PC keyboard controller
 pcppi*         at acpi?                # AT-style speaker sound
-#qemufwcfg*    at acpi?                # QEMU Firmware Configuration device
-#sdhc*         at acpi?                # SD Host Controller
-#sony*         at acpi?                # Sony Notebook Controller
-#spic*         at acpi?                # Sony Programmable I/O Controller
-#wsmouse*      at spic?                # mouse
-#thinkpad*     at acpi?                # IBM/Lenovo Thinkpad hotkeys
-#tpm*          at acpi?                # ACPI TPM (Experimental)
-#ug*           at acpi?                # Abit uGuru Hardware monitor
-#valz*         at acpi?                # Toshiba Dynabook hotkeys
-#wb*           at acpi?                # Winbond W83L518D SD/MMC reader
-#sdmmc*                at wb?                  # SD/MMC bus
-#wmidell*      at acpiwmibus?          # Dell WMI mappings
-#wmieeepc*     at acpiwmibus?          # Asus Eee PC WMI mappings
-#wmihp*                at acpiwmibus?          # HP WMI mappings
-#wmimsi*       at acpiwmibus?          # MSI WMI mappings
+qemufwcfg*     at acpi?                # QEMU Firmware Configuration device
+sdhc*          at acpi?                # SD Host Controller
+sony*          at acpi?                # Sony Notebook Controller
+spic*          at acpi?                # Sony Programmable I/O Controller
+wsmouse*       at spic?                # mouse
+thinkpad*      at acpi?                # IBM/Lenovo Thinkpad hotkeys
+tpm*           at acpi?                # ACPI TPM (Experimental)
+ug*            at acpi?                # Abit uGuru Hardware monitor
+valz*          at acpi?                # Toshiba Dynabook hotkeys
+wb*            at acpi?                # Winbond W83L518D SD/MMC reader
+sdmmc*         at wb?                  # SD/MMC bus
+wmidell*       at acpiwmibus?          # Dell WMI mappings
+wmieeepc*      at acpiwmibus?          # Asus Eee PC WMI mappings
+wmihp*         at acpiwmibus?          # HP WMI mappings
+wmimsi*        at acpiwmibus?          # MSI WMI mappings
 
 # Basic Bus Support
 
@@ -393,6 +384,9 @@
 pci*   at pchb? bus ?
 pci*   at ppb? bus ?
 
+# MSIX bugs with XEN3_DOM0: kern/55667, kern/56291
+options NO_PCI_MSI_MSIX
+
 # PCI bridges
 pchb*  at pci? dev ? function ?        # PCI-Host bridges
 #options       AGP_X86                 # INTENTIONAL OMISSION - crashes reported with agp
@@ -401,20 +395,19 @@
 # XXX 'puc's aren't really bridges, but there's no better place for them here
 puc*   at pci? dev ? function ?        # PCI "universal" comm. cards
 
-#amdpcib* at pci? dev ? function ?     # AMD 8111 PCI-ISA w/ HPET
-#hpet* at amdpcib?
+amdpcib* at pci? dev ? function ?      # AMD 8111 PCI-ISA w/ HPET
+hpet*  at amdpcib?
 
-#pwdog*        at pci? dev ? function ?        # QUANCOM PWDOG1
+pwdog* at pci? dev ? function ?        # QUANCOM PWDOG1
 
 ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-LPC w/ timecounter,
                                        # watchdog, gpio, Speedstep and HPET
-#fwhrng* at ichlpcib?          # Intel 82802 FWH Random Number Generator
+fwhrng* at ichlpcib?           # Intel 82802 FWH Random Number Generator
 #hpet* at ichlpcib?
-#tco*  at ichlpcib?            # TCO watch dog timer
-
-#aapic*        at pci? dev ? function ?        # AMD 8131 IO apic
+tco*   at ichlpcib?            # TCO watch dog timer
 
 #agp*  at pchb?                        # INTENTIONAL OMISSION - crashes reported with agp
+aapic* at pci? dev ? function ?        # AMD 8131 IO apic
 
 # pci backend devices, used for PCI pass-through. To export a PCI device
 # to a domU, the device has to be attached to the pciback driver in the dom0.
@@ -431,12 +424,12 @@
 isa0   at ichlpcib?
 
 # CardBus bridge support
-#cbb*          at pci? dev ? function ?
-#cardslot*     at cbb?
+cbb*           at pci? dev ? function ?
+cardslot*      at cbb?
 
 # CardBus bus support
-#cardbus*      at cardslot?
-#pcmcia*       at cardslot?
+cardbus*       at cardslot?
+pcmcia*        at cardslot?
 
 # Console Devices
 
@@ -446,25 +439,22 @@
 pms*           at pckbc?               # PS/2 mouse for wsmouse
 #options       PMS_DISABLE_POWERHOOK   # Disable PS/2 reset on resume
 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 ?
-#vga0          at isa?
-#genfb*                at pci? dev ? function ?
+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)
+#genfb*                at pci? dev ? function ?# Needs acpi_md_vesa_modenum
+                                       # in acpi_wakeup.c (!xenpv)
 #options       VCONS_DRAW_INTR
-wsdisplay*     at vga? console ?
-#wsdisplay*    at wsemuldisplaydev?
-#wsdisplay*    at pcdisplay? console ?
-#wsdisplay*    at machfb? console ?
-#pcdisplay0    at isa?                 # CGA, MDA, EGA, HGA
-#machfb*       at pci? dev ? function ? # ATI Mach64 framebuffer driver
+#wsdisplay*    at vga? console ?
+wsdisplay*     at wsemuldisplaydev?
 wskbd*         at pckbd? console ?
 wsmouse*       at pms? mux 0
-#wsmouse*      at wsmousedev?
+wsmouse*       at wsmousedev?
 
-#attimer0      at isa?
-#pcppi0                at isa?
-#sysbeep0      at pcppi?
+attimer0       at isa?
+pcppi0         at isa?
+#sysbeep0      at pcppi?       # Needs sysbeep_ca (from where?)
 
 # DRI legacy drivers
 #i915drm*      at drm?         # Intel i915, i945 DRM driver
@@ -477,7 +467,8 @@
 #tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
 
 # DRMKMS drivers
-#i915drmkms*   at pci? dev ? function ?
+# all disabled: drm uses acpi_md_vesa_modenum in acpi_wakeup.c (!xenpv)
+#i915drmkms*   at pci? dev ? function ?        # also require disabled agp
 #intelfb*      at intelfbbus?
 
 #radeon*       at pci? dev ? function ?
@@ -492,16 +483,19 @@
 # DRMUMS drivers
 #viadrmums*    at drm?
 
+#options       DRM_MAX_RESOLUTION_HORIZONTAL=1920      # Limit DRM size in horizontal dimension
+#options       DRM_MAX_RESOLUTION_VERTICAL=1080        # Limit DRM size in vertical dimension
+
 # Cryptographic Devices
 
 # PCI cryptographic devices
-#amdccp*       at pci? dev ? function ?        # AMD Cryptographic Coprocessor
+amdccp*        at pci? dev ? function ?        # AMD Cryptographic Coprocessor



Home | Main Index | Thread Index | Old Index