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 XEN3_DOM0: Approach GENERIC



details:   https://anonhg.NetBSD.org/src/rev/4b2d377ef133
branches:  trunk
changeset: 1019288:4b2d377ef133
user:      gdt <gdt%NetBSD.org@localhost>
date:      Fri Mar 05 20:30:56 2021 +0000

description:
XEN3_DOM0: Approach GENERIC

When processed to remove comments, blank lines, normalize whitespace,
and sort/uniq (one line was previously duplicated), this file is
identical to the previous version.  It has been reorganized to reduce
diffs to GENERIC, and many missing lines from GENERIC have been added
but commented out.

diffstat:

 sys/arch/amd64/conf/XEN3_DOM0 |  814 +++++++++++++++++++++++++++++------------
 1 files changed, 576 insertions(+), 238 deletions(-)

diffs (truncated from 1095 to 300 lines):

diff -r 9f974e420b65 -r 4b2d377ef133 sys/arch/amd64/conf/XEN3_DOM0
--- a/sys/arch/amd64/conf/XEN3_DOM0     Fri Mar 05 20:18:39 2021 +0000
+++ b/sys/arch/amd64/conf/XEN3_DOM0     Fri Mar 05 20:30:56 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.191 2021/03/04 16:02:10 gdt Exp $
+# $NetBSD: XEN3_DOM0,v 1.192 2021/03/05 20:30:56 gdt 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.191 $"
+#ident         "XEN3_DOM0-$Revision: 1.192 $"
 
 maxusers       32              # estimated number of users
 
@@ -43,9 +43,20 @@
 #options       PHYSMEM_MAX_SIZE=64     # max size of physical memory (in MB)
 #options       PHYSMEM_MAX_ADDR=2048   # don't use memory above this (in MB)
 
+## Replace std.amd64 content
+
+mainbus0 at root
+cpu* at mainbus?
+ioapic* at mainbus? apid ?
+
+# Atheros HAL options
+include "external/isc/atheros_hal/conf/std.ath_hal"
+
+## end std.amd64
+
 ## Xen-specific options
 
-options                XENPV           # PV dom0 support
+options        XENPV           # PV dom0 support
 options        DOM0OPS
 options        MULTIPROCESSOR
 #options       NO_PREEMPTION   # needed if MULTIPROCESSOR is disabled
@@ -58,10 +69,6 @@
 # boot messages with MPBIOS, acpi and ioapic can be quite large
 options        MSGBUFSIZE=24576
 
-# CPU features
-est0           at cpu0         # Intel Enhanced SpeedStep (non-ACPI)
-powernow0      at cpu0         # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
-
 # Standard system options
 
 options        INSECURE        # disable kernel security levels - X needs this
@@ -79,10 +86,20 @@
 options        SYSVSHM         # System V-like memory sharing
 
 options        MODULAR         # new style module(7) framework
+#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
+est0           at cpu0         # Intel Enhanced SpeedStep (non-ACPI)
+#hyperv0       at cpu0         # Microsoft Hyper-V
+#odcm0         at cpu0         # On-demand clock modulation
+powernow0      at cpu0         # AMD PowerNow! and Cool'n'Quiet (non-ACPI)
+#vmt0          at cpu0         # VMware Tools
+
 # Alternate buffer queue strategies for better responsiveness under high
 # disk I/O load.
 #options       BUFQ_READPRIO
@@ -286,10 +303,6 @@
 #
 
 ## Xen-specific options
-mainbus0 at root
-
-cpu* at mainbus?
-
 hypervisor*    at mainbus?             # Xen hypervisor
 
 vcpu*          at hypervisor?          # Xen virtual CPUs
@@ -306,8 +319,8 @@
 ipmi0          at ipmi_acpi?
 
 # ACPI will be used if present. If not it will fall back to MPBIOS
+acpi0          at mainbus?             # ACPI access in PVH(VM) mode
 acpi0          at hypervisor?          # ACPI access in PV mode
-acpi0          at mainbus?             # ACPI access in PVH(VM) mode
 
 options        ACPI_SCANPCI            # find PCI roots using ACPI
 options        MPBIOS                  # configure CPUs and APICs using MPBIOS
@@ -322,8 +335,6 @@
 #options       MPDEBUG                 # MPBIOS configures PCI roots
 #options       MPVERBOSE               # verbose MPBIOS autoconfig messages
 
-ioapic*        at mainbus? apid ?
-
 # ACPI devices
 acpiacad*      at acpi?                # ACPI AC Adapter
 acpibat*       at acpi?                # ACPI Battery
@@ -343,22 +354,67 @@
 
 # Mainboard devices
 aibs*          at acpi?                # ASUSTeK AI Booster hardware monitor
+#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
 #hpacel*       at acpi?                # HP 3D DriveGuard accelerometer
-#hpqlb*                at acpi?                # HP Quick Launch Buttons
 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
 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
 
 # Basic Bus Support
 
 # PCI bus support
