Source-Changes-HG archive

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

[src/uebayasi-xip]: src Sync with HEAD (-D20101022).



details:   https://anonhg.NetBSD.org/src/rev/e9f0a9661065
branches:  uebayasi-xip
changeset: 751813:e9f0a9661065
user:      uebayasi <uebayasi%NetBSD.org@localhost>
date:      Fri Oct 22 09:23:11 2010 +0000

description:
Sync with HEAD (-D20101022).

diffstat:

 share/man/man9/man9.x86/Makefile                    |    10 +
 share/man/man9/man9.x86/nmi.9                       |   144 ++
 share/man/man9/man9.x86/x86_msr_xcall.9             |    97 +
 sys/arch/arm/marvell/files.marvell                  |    71 +
 sys/arch/arm/marvell/kirkwood.c                     |   292 +++++
 sys/arch/arm/marvell/kirkwoodreg.h                  |   206 +++
 sys/arch/arm/marvell/mv78xx0reg.h                   |   206 +++
 sys/arch/arm/marvell/mvsoc.c                        |   649 ++++++++++++
 sys/arch/arm/marvell/mvsoc_dma.c                    |    74 +
 sys/arch/arm/marvell/mvsoc_intr.c                   |   153 ++
 sys/arch/arm/marvell/mvsoc_intr.h                   |    49 +
 sys/arch/arm/marvell/mvsoc_space.c                  |   320 ++++++
 sys/arch/arm/marvell/mvsocgpp.c                     |   455 ++++++++
 sys/arch/arm/marvell/mvsocgppreg.h                  |    67 +
 sys/arch/arm/marvell/mvsocgppvar.h                  |    45 +
 sys/arch/arm/marvell/mvsocreg.h                     |   134 ++
 sys/arch/arm/marvell/mvsoctmr.c                     |   305 +++++
 sys/arch/arm/marvell/mvsoctmrreg.h                  |    45 +
 sys/arch/arm/marvell/mvsocvar.h                     |    92 +
 sys/arch/arm/marvell/orion.c                        |   257 ++++
 sys/arch/arm/marvell/orionreg.h                     |   206 +++
 sys/arch/arm/marvell/pci_machdep.c                  |   419 +++++++
 sys/arch/evbarm/marvell/marvell_machdep.c           |  1001 +++++++++++++++++++
 sys/arch/evbarm/marvell/marvell_start.S             |   206 +++
 sys/arch/evbarm/marvell/marvellreg.h                |    42 +
 sys/arch/evbarm/marvell/marvellvar.h                |    40 +
 sys/dev/filemon/filemon.c                           |   366 ++++++
 sys/dev/filemon/filemon.h                           |    52 +
 sys/dev/filemon/filemon_wrapper.c                   |   385 +++++++
 sys/dev/filemon/mknod-sh                            |    22 +
 sys/modules/compat_aoutm68k/Makefile                |    15 +
 sys/modules/filemon/Makefile                        |    11 +
 sys/modules/npf/Makefile                            |    13 +
 sys/modules/swsensor/Makefile                       |    11 +
 sys/net/npf/Makefile                                |     9 +
 sys/net/npf/files.npf                               |    28 +
 sys/net/npf/npf.c                                   |   216 ++++
 sys/net/npf/npf.h                                   |   188 +++
 sys/net/npf/npf_alg.c                               |   168 +++
 sys/net/npf/npf_alg_icmp.c                          |   326 ++++++
 sys/net/npf/npf_ctl.c                               |   499 +++++++++
 sys/net/npf/npf_handler.c                           |   227 ++++
 sys/net/npf/npf_impl.h                              |   213 ++++
 sys/net/npf/npf_inet.c                              |   386 +++++++
 sys/net/npf/npf_instr.c                             |   230 ++++
 sys/net/npf/npf_mbuf.c                              |   252 ++++
 sys/net/npf/npf_nat.c                               |   626 +++++++++++
 sys/net/npf/npf_ncode.h                             |   108 ++
 sys/net/npf/npf_processor.c                         |   541 ++++++++++
 sys/net/npf/npf_ruleset.c                           |   470 ++++++++
 sys/net/npf/npf_sendpkt.c                           |   196 +++
 sys/net/npf/npf_session.c                           |   888 ++++++++++++++++
 sys/net/npf/npf_tableset.c                          |   552 ++++++++++
 sys/rump/dev/lib/libnpf/Makefile                    |    17 +
 sys/rump/dev/lib/libnpf/component.c                 |    35 +
 sys/rump/dev/lib/libnpf/shlib_version               |     4 +
 sys/rump/dev/lib/libscsipi/Makefile                 |    22 +
 sys/rump/dev/lib/libscsipi/SCSIPI.ioconf            |    20 +
 sys/rump/dev/lib/libscsipi/component.c              |    39 +
 sys/rump/dev/lib/libscsipi/opt/atapibus.h           |     3 +
 sys/rump/dev/lib/libscsipi/opt/opt_compat_freebsd.h |     1 +
 sys/rump/dev/lib/libscsipi/opt/opt_scsi.h           |     1 +
 sys/rump/dev/lib/libscsipi/opt/scsibus.h            |     3 +
 sys/rump/dev/lib/libscsipi/opt/wd.h                 |     1 +
 sys/rump/dev/lib/libscsipi/shlib_version            |     4 +
 sys/rump/dev/lib/libscsitest/Makefile               |    11 +
 sys/rump/dev/lib/libscsitest/SCSITEST.ioconf        |    12 +
 sys/rump/dev/lib/libscsitest/component.c            |    46 +
 sys/rump/dev/lib/libscsitest/scsitest.c             |   255 ++++
 sys/rump/dev/lib/libscsitest/shlib_version          |     4 +
 70 files changed, 13061 insertions(+), 0 deletions(-)

