Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/sommerfeld_i386mp_1]: src/sys/arch/i386 Merge branch with current, post ...
details: https://anonhg.NetBSD.org/src/rev/c9b6d7b27501
branches: sommerfeld_i386mp_1
changeset: 482433:c9b6d7b27501
user: sommerfeld <sommerfeld%NetBSD.org@localhost>
date: Sat Sep 22 23:00:54 2001 +0000
description:
Merge branch with current, post ubcperf, MTRR, etc., etc.,
with the recent fifo_putpages fix to the trunk, GENERIC.MPDEBUG config
boots multiuser on my BP6.
diffstat:
sys/arch/i386/conf/CARDBUS | 10 +-
sys/arch/i386/conf/GENERIC | 36 +-
sys/arch/i386/conf/GENERIC_LAPTOP | 12 +-
sys/arch/i386/conf/GENERIC_TINY | 12 +-
sys/arch/i386/conf/INSTALL | 13 +-
sys/arch/i386/conf/files.i386 | 22 +-
sys/arch/i386/i386/apm.c | 8 +-
sys/arch/i386/i386/autoconf.c | 43 +-
sys/arch/i386/i386/bus_machdep.c | 9 +-
sys/arch/i386/i386/conf.c | 16 +-
sys/arch/i386/i386/cpu.c | 23 +-
sys/arch/i386/i386/ipifuncs.c | 55 +-
sys/arch/i386/i386/locore.s | 46 +-
sys/arch/i386/i386/machdep.c | 73 ++-
sys/arch/i386/i386/mtrr.c | 28 +-
sys/arch/i386/i386/mtrr_i686.c | 701 ++++++++++++++++++++++++++++++++++++++
sys/arch/i386/i386/pmap.c | 133 ++----
sys/arch/i386/i386/svr4_sigcode.s | 8 +-
sys/arch/i386/i386/sys_machdep.c | 71 +++-
sys/arch/i386/i386/vm_machdep.c | 21 +-
sys/arch/i386/include/apmvar.h | 6 +-
sys/arch/i386/include/mtrr.h | 117 ++++++-
sys/arch/i386/include/pmap.h | 4 +-
sys/arch/i386/isa/icu.s | 8 +-
sys/arch/i386/isa/vector.s | 4 +-
25 files changed, 1220 insertions(+), 259 deletions(-)
diffs (truncated from 2767 to 300 lines):
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/CARDBUS
--- a/sys/arch/i386/conf/CARDBUS Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/CARDBUS Sat Sep 22 23:00:54 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CARDBUS,v 1.28.2.6 2001/09/03 19:48:06 sommerfeld Exp $
+# $NetBSD: CARDBUS,v 1.28.2.7 2001/09/22 23:00:54 sommerfeld Exp $
#
# CARDBUS: GENERIC + CardBus support. Additionally, some
# things typically not found on laptops have been commented out.
@@ -8,7 +8,7 @@
include "arch/i386/conf/std.i386"
-#ident "CARDBUS-$Revision: 1.28.2.6 $"
+#ident "CARDBUS-$Revision: 1.28.2.7 $"
maxusers 32 # estimated number of users
@@ -254,9 +254,9 @@
#eisa* at pceb?
# ISA bus support
-isa* at mainbus?
-isa* at pceb?
-isa* at pcib?
+isa0 at mainbus?
+isa0 at pceb?
+isa0 at pcib?
# PCMCIA bus support
#pcmcia* at pcic? controller ? socket ?
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/GENERIC
--- a/sys/arch/i386/conf/GENERIC Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC Sat Sep 22 23:00:54 2001 +0000
@@ -1,11 +1,11 @@
-# $NetBSD: GENERIC,v 1.300.2.21 2001/09/03 19:48:06 sommerfeld Exp $
+# $NetBSD: GENERIC,v 1.300.2.22 2001/09/22 23:00:55 sommerfeld Exp $
#
# GENERIC -- everything that's currently supported
#
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.300.2.21 $"
+#ident "GENERIC-$Revision: 1.300.2.22 $"
maxusers 32 # estimated number of users
@@ -22,6 +22,8 @@
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options DUMMY_NOPS
+options MTRR # memory-type range register syscall support
+
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@@ -52,10 +54,10 @@
options SYSVMSG # System V-like message queues
options SYSVSEM # System V-like semaphores
-#options SEMMNI=10 # number of semaphore identifiers
-#options SEMMNS=60 # number of semaphores in system
-#options SEMUME=10 # max number of undo entries per process
-#options SEMMNU=30 # number of undo structures in system
+#options SEMMNI=10 # number of semaphore identifiers
+#options SEMMNS=60 # number of semaphores in system
+#options SEMUME=10 # max number of undo entries per process
+#options SEMMNU=30 # number of undo structures in system
options SYSVSHM # System V-like memory sharing
#options SHMMAXPGS=1024 # 1024 pages is the default
@@ -88,8 +90,8 @@
options COMPAT_IBCS2 # binary compatibility with SCO and ISC
options COMPAT_LINUX # binary compatibility with Linux
options COMPAT_FREEBSD # binary compatibility with FreeBSD
-#options COMPAT_MACH # binary compatibility with Mach binaries
-#options EXEC_MACHO # exec MACH-O binaries
+#options COMPAT_MACH # binary compatibility with Mach binaries
+#options EXEC_MACHO # exec MACH-O binaries
#options COMPAT_PECOFF # kernel support to run Win32 apps
# File systems
@@ -150,7 +152,7 @@
options SCSIVERBOSE # human readable SCSI error messages
options USBVERBOSE # verbose USB device autoconfig messages
#options PNPBIOSVERBOSE # verbose PnP BIOS messages
-#options PNPBIOSDEBUG # more fulsome PnP BIOS debugging messages
+#options PNPBIOSDEBUG # more fulsome PnP BIOS debugging messages
options I2OVERBOSE # verbose I2O driver messages
options MCAVERBOSE # verbose MCA device autoconfig messages
@@ -256,14 +258,16 @@
# 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
+#agp* at pchb?
+
# EISA bus support
-eisa* at mainbus?
-eisa* at pceb?
+eisa0 at mainbus?
+eisa0 at pceb?
# ISA bus support
-isa* at mainbus?
-isa* at pceb?
-isa* at pcib?
+isa0 at mainbus?
+isa0 at pceb?
+isa0 at pcib?
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
@@ -401,6 +405,7 @@
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
ld* at iop? tid ? # block devices
+dpti* at iop? tid 0 # DPT/Adaptec control interface
# SCSI Controllers and Devices
@@ -619,7 +624,8 @@
ne* at pcmcia? function ? # NE2000-compatible Ethernet
ray* at pcmcia? function ? # Raytheon Raylink (802.11)
sm* at pcmcia? function ? # Megahertz Ethernet
-tr* at pcmcia? function ? # TROPIC based Token-Ring
+# tr at pcmcia has problems with Cardbus bridges
+#tr* at pcmcia? function ? # TROPIC based Token-Ring
wi* at pcmcia? function ? # Lucent WaveLan IEEE (802.11)
xi* at pcmcia? function ? # Xircom CreditCard Ethernet
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/GENERIC_LAPTOP
--- a/sys/arch/i386/conf/GENERIC_LAPTOP Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_LAPTOP Sat Sep 22 23:00:54 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_LAPTOP,v 1.8.2.6 2001/09/03 19:48:06 sommerfeld Exp $
+# $NetBSD: GENERIC_LAPTOP,v 1.8.2.7 2001/09/22 23:00:56 sommerfeld Exp $
# From: NetBSD: GENERIC,v 1.414 2001/07/30 19:59:05 ad Exp
#
# GENERIC_LAPTOP -- GENERIC with cardbus and some USB devices enabled
@@ -6,7 +6,7 @@
include "arch/i386/conf/std.i386"
-#ident "GENERIC-$Revision: 1.8.2.6 $"
+#ident "GENERIC-$Revision: 1.8.2.7 $"
maxusers 32 # estimated number of users
@@ -23,6 +23,8 @@
# eliminate delay no-ops in I/O; recommended on all but very old machines
#options DUMMY_NOPS
+options MTRR # memory-type range register syscall support
+
# delay between "rebooting ..." message and hardware reset, in milliseconds
#options CPURESET_DELAY=2000
@@ -250,9 +252,11 @@
# 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
+#agp* at pchb?
+
# ISA bus support
-isa* at mainbus?
-isa* at pcib?
+isa0 at mainbus?
+isa0 at pcib?
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/GENERIC_TINY
--- a/sys/arch/i386/conf/GENERIC_TINY Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/GENERIC_TINY Sat Sep 22 23:00:54 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC_TINY,v 1.22.2.5 2001/09/03 19:48:07 sommerfeld Exp $
+# $NetBSD: GENERIC_TINY,v 1.22.2.6 2001/09/22 23:00:57 sommerfeld Exp $
#
# GENERIC_TINY -- suitable default for 4M machines
# No EISA, PCI, or SCSI.
@@ -187,13 +187,13 @@
#puc* at pci? dev ? function ? # PCI "universal" comm. cards
# EISA bus support
-#eisa* at mainbus?
-#eisa* at pceb?
+#eisa0 at mainbus?
+#eisa0 at pceb?
# ISA bus support
-isa* at mainbus?
-#isa* at pceb?
-#isa* at pcib?
+isa0 at mainbus?
+#isa0 at pceb?
+#isa0 at pcib?
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/INSTALL
--- a/sys/arch/i386/conf/INSTALL Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/INSTALL Sat Sep 22 23:00:54 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.135.2.14 2001/09/03 19:48:07 sommerfeld Exp $
+# $NetBSD: INSTALL,v 1.135.2.15 2001/09/22 23:00:57 sommerfeld Exp $
#
# INSTALL - Installation kernel.
#
@@ -183,13 +183,13 @@
puc* at pci? dev ? function ? # PCI "universal" comm. cards
# EISA bus support
-eisa* at mainbus?
-eisa* at pceb?
+eisa0 at mainbus?
+eisa0 at pceb?
# ISA bus support
-isa* at mainbus?
-isa* at pceb?
-isa* at pcib?
+isa0 at mainbus?
+isa0 at pceb?
+isa0 at pcib?
# PCMCIA bus support
pcmcia* at pcic? controller ? socket ?
@@ -291,6 +291,7 @@
iop* at pci? dev ? function ? # I/O processor
iopsp* at iop? tid ? # SCSI/FC-AL ports
ld* at iop? tid ? # Block devices
+#dpti* at iop? tid 0 # DPT/Adaptec control interface
# SCSI Controllers and Devices
diff -r f40aa327e18e -r c9b6d7b27501 sys/arch/i386/conf/files.i386
--- a/sys/arch/i386/conf/files.i386 Fri Sep 21 14:12:51 2001 +0000
+++ b/sys/arch/i386/conf/files.i386 Sat Sep 22 23:00:54 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.i386,v 1.147.2.17 2001/09/06 03:41:44 sommerfeld Exp $
+# $NetBSD: files.i386,v 1.147.2.18 2001/09/22 23:00:58 sommerfeld Exp $
#
# new style config file for i386 architecture
#
@@ -6,7 +6,7 @@
# maxpartitions must be first item in files.${ARCH}.newconf
maxpartitions 8
-maxusers 2 16 64
+maxusers 2 16 128
# APM options
defopt opt_apm.h APM_DISABLE APM_FORCE_64K_SEGMENTS APM_NO_IDLE
@@ -35,6 +35,9 @@
# Performance counter support
defopt PERFCTRS
+# MTRR support
+defopt MTRR
+
# X server support in console drivers
defopt opt_xserver.h XSERVER XSERVER_DDB
@@ -74,7 +77,8 @@
file arch/i386/i386/mem.c
file arch/i386/i386/microtime.s
file arch/i386/i386/tsc_microtime.c i586_cpu | i686_cpu
-file arch/i386/i386/mtrr.c
+file arch/i386/i386/mtrr_i686.c mtrr
+file arch/i386/i386/mtrr_k6.c mtrr
file netns/ns_cksum.c ns
file arch/i386/i386/pmap.c
file arch/i386/i386/process_machdep.c
@@ -92,6 +96,11 @@
file arch/i386/i386/pmc.c perfctrs
+file crypto/des/arch/i386/des_enc.S ipsec & ipsec_esp
+#file crypto/des/arch/i386/des_cbc.S ipsec & ipsec_esp
+file crypto/blowfish/arch/i386/bf_enc.S ipsec & ipsec_esp
+#file crypto/blowfish/arch/i386/bf_cbc.S ipsec & ipsec_esp
+
#
# Machine-independent SCSI drivers
#
@@ -149,7 +158,9 @@
#
include "dev/pci/files.pci"
+include "dev/pci/files.agp"
file arch/i386/pci/pci_machdep.c pci
+file arch/i386/pci/agp_machdep.c agp
file arch/i386/pci/pcibios.c pcibios
file arch/i386/pci/pci_intr_fixup.c pcibios & pcibios_intr_fixup
file arch/i386/pci/piix.c pcibios & pcibios_intr_fixup
@@ -166,9 +177,10 @@
file arch/i386/pci/pcic_pci_machdep.c pcic_pci
Home |
Main Index |
Thread Index |
Old Index