-pci*           at hypervisor? bus ?
-pci*           at pchb? bus ?
-ppb*           at pci? dev ? function ?        # PCI-PCI bridges
-pci*           at ppb? bus ?
+pci*   at hypervisor? bus ?
+pci*   at pchb? bus ?
+pci*   at ppb? bus ?
+
+# PCI bridges
+pchb*  at pci? dev ? function ?        # PCI-Host bridges
+#options       AGP_X86                 # INTENTIONAL OMISSION - crashes reported with agp
+pcib*  at pci? dev ? function ?        # PCI-ISA bridges
+ppb*   at pci? dev ? function ?        # PCI-PCI bridges
+# 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?
+
+#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
+#hpet* at ichlpcib?
+#tco*  at ichlpcib?            # TCO watch dog timer
+
+#aapic*        at pci? dev ? function ?        # AMD 8131 IO apic
+
+#agp*  at pchb?                        # INTENTIONAL OMISSION - crashes reported with agp
 
 # 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.
@@ -368,23 +424,84 @@
 # pciback.hide=(00:1a.0)(00:1a.1)(00:1a.7)
 pciback* at pci?                       # pci backend device
 
-# PCI bridges
-pchb*  at pci? dev ? function ?        # PCI-Host bridges
-#options       AGP_X86                 # INTENTIONAL OMISSION - crashes reported with agp
-pcib*  at pci? dev ? function ?        # PCI-ISA bridges
-ppb*   at pci? dev ? function ?        # PCI-PCI bridges
-# 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
+# ISA bus support
+isa0   at hypervisor?
+isa0   at pcib?
+#isa0  at amdpcib?
+isa0   at ichlpcib?
+
+# CardBus bridge support
+#cbb*          at pci? dev ? function ?
+#cardslot*     at cbb?
+
+# CardBus bus support
+#cardbus*      at cardslot?
+#pcmcia*       at cardslot?
+
+# Console Devices
+
+# wscons
+pckbc0         at isa?                 # pc keyboard controller
+pckbd*         at pckbc?               # PC keyboard
+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       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
+wskbd*         at pckbd? console ?
+wsmouse*       at pms? mux 0
+#wsmouse*      at wsmousedev?
 
-ichlpcib* at pci? dev ? function ?     # Intel ICH PCI-ISA w/ timecounter,
-                                       # watchdog and SpeedStep support
+#attimer0      at isa?
+#pcppi0                at isa?
+#sysbeep0      at pcppi?
 
-#agp*  at pchb?                        # INTENTIONAL OMISSION - crashes reported with agp
+# DRI legacy drivers
+#i915drm*      at drm?         # Intel i915, i945 DRM driver
+#mach64drm*    at drm?         # mach64 (3D Rage Pro, Rage) DRM driver
+#mgadrm*       at drm?         # Matrox G[24]00, G[45]50 DRM driver
+#r128drm*      at drm?         # ATI Rage 128 DRM driver
+#radeondrm*    at drm?         # ATI Radeon DRM driver
+#savagedrm*    at drm?         # S3 Savage DRM driver
+#sisdrm*       at drm?         # SiS DRM driver
+#tdfxdrm*      at drm?         # 3dfx (voodoo) DRM driver
+
+# DRMKMS drivers
+#i915drmkms*   at pci? dev ? function ?
+#intelfb*      at intelfbbus?
 
-# ISA bus support
-isa0   at ichlpcib?
-isa0   at pcib?
-isa0   at hypervisor?
+#radeon*       at pci? dev ? function ?
+#radeondrmkmsfb* at radeonfbbus?
+
+#amdgpu*       at pci? dev ? function ?
+#amdgpufb*     at amdgpufbbus?
+
+#nouveau*      at pci? dev ? function ?
+#nouveaufb*    at nouveaufbbus?
+
+# DRMUMS drivers
+#viadrmums*    at drm?
+
+# Cryptographic Devices
+
+# PCI cryptographic devices
+#amdccp*       at pci? dev ? function ?        # AMD Cryptographic Coprocessor
+hifn*  at pci? dev ? function ?        # Hifn 7755/7811/795x
+#qat*  at pci? dev ? function ?        # Intel QuickAssist
+ubsec* at pci? dev ? function ?        # Broadcom 5501/5601/580x/582x
+
+# Trusted Platform Module
+#tpm*  at isa? iomem 0xfed40000 irq 7
 
 # Serial Devices
 
@@ -393,6 +510,15 @@
 cy*    at pci? dev ? function ?        # Cyclades Cyclom-Y serial boards
 cz*    at pci? dev ? function ?        # Cyclades-Z multi-port serial boards
 
+# PCMCIA serial interfaces
+#com*  at pcmcia? function ?           # Modems and serial cards
+
+#pcmcom* at pcmcia? function ?         # PCMCIA multi-port serial cards
+#com*  at pcmcom? slave ?              # ...and the slave devices
+
+# CardBus serial interfaces
+#com*  at cardbus? function ?  # Modems and serial cards
+
 # ISA serial interfaces
 #options       COM_HAYESP              # adds Hayes ESP serial board support
 # If a com port is used as Xen console it can't be used by the domain0 kernel
@@ -410,25 +536,59 @@
 
 # ISA parallel printer interfaces
 lpt0   at isa? port 0x378 irq 7        # standard PC parallel ports
+#lpt1  at isa? port 0x278
 
 # Hardware monitors
 
 amdnb_misc* at pci?                    # AMD NB Misc Configuration
-amdtemp* at amdnb_misc?                # AMD CPU Temperature sensors



Home | Main Index | Thread Index | Old Index