PERFORCE change 48045 for review
Peter Wemm
peter at FreeBSD.org
Wed Mar 3 00:09:03 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=48045
Change 48045 by peter at peter_daintree on 2004/03/03 00:08:50
checkpoint
Affected files ...
.. //depot/projects/hammer/sys/amd64/conf/NOTES#2 edit
.. //depot/projects/hammer/sys/amd64/conf/NOTES.fixed#2 delete
Differences ...
==== //depot/projects/hammer/sys/amd64/conf/NOTES#2 (text+ko) ====
@@ -3,9 +3,12 @@
#
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
+# (XXX from i386:NOTES,v 1.1106; merge in updates)
+# $FreeBSD: src/sys/amd64/conf/NOTES.fixed,v 1.1 2004/02/29 19:32:02 peter Exp $
#
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.4 2004/02/19 04:39:14 obrien Exp $
-#
+
+# We don't have modules on amd64.
+makeoptions NO_MODULES=not_yet
#
# This directive is mandatory; it defines the architecture to be
@@ -13,22 +16,58 @@
# compatibles.
#
machine amd64
-cpu HAMMER
#
# We want LINT to cover profiling as well
-profile 2
+#X#profile 2
+
+
+#####################################################################
+# SMP OPTIONS:
+#
+# The apic device enables the use of the I/O APIC for interrupt delivery.
+# The apic device can be used in both UP and SMP kernels, but is required
+# for SMP kernels. Thus, the apic device is not strictly an SMP option,
+# but it is a prerequisite for SMP.
+#
+# Notes:
+#
+# Be sure to disable 'cpu I386_CPU' for SMP kernels.
+#
+# By default, mixed mode is used to route IRQ0 from the AT timer via
+# the 8259A master PIC through the ExtINT pin on the first I/O APIC.
+# This can be disabled via the NO_MIXED_MODE option. In that case,
+# IRQ0 will be routed via an intpin on the first I/O APIC. Not all
+# motherboards hook IRQ0 up to the first I/O APIC even though their
+# MP table or MADT may claim to do so. That is why mixed mode is
+# enabled by default.
+#
+
+# Optional:
+device atpic
+device mptable
+options NO_MIXED_MODE # Disable use of mixed mode
-# Debug options
-options NPX_DEBUG # enable npx debugging (FPU/math emu)
- #new math emulator
+#####################################################################
+# CPU OPTIONS
+
+#
+# You must specify at least one CPU (the one you intend to run on);
+# deleting the specification for CPUs you don't need to use may make
+# parts of the system run faster.
+#
+cpu HAMMER
+
+#
+# Options for CPU features.
+#
#
# PERFMON causes the driver for Pentium/Pentium Pro performance counters
# to be compiled. See perfmon(4) for more information.
#
-options PERFMON
+#X#options PERFMON
#####################################################################
@@ -65,14 +104,17 @@
options CLK_CALIBRATION_LOOP
+# The following two options measure the frequency of the corresponding
+# clock relative to the RTC (onboard mc146818a).
+
+options CLK_USE_I8254_CALIBRATION
+options CLK_USE_TSC_CALIBRATION
+
#####################################################################
# MISCELLANEOUS DEVICES AND OPTIONS
-hint.speaker.0.at="isa"
-hint.speaker.0.port="0x61"
device gzip #Exec gzipped a.out's. REQUIRES COMPAT_AOUT!
-device apm_saver # Requires APM
#####################################################################
@@ -109,6 +151,9 @@
# reset the CPU for reboot. This is needed on some systems with broken
# keyboard controllers.
+options AUTO_EOI_1
+#options AUTO_EOI_2
+
options MAXMEM=(128*1024)
#options BROKEN_KEYBOARD_RESET
@@ -133,7 +178,19 @@
# Optional devices:
#
+# 3Dfx Voodoo Graphics, Voodoo II /dev/3dfx CDEV support. This will create
+# the /dev/3dfx0 device to work with glide implementations. This should get
+# linked to /dev/3dfx and /dev/voodoo. Note that this is not the same as
+# the tdfx DRI module from XFree86 and is completely unrelated.
#
+# To enable Linuxulator support, one must also include COMPAT_LINUX in the
+# config as well, or you will not have the dependencies. The other option
+# is to load both as modules.
+
+device tdfx # Enable 3Dfx Voodoo support
+#X#options TDFX_LINUX # Enable Linuxulator support
+
+#
# ACPI support using the Intel ACPI Component Architecture reference
# implementation.
#
@@ -142,17 +199,29 @@
# Intel ACPICA code. (Note that the Intel code must also have USE_DEBUGGER
# defined when it is built).
#
+# ACPI_MAX_THREADS sets the number of task threads started.
+#
+# ACPI_NO_SEMAPHORES makes the AcpiOs*Semaphore routines a no-op.
+#
+# ACPICA_PEDANTIC enables strict checking of AML. Our default is to
+# relax these checks to allow code generated by the Microsoft compiler
+# to still execute.
+#
# Note that building ACPI into the kernel is deprecated; the module is
# normally loaded automatically by the loader.
#
device acpi
options ACPI_DEBUG
+options ACPI_MAX_THREADS=1
+#!options ACPI_NO_SEMAPHORES
+#!options ACPICA_PEDANTIC
# DRM options:
# mgadrm: AGP Matrox G200, G400, G450, G550
-# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee
# r128drm: ATI Rage 128
# radeondrm: ATI Radeon up to 9000/9100
+# sisdrm: SiS 300/305,540,630
+# tdfxdrm: 3dfx Voodoo 3/4/5 and Banshee
# DRM_DEBUG: include debug printfs, very slow
#
# mga requires AGP in the kernel, and it is recommended
@@ -161,71 +230,31 @@
device mgadrm
device "r128drm"
device radeondrm
+device sisdrm
device tdfxdrm
options DRM_DEBUG
-# M-systems DiskOnchip products see src/sys/contrib/dev/fla/README
-###device fla
-###hint.fla.0.at="isa"
-
#
# Network interfaces:
#
-# ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
-# HP PC Lan+, various PC Card devices (refer to etc/defauls/pccard.conf)
-# (requires miibus)
-# ie: AT&T StarLAN 10 and EN100; 3Com 3C507; unknown NI5210;
-# Intel EtherExpress
-# lnc: Lance/PCnet cards (Isolan, Novell NE2100, NE32-VL, AMD Am7990 and
-# Am79C960)
-# sr: RISCom/N2 hdlc sync 1/2 port V.35/X.21 serial driver (requires sppp)
-# wl: Lucent Wavelan (ISA card only).
+# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan)
-# Order for ISA/EISA devices is important here
-
-device ed
-#options ED_NO_MIIBUS # Disable ed miibus support
-hint.ed.0.at="isa"
-hint.ed.0.port="0x280"
-hint.ed.0.irq="5"
-hint.ed.0.maddr="0xd8000"
-device lnc
-hint.lnc.0.at="isa"
-hint.lnc.0.port="0x280"
-hint.lnc.0.irq="10"
-hint.lnc.0.drq="0"
-device sr
-hint.sr.0.at="isa"
-hint.sr.0.port="0x300"
-hint.sr.0.irq="5"
-hint.sr.0.maddr="0xd0000"
-device wl
-hint.wl.0.at="isa"
-hint.wl.0.port="0x300"
-options WLCACHE # enables the signal-strength cache
-options WLDEBUG # enables verbose debugging output
+#X#device ath
+#X#device ath_hal # Atheros HAL (includes binary component)
+device wlan # 802.11 layer
#
# ATA raid adapters
#
-device pst
+#XXX this stores pointers in a 32bit field that is defined by the hardware
+#device pst
#
# SCSI host adapters:
-#
-# ncv: NCR 53C500 based SCSI host adapters.
-# nsp: Workbit Ninja SCSI-3 based PC Card SCSI host adapters.
-# stg: TMC 18C30, 18C50 based SCSI host adapters.
+#
-device ncv
-device nsp
-device stg
-hint.stg.0.at="isa"
-hint.stg.0.port="0x140"
-hint.stg.0.port="11"
-
#
# Adaptec FSA RAID controllers, including integrated DELL controllers,
# the Dell PERC 2/QC and the HP NetRAID-4M
@@ -249,12 +278,7 @@
#
# Miscellaneous hardware:
#
-# dgb: Digiboard PC/Xi and PC/Xe series driver (ALPHA QUALITY!)
# digi: Digiboard driver
-# gsc: Genius GS-4500 hand scanner.
-# spic: Sony Programmable I/O controller (VAIO notebooks)
-# stl: Stallion EasyIO and EasyConnection 8/32 (cd1400 based)
-# stli: Stallion EasyConnection 8/64, ONboard, Brumby (intelligent)
# Notes on the Specialix SI/XIO driver:
# The host card is memory, not IO mapped.
@@ -262,15 +286,6 @@
# The Rev 2 host cards use a 32K chunk, on a 32K boundary.
# The cards can use an IRQ of 11, 12 or 15.
-# Notes on the Digiboard PC/Xi and PC/Xe series driver
-#
-# The NDGBPORTS option specifies the number of ports controlled by the
-# dgb(4) driver. The default value is 16 ports per device.
-#
-# The following flag values have special meanings in dgb:
-# 0x01 - alternate layout of pins
-# 0x02 - use the windowed PC/Xe in 64K mode
-
device digi
hint.digi.0.at="isa"
hint.digi.0.port="0x104"
@@ -289,20 +304,13 @@
#
# Laptop/Notebook options:
#
-# See also:
-# apm under `Miscellaneous hardware'
-# above.
+
-# PCI bus Cards:
-# --------------
+#
+# I2C Bus
#
-# Cyclades Cyclom-Y PCI serial driver
-device cy
-options CY_PCI_FASTINTR # Use with cy_pci unless irq is shared
-#hint.cy.0.at="isa"
-#hint.cy.0.irq="10"
-#hint.cy.0.maddr="0xd4000"
-#hint.cy.0.msize="0x2000"
+
+#---------------------------------------------------------------------------
#
# Set the number of PV entries per process. Increasing this can
@@ -315,48 +323,52 @@
#
# The value below is the one more than the default.
#
-#options PMAP_SHPGPERPROC=201
+options PMAP_SHPGPERPROC=201
-#
-# Change the size of the kernel virtual address space. Due to
-# constraints in loader(8) on i386, this must be a multiple of 4.
-# 256 = 1 GB of kernel address space. Increasing this also causes
-# a reduction of the address space in user processes. 512 splits
-# the 4GB cpu address space in half (2GB user, 2GB kernel).
-#
-options KVA_PAGES=260
-
#####################################################################
# ABI Emulation
+#XXX keep these here for now and reactivate when support for emulating
+#XXX these 32 bit binaries is added.
+
+# Enable iBCS2 runtime support for SCO and ISC binaries
+#X#options IBCS2
+
+# Emulate spx device for client side of SVR3 local X interface
+#X#options SPX_HACK
+
# Enable Linux ABI emulation
-#options COMPAT_LINUX
+#X#options COMPAT_LINUX
# Enable the linux-like proc filesystem support (requires COMPAT_LINUX
# and PSEUDOFS)
-#options LINPROCFS
+#X#options LINPROCFS
+
+#
+# SysVR4 ABI emulation
+#
+# The svr4 ABI emulator can be statically compiled into the kernel or loaded as
+# a KLD module.
+# The STREAMS network emulation code can also be compiled statically or as a
+# module. If loaded as a module, it must be loaded before the svr4 module
+# (the /usr/sbin/svr4 script does this for you). If compiling statically,
+# the `streams' device must be configured into any kernel which also
+# specifies COMPAT_SVR4. It is possible to have a statically-configured
+# STREAMS device and a dynamically loadable svr4 emulator; the /usr/sbin/svr4
+# script understands that it doesn't need to load the `streams' module under
+# those circumstances.
+# Caveat: At this time, `options KTRACE' is required for the svr4 emulator
+# (whether static or dynamic).
+#
+#X#options COMPAT_SVR4 # build emulator statically
+#X#options DEBUG_SVR4 # enable verbose debugging
+#X#device streams # STREAMS network driver (required for svr4).
#####################################################################
# VM OPTIONS
-# Disable the 4 MByte page PSE CPU feature. The PSE feature allows the
-# kernel to use a 4 MByte pages to map the kernel instead of 4k pages.
-# This saves on the amount of memory needed for page tables needed to
-# map the kernel. You should only disable this feature as a temporary
-# workaround if you are having problems with it enabled.
-#
-#options DISABLE_PSE
-
-# Disable the global pages PGE CPU feature. The PGE feature allows pages
-# to be marked with the PG_G bit. TLB entries for these pages are not
-# flushed from the cache when %cr3 is reloaded. This can make context
-# switches less expensive. You should only disable this feature as a
-# temporary workaround if you are having problems with it enabled.
-#
-#options DISABLE_PG_G
-
# KSTACK_PAGES is the number of memory pages to assign to the kernel
# stack of each thread.
@@ -369,6 +381,10 @@
options FB_INSTALL_CDEV # install a CDEV entry in /dev
+# PECOFF module (Win32 Execution Format)
+#X#options PECOFF_SUPPORT
+#X#options PECOFF_DEBUG
+
options ENABLE_ALART
options KBDIO_DEBUG=2
options KBD_MAXRETRY=4
@@ -382,3 +398,25 @@
options VM_KMEM_SIZE
options VM_KMEM_SIZE_MAX
options VM_KMEM_SIZE_SCALE
+
+###############################################################
+# Broken stuff that shouldn't really be broken
+
+# machine/ioctl_meteor.h and machine/bt848.h
+nodevice bktr
+
+# pointer/int stuff
+nodevice mgadrm
+nodevice "r128drm"
+nodevice radeondrm
+nodevice sisdrm
+nodevice tdfxdrm
+
+# missing conf lines (must be fixed ASAP)
+nooption SC_DFLT_FONT
+nooption UKBD_DFLT_KEYMAP
+nooption ATKBD_DFLT_KEYMAP
+nooption PMAP_SHPGPERPROC
+nooption CLK_USE_I8254_CALIBRATION
+# XXX dead option
+nooption CLK_USE_TSC_CALIBRATION
More information about the p4-projects
mailing list