Source-Changes-HG archive

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

[src/netbsd-1-5]: src/sys/arch/sparc64 pullup the contents of -current arch/s...



details:   https://anonhg.NetBSD.org/src/rev/d5ce87554bf5
branches:  netbsd-1-5
changeset: 488569:d5ce87554bf5
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jul 18 16:23:16 2000 +0000

description:
pullup the contents of -current arch/sparc64.  this gives us significant
ultrasparc PCI support (ultra5, ultra10, AXi, and E250 tested so far),
plus many other small fixes.  netbooting is now supported.

diffstat:

 sys/arch/sparc64/conf/EVERGLADES            |    5 +-
 sys/arch/sparc64/conf/GENERIC               |  450 +---------------
 sys/arch/sparc64/conf/GENERIC32             |  450 ++++++++++++++++
 sys/arch/sparc64/conf/GENERIC64             |    9 -
 sys/arch/sparc64/conf/NONPLUS               |    8 +-
 sys/arch/sparc64/conf/NONPLUS64             |    8 +-
 sys/arch/sparc64/conf/POWEROFSEVEN          |   61 +-
 sys/arch/sparc64/conf/POWEROFSEVEN64        |    7 +
 sys/arch/sparc64/dev/consinit.c             |   11 +-
 sys/arch/sparc64/dev/cs4231_ebus.c          |    4 +-
 sys/arch/sparc64/dev/ebus.c                 |   70 +-
 sys/arch/sparc64/dev/iommu.c                |  133 ++--
 sys/arch/sparc64/dev/iommuvar.h             |    4 +-
 sys/arch/sparc64/dev/lpt_ebus.c             |    6 +-
 sys/arch/sparc64/dev/pci_machdep.c          |   16 +-
 sys/arch/sparc64/dev/pcons.c                |   26 +-
 sys/arch/sparc64/dev/psycho.c               |  240 +++++---
 sys/arch/sparc64/dev/psychoreg.h            |   22 +-
 sys/arch/sparc64/dev/psychovar.h            |   10 +-
 sys/arch/sparc64/dev/sbus.c                 |   16 +-
 sys/arch/sparc64/dev/zs.c                   |  110 +--
 sys/arch/sparc64/dev/zsvar.h                |    6 +-
 sys/arch/sparc64/include/asm.h              |   12 +-
 sys/arch/sparc64/include/bus.h              |  232 ++++----
 sys/arch/sparc64/include/cpu.h              |    7 +-
 sys/arch/sparc64/include/ctlreg.h           |  781 +++++++++++++++++++++------
 sys/arch/sparc64/include/elf_machdep.h      |   17 +-
 sys/arch/sparc64/include/intr.h             |   20 +-
 sys/arch/sparc64/include/param.h            |   28 +-
 sys/arch/sparc64/include/pcb.h              |    8 +-
 sys/arch/sparc64/include/psl.h              |   22 +-
 sys/arch/sparc64/include/reg.h              |    4 +-
 sys/arch/sparc64/include/reloc.h            |   31 +-
 sys/arch/sparc64/include/stdarg.h           |    8 +-
 sys/arch/sparc64/include/vmparam.h          |    6 +-
 sys/arch/sparc64/include/z8530var.h         |    3 +-
 sys/arch/sparc64/sparc64/autoconf.c         |   84 ++-
 sys/arch/sparc64/sparc64/auxreg.c           |  133 ----
 sys/arch/sparc64/sparc64/auxreg.h           |   80 --
 sys/arch/sparc64/sparc64/bsd_fdintr.s       |    3 +-
 sys/arch/sparc64/sparc64/clock.c            |   89 +--
 sys/arch/sparc64/sparc64/cpu.c              |    4 +-
 sys/arch/sparc64/sparc64/db_interface.c     |    4 +-
 sys/arch/sparc64/sparc64/db_trace.c         |    4 +-
 sys/arch/sparc64/sparc64/genassym.c         |    9 +-
 sys/arch/sparc64/sparc64/genassym.cf        |   25 +-
 sys/arch/sparc64/sparc64/intr.c             |   28 +-
 sys/arch/sparc64/sparc64/intreg.h           |   17 +-
 sys/arch/sparc64/sparc64/locore.s           |  729 ++++++++++++++++++-------
 sys/arch/sparc64/sparc64/machdep.c          |   79 ++-
 sys/arch/sparc64/sparc64/mem.c              |   11 +-
 sys/arch/sparc64/sparc64/memreg.c           |  294 ----------
 sys/arch/sparc64/sparc64/memreg.h           |   74 --
 sys/arch/sparc64/sparc64/netbsd32_machdep.c |    5 +-
 sys/arch/sparc64/sparc64/ofw_machdep.c      |    8 +-
 sys/arch/sparc64/sparc64/pmap.c             |  497 +++++++----------
 sys/arch/sparc64/sparc64/trap.c             |   20 +-
 sys/arch/sparc64/sparc64/vaddrs.h           |   76 --
 sys/arch/sparc64/stand/bootblk/bootblk.fth  |   32 +-
 sys/arch/sparc64/stand/ofwboot/net.c        |   99 ++-
 60 files changed, 2787 insertions(+), 2468 deletions(-)

