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.
details: https://anonhg.NetBSD.org/src/rev/662b1f6d830d
branches: uebayasi-xip
changeset: 751855:662b1f6d830d
user: uebayasi <uebayasi%NetBSD.org@localhost>
date: Mon Nov 15 14:38:21 2010 +0000
description:
Sync with HEAD.
diffstat:
share/man/man4/et.4 | 79 +
share/man/man4/etphy.4 | 58 +
sys/arch/alpha/include/pmap.h | 18 +-
sys/arch/alpha/include/vmparam.h | 18 +-
sys/arch/amd64/include/pmap.h | 13 +-
sys/arch/amd64/include/vmparam.h | 13 +-
sys/arch/arm/imx/files.imx31 | 69 +
sys/arch/arm/imx/files.imx51 | 105 +
sys/arch/arm/imx/imx31_clock.c | 114 +
sys/arch/arm/imx/imx31_uart.c | 63 +
sys/arch/arm/imx/imx51_axi.c | 159 ++
sys/arch/arm/imx/imx51_clock.c | 130 +
sys/arch/arm/imx/imx51_intr.h | 304 ++++
sys/arch/arm/imx/imx51_iomuxreg.h | 1653 +++++++++++++++++++++++++
sys/arch/arm/imx/imx51_tzic.c | 284 ++++
sys/arch/arm/imx/imx51_tzicreg.h | 53 +
sys/arch/arm/imx/imx51_uart.c | 61 +
sys/arch/arm/imx/imx51reg.h | 295 ++++
sys/arch/arm/imx/imx51var.h | 23 +
sys/arch/arm/imx/imx_dma.c | 67 +
sys/arch/arm/imx/imx_space.c | 271 ++++
sys/arch/arm/imx/imxclockvar.h | 18 +
sys/arch/arm/imx/imxepitreg.h | 51 +
sys/arch/arm/imx/imxgpioreg.h | 55 +
sys/arch/arm/imx/imxi2creg.h | 24 +
sys/arch/arm/imx/imxkppreg.h | 53 +
sys/arch/arm/imx/imxsdmareg.h | 120 +
sys/arch/arm/imx/imxssireg.h | 119 +
sys/arch/arm/imx/imxwdogreg.h | 102 +
sys/arch/arm/include/arm32/pmap.h | 46 +-
sys/arch/arm/include/arm32/vmparam.h | 42 +-
sys/arch/arm/pic/picvar.h | 4 +-
sys/arch/evbarm/conf/NETWALKER | 209 +++
sys/arch/evbarm/conf/NETWALKER_MD | 15 +
sys/arch/evbarm/conf/files.netwalker | 13 +
sys/arch/evbarm/conf/mk.netwalker | 14 +
sys/arch/evbarm/conf/std.netwalker | 30 +
sys/arch/evbarm/netwalker/netwalker_machdep.c | 1184 +++++++++++++++++
sys/arch/evbarm/netwalker/netwalker_reg.h | 66 +
sys/arch/evbarm/netwalker/netwalker_start.S | 374 +++++
sys/arch/hp700/dev/sti_pci_machdep.c | 88 +
sys/sys/param.h | 3 +-
42 files changed, 6405 insertions(+), 75 deletions(-)
diffs (truncated from 6726 to 300 lines):
diff -r 3656d70afd8b -r 662b1f6d830d share/man/man4/et.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/et.4 Mon Nov 15 14:38:21 2010 +0000
@@ -0,0 +1,79 @@
+.\" $NetBSD: et.4,v 1.1.2.2 2010/11/15 14:38:21 uebayasi Exp $
+.\" $OpenBSD: et.4,v 1.2 2007/10/30 13:22:21 jmc Exp $
+.\"
+.\" Copyright (c) 2007 Jonathan Gray <jsg%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd October 13, 2010
+.Dt ET 4
+.Os
+.Sh NAME
+.Nm et
+.Nd Agere/LSI ET1310/ET1301 10/100/Gigabit Ethernet device
+.Sh SYNOPSIS
+.Cd "et* at pci? dev ? function ?"
+.Cd "etphy* at mii? phy ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports PCI Express Ethernet adapters based on the Agere/LSI
+ET1310/ET1301 integrated MAC/PHY.
+.Pp
+The following
+.Ar media
+types are supported:
+.Pp
+.Bl -tag -width autoselect -compact
+.It Cm autoselect
+Enable autoselection of the media type and options.
+.It Cm 10baseT
+Set 10Mbps operation.
+.It Cm 100baseTX
+Set 100Mbps (Fast Ethernet) operation.
+.It Cm 1000baseT
+Set 1000Mbps (Gigabit Ethernet) operation (ET1310 only).
+.El
+.Sh SEE ALSO
+.Xr arp 4 ,
+.Xr etphy 4 ,
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr netintro 4 ,
+.Xr pci 4 ,
+.Xr ifconfig.if 5 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Ox 4.3 .
+It was added to
+.Nx 6.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Sepherosa Ziehau
+for
+DragonFlyBSD,
+ported to
+.Ox
+by
+.An Jonathan Gray
+.Aq jsg%openbsd.org@localhost ,
+and subsequently ported to
+.Nx
+by
+.An Kaspar Brand .
diff -r 3656d70afd8b -r 662b1f6d830d share/man/man4/etphy.4
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/share/man/man4/etphy.4 Mon Nov 15 14:38:21 2010 +0000
@@ -0,0 +1,58 @@
+.\" $NetBSD: etphy.4,v 1.1.2.2 2010/11/15 14:38:21 uebayasi Exp $
+.\" $OpenBSD: etphy.4,v 1.2 2007/10/30 13:22:21 jmc Exp $
+.\"
+.\" Copyright (c) 2007 Jonathan Gray <jsg%openbsd.org@localhost>
+.\"
+.\" Permission to use, copy, modify, and distribute this software for any
+.\" purpose with or without fee is hereby granted, provided that the above
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd October 13, 2010
+.Dt ETPHY 4
+.Os
+.Sh NAME
+.Nm etphy
+.Nd Agere/LSI ET1011 TruePHY Gigabit Ethernet PHY
+.Sh SYNOPSIS
+.Cd "etphy* at mii? phy ?"
+.Sh DESCRIPTION
+The
+.Nm
+driver supports the Agere/LSI ET1011 TruePHY 10/100/1000 Ethernet PHYs
+including the integrated TruePHY in ET1310/ET1301 based adapters.
+.Sh SEE ALSO
+.Xr ifmedia 4 ,
+.Xr intro 4 ,
+.Xr mii 4 ,
+.Xr ifconfig 8
+.Sh HISTORY
+The
+.Nm
+device driver first appeared in
+.Ox 4.3 .
+It was added to
+.Nx 6.0 .
+.Sh AUTHORS
+.An -nosplit
+The
+.Nm
+driver was written by
+.An Sepherosa Ziehau
+for DragonFlyBSD,
+ported to
+.Ox
+by
+.An Jonathan Gray
+.Aq jsg%openbsd.org@localhost ,
+and subsequently ported to
+.Nx
+by
+.An Kaspar Brand .
diff -r 3656d70afd8b -r 662b1f6d830d sys/arch/alpha/include/pmap.h
--- a/sys/arch/alpha/include/pmap.h Mon Nov 15 08:41:44 2010 +0000
+++ b/sys/arch/alpha/include/pmap.h Mon Nov 15 14:38:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.75.2.1 2010/02/25 03:44:17 uebayasi Exp $ */
+/* $NetBSD: pmap.h,v 1.75.2.2 2010/11/15 14:38:21 uebayasi Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000, 2001, 2007 The NetBSD Foundation, Inc.
@@ -349,6 +349,22 @@
} \
} while (0)
+/*
+ * pmap-specific data store in the vm_page structure.
+ */
+#define __HAVE_VM_PAGE_MD
+struct vm_page_md {
+ struct pv_entry *pvh_list; /* pv_entry list */
+ int pvh_attrs; /* page attributes */
+ unsigned pvh_refcnt;
+};
+
+#define VM_MDPAGE_INIT(md, pa) \
+do { \
+ (md)->pvh_list = NULL; \
+ (md)->pvh_refcnt = 0; \
+} while (/*CONSTCOND*/0)
+
#endif /* _KERNEL */
#endif /* _PMAP_MACHINE_ */
diff -r 3656d70afd8b -r 662b1f6d830d sys/arch/alpha/include/vmparam.h
--- a/sys/arch/alpha/include/vmparam.h Mon Nov 15 08:41:44 2010 +0000
+++ b/sys/arch/alpha/include/vmparam.h Mon Nov 15 14:38:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.33.2.2 2010/04/26 06:19:03 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.33.2.3 2010/11/15 14:38:21 uebayasi Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -151,20 +151,4 @@
#define VM_NFREELIST 1
#define VM_FREELIST_DEFAULT 0
-/*
- * pmap-specific data store in the vm_page structure.
- */
-#define __HAVE_VM_PAGE_MD
-struct vm_page_md {
- struct pv_entry *pvh_list; /* pv_entry list */
- int pvh_attrs; /* page attributes */
- unsigned pvh_refcnt;
-};
-
-#define VM_MDPAGE_INIT(md, pa) \
-do { \
- (md)->pvh_list = NULL; \
- (md)->pvh_refcnt = 0; \
-} while (/*CONSTCOND*/0)
-
#endif /* ! _ALPHA_VMPARAM_H_ */
diff -r 3656d70afd8b -r 662b1f6d830d sys/arch/amd64/include/pmap.h
--- a/sys/arch/amd64/include/pmap.h Mon Nov 15 08:41:44 2010 +0000
+++ b/sys/arch/amd64/include/pmap.h Mon Nov 15 14:38:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.22 2008/10/26 00:08:15 mrg Exp $ */
+/* $NetBSD: pmap.h,v 1.22.14.1 2010/11/15 14:38:21 uebayasi Exp $ */
/*
*
@@ -343,6 +343,17 @@
void pmap_prealloc_lowmem_ptps(void);
void pmap_changeprot_local(vaddr_t, vm_prot_t);
+#include <x86/pmap_pv.h>
+
+#define __HAVE_VM_PAGE_MD
+#define VM_MDPAGE_INIT(md, pa) \
+ memset((md), 0, sizeof(*(md))); \
+ PMAP_PAGE_INIT(&(md)->mp_pp)
+
+struct vm_page_md {
+ struct pmap_page mp_pp;
+};
+
#else /* __x86_64__ */
#include <i386/pmap.h>
diff -r 3656d70afd8b -r 662b1f6d830d sys/arch/amd64/include/vmparam.h
--- a/sys/arch/amd64/include/vmparam.h Mon Nov 15 08:41:44 2010 +0000
+++ b/sys/arch/amd64/include/vmparam.h Mon Nov 15 14:38:21 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: vmparam.h,v 1.22.2.2 2010/04/26 06:19:03 uebayasi Exp $ */
+/* $NetBSD: vmparam.h,v 1.22.2.3 2010/11/15 14:38:21 uebayasi Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -156,17 +156,6 @@
#define VM_FREELIST_FIRST4G 1
#define VM_FREELIST_FIRST16 2
-#include <x86/pmap_pv.h>
-
-#define __HAVE_VM_PAGE_MD
-#define VM_MDPAGE_INIT(md, pa) \
- memset((md), 0, sizeof(*(md))); \
- PMAP_PAGE_INIT(&(md)->mp_pp)
-
-struct vm_page_md {
- struct pmap_page mp_pp;
-};
-
#else /* !__x86_64__ */
#include <i386/vmparam.h>
diff -r 3656d70afd8b -r 662b1f6d830d sys/arch/arm/imx/files.imx31
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/arch/arm/imx/files.imx31 Mon Nov 15 14:38:21 2010 +0000
@@ -0,0 +1,69 @@
+# $NetBSD: files.imx31,v 1.5.2.2 2010/11/15 14:38:21 uebayasi Exp $
+#
+# Configuration info for the Freescale i.MX31
+#
+
+defparam opt_imx.h MEMSIZE
+defflag opt_imx.h IMX51
+
+define bus_dma_generic
+
+file arch/arm/imx/imx_space.c
+file arch/arm/imx/imx_dma.c bus_dma_generic
+
+# iMX L2 Cache Controller
+device l2cc
+attach l2cc at mainbus
+file arch/arm/imx/imx31_l2cc.c l2cc
+
+# iMX AHB
+device ahb { [addr=-1], [size=0], [intr=-1], [irqbase=-1]} : bus_space_generic
+attach ahb at mainbus
+file arch/arm/imx/imx31_ahb.c ahb
+
+# iMX AdVanced Interrupt Controller
+include "arch/arm/pic/files.pic"
+device avic: pic
+attach avic at ahb
+file arch/arm/imx/imx31_icu.c avic needs-flag
+file arch/arm/arm32/irq_dispatch.S
+
+# iMX IP bus
+device aips { [addr=-1], [size=0], [intr=-1]} : bus_space_generic
+attach aips at ahb
+file arch/arm/imx/imx31_aips.c aips
+
Home |
Main Index |
Thread Index |
Old Index