Re: u3g for XEN3_DOM0 ?
Emmanuel Dreyfus <[email protected]> Sat, 11 Sep 2021 00:49:16 +0000
| Newsgroups | gmane.os.netbsd.ports.x86-64 |
|---|---|
| Message-ID | <[email protected]> |
On Mon, Sep 06, 2021 at 11:53:08AM -0400, Greg Troxel wrote: > I didn't mean that. If some driver doesn't work on xen, that's not a > big deal. I just meant that when I was messing with the config that I > felt like i needed to actually do a build, and then install the kernel > on a xen box and actually boot it and make sure it still could run xen, > so that people would be no worse off. I tried to move XEN3_DOM0 as close as possible to GENERIC. I left the following differences - maxusers 32 vs 64 - xen specific options and device attachments - things that do not build: acpicpu, vga and framebuffer, sysbeep - AGP, which is known to crash - VirtIO ent Hyper-V, which I assume are not relevant. The kernel boot, but my wm network interface gets deaf. I had to asdd options NO_PCI_MSI_MSIX to fix that, but perhaps it is not related to my change, I need to test a vanilla -current XEN3_DOM0 to check. Attached is the patch to XEN3_DOM0. Once applied, you can diff XEN3_DOM0 GENERIC to check what differences are left. -- Emmanuel Dreyfus [email protected]
xenconf.patch
(text/x-diff, 43.5 KB)
Index: sys/arch/amd64/conf/XEN3_DOM0 =================================================================== RCS file: /cvsroot/src/sys/arch/amd64/conf/XEN3_DOM0,v retrieving revision 1.193 diff -U4 -r1.193 XEN3_DOM0 --- sys/arch/amd64/conf/XEN3_DOM0 29 Jun 2021 10:22:34 -0000 1.193 +++ sys/arch/amd64/conf/XEN3_DOM0 11 Sep 2021 00:40:07 -0000 @@ -42,19 +42,8 @@ # and can deal with holes in the memory layout. #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 DOM0OPS @@ -85,16 +74,16 @@ options SYSVSEM # System V-like semaphores 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 +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) @@ -116,18 +105,19 @@ # is needed to make backtraces in DDB work. # 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 #options UBSAN_ALWAYS_FATAL # optional: panic on all kUBSan reports @@ -194,21 +184,21 @@ # File system options # 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 #options GATEWAY # packet forwarding @@ -251,14 +241,8 @@ #options USBVERBOSE # verbose USB device autoconfig messages #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 # @@ -328,94 +312,90 @@ #options PCI_INTR_FIXUP # fixup PCI interrupt routing via ACPI #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 acpibat* at acpi? # ACPI Battery acpibut* at acpi? # ACPI Button 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 -#lpt* at acpi? # Parallel port -#mpu* at acpi? # Roland MPU-401 MIDI UART +#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 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 # PCI bus support pci* at hypervisor? bus ? pci* at pchb? bus ? pci* at ppb? bus ? +options NO_PCI_MSI_MSIX + # 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? +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. # you can force a device to attach to the pciback driver in dom0 passing @@ -430,14 +410,14 @@ #isa0 at amdpcib? 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 # wscons @@ -445,26 +425,21 @@ 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? +options PMS_ELANTECH_TOUCHPAD # Enable support for Elantech Touchpads +options PMS_ALPS_TOUCHPAD # Enable support for Alps Touchpads +#vga* at pci? dev ? function ? #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 +#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? +attimer0 at isa? +pcppi0 at isa? #sysbeep0 at pcppi? # DRI legacy drivers #i915drm* at drm? # Intel i915, i945 DRM driver @@ -476,9 +451,9 @@ #sisdrm* at drm? # SiS DRM driver #tdfxdrm* at drm? # 3dfx (voodoo) DRM driver # DRMKMS drivers -#i915drmkms* at pci? dev ? function ? +#i915drmkms* at pci? dev ? function ? # require disabled agp #intelfb* at intelfbbus? #radeon* at pci? dev ? function ? #radeondrmkmsfb* at radeonfbbus? @@ -491,18 +466,21 @@ # 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 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 +tpm* at isa? iomem 0xfed40000 irq 7 # Serial Devices # PCI serial interfaces @@ -510,34 +488,32 @@ 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 +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 +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 +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 # and there's no easy way to detect this yet. Leave com0 out as it's the # port usually used for serial console #com0 at isa? port 0x3f8 irq 4 # Standard PC serial ports com1 at isa? port 0x2f8 irq 3 -#com2 at isa? port 0x3e8 irq 5 -#com3 at isa? port 0x2e8 irq 9 # Parallel Printer Interfaces # PCI parallel printer interfaces lpt* at puc? port ? # || ports on "universal" comm boards # ISA parallel printer interfaces lpt0 at isa? port 0x378 irq 7 # standard PC parallel ports -#lpt1 at isa? port 0x278 +lpt1 at isa? port 0x278 # Hardware monitors amdnb_misc* at pci? # AMD NB Misc Configuration @@ -569,26 +545,26 @@ amdpm* at pci? dev ? function ? # RNG and SMBus 1.0 interface #iic* at amdpm? # sensors below are on this bus # NVIDIA nForce2/3/4 SMBus controller -#nfsmbc* at pci? dev ? function ? -#nfsmb* at nfsmbc? -#iic* at nfsmb? +nfsmbc* at pci? dev ? function ? +nfsmb* at nfsmbc? +iic* at nfsmb? # Intel PIIX4 power management controllers -#piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller -#iic* at piixpm? # SMBus on PIIX4 +piixpm* at pci? dev ? function ? # PIIX4 compatible PM controller +iic* at piixpm? # SMBus on PIIX4 # Intel ICH SMBus controller ichsmb* at pci? dev ? function ? iic* at ichsmb? # Intel S1200,C2000 (non-pch) SMBus controller -#ismt* at pci? dev ? function ? -#iic* at ismt? +ismt* at pci? dev ? function ? +iic* at ismt? # DesignWare I2C controller as found in some Intel PCH and AMD FCH devices. -#dwiic* at acpi? # DesignWare I2C controller +dwiic* at acpi? # DesignWare I2C controller dwiic* at pci? # DesignWare I2C controller iic* at dwiic? # Thermal monitor and fan controller @@ -607,13 +583,8 @@ # Abit uGuru Hardware system monitor #ug0 at isa? port 0xe0 -# Thermal monitor and fan controller -#dbcool* at iic? addr 0x2C # Unknown other motherboard(s) -#dbcool* at iic? addr 0x2D # Tyan S2881 -#dbcool* at iic? addr 0x2E # Tyan S2882-D - # Serial Presence Detect capable memory modules #spdmem* at iic? addr 0x50 #spdmem* at iic? addr 0x51 #spdmem* at iic? addr 0x52 @@ -630,11 +601,8 @@ #sdtemp* at iic? addr 0x1d #sdtemp* at iic? addr 0x1e #sdtemp* at iic? addr 0x1f -# VIA VT82C686A/VT8231 Hardware Monitor and Power Management TImer -#viaenv* at pci? dev ? function ? - # I2C HID devices ihidev* at iic? # I2C Mice @@ -648,17 +616,17 @@ # XXX dpti.c wants a processor type that is not assigned for x86-64 #dpti* at iop? tid 0 # DPT/Adaptec control interface # GPIO devices -#gpio* at gpiobus? +gpio* at gpiobus? # 1- Wire support #gpioow* at gpio? offset ? mask ? # 1-wire bitbanging via gpio -#gpioow* at gpio? -#onewire* at gpioow? +gpioow* at gpio? +onewire* at gpioow? # 1-Wire devices -#owtemp* at onewire? # Temperature sensors +owtemp* at onewire? # Temperature sensors # I2C support #gpioiic* at gpio? #iic* at gpioiic? @@ -672,17 +640,17 @@ # Soekris 6501 GPIO/LED driver (provides gpiobus, needs gpio) #soekrisgpio0 at isa? port 0x680 # Nuvoton NCT5104D SuperIO providing GPIO -#nct0 at isa? port ? +nct0 at isa? port ? # SCSI Controllers and Devices # PCI SCSI controllers adv* at pci? dev ? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI adw* at pci? dev ? function ? # AdvanSys 9x0UW[D], 3940U[2,3]W SCSI ahc* at pci? dev ? function ? # Adaptec [23]94x, aic78x0 SCSI -ahd* at pci? dev ? function ? # Adaptec 29320, 39320 (aic790x) SCSI +ahd* at pci? dev ? function ? # Adaptec aic790x SCSI bha* at pci? dev ? function ? # BusLogic 9xx SCSI dpt* at pci? dev ? function ? # DPT SmartCache/SmartRAID iha* at pci? dev ? function ? # Initio INIC-940/950 SCSI isp* at pci? dev ? function ? # Qlogic ISP [12]0x0 SCSI/FibreChannel @@ -693,21 +661,21 @@ mpii* at pci? dev ? function ? # LSI Logic Fusion-MPT II njs* at pci? dev ? function ? # Workbit NinjaSCSI-32 pcscp* at pci? dev ? function ? # AMD 53c974 PCscsi-PCI SCSI siop* at pci? dev ? function ? # Symbios 53c8xx SCSI -esiop* at pci? dev ? function ? # Symbios 53c875 SCSI and newer +esiop* at pci? dev ? function ? # Symbios 53c875 and newer SCSI #options SIOP_SYMLED # drive the act. LED in software trm* at pci? dev ? function ? # Tekram DC-395U/UW/F, DC-315/U SCSI # PCMCIA SCSI controllers -#aic* at pcmcia? function ? # Adaptec APA-1460 SCSI -#esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI -#spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI +aic* at pcmcia? function ? # Adaptec APA-1460 SCSI +esp* at pcmcia? function ? # Qlogic ESP406/FAS408 SCSI +spc* at pcmcia? function ? # Fujitsu MB87030/MB89352 SCSI # CardBus SCSI cards -#adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI -#ahc* at cardbus? function ? # Adaptec ADP-1480 -#njs* at cardbus? function ? # Workbit NinjaSCSI-32 +adv* at cardbus? function ? # AdvanSys 1200[A,B], 9xx[U,UA] SCSI +ahc* at cardbus? function ? # Adaptec ADP-1480 +njs* at cardbus? function ? # Workbit NinjaSCSI-32 # SCSI bus support scsibus* at scsi? @@ -719,8 +687,9 @@ ses* at scsibus? target ? lun ? # SCSI Enclosure Services devices ss* at scsibus? target ? lun ? # SCSI scanners uk* at scsibus? target ? lun ? # SCSI unknown + # RAID controllers and devices aac* at pci? dev ? function ? # Adaptec AAC family amr* at pci? dev ? function ? # AMI/LSI Logic MegaRAID arcmsr* at pci? dev ? function ? # Areca SATA RAID controllers @@ -728,11 +697,11 @@ ciss* at pci? dev ? function ? # HP Smart Array controllers icp* at pci? dev ? function ? # ICP-Vortex GDT & Intel RAID mlx* at pci? dev ? function ? # Mylex DAC960 & DEC SWXCR family twe* at pci? dev ? function ? # 3ware Escalade RAID controllers -twa* at pci? dev ? function ? # 3ware Escalade 95xx RAID controllers +twa* at pci? dev ? function ? # 3ware Escalade 9xxx RAID controllers -ld* at aac? unit ? # logical disk devices +ld* at aac? unit ? ld* at amr? unit ? ld* at cac? unit ? ld* at icp? unit ? ld* at twe? unit ? @@ -745,36 +714,50 @@ # PCI IDE controllers - see pciide(4) for supported hardware. # The 0x0001 flag force the driver to use DMA, even if the driver doesn't know # how to set up DMA modes for this chip. This may work, or may cause # a machine hang with some controllers. -pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver -acardide* at pci? dev ? function ? # Acard IDE controllers -aceride* at pci? dev ? function ? # Acer Lab IDE controllers -ahcisata* at pci? dev ? function ? # AHCI SATA controllers -artsata* at pci? dev ? function ? # Intel i31244 SATA controller -cmdide* at pci? dev ? function ? # CMD tech IDE controllers -cypide* at pci? dev ? function ? # Cypress IDE controllers -geodeide* at pci? dev ? function ? # AMD Geode IDE controllers -hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers -iteide* at pci? dev ? function ? # IT Express IDE controllers -ixpide* at pci? dev ? function ? # ATI IXP IDE controllers -jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers -ahcisata* at jmide? -optiide* at pci? dev ? function ? # Opti IDE controllers -piixide* at pci? dev ? function ? # Intel IDE controllers -pdcide* at pci? dev ? function ? # Promise IDE controllers -pdcsata* at pci? dev ? function ? # Promise SATA150 controllers -rccide* at pci? dev ? function ? # ServerWorks IDE controllers -satalink* at pci? dev ? function ? # SiI SATALink controllers -siisata* at pci? dev ? function ? # SiI SteelVine controllers -siside* at pci? dev ? function ? # SiS IDE controllers -slide* at pci? dev ? function ? # Symphony Labs IDE controllers -svwsata* at pci? dev ? function ? # ServerWorks SATA controllers -stpcide* at pci? dev ? function ? # STMicro STPC IDE controllers -viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers +pciide* at pci? dev ? function ? flags 0x0000 # GENERIC pciide driver +acardide* at pci? dev ? function ? # Acard IDE controllers +aceride* at pci? dev ? function ? # Acer Lab IDE controllers +ahcisata* at pci? dev ? function ? # AHCI SATA controllers +artsata* at pci? dev ? function ? # Intel i31244 SATA controller +cmdide* at pci? dev ? function ? # CMD tech IDE controllers +cypide* at pci? dev ? function ? # Cypress IDE controllers +hptide* at pci? dev ? function ? # Triones/HighPoint IDE controllers +iteide* at pci? dev ? function ? # IT Express IDE controllers +ixpide* at pci? dev ? function ? # ATI IXP IDE controllers +jmide* at pci? dev ? function ? # JMicron PCI-e PATA/SATA controllers +ahcisata* at jmide? +mvsata* at pci? dev ? function ? # Marvell Hercules-I/II +optiide* at pci? dev ? function ? # Opti IDE controllers +piixide* at pci? dev ? function ? # Intel IDE controllers +pdcide* at pci? dev ? function ? # Promise IDE controllers +pdcsata* at pci? dev ? function ? # Promise SATA150 controllers +satalink* at pci? dev ? function ? # SiI SATALink controllers +siisata* at pci? dev ? function ? # SiI SteelVine controllers +siside* at pci? dev ? function ? # SiS IDE controllers +slide* at pci? dev ? function ? # Symphony Labs IDE controllers +svwsata* at pci? dev ? function ? # ServerWorks SATA controllers +toshide* at pci? dev ? function ? # TOSHIBA PICCOLO controllers +viaide* at pci? dev ? function ? # VIA/AMD/Nvidia IDE controllers + +# PCMCIA IDE controllers +wdc* at pcmcia? function ? + +# CardBus IDE controllers +njata* at cardbus? function ? flags 0x01 # Workbit NinjaATA-32 +siisata* at cardbus? function ? # SiI SteelVine controllers + +# ISA ST506, ESDI, and IDE controllers +# Use flags 0x01 if you want to try to use 32bits data I/O (the driver will +# fall back to 16bits I/O if 32bits I/O are not functional). +# Some controllers pass the initial 32bit test, but will fail later. +wdc0 at isa? port 0x1f0 irq 14 flags 0x00 +wdc1 at isa? port 0x170 irq 15 flags 0x00 # ATA (IDE) bus support atabus* at ata? +options ATADEBUG # IDE drives # Flags are used only with controllers that support DMA operations # and mode settings (e.g. some pciide controllers) @@ -811,11 +794,11 @@ # Miscellaneous mass storage devices # ISA floppy -#fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers +fdc0 at isa? port 0x3f0 irq 6 drq 2 # standard PC floppy controllers #fdc1 at isa? port 0x370 irq ? drq ? -#fd* at fdc? drive ? # the drives themselves +fd* at fdc? drive ? # the drives themselves # some machines need you to do this instead of fd* #fd0 at fdc0 drive 0 # Network Interfaces @@ -826,39 +809,39 @@ ale* at pci? dev ? function ? # Attansic/Atheros L1E Ethernet an* at pci? dev ? function ? # Aironet PC4500/PC4800 (802.11) aq* at pci? dev ? function ? # Aquantia AQC 10 gigabit ath* at pci? dev ? function ? # Atheros 5210/5211/5212 802.11 -#athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) +athn* at pci? dev ? function ? # Atheros AR9k (802.11a/g/n) atw* at pci? dev ? function ? # ADMtek ADM8211 (802.11) -bce* at pci? dev ? function ? # Broadcom 4401 10/100 Ethernet +bce* at pci? dev ? function ? # Broadcom 440x 10/100 Ethernet bge* at pci? dev ? function ? # Broadcom 570x gigabit Ethernet bnx* at pci? dev ? function ? # Broadcom NetXtremeII gigabit Ethernet -#bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless -#bwfm* at pci? dev ? function ? # Broadcom FullMAC -#cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet +bwi* at pci? dev ? function ? # Broadcom BCM43xx wireless +bwfm* at pci? dev ? function ? # Broadcom FullMAC +cas* at pci? dev ? function ? # Sun Cassini/Cassini+ Ethernet dge* at pci? dev ? function ? # Intel 82597 10GbE LR -#ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter +ena* at pci? dev ? function ? # Amazon.com Elastic Network Adapter ep* at pci? dev ? function ? # 3Com 3c59x epic* at pci? dev ? function ? # SMC EPIC/100 Ethernet et* at pci? dev ? function ? # Agere/LSI ET1310/ET1301 Gigabit ex* at pci? dev ? function ? # 3Com 90x[BC] fxp* at pci? dev ? function ? # Intel EtherExpress PRO 10+/100B -#gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet +gem* at pci? dev ? function ? # Apple GMAC and Sun ERI gigabit enet gsip* at pci? dev ? function ? # NS83820 Gigabit Ethernet hme* at pci? dev ? function ? # Sun Microelectronics STP2002-STQ -#iavf* at pci? dev ? function ? # Intel Adaptive Virtual Function +iavf* at pci? dev ? function ? # Intel Adaptive Virtual Function ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG +iwm* at pci? dev ? function ? # Intel Centrino 7260 iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN -iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx ixg* at pci? dev ? function ? # Intel 8259x 10 gigabit -#ixl* at pci? dev ? function ? # Intel Ethernet 700 Series -#ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function +ixl* at pci? dev ? function ? # Intel Ethernet 700 Series +ixv* at pci? dev ? function ? # Intel 8259x 10G virtual function jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet -#kse* at pci? dev ? function ? # Micrel KSZ8841/8842 ethernet +kse* at pci? dev ? function ? # Micrel KSZ8841/8842 ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet -#malo* at pci? dev ? function ? # Marvell Libertas Wireless -#mcx* at pci? dev ? function ? # Mellanox 5th generation Ethernet +malo* at pci? dev ? function ? # Marvell Libertas Wireless +mcx* at pci? dev ? function ? # Mellanox 5th generation Ethernet mskc* at pci? dev ? function ? # Marvell Yukon 2 Gigabit Ethernet msk* at mskc? # Marvell Yukon 2 Gigabit Ethernet mtd* at pci? dev ? function ? # Myson MTD803 3-in-1 Ethernet ne* at pci? dev ? function ? # NE2000-compatible Ethernet @@ -866,12 +849,12 @@ ntwoc* at pci? dev ? function ? # Riscom/N2 PCI Sync Serial pcn* at pci? dev ? function ? # AMD PCnet-PCI Ethernet ral* at pci? dev ? function ? # Ralink Technology RT25x0 802.11a/b/g re* at pci? dev ? function ? # Realtek 8139C+/8169/8169S/8110S -#rge* at pci? dev ? function ? # Realtek 8125 +rge* at pci? dev ? function ? # Realtek 8125 rtk* at pci? dev ? function ? # Realtek 8129/8139 -#rtw* at pci? dev ? function ? # Realtek 8180L (802.11) -#rtwn* at pci? dev ? function ? # Realtek 8188CE/8192CE 802.11b/g/n +rtw* at pci? dev ? function ? # Realtek 8180L (802.11) +rtwn* at pci? dev ? function ? # Realtek 8188CE/8192CE 802.11b/g/n sf* at pci? dev ? function ? # Adaptec AIC-6915 Ethernet sip* at pci? dev ? function ? # SiS 900/DP83815 Ethernet skc* at pci? dev ? function ? # SysKonnect SK9821 Gigabit Ethernet sk* at skc? # SysKonnect SK9821 Gigabit Ethernet @@ -881,47 +864,47 @@ tl* at pci? dev ? function ? # ThunderLAN-based Ethernet tlp* at pci? dev ? function ? # DECchip 21x4x and clones txp* at pci? dev ? function ? # 3com 3cr990 vge* at pci? dev ? function ? # VIATech VT612X Gigabit Ethernet -#vmx* at pci? dev ? function ? # VMware VMXNET3 +vmx* at pci? dev ? function ? # VMware VMXNET3 vr* at pci? dev ? function ? # VIA Rhine Fast Ethernet wi* at pci? dev ? function ? # Intersil Prism Mini-PCI (802.11b) -wm* at pci? dev ? function ? # Intel 8254x gigabit +wm* at pci? dev ? function ? # Intel 82543/82544 gigabit wpi* at pci? dev ? function ? # Intel PRO/Wireless 3945ABG xge* at pci? dev ? function ? # Neterion (S2io) Xframe-I 10GbE # PCMCIA network interfaces -#an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11) -#awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS) -#cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer -#cs* at pcmcia? function ? # CS89xx Ethernet -#ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet -#malo* at pcmcia? function ? # Marvell Libertas -#mbe* at pcmcia? function ? # MB8696x based Ethernet -#ne* at pcmcia? function ? # NE2000-compatible Ethernet -#ray* at pcmcia? function ? # Raytheon Raylink (802.11) -#sm* at pcmcia? function ? # Megahertz Ethernet -#wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) -#xirc* at pcmcia? function ? # Xircom CreditCard Ethernet -#com* at xirc? -#xi* at xirc? - -#mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards -#com* at mhzc? -#sm* at mhzc? +an* at pcmcia? function ? # Aironet PC4500/PC4800 (802.11) +awi* at pcmcia? function ? # BayStack 650/660 (802.11FH/DS) +cnw* at pcmcia? function ? # Xircom/Netwave AirSurfer +cs* at pcmcia? function ? # CS89xx Ethernet +ep* at pcmcia? function ? # 3Com 3c589 and 3c562 Ethernet +malo* at pcmcia? function ? # Marvell Libertas +mbe* at pcmcia? function ? # MB8696x based Ethernet +ne* at pcmcia? function ? # NE2000-compatible Ethernet +ray* at pcmcia? function ? # Raytheon Raylink (802.11) +sm* at pcmcia? function ? # Megahertz Ethernet +wi* at pcmcia? function ? # Lucent/Intersil WaveLan IEEE (802.11) +xirc* at pcmcia? function ? # Xircom CreditCard Ethernet +com* at xirc? +xi* at xirc? + +mhzc* at pcmcia? function ? # Megahertz Ethernet/Modem combo cards +com* at mhzc? +sm* at mhzc? # CardBus network cards -#ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 -#athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED -#atw* at cardbus? function ? # ADMtek ADM8211 (802.11) -#ex* at cardbus? function ? # 3Com 3C575TX -#fxp* at cardbus? function ? # Intel i8255x -#malo* at cardbus? function ? # Marvell Libertas Wireless -#ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g -#re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S -#rtk* at cardbus? function ? # Realtek 8129/8139 -#rtw* at cardbus? function ? # Realtek 8180L (802.11) -#tlp* at cardbus? function ? # DECchip 21143 +ath* at cardbus? function ? # Atheros 5210/5211/5212 802.11 +athn* at cardbus? function ? # Atheros AR9k (802.11a/g/n) - UNTESTED +atw* at cardbus? function ? # ADMtek ADM8211 (802.11) +ex* at cardbus? function ? # 3Com 3C575TX +fxp* at cardbus? function ? # Intel i8255x +malo* at cardbus? function ? # Marvell Libertas Wireless +ral* at cardbus? function ? # Ralink Technology RT25x0 802.11a/b/g +re* at cardbus? function ? # Realtek 8139C+/8169/8169S/8110S +rtk* at cardbus? function ? # Realtek 8129/8139 +rtw* at cardbus? function ? # Realtek 8180L (802.11) +tlp* at cardbus? function ? # DECchip 21143 # MII/PHY support acphy* at mii? phy ? # DAltima AC101 and AMD Am79c874 PHYs amhphy* at mii? phy ? # AMD 79c901 Ethernet PHYs @@ -940,19 +923,20 @@ ihphy* at mii? phy ? # Intel 82577 PHYs ikphy* at mii? phy ? # Intel 82563 PHYs inphy* at mii? phy ? # Intel 82555 PHYs iophy* at mii? phy ? # Intel 82553 PHYs -#ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs -#jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs +ipgphy* at mii? phy ? # IC PLUS IP1000A/IP1001 PHYs +jmphy* at mii? phy ? # Jmicron JMP202/211 PHYs lxtphy* at mii? phy ? # Level One LXT-970 PHYs makphy* at mii? phy ? # Marvell Semiconductor 88E1000 PHYs +micphy* at mii? phy ? # Micrel KSZ[89]xxx PHYs nsphy* at mii? phy ? # NS83840 PHYs nsphyter* at mii? phy ? # NS83843 PHYs pnaphy* at mii? phy ? # generic HomePNA PHYs qsphy* at mii? phy ? # Quality Semiconductor QS6612 PHYs rgephy* at mii? phy ? # Realtek 8169S/8110 internal PHYs rlphy* at mii? phy ? # Realtek 8139/8201L PHYs -#smscphy* at mii? phy ? # SMSC LAN87xx PHYs +smscphy* at mii? phy ? # SMSC LAN87xx PHYs sqphy* at mii? phy ? # Seeq 80220/80221/80223 PHYs tlphy* at mii? phy ? # ThunderLAN PHYs tqphy* at mii? phy ? # TDK Semiconductor PHYs ukphy* at mii? phy ? # generic unknown PHYs @@ -970,137 +954,33 @@ ohci* at pci? dev ? function ? # Open Host Controller uhci* at pci? dev ? function ? # Universal Host Controller (Intel) # CardBus USB controllers -#ehci* at cardbus? function ? # Enhanced Host Controller -#ohci* at cardbus? function ? # Open Host Controller -#uhci* at cardbus? function ? # Universal Host Controller (Intel) +ehci* at cardbus? function ? # Enhanced Host Controller +ohci* at cardbus? function ? # Open Host Controller +uhci* at cardbus? function ? # Universal Host Controller (Intel) # ISA USB controllers #slhci0 at isa? port 0x300 irq 5 # ScanLogic SL811HS # PCMCIA USB controllers -#slhci* at pcmcia? function ? # ScanLogic SL811HS +slhci* at pcmcia? function ? # ScanLogic SL811HS # USB bus support #usb* at vhci? usb* at xhci? usb* at ehci? usb* at ohci? usb* at uhci? -#usb* at slhci? - -#include "dev/usb/usbdevices.config" -# USB Hubs -uhub* at usb? -uhub* at uhub? port ? - -# USB HID device -uhidev* at uhub? port ? configuration ? interface ? - -# USB Mice -ums* at uhidev? reportid ? -wsmouse* at ums? mux 0 - -# USB eGalax touch-panel -uep* at uhub? port ? -wsmouse* at uep? mux 0 - -# USB Keyboards -ukbd* at uhidev? reportid ? -wskbd* at ukbd? console ? mux 1 - -# USB serial adapter -ucycom* at uhidev? reportid ? - -# USB Generic HID devices -uhid* at uhidev? reportid ? - -# USB Printer -ulpt* at uhub? port ? configuration ? interface ? - -# USB Modem -umodem* at uhub? port ? configuration ? -ucom* at umodem? - -# Option N.V. Wireless WAN modems -uhso* at uhub? port ? configuration ? - -# USB Mass Storage -umass* at uhub? port ? configuration ? interface ? - -# USB audio -uaudio* at uhub? port ? configuration ? - -# USB MIDI -umidi* at uhub? port ? configuration ? - -# USB IrDA -# USB-IrDA bridge spec -uirda* at uhub? port ? configuration ? interface ? -irframe* at uirda? - -# SigmaTel STIr4200 USB/IrDA Bridge -ustir* at uhub? port ? -irframe* at ustir? - -# USB Ethernet adapters -aue* at uhub? port ? # ADMtek AN986 Pegasus based adapters -axe* at uhub? port ? # ASIX AX88172 based adapters -cdce* at uhub? port ? # CDC, Ethernet Networking Control Model -cue* at uhub? port ? # CATC USB-EL1201A based adapters -kue* at uhub? port ? # Kawasaki LSI KL5KUSB101B based adapters -mue* at uhub? port ? # Microchip LAN75xx/LAN78xx based adapters -udav* at uhub? port ? # Davicom DM9601 based adapters -ure* at uhub? port ? # Realtek RTL8152/RTL8153 based adapters -url* at uhub? port ? # Realtek RTL8150L based adapters -urndis* at uhub? port ? # Microsoft RNDIS specification - -# USB 802.11 adapters -atu* at uhub? port ? # Atmel AT76C50XX based adapters -ural* at uhub? port ? # Ralink Technology RT2500USB 802.11a/b/g -rum* at uhub? port ? # Ralink Technology RT2501/RT2601 802.11a/b/g -urtw* at uhub? port ? # Realtek RTL8187/RTL8187B 802.11b/g - -# Prolific PL2301/PL2302 host-to-host adapter -upl* at uhub? port ? - -# Serial adapters -ubsa* at uhub? port ? # Belkin serial adapter -ucom* at ubsa? portno ? - -uftdi* at uhub? port ? # FTDI FT8U100AX serial adapter -ucom* at uftdi? portno ? - -umct* at uhub? port ? # MCT USB-RS232 serial adapter -ucom* at umct? portno ? - -uplcom* at uhub? port ? # I/O DATA USB-RSAQ2 serial adapter -ucom* at uplcom? portno ? - -uvscom* at uhub? port ? # SUNTAC Slipper U VS-10U serial adapter -ucom* at uvscom? portno ? - -# USB Handspring Visor -uvisor* at uhub? port ? -ucom* at uvisor? - -# Kyocera AIR-EDGE PHONE -ukyopon* at uhub? port ? -ucom* at ukyopon? portno ? - -# USB scanners that use SCSI emulation, e.g., HP5300 -usscanner* at uhub? port ? - -# USB Generic driver -ugen* at uhub? port ? +usb* at slhci? +include "dev/usb/usbdevices.config" # PCI IEEE1394 controllers fwohci* at pci? dev ? function ? # IEEE1394 Open Host Controller # CardBus IEEE1394 controllers -#fwohci* at cardbus? function ? # IEEE1394 Open Host Controller +fwohci* at cardbus? function ? # IEEE1394 Open Host Controller ieee1394if* at fwohci? fwip* at ieee1394if? # IP over IEEE1394 sbp* at ieee1394if? euihi ? euilo ? @@ -1131,9 +1011,8 @@ opl* at cmpci? flags 1 opl* at eso? opl* at fms? opl* at sv? -opl* at yds? # High Definition Audio hdaudio* at pci? dev ? function ? # High Definition Audio hdafg* at hdaudiobus? @@ -1141,69 +1020,65 @@ # Audio support audio* at audiobus? # The spkr driver provides a simple tone interface to the built in speaker. -#spkr* at pcppi? # PC speaker +spkr* at pcppi? # PC speaker spkr* at audio? # PC speaker (synthesized) #wsbell* at spkr? # Bell for wscons display (module by default) # MPU 401 UARTs #mpu* at isa? port 0x330 irq 9 # MPU401 or compatible card mpu* at cmpci? mpu* at eso? -mpu* at fms? mpu* at yds? # MIDI support midi* at midibus? -#midi* at pcppi? # MIDI interface to the PC speaker +midi* at pcppi? # MIDI interface to the PC speaker # FM-Radio devices # PCI radio devices #gtp* at pci? dev ? function ? # Guillemot Maxi Radio FM 2000 Radio Card # Radio support #radio* at gtp? -# D-Link DSB-R100 USB radio -udsbr* at uhub? port ? -radio* at udsbr? # Video capture devices -#coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV -#cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV +coram* at pci? dev ? function ? # Conexant CX23885 PCI-E TV +cxdtv* at pci? dev ? function ? # Conexant CX2388[0-3] PCI TV -#video* at videobus? # Analog capture interface -#dtv* at dtvbus? # Digital capture interface +video* at videobus? # Analog capture interface +dtv* at dtvbus? # Digital capture interface # TV cards # Brooktree 848/849/878/879 based TV cards -#bktr* at pci? dev ? function ? -#radio* at bktr? +bktr* at pci? dev ? function ? +radio* at bktr? # Bluetooth Controller and Device support # Bluetooth PCMCIA Controllers -#bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A -#btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139 +bt3c* at pcmcia? function ? # 3Com 3CRWB6096-A +btbc* at pcmcia? function ? # AnyCom BlueCard LSE041/039/139 # Bluetooth SDIO Controllers -#sbt* at sdmmc? +sbt* at sdmmc? # Bluetooth USB Controllers ubt* at uhub? port ? aubtfwl* at uhub? port ? # Bluetooth Device Hub -#bthub* at bcsp? -#bthub* at bt3c? -#bthub* at btbc? -#bthub* at btuart? -#bthub* at sbt? +bthub* at bcsp? +bthub* at bt3c? +bthub* at btbc? +bthub* at btuart? +bthub* at sbt? bthub* at ubt? # Bluetooth HID support bthidev* at bthub? @@ -1228,22 +1103,21 @@ # SD/MMC controller sdhc* at pci? # SD Host Controller rtsx* at pci? # Realtek RTS5209/RTS5229 Card Reader -#sdhc* at cardbus? # SD Host Controller +sdhc* at cardbus? # SD Host Controller sdmmc* at sdhc? # SD/MMC bus sdmmc* at rtsx? # SD/MMC bus ld* at sdmmc? # Middle Digital, Inc. PCI-Weasel serial console board control # devices (watchdog timer, etc.) -#weasel* at pci? +weasel* at pci? # Pull in optional local configuration cinclude "arch/amd64/conf/GENERIC.local" -cinclude "arch/amd64/conf/XEN3_DOM0.local" # Pseudo-Devices @@ -1266,38 +1140,37 @@ #options RF_INCLUDE_PARITY_DECLUSTERING_DS=1 pseudo-device fss # file system snapshot device pseudo-device md # memory disk device (ramdisk) -#options MEMORY_DISK_HOOKS # enable md specific hooks -#options MEMORY_DISK_DYNAMIC # enable dynamic resizing +options MEMORY_DISK_HOOKS # enable md specific hooks +options MEMORY_DISK_DYNAMIC # enable dynamic resizing pseudo-device vnd # disk-like interface to files -#options VND_COMPRESSION # compressed vnd(4) - -pseudo-device dm # device-mapper driver for LVM +options VND_COMPRESSION # compressed vnd(4) # network pseudo-devices pseudo-device bpfilter # Berkeley packet filter -#pseudo-device carp # Common Address Redundancy Protocol +pseudo-device carp # Common Address Redundancy Protocol pseudo-device loop # network loopback #pseudo-device mpls # MPLS pseudo-interface pseudo-device ppp # Point-to-Point Protocol pseudo-device pppoe # PPP over Ethernet (RFC 2516) pseudo-device sl # Serial Line IP -#pseudo-device irframetty # IrDA frame line discipline +pseudo-device irframetty # IrDA frame line discipline pseudo-device tun # network tunneling over tty pseudo-device tap # virtual Ethernet pseudo-device gre # generic L3 over IP tunnel pseudo-device gif # IPv[46] over IPv[46] tunnel (RFC1933) -#pseudo-device ipsecif # tunnel interface for routing based ipsec +pseudo-device ipsecif # tunnel interface for routing based ipsec #pseudo-device faith # IPv[46] tcp relay translation i/f pseudo-device stf # 6to4 IPv6 over IPv4 encapsulation pseudo-device vlan # IEEE 802.1q encapsulation pseudo-device bridge # simple inter-network bridging pseudo-device vether # Virtual Ethernet for bridge -#pseudo-device agr # IEEE 802.3ad link aggregation +pseudo-device agr # IEEE 802.3ad link aggregation pseudo-device l2tp # L2TPv3 interface +pseudo-device lagg # Link aggregation interface pseudo-device npf # NPF packet filter #pseudo-device canloop # CAN loopback interface @@ -1307,42 +1180,40 @@ pseudo-device accf_http # "httpready" accept filter # miscellaneous pseudo-devices pseudo-device pty # pseudo-terminals -#pseudo-device sequencer # MIDI sequencer +pseudo-device sequencer # MIDI sequencer # rnd works; RND_COM does not on port i386 yet. #options RND_COM # use "com" randomness as well (BROKEN) pseudo-device clockctl # user control of clock subsystem pseudo-device ksyms # /dev/ksyms -#pseudo-device lockstat # lock profiling -#pseudo-device bcsp # BlueCore Serial Protocol -#pseudo-device btuart # Bluetooth HCI UART (H4) +pseudo-device lockstat # lock profiling +pseudo-device bcsp # BlueCore Serial Protocol +pseudo-device btuart # Bluetooth HCI UART (H4) +#pseudo-device nvmm # NetBSD Virtual Machine Monitor # wscons pseudo-devices pseudo-device wsmux # mouse & keyboard multiplexor pseudo-device wsfont # Give us a choice of fonts based on monitor size -#options FONT_BOLD8x16 -#options FONT_BOLD16x32 +options FONT_BOLD8x16 +options FONT_BOLD16x32 # pseudo audio device driver -#pseudo-device pad +pseudo-device pad # userland interface to drivers, including autoconf and properties retrieval pseudo-device drvctl -#include "dev/veriexec.config" +include "dev/veriexec.config" -#options PAX_SEGVGUARD=0 # PaX Segmentation fault guard +options PAX_SEGVGUARD=0 # PaX Segmentation fault guard options PAX_MPROTECT=1 # PaX mprotect(2) restrictions -#options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug +options PAX_MPROTECT_DEBUG=1 # PaX mprotect debug options PAX_ASLR=1 # PaX Address Space Layout Randomization -#options PAX_ASLR_DEBUG=1 # PaX ASLR debug - - -# iSCSI initiator -#pseudo-device iscsi +options PAX_ASLR_DEBUG=1 # PaX ASLR debug # xen pseudo-devices -pseudo-device xenevt -pseudo-device xvif -pseudo-device xbdback +pseudo-device xenevt +pseudo-device xvif +pseudo-device xbdback + Index: sys/arch/amd64/conf/std.xen =================================================================== RCS file: /cvsroot/src/sys/arch/amd64/conf/std.xen,v retrieving revision 1.14 diff -U4 -r1.14 std.xen --- sys/arch/amd64/conf/std.xen 4 Mar 2021 19:01:41 -0000 1.14 +++ sys/arch/amd64/conf/std.xen 11 Sep 2021 00:40:07 -0000 @@ -17,4 +17,11 @@ options OPEN_MAX=1024 # 128 is too few options XEN # Xen support include "arch/xen/conf/files.xen.pv" + +mainbus0 at root +cpu* at mainbus? +ioapic* at mainbus? apid ? + +# Atheros HAL options +include "external/isc/atheros_hal/conf/std.ath_hal"