diffs (truncated from 8810 to 300 lines):

diff -r 08e27ff08976 -r d5ce87554bf5 sys/arch/sparc64/conf/EVERGLADES
--- a/sys/arch/sparc64/conf/EVERGLADES  Tue Jul 18 16:15:05 2000 +0000
+++ b/sys/arch/sparc64/conf/EVERGLADES  Tue Jul 18 16:23:16 2000 +0000
@@ -1,10 +1,10 @@
-#      $NetBSD: EVERGLADES,v 1.2 2000/06/15 18:23:52 mrg Exp $
+#      $NetBSD: EVERGLADES,v 1.2.2.1 2000/07/18 16:23:16 mrg Exp $
 #
 # from: NetBSD: GENERIC,v 1.33 2000/05/19 05:28:47 eeh Exp
 
 include "arch/sparc64/conf/std.sparc64"
 
-#ident                 "GENERIC-$Revision: 1.2 $"
+#ident                 "GENERIC-$Revision: 1.2.2.1 $"
 
 maxusers       32
 
@@ -35,6 +35,7 @@
 ## automagically determined at boot time.
 
 config         netbsd  root on ? type ?
+options        BUFCACHE=20
 
 ## UVM options.
 #options       UVM_PAGE_TRKOWN
diff -r 08e27ff08976 -r d5ce87554bf5 sys/arch/sparc64/conf/GENERIC
--- a/sys/arch/sparc64/conf/GENERIC     Tue Jul 18 16:15:05 2000 +0000
+++ b/sys/arch/sparc64/conf/GENERIC     Tue Jul 18 16:23:16 2000 +0000
@@ -1,446 +1,10 @@
-#      $NetBSD: GENERIC,v 1.35.2.2 2000/07/06 14:10:36 sommerfeld Exp $
-
-include "arch/sparc64/conf/std.sparc64"
-
-#ident                 "GENERIC-$Revision: 1.35.2.2 $"
-
-maxusers       32
-
-## System kernel configuration.  See options(4) for more detail.
-
-
-# Options for variants of the Sun SPARC architecure.
-# We currently support three architecture types; at least one is required.
-options        SUN4U           # sun4u - Ultra 140 and 170
-options        TRAPWIN
-options        __ELF__         # we use elf 
-#options       _LP64           # we're using a 64-bit compiler
-
-## System options specific to the sparc machine type
-
-## Use a faster console than the PROM's slow drawing routines.  Not needed
-## for headless (no framebuffer) machines.
-# XXX broken on sparc64
-#options       RASTERCONSOLE           # fast rasterop console
-#options       FONT_GALLANT12x22       # the console font
-#options       FONT_BOLD8x16           # a somewhat smaller font
-
-#### System options that are the same for all ports
-
-## Root device configuration: change the ?'s if you are going to use a
-## nonstandard root partition (other than where the kernel is booted from)
-## and/or nonstandard root type (not ffs or nfs).  Normally this can be
-## automagically determined at boot time.
-
-config         netbsd  root on ? type ?
-
-## UVM options.
-#options       UVM_PAGE_TRKOWN
-#options       UVMHIST
-#options       UVMHIST_PRINT   # Loud!
-
-## System call tracing (see ktrace(1)).
-options        KTRACE
-
-## Collect statistics on kernel malloc's and free's.  This does have a
-## significant performance hit on slower machines, so it is intended for
-## diagnostic use only.
-#options       KMEMSTATS
-
-## System V compatible IPC subsystem.  (msgctl(2), semctl(2), and shmctl(2))
-options        SYSVMSG         # System V message queues
-options        SYSVSEM         # System V semaphores
-options        SYSVSHM         # System V shared memory
-#options       SHMMAXPGS=1024  # 1024 pages is the default
-
-## Loadable kernel module support; still under development.
-options        LKM
-
-## NFS boot options; default on sparc is the bootparam protocol
-options        NFS_BOOT_BOOTPARAM
-#options       NFS_BOOT_BOOTP
-#options       NFS_BOOT_DHCP
-
-#### Debugging options
-
-## The DDB in-kernel debugger runs at panic (unless DDB_ONPANIC=0), or at
-## serial console break or keyboard reset, where the PROM would normally
-## intercept.  DDB_HISTORY_SIZE adds up/down arrow command history.
-# we enable DDB in GENERIC for now.
-options        DDB                     # kernel dynamic debugger
-options        DDB_HISTORY_SIZE=100    # enable history editing in DDB
-#options       DDB_ONPANIC             # see also sysctl(8): `ddb.onpanic'
-
-## You may also use gdb, on another computer connected to this machine over
-## a serial port.  Both KGDBDEV and KGDBRATE should be specified; KGDBDEV is
-## a dev_t encoded device number of the serial port to use.
-## (0xc01 = ttya, 0xc02 = ttyb.)
-#options       KGDB            # support for kernel gdb
-#options       KGDBDEV=0xc01   # kgdb device number (this sample is `ttyb')
-#options       KGDBRATE=38400  # baud rate
-
-
-## Compile the kernel with debugging symbols (`netbsd.gdb' is the debug file),
-## such that gdb(1) can be used on a kernel coredump.
-
-makeoptions    DEBUG="-g"
-
-
-## Adds code to the kernel that does internal consistency checks, and will
-## cause the kernel to panic if corruption of internal data structures
-## is detected.
-#options       DIAGNOSTIC      # extra kernel sanity checking
-
-## Enable (possibly expensive) debugging code that may also display messages
-## on the system console
-options        DEBUG
-
-## Make SCSI error messages more verbose when explaining their meanings.
-options        SCSIVERBOSE
-options        PCIVERBOSE
-options        MIIVERBOSE      # verbose PHY autoconfig messages
-#options       PCI_CONFIG_DUMP # verbosely dump PCI config space
-
-## `INSECURE' turns off the kernel security level (securelevel = 0 always).
-## This allows writing to /dev/mem, loading kernel modules while multi-user,
-## and other insecurities good only for development work.  Do not use this
-## option on a production machine.
-#options       INSECURE
+#      $NetBSD: GENERIC,v 1.35.2.3 2000/07/18 16:23:16 mrg Exp $
 