diffs (truncated from 13341 to 300 lines):

diff -r 28b9e4a8e7d9 -r e9f0a9661065 share/man/man9/man9.x86/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man9/man9.x86/Makefile  Fri Oct 22 09:23:11 2010 +0000
@@ -0,0 +1,10 @@
+#      $NetBSD: Makefile,v 1.2.2.2 2010/10/22 09:23:11 uebayasi Exp $
+
+MAN=   nmi.9 x86_msr_xcall.9
+
+MANSUBDIR=/x86
+
+MLINKS+=nmi.9 nmi_establish.9
+MLINKS+=nmi.9 nmi_disestablish.9
+
+.include <bsd.man.mk>
diff -r 28b9e4a8e7d9 -r e9f0a9661065 share/man/man9/man9.x86/nmi.9
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man9/man9.x86/nmi.9     Fri Oct 22 09:23:11 2010 +0000
@@ -0,0 +1,144 @@
+.\"     $NetBSD: nmi.9,v 1.2.2.2 2010/10/22 09:23:11 uebayasi Exp $
+.\"
+.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by David Young.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd February 9, 2010
+.Dt NMI 9 x86
+.Os
+.Sh NAME
+.Nm nmi ,
+.Nm nmi_establish ,
+.Nm nmi_disestablish ,
+.Nd NMI
+.Sh SYNOPSIS
+.In x86/nmi.h
+.Ft nmi_handler_t *
+.Fn nmi_establish "int (*func)(const struct trapframe *, void *)" "void *arg"
+.Ft void
+.Fn nmi_disestablish "nmi_handler_t *handle"
+.Sh DESCRIPTION
+The
+.Nm
+interface lets the kernel establish handlers for x86 Non-Maskable
+Interrupts (NMIs).
+An NMI signals to the processor an exception on a processor, memory
+controller, or I/O bus that is irrecoverable or else needs attention
+at a high priority.
+A
+.Dq "debug switch"
+or a performance/watchdog timer may also trigger an NMI.
+.Pp
+An NMI handler will run to completion on the same processor where
+it began without being preempted by any thread or interrupt except
+for another NMI.
+An NMI handler must prepare for re-entry.
+An NMI handler may run simultaneously on more than one CPU.
+.Pp
+Synchronizing access to a shared data structure from
+an NMI handler is a different challenge than synchronizing access
+from hardware/software interrupt routines or from kernel threads.
+An NMI handler may not perform any operation that may sleep, acquire
+a mutex, or schedule a software interrupt.
+An NMI handler may use
+.Xr atomic_ops 3 .
+An NMI handler may reference per-CPU storage
+.Po
+.Xr percpu 9
+.Pc .
+.Pp
+An NMI handler may not write to the kernel message buffer.
+.Sh FUNCTIONS
+.Bl -tag -width compact
+.It Fn nmi_establish "func" "arg"
+Call this in thread context to establish a handler for non-maskable
+interrupts.
+Establish
+.Fa func
+as one of the handler functions to call when an NMI occurs.
+Where
+.Fa tf
+is a
+.Vt struct trapframe
+representation of the processor context where the NMI was received,
+and
+.Fa arg
+is the argument to
+.Fn nmi_establish ,
+the kernel will call
+.Fo (*func)
+.Fa tf
+.Fa arg
+.Fc
+every time an NMI occurs until the handler is removed with
+.Fn nmi_disestablish .
+.Fa func
+should return non-zero if it handled a condition that causes
+NMI, or zero if it did not.
+If, for a given NMI, all handlers return zero, the system will
+panic or enter the kernel debugger,
+.Xr ddb 4 .
+.Fn nmi_establish
+returns
+.Dv NULL
+on failure, and a handle for the NMI handler on success.
+.It Fn nmi_disestablish "handle"
+Call this in thread context to stop the kernel from calling an NMI
+handler.
+Indicate the handler to disestablish with the
+.Fa handle
+returned by
+.Fn nmi_establish .
+.El
+.Sh CODE REFERENCES
+This section describes places within the
+.Nx
+source tree where actual code implementing the
+.Nm
+interface
+can be found.
+All pathnames are relative to
+.Pa /usr/src .
+.Pp
+The
+.Nm
+interface is implemented within the file
+.Pa sys/arch/x86/x86/nmi.c .
+.\" .Sh EXAMPLES
+.Sh SEE ALSO
+.Xr atomic_ops 3 ,
+.Xr ddb 4
+.Sh HISTORY
+The
+.Nm
+interface first appeared in
+.Nx 6.0 .
+.Sh AUTHORS
+.An YAMAMOTO Takashi Aq yamt%NetBSD.org@localhost
+.\" .Sh CAVEATS
+.\" .Sh BUGS
+.\" .Sh SECURITY CONSIDERATIONS
diff -r 28b9e4a8e7d9 -r e9f0a9661065 share/man/man9/man9.x86/x86_msr_xcall.9
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man9/man9.x86/x86_msr_xcall.9   Fri Oct 22 09:23:11 2010 +0000
@@ -0,0 +1,97 @@
+.\" $NetBSD: x86_msr_xcall.9,v 1.3.2.2 2010/10/22 09:23:11 uebayasi Exp $
+.\"
+.\" Copyright (c) 2010 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to The NetBSD Foundation
+.\" by Jukka Ruohonen.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd August 21, 2010
+.Dt X86_MSR_XCALL 9 x86
+.Os
+.Sh NAME
+.Nm x86_msr_xcall
+.Nd MSR specific cross-call
+.Sh SYNOPSIS
+.In x86/cpu_msr.h
+.Ft void
+.Fn x86_msr_xcall "void *arg1" "void *arg1"
+.Sh DESCRIPTION
+The
+.Fn x86_msr_xcall
+function provides a x86-specific IPI handler suitable for use with the
+.Xr xcall 9
+interface.
+It can be used to ensure that a given
+.Tn MSR
+call is executed on all processors.
+The prototype follows the
+.Ft xcfunc_t
+function pointer type and the opaque
+.Fa arg1
+pointer is casted to the following structure:
+.Bd -literal -offset indent
+struct msr_rw_info {
+       int             msr_read;
+       int             msr_type;
+       uint64_t        msr_value;
+       uint64_t        msr_mask;
+};
+.Ed
+.Pp
+This structure must be filled prior to the call.
+Two fields are compulsory:
+.Fa msr_type
+is used as the address of the
+.Tn MSR
+and
+.Fa msr_value
+is the value to be written.
+If
+.Fa msr_read
+is not zero,
+.Fn x86_msr_xcall
+will first read from
+.Fa msr_type
+and then clear the mask specified in
+.Fa msr_mask
+before the write operation.
+.Sh EXAMPLES
+The following example writes a value zero to the
+.Tn MSR_THERM_CONTROL
+model-specific register on all processors in the system:
+.Bd -literal -offset indent
+struct msr_rw_info msr;
+uint64_t xc;
+
+msr.msr_value = 0;
+msr.msr_read = true;
+msr.msr_type = MSR_THERM_CONTROL;
+msr.msr_mask = 0x1e;
+
+xc = xc_broadcast(0, (xcfunc_t)x86_msr_xcall, &msr, NULL);
+xc_wait(xc);
+.Ed
+.Sh SEE ALSO
+.Xr xcall 9
diff -r 28b9e4a8e7d9 -r e9f0a9661065 sys/arch/arm/marvell/files.marvell
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/marvell/files.marvell        Fri Oct 22 09:23:11 2010 +0000
@@ -0,0 +1,71 @@
+#       $NetBSD: files.marvell,v 1.2.4.2 2010/10/22 09:23:11 uebayasi Exp $
+#
+# Configuration info for Marvell System on Chip support
+#
+
+include "arch/arm/pic/files.pic"
+
+device mvsoc { [unit = -1], [offset = -1], [irq = -1] } : bus_space_generic, pic
+attach mvsoc at mainbus
+file   arch/arm/marvell/mvsoc.c                mvsoc
+file   arch/arm/marvell/mvsoc_space.c
+file   arch/arm/marvell/mvsoc_dma.c
+
+file   arch/arm/arm32/irq_dispatch.S
+
+defflag opt_mvsoc.h                            ORION KIRKWOOD MV78XX0
+file   arch/arm/marvell/mvsoc_intr.c
+file   arch/arm/marvell/orion.c                orion
+file   arch/arm/marvell/kirkwood.c             kirkwood
+#file  arch/arm/marvell/mv78xx0.c              mv78xx0
+
+
+# Integrated peripherals
+include "dev/marvell/files.discovery"
+
+# Timers
+device mvsoctmr
+attach mvsoctmr at mvsoc
+file   arch/arm/marvell/mvsoctmr.c             mvsoctmr
+
+
+# PCI Express Interface
+attach mvpex at mvsoc with mvpex_mbus



Home | Main Index | Thread Index | Old Index