-## Allow non-root users to grab /dev/console with programs such as xconsole.
-## `xconsole' therefore does not need setuid root with this option enabled.
-#options       UCONSOLE
-
-## `FDSCRIPTS' allows non-readable but executable scripts by providing a
-## pre-opened opaque file to the script interpreter.  `SETUIDSCRIPTS',
-## which implies FDSCRIPTS, allows scripts to be set-user-id using the same
-## opaque file mechanism.  Perl calls this "secure setuid scripts."
-
-#options       FDSCRIPTS
-#options       SETUIDSCRIPTS
-
-## Options for compatibility with previous releases foreign system binaries.
-## In the cases of COMPAT_SUNOS and COMPAT_SVR4, you may need to set up
-## additional user-level utilities or system configuration files. See
-## compat_sunos(8) and compat_svr4(8).
-
-options        COMPAT_43       # 4.3BSD system interfaces
-options        COMPAT_10       # NetBSD 1.0 binary compatibility
-options        COMPAT_11       # NetBSD 1.1 binary compatibility
-options        COMPAT_12       # NetBSD 1.2 binary compatibility
-options        COMPAT_13       # NetBSD 1.3 binary compatibility
-options        COMPAT_14       # NetBSD 1.4 binary compatibility
-options        COMPAT_SUNOS    # SunOS 4.x binary compatibility
-options        COMPAT_SVR4     # SunOS 5.x binary compatibility
-#options       COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -- 64-bit only
-#options       COMPAT_AOUT     # NetBSD/sparc compat support
-options        EXEC_AOUT       # execve(2) support for a.out binaries
-options        EXEC_ELF32      # Exec module for SunOS 5.x binaries.
-#options       EXEC_ELF64      # Exec module for sparc64 & SunOs 5.x binaries. -- 64-bit only
-#options       SYSCALL_DEBUG
-
-## File systems.  You probably need at least one of FFS or NFS.
-file-system    FFS             # Berkeley Fast Filesystem
-file-system    NFS             # Sun NFS-compatible filesystem client
-file-system    KERNFS          # kernel data-structure filesystem
-file-system    NULLFS          # NULL layered filesystem
-file-system    OVERLAY         # overlay file system
-file-system    MFS             # memory-based filesystem
-file-system    FDESC           # user file descriptor filesystem
-file-system    UMAPFS          # uid/gid remapping filesystem
-file-system    LFS             # Log-based filesystem (still experimental)
-file-system    PORTAL          # portal filesystem (still experimental)
-file-system    PROCFS          # /proc
-file-system    CD9660          # ISO 9660 + Rock Ridge file system
-file-system    UNION           # union file system
-file-system    MSDOSFS         # MS-DOS FAT filesystem(s).
-
-## File system options.
-options        NFSSERVER       # Sun NFS-compatible filesystem server
-options        QUOTA           # FFS quotas
-#options       FFS_EI          # FFS Endian Independent support
-options        SOFTDEP         # FFS soft updates support.
-
-## Network protocol support.  In most environments, INET is required.
-options        INET            # IP (Internet Protocol) v4
-options        INET6           # IPV6
-#options       IPSEC           # IP security
-#options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
-#options       IPSEC_DEBUG     # debug for IP security
-options        TCP_COMPAT_42   # 4.2BSD IP implementation compatibility
-#options       GATEWAY         # packet forwarding ("router switch")
-options        MROUTING        # packet forwarding of multicast packets
-#options       DIRECTED_BROADCAST      # allow broadcasts through routers
-options        NS              # Xerox NS networking
-#options       NSIP            # Xerox NS tunneling over IP
-options        ISO,TPIP        # OSI networking
-#options       EON             # OSI tunneling over IP
-#options       CCITT,LLC,HDLC  # X.25 packet switched protocol
-options        NETATALK        # AppleTalk (over Ethernet) protocol
-options        NTP             # Network Time Protocol in-kernel support
-#options       PPS_SYNC        # Add serial line synchronization for NTP
-options        PFIL_HOOKS      # Add pfil(9) hooks, intended for custom LKMs.
-options        IPFILTER_LOG    # Add ipmon(8) logging for ipfilter device
-options        PPP_BSDCOMP     # Add BSD compression to ppp device
-options        PPP_DEFLATE     # Add deflate (libz) compression to ppp device
-options        PPP_FILTER      # Add active filters for ppp (via bpf)
-
-
-#### Main bus and CPU .. all systems.
-mainbus0 at root
-cpu0   at mainbus0
-
-#### Bus types found on SPARC systems.
-
-sbus0  at mainbus0                             # Ultra 1
-#upa0  at mainbus0                             # Ultra 1E, Ultra 2, Ex0000
-psycho*        at mainbus0                             # Darwin, Ultra5
-pci*   at psycho?
-pci*   at simba?
-simba* at pci? dev ? function ?                # `APB' support.
-ebus*  at pci?                                 # ebus devices
-
-#### Standard system devices -- all required for a given architecture
-
-## PROM console driver -- if all else fails
-pcons0 at mainbus0                             # PROM console
-
-## Auxiliary system registers -- We use the OBP for power management
-auxio* at ebus?                                # auxio registers
-auxio* at sbus? slot ? offset ?                # auxio registers
-
-# We also need:
-bpp*   at sbus? slot ? offset ?                # parallel port
-lpt*   at ebus?                                # parallel port
-
-## Mostek clock found on 4/300, sun4c, sun4m and sun4u systems.
-## The Mostek clock NVRAM is the "eeprom" on sun4/300 systems.
-clock* at sbus? slot ? offset ?
-clock* at ebus?
-
-## Timer chip found on 4/300, sun4c, sun4m and (some) sun4u systems.
-timer* at mainbus0                             # sun4c
+include "arch/sparc64/conf/GENERIC32"
 
-#### Serial port configuration
-
-## Zilog 8530 serial chips.  Each has two-channels.
-## zs0 is ttya and ttyb.  zs1 is the keyboard and mouse.
-zs0    at sbus? slot ? offset ?
-zstty0 at zs0 channel 0        # ttya
-zstty1 at zs0 channel 1        # ttyb
-
-zs1    at sbus? slot ? offset ?
-kbd0   at zs1 channel 0        # keyboard
-ms0    at zs1 channel 1        # mouse
-
-## PCI machines have serial ports:
-##     Siemens SAB82532 controller: ttya and ttyb (`su'; sab)
-##     Part of NS PC87332VLJ Super I/O controller: kbd/mouse (`se'; com)
-
-## These are two SAB82532 controllers
-#sab0  at ebus?                        # ttya/ttyb
-#sabtty0       at sab0 channel 0       # ttya
-#sabtty1       at sab0 channel 1       # ttyb
-
-## Part of a PC87332VLJ?
-#ucom0 at ebus? addr 0x3083f8          # `com' driver
-#ucom1 at ebus? addr 0x3062f8          # 
-#ucom0 at ebus?                        # `com' driver
-#ucom1 at ebus?                        # 
-#kbd0  at ucom0 channel 0              # keyboard
-#ms0   at ucom1 channel 1              # mouse
-
-#### Disk controllers and disks
-
-## The following flags may be set for the NCR53c94 based esp driver:
-##     bits 0-7:  disable disconnect/reselect for the corresponding target
-##     bits 8-15: disable synchronous negotiation for target [bit-8]
-
-## sun4u on-board SCSI, and FSBE/S SBus SCSI cards, an NCR53c94 or
-## equivalent behind an LSI Logic DMA controller
-
-dma*   at sbus? slot ? offset ?                        # SBus
-esp*   at dma? flags 0x0000                            # SBus
-
-scsibus* at esp?
-
-## Qlogic ISP SBus SCSI Card
-isp*   at sbus? slot ? offset ?
-scsibus* at isp?
-



Home | Main Index | Thread Index | Old Index