CVS commit: src/sys
Module Name:src
Committed By: hannken
Date: Sun May 31 15:48:03 UTC 2015
Modified Files:
src/sys/modules/lfs: Makefile
src/sys/rump/fs/lib/liblfs: Makefile
src/sys/ufs: files.ufs
src/sys/ufs/lfs: lfs_alloc.c lfs_extern.h lfs_rfw.c lfs_segment.c
lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_extern.h ulfs_inode.c
ulfs_lookup.c ulfs_vfsops.c ulfs_vnops.c ulfsmount.h
Removed Files:
src/sys/ufs/lfs: ulfs_ihash.c
Log Message:
Change lfs from hash table to vcache.
- Change lfs_valloc() to return an inode number and version instead of
a vnode and move lfs_ialloc() and lfs_vcreate() to new lfs_init_vnode().
- Add lfs_valloc_fixed() to allocate a known inode, used by kernel
roll forward.
- Remove lfs_*ref(), these functions cannot coexist with vcache and
their commented behaviour is far away from their implementation.
- Add the cleaner lwp and blockinfo to struct ulfsmount so lfs_loadvnode()
may use hints from the cleaner.
- Remove vnode locks from ulfs_lookup() like we did with ufs_lookup().
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/modules/lfs/Makefile
cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/liblfs/Makefile
cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/files.ufs
cvs rdiff -u -r1.119 -r1.120 src/sys/ufs/lfs/lfs_alloc.c
cvs rdiff -u -r1.104 -r1.105 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/lfs/lfs_rfw.c
cvs rdiff -u -r1.239 -r1.240 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.159 -r1.160 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.323 -r1.324 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.271 -r1.272 src/sys/ufs/lfs/lfs_vnops.c
cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/lfs/ulfs_extern.h
cvs rdiff -u -r1.5 -r0 src/sys/ufs/lfs/ulfs_ihash.c
cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/lfs/ulfs_inode.c
cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/lfs/ulfs_lookup.c
cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_vfsops.c
cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/lfs/ulfs_vnops.c
cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfsmount.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/lfs/Makefile
diff -u src/sys/modules/lfs/Makefile:1.7 src/sys/modules/lfs/Makefile:1.8
--- src/sys/modules/lfs/Makefile:1.7 Fri May 16 09:34:03 2014
+++ src/sys/modules/lfs/Makefile Sun May 31 15:48:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2014/05/16 09:34:03 dholland Exp $
+# $NetBSD: Makefile,v 1.8 2015/05/31 15:48:02 hannken Exp $
.include ../Makefile.inc
@@ -13,7 +13,7 @@ SRCS= lfs_vfsops.c lfs_vnops.c lfs_subr.
lfs_bio.c lfs_cksum.c lfs_debug.c lfs_inode.c lfs_pages.c \
lfs_segment.c lfs_rename.c lfs_syscalls.c lfs_itimes.c
-SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_ihash.c ulfs_inode.c ulfs_lookup.c \
+SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_inode.c ulfs_lookup.c \
ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
.include bsd.kmodule.mk
Index: src/sys/rump/fs/lib/liblfs/Makefile
diff -u src/sys/rump/fs/lib/liblfs/Makefile:1.11 src/sys/rump/fs/lib/liblfs/Makefile:1.12
--- src/sys/rump/fs/lib/liblfs/Makefile:1.11 Fri May 16 09:34:03 2014
+++ src/sys/rump/fs/lib/liblfs/Makefile Sun May 31 15:48:02 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2014/05/16 09:34:03 dholland Exp $
+# $NetBSD: Makefile,v 1.12 2015/05/31 15:48:02 hannken Exp $
#
.PATH: ${.CURDIR}/../../../../ufs/lfs
@@ -9,7 +9,7 @@ SRCS= lfs_alloc.c lfs_balloc.c lfs_bio.c
lfs_inode.c lfs_itimes.c lfs_pages.c lfs_rename.c lfs_rfw.c \
lfs_segment.c lfs_subr.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c
-SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_extattr.c ulfs_ihash.c \
+SRCS+= ulfs_bmap.c ulfs_dirhash.c ulfs_extattr.c \
ulfs_inode.c ulfs_lookup.c ulfs_quota.c ulfs_quota1.c \
ulfs_quota2.c ulfs_quota1_subr.c ulfs_quota2_subr.c \
ulfs_snapshot.c ulfs_vfsops.c ulfs_vnops.c
Index: src/sys/ufs/files.ufs
diff -u src/sys/ufs/files.ufs:1.39 src/sys/ufs/files.ufs:1.40
--- src/sys/ufs/files.ufs:1.39 Sun Jan 11 17:29:57 2015
+++ src/sys/ufs/files.ufs Sun May 31 15:48:03 2015
@@ -1,4 +1,4 @@
-# $NetBSD: files.ufs,v 1.39 2015/01/11 17:29:57 hannken Exp $
+# $NetBSD: files.ufs,v 1.40 2015/05/31 15:48:03 hannken Exp $
deffs FFS
deffs EXT2FS
@@ -77,7 +77,6 @@ file ufs/lfs/lfs_vnops.c lfs
file ufs/lfs/ulfs_bmap.c lfs
file ufs/lfs/ulfs_dirhash.c lfs lfs_dirhash
file ufs/lfs/ulfs_extattr.c lfs lfs_extattr
-file ufs/lfs/ulfs_ihash.c lfs
file ufs/lfs/ulfs_inode.c lfs
file ufs/lfs/ulfs_lookup.c lfs
file ufs/lfs/ulfs_quota.c lfs (lfs_quota | lfs_quota2)
Index: src/sys/ufs/lfs/lfs_alloc.c
diff -u src/sys/ufs/lfs/lfs_alloc.c:1.119 src/sys/ufs/lfs/lfs_alloc.c:1.120
--- src/sys/ufs/lfs/lfs_alloc.c:1.119 Sun Jul 28 01:25:05 2013
+++ src/sys/ufs/lfs/lfs_alloc.c Sun May 31 15:48:03 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_alloc.c,v 1.119 2013/07/28 01:25:05 dholland Exp $ */
+/* $NetBSD: lfs_alloc.c,v 1.120
CVS commit: src/sys
Module Name:src Committed By: hannken Date: Sun May 31 15:48:03 UTC 2015 Modified Files: src/sys/modules/lfs: Makefile src/sys/rump/fs/lib/liblfs: Makefile src/sys/ufs: files.ufs src/sys/ufs/lfs: lfs_alloc.c lfs_extern.h lfs_rfw.c lfs_segment.c lfs_syscalls.c lfs_vfsops.c lfs_vnops.c ulfs_extern.h ulfs_inode.c ulfs_lookup.c ulfs_vfsops.c ulfs_vnops.c ulfsmount.h Removed Files: src/sys/ufs/lfs: ulfs_ihash.c Log Message: Change lfs from hash table to vcache. - Change lfs_valloc() to return an inode number and version instead of a vnode and move lfs_ialloc() and lfs_vcreate() to new lfs_init_vnode(). - Add lfs_valloc_fixed() to allocate a known inode, used by kernel roll forward. - Remove lfs_*ref(), these functions cannot coexist with vcache and their commented behaviour is far away from their implementation. - Add the cleaner lwp and blockinfo to struct ulfsmount so lfs_loadvnode() may use hints from the cleaner. - Remove vnode locks from ulfs_lookup() like we did with ufs_lookup(). To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/modules/lfs/Makefile cvs rdiff -u -r1.11 -r1.12 src/sys/rump/fs/lib/liblfs/Makefile cvs rdiff -u -r1.39 -r1.40 src/sys/ufs/files.ufs cvs rdiff -u -r1.119 -r1.120 src/sys/ufs/lfs/lfs_alloc.c cvs rdiff -u -r1.104 -r1.105 src/sys/ufs/lfs/lfs_extern.h cvs rdiff -u -r1.19 -r1.20 src/sys/ufs/lfs/lfs_rfw.c cvs rdiff -u -r1.239 -r1.240 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.159 -r1.160 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.323 -r1.324 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.271 -r1.272 src/sys/ufs/lfs/lfs_vnops.c cvs rdiff -u -r1.14 -r1.15 src/sys/ufs/lfs/ulfs_extern.h cvs rdiff -u -r1.5 -r0 src/sys/ufs/lfs/ulfs_ihash.c cvs rdiff -u -r1.9 -r1.10 src/sys/ufs/lfs/ulfs_inode.c cvs rdiff -u -r1.23 -r1.24 src/sys/ufs/lfs/ulfs_lookup.c cvs rdiff -u -r1.8 -r1.9 src/sys/ufs/lfs/ulfs_vfsops.c cvs rdiff -u -r1.25 -r1.26 src/sys/ufs/lfs/ulfs_vnops.c cvs rdiff -u -r1.12 -r1.13 src/sys/ufs/lfs/ulfsmount.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun May 31 20:04:44 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: std.tegra Log Message: disable __HAVE_MM_MD_DIRECT_MAPPED_PHYS again, still some stability issues To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.tegra Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun May 31 20:04:44 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: std.tegra Log Message: disable __HAVE_MM_MD_DIRECT_MAPPED_PHYS again, still some stability issues To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/std.tegra Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/std.tegra diff -u src/sys/arch/evbarm/conf/std.tegra:1.6 src/sys/arch/evbarm/conf/std.tegra:1.7 --- src/sys/arch/evbarm/conf/std.tegra:1.6 Sun May 31 00:41:53 2015 +++ src/sys/arch/evbarm/conf/std.tegra Sun May 31 20:04:44 2015 @@ -1,4 +1,4 @@ -# $NetBSD: std.tegra,v 1.6 2015/05/31 00:41:53 jmcneill Exp $ +# $NetBSD: std.tegra,v 1.7 2015/05/31 20:04:44 jmcneill Exp $ # machine evbarm arm @@ -12,8 +12,8 @@ options __HAVE_CPU_COUNTER options CORTEX_PMC options __HAVE_FAST_SOFTINTS # should be in types.h options ARM_HAS_VBAR -options __HAVE_MM_MD_DIRECT_MAPPED_PHYS -options PMAP_NEED_ALLOC_POOLPAGE +#options __HAVE_MM_MD_DIRECT_MAPPED_PHYS +#options PMAP_NEED_ALLOC_POOLPAGE options TPIDRPRW_IS_CURCPU options KERNEL_BASE_EXT=0x8000 options FPU_VFP
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: roy
Date: Sun May 31 15:08:14 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c
Log Message:
Fixup ifdrv parameter order.
To generate a diff of this commit:
cvs rdiff -u -r1.74 -r1.75 src/sys/compat/netbsd32/netbsd32_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.74 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.75
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.74 Wed May 27 21:56:43 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 15:08:14 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.74 2015/05/27 21:56:43 matt Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.74 2015/05/27 21:56:43 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $);
#include sys/param.h
#include sys/systm.h
@@ -163,7 +163,7 @@ static inline void
netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd)
{
- memcpy(p-ifd_name, s32p-ifd_name, sizeof s32p-ifd_name);
+ memcpy(p-ifd_name, s32p-ifd_name, sizeof p-ifd_name);
p-ifd_cmd = s32p-ifd_cmd;
p-ifd_len = s32p-ifd_len;
p-ifd_data = (void *)NETBSD32PTR64(s32p-ifd_data);
@@ -504,7 +504,8 @@ netbsd32_from_ifmediareq(struct ifmediar
static inline void
netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd)
{
- memcpy(p-ifd_name, s32p-ifd_name, sizeof s32p-ifd_name);
+
+ memcpy(s32p-ifd_name, p-ifd_name, sizeof s32p-ifd_name);
s32p-ifd_cmd = p-ifd_cmd;
s32p-ifd_len = p-ifd_len;
NETBSD32PTR32(s32p-ifd_data, p-ifd_data);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: roy Date: Sun May 31 15:08:14 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c Log Message: Fixup ifdrv parameter order. To generate a diff of this commit: cvs rdiff -u -r1.74 -r1.75 src/sys/compat/netbsd32/netbsd32_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src
Committed By: hannken
Date: Sun May 31 15:44:31 UTC 2015
Modified Files:
src/sbin/fsck_lfs: lfs.c pass5.c pass6.c segwrite.c setup.c
src/sbin/newfs_lfs: make_lfs.c
src/sys/ufs/lfs: lfs.h lfs_extern.h lfs_segment.c lfs_syscalls.c
lfs_vfsops.c
src/usr.sbin/dumplfs: dumplfs.c
Log Message:
Use VFS_PROTOS() for lfs.
Rename conflicting struct lfs field lfs_start to lfs_s0addr.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/lfs.c
cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_lfs/pass5.c \
src/sbin/fsck_lfs/segwrite.c
cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/pass6.c
cvs rdiff -u -r1.45 -r1.46 src/sbin/fsck_lfs/setup.c
cvs rdiff -u -r1.30 -r1.31 src/sbin/newfs_lfs/make_lfs.c
cvs rdiff -u -r1.161 -r1.162 src/sys/ufs/lfs/lfs.h
cvs rdiff -u -r1.102 -r1.103 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.238 -r1.239 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.157 -r1.158 src/sys/ufs/lfs/lfs_syscalls.c
cvs rdiff -u -r1.322 -r1.323 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/dumplfs/dumplfs.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/fsck_lfs/lfs.c
diff -u src/sbin/fsck_lfs/lfs.c:1.44 src/sbin/fsck_lfs/lfs.c:1.45
--- src/sbin/fsck_lfs/lfs.c:1.44 Sun Mar 29 19:35:58 2015
+++ src/sbin/fsck_lfs/lfs.c Sun May 31 15:44:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs.c,v 1.44 2015/03/29 19:35:58 chopps Exp $ */
+/* $NetBSD: lfs.c,v 1.45 2015/05/31 15:44:30 hannken Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -528,7 +528,7 @@ lfs_init(int devfd, daddr_t sblkno, dadd
if (fs-lfs_version 2) {
fs-lfs_sumsize = LFS_V1_SUMMARY_SIZE;
fs-lfs_ibsize = fs-lfs_bsize;
- fs-lfs_start = fs-lfs_sboffs[0];
+ fs-lfs_s0addr = fs-lfs_sboffs[0];
fs-lfs_tstamp = fs-lfs_otstamp;
fs-lfs_fsbtodb = 0;
}
@@ -586,7 +586,7 @@ try_verify(struct lfs *osb, struct uvnod
* Don't mistakenly read a superblock, if there is one here.
*/
if (lfs_sntod(osb, lfs_dtosn(osb, daddr)) == daddr) {
- if (daddr == osb-lfs_start)
+ if (daddr == osb-lfs_s0addr)
daddr += lfs_btofsb(osb, LFS_LABELPAD);
for (i = 0; i LFS_MAXNUMSB; i++) {
if (osb-lfs_sboffs[i] daddr)
Index: src/sbin/fsck_lfs/pass5.c
diff -u src/sbin/fsck_lfs/pass5.c:1.28 src/sbin/fsck_lfs/pass5.c:1.29
--- src/sbin/fsck_lfs/pass5.c:1.28 Tue Jun 18 18:18:58 2013
+++ src/sbin/fsck_lfs/pass5.c Sun May 31 15:44:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass5.c,v 1.28 2013/06/18 18:18:58 christos Exp $ */
+/* $NetBSD: pass5.c,v 1.29 2015/05/31 15:44:30 hannken Exp $ */
/*-
* Copyright (c) 2000, 2003 The NetBSD Foundation, Inc.
@@ -120,9 +120,9 @@ pass5(void)
if (su-su_flags SEGUSE_SUPERBLOCK)
avail -= lfs_btofsb(fs, LFS_SBPAD);
if (i == 0 fs-lfs_version 1
- fs-lfs_start lfs_btofsb(fs, LFS_LABELPAD))
+ fs-lfs_s0addr lfs_btofsb(fs, LFS_LABELPAD))
avail -= lfs_btofsb(fs, LFS_LABELPAD) -
-fs-lfs_start;
+fs-lfs_s0addr;
}
if (diddirty)
VOP_BWRITE(bp);
@@ -169,7 +169,7 @@ pass5(void)
labelskew = 0;
if (fs-lfs_version 1
- fs-lfs_start lfs_btofsb(fs, LFS_LABELPAD))
+ fs-lfs_s0addr lfs_btofsb(fs, LFS_LABELPAD))
labelskew = lfs_btofsb(fs, LFS_LABELPAD);
if (fs-lfs_bfree fs-lfs_dsize - bb - labelskew ||
fs-lfs_bfree fs-lfs_dsize - ubb - labelskew) {
Index: src/sbin/fsck_lfs/segwrite.c
diff -u src/sbin/fsck_lfs/segwrite.c:1.28 src/sbin/fsck_lfs/segwrite.c:1.29
--- src/sbin/fsck_lfs/segwrite.c:1.28 Sun Mar 29 19:35:58 2015
+++ src/sbin/fsck_lfs/segwrite.c Sun May 31 15:44:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: segwrite.c,v 1.28 2015/03/29 19:35:58 chopps Exp $ */
+/* $NetBSD: segwrite.c,v 1.29 2015/05/31 15:44:30 hannken Exp $ */
/*-
* Copyright (c) 2003 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -634,9 +634,9 @@ lfs_initseg(struct lfs * fs)
brelse(bp, 0);
/* Segment zero could also contain the labelpad */
if (fs-lfs_version 1 sp-seg_number == 0
- fs-lfs_start lfs_btofsb(fs, LFS_LABELPAD)) {
- fs-lfs_offset += lfs_btofsb(fs, LFS_LABELPAD) - fs-lfs_start;
- sp-seg_bytes_left -= LFS_LABELPAD - lfs_fsbtob(fs, fs-lfs_start);
+ fs-lfs_s0addr lfs_btofsb(fs, LFS_LABELPAD)) {
+ fs-lfs_offset += lfs_btofsb(fs, LFS_LABELPAD) - fs-lfs_s0addr;
+ sp-seg_bytes_left -= LFS_LABELPAD - lfs_fsbtob(fs, fs-lfs_s0addr);
}
} else {
sp-seg_number = lfs_dtosn(fs, fs-lfs_curseg);
Index: src/sbin/fsck_lfs/pass6.c
diff -u src/sbin/fsck_lfs/pass6.c:1.33 src/sbin/fsck_lfs/pass6.c:1.34
--- src/sbin/fsck_lfs/pass6.c:1.33 Sun Mar 29 19:35:58 2015
+++ src/sbin/fsck_lfs/pass6.c Sun May 31 15:44:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: pass6.c,v 1.33 2015/03/29 19:35:58 chopps Exp $ */
+/* $NetBSD: pass6.c,v 1.34 2015/05/31 15:44:30 hannken Exp $ */
/*-
*
CVS commit: src
Module Name:src Committed By: hannken Date: Sun May 31 15:44:31 UTC 2015 Modified Files: src/sbin/fsck_lfs: lfs.c pass5.c pass6.c segwrite.c setup.c src/sbin/newfs_lfs: make_lfs.c src/sys/ufs/lfs: lfs.h lfs_extern.h lfs_segment.c lfs_syscalls.c lfs_vfsops.c src/usr.sbin/dumplfs: dumplfs.c Log Message: Use VFS_PROTOS() for lfs. Rename conflicting struct lfs field lfs_start to lfs_s0addr. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/sbin/fsck_lfs/lfs.c cvs rdiff -u -r1.28 -r1.29 src/sbin/fsck_lfs/pass5.c \ src/sbin/fsck_lfs/segwrite.c cvs rdiff -u -r1.33 -r1.34 src/sbin/fsck_lfs/pass6.c cvs rdiff -u -r1.45 -r1.46 src/sbin/fsck_lfs/setup.c cvs rdiff -u -r1.30 -r1.31 src/sbin/newfs_lfs/make_lfs.c cvs rdiff -u -r1.161 -r1.162 src/sys/ufs/lfs/lfs.h cvs rdiff -u -r1.102 -r1.103 src/sys/ufs/lfs/lfs_extern.h cvs rdiff -u -r1.238 -r1.239 src/sys/ufs/lfs/lfs_segment.c cvs rdiff -u -r1.157 -r1.158 src/sys/ufs/lfs/lfs_syscalls.c cvs rdiff -u -r1.322 -r1.323 src/sys/ufs/lfs/lfs_vfsops.c cvs rdiff -u -r1.41 -r1.42 src/usr.sbin/dumplfs/dumplfs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: hannken
Date: Sun May 31 15:45:18 UTC 2015
Modified Files:
src/sys/ufs/lfs: lfs_extern.h lfs_syscalls.c
Log Message:
Make lfs_fastvget() private to lfs_syscalls.c, change it to take the
BLOCK_INFO and vnode lock type instead of the inode disk address and
return the vnode locked.
Change lfs_markv() and lfs_bmapv() to work on locked vnodes.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/sys/ufs/lfs/lfs_extern.h
cvs rdiff -u -r1.158 -r1.159 src/sys/ufs/lfs/lfs_syscalls.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/ufs/lfs/lfs_extern.h
diff -u src/sys/ufs/lfs/lfs_extern.h:1.103 src/sys/ufs/lfs/lfs_extern.h:1.104
--- src/sys/ufs/lfs/lfs_extern.h:1.103 Sun May 31 15:44:31 2015
+++ src/sys/ufs/lfs/lfs_extern.h Sun May 31 15:45:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_extern.h,v 1.103 2015/05/31 15:44:31 hannken Exp $ */
+/* $NetBSD: lfs_extern.h,v 1.104 2015/05/31 15:45:18 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -215,7 +215,6 @@ void lfs_writer_leave(struct lfs *);
void lfs_wakeup_cleaner(struct lfs *);
/* lfs_syscalls.c */
-int lfs_fastvget(struct mount *, ino_t, daddr_t, struct vnode **, struct ulfs1_dinode *);
struct buf *lfs_fakebuf(struct lfs *, struct vnode *, int, size_t, void *);
int lfs_do_segclean(struct lfs *, unsigned long);
int lfs_segwait(fsid_t *, struct timeval *);
Index: src/sys/ufs/lfs/lfs_syscalls.c
diff -u src/sys/ufs/lfs/lfs_syscalls.c:1.158 src/sys/ufs/lfs/lfs_syscalls.c:1.159
--- src/sys/ufs/lfs/lfs_syscalls.c:1.158 Sun May 31 15:44:31 2015
+++ src/sys/ufs/lfs/lfs_syscalls.c Sun May 31 15:45:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_syscalls.c,v 1.158 2015/05/31 15:44:31 hannken Exp $ */
+/* $NetBSD: lfs_syscalls.c,v 1.159 2015/05/31 15:45:18 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007, 2008
@@ -61,7 +61,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: lfs_syscalls.c,v 1.158 2015/05/31 15:44:31 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: lfs_syscalls.c,v 1.159 2015/05/31 15:45:18 hannken Exp $);
#ifndef LFS
# define LFS /* for prototypes in syscallargs.h */
@@ -87,6 +87,7 @@ __KERNEL_RCSID(0, $NetBSD: lfs_syscalls
struct buf *lfs_fakebuf(struct lfs *, struct vnode *, int, size_t, void *);
int lfs_fasthashget(dev_t, ino_t, struct vnode **);
+int lfs_fastvget(struct mount *, ino_t, BLOCK_INFO *, int, struct vnode **);
pid_t lfs_cleaner_pid = 0;
@@ -230,9 +231,10 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
struct inode *ip = NULL;
struct lfs *fs;
struct mount *mntp;
- struct vnode *vp = NULL;
+ struct ulfsmount *ump;
+ struct vnode *vp;
ino_t lastino;
- daddr_t b_daddr, v_daddr;
+ daddr_t b_daddr;
int cnt, error;
int do_again = 0;
int numrefed = 0;
@@ -245,7 +247,8 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
if ((mntp = vfs_getvfs(fsidp)) == NULL)
return (ENOENT);
- fs = VFSTOULFS(mntp)-um_lfs;
+ ump = VFSTOULFS(mntp);
+ fs = ump-um_lfs;
if (fs-lfs_ronly)
return EROFS;
@@ -273,7 +276,7 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
error = 0;
/* these were inside the initialization for the for loop */
- v_daddr = LFS_UNUSED_DADDR;
+ vp = NULL;
lastino = LFS_UNUSED_INUM;
nblkwritten = ninowritten = 0;
for (blkp = blkiov; cnt--; ++blkp)
@@ -289,11 +292,12 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
*/
if (lastino != blkp-bi_inode) {
/*
- * Finish the old file, if there was one. The presence
- * of a usable vnode in vp is signaled by a valid v_daddr.
+ * Finish the old file, if there was one.
*/
- if (v_daddr != LFS_UNUSED_DADDR) {
+ if (vp != NULL) {
+VOP_UNLOCK(vp);
lfs_vunref(vp);
+vp = NULL;
numrefed--;
}
@@ -301,27 +305,10 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
* Start a new file
*/
lastino = blkp-bi_inode;
- if (blkp-bi_inode == LFS_IFILE_INUM)
-v_daddr = fs-lfs_idaddr;
- else {
-LFS_IENTRY(ifp, fs, blkp-bi_inode, bp);
-/* XXX fix for force write */
-v_daddr = ifp-if_daddr;
-brelse(bp, 0);
- }
- if (v_daddr == LFS_UNUSED_DADDR)
-continue;
/* Get the vnode/inode. */
- error = lfs_fastvget(mntp, blkp-bi_inode, v_daddr,
- vp,
- (blkp-bi_lbn == LFS_UNUSED_LBN
- ? blkp-bi_bp
- : NULL));
-
- if (!error) {
-numrefed++;
- }
+ error = lfs_fastvget(mntp, blkp-bi_inode, blkp,
+ LK_EXCLUSIVE | LK_NOWAIT, vp);
if (error) {
DLOG((DLOG_CLEAN, lfs_markv: lfs_fastvget
failed with %d (ino %d, segment %d)\n,
@@ -335,28 +322,22 @@ lfs_markv(struct proc *p, fsid_t *fsidp,
* again with another. (When the
* cleaner runs again, this segment will
* sort high on the list, since it is
- * now almost entirely empty.) But, we
- * still set v_daddr = LFS_UNUSED_ADDR
-
CVS commit: src/sys/ufs/lfs
Module Name:src Committed By: hannken Date: Sun May 31 15:45:18 UTC 2015 Modified Files: src/sys/ufs/lfs: lfs_extern.h lfs_syscalls.c Log Message: Make lfs_fastvget() private to lfs_syscalls.c, change it to take the BLOCK_INFO and vnode lock type instead of the inode disk address and return the vnode locked. Change lfs_markv() and lfs_bmapv() to work on locked vnodes. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/ufs/lfs/lfs_extern.h cvs rdiff -u -r1.158 -r1.159 src/sys/ufs/lfs/lfs_syscalls.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: roy Date: Sun May 31 23:01:04 UTC 2015 Modified Files: src/sys/net: files.net Log Message: Revert prior as it's no longer needed. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/files.net diff -u src/sys/net/files.net:1.3 src/sys/net/files.net:1.4 --- src/sys/net/files.net:1.3 Sun May 31 22:09:38 2015 +++ src/sys/net/files.net Sun May 31 23:01:04 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.net,v 1.3 2015/05/31 22:09:38 roy Exp $ +# $NetBSD: files.net,v 1.4 2015/05/31 23:01:04 roy Exp $ # XXX CLEANUP define net @@ -29,7 +29,7 @@ file net/if_ppp.c ppp needs-flag file net/if_srt.c srt file net/if_stf.c stf inet inet6 needs-flag file net/if_sl.c sl needs-flag -file net/if_spppsubr.c sppp needs-flag +file net/if_spppsubr.c sppp file net/if_strip.c strip needs-flag file net/if_tokensubr.c token needs-flag file net/if_tap.c tap
CVS commit: src/sys/net
Module Name:src Committed By: roy Date: Sun May 31 23:01:04 UTC 2015 Modified Files: src/sys/net: files.net Log Message: Revert prior as it's no longer needed. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: roy Date: Mon Jun 1 00:15:08 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c src/sys/net: files.net Removed Files: src/sys/modules/compat_netbsd32: pppoe.h sppp.h Log Message: Back out prior gimpy1@ we don't #include driver .h in netbsd32 To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.1 -r0 src/sys/modules/compat_netbsd32/pppoe.h \ src/sys/modules/compat_netbsd32/sppp.h cvs rdiff -u -r1.5 -r1.6 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_ioctl.c diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.79 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.80 --- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.79 Sun May 31 23:40:20 2015 +++ src/sys/compat/netbsd32/netbsd32_ioctl.c Mon Jun 1 00:15:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $ */ +/* $NetBSD: netbsd32_ioctl.c,v 1.80 2015/06/01 00:15:08 roy Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -31,10 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $); - -#include pppoe.h -#include sppp.h +__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.80 2015/06/01 00:15:08 roy Exp $); #include sys/param.h #include sys/systm.h @@ -68,12 +65,8 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc #include net/if.h #include net/route.h -#if NPPPOE 0 #include net/if_pppoe.h -#endif -#if NSPPP 0 #include net/if_sppp.h -#endif #include net/bpf.h #include netinet/in.h @@ -169,7 +162,6 @@ netbsd32_to_ifmediareq(struct netbsd32_i p-ifm_ulist = (int *)NETBSD32PTR64(s32p-ifm_ulist); } -#if NPPPOE 0 static inline void netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p, struct pppoediscparms *p, u_long cmd) @@ -182,9 +174,7 @@ netbsd32_to_pppoediscparms(struct netbsd p-service_name = (char *)NETBSD32PTR64(s32p-service_name); p-service_name_len = s32p-service_name_len; } -#endif -#if NSPPP 0 static inline void netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p, struct spppauthcfg *p, u_long cmd) @@ -204,7 +194,6 @@ netbsd32_to_spppauthcfg(struct netbsd32_ p-hisname = (char *)NETBSD32PTR64(s32p-hisname); p-hissecret = (char *)NETBSD32PTR64(s32p-hissecret); } -#endif static inline void netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd) @@ -548,7 +537,6 @@ netbsd32_from_ifmediareq(struct ifmediar #endif } -#if NPPPOE 0 static inline void netbsd32_from_pppoediscparms(struct pppoediscparms *p, struct netbsd32_pppoediscparms *s32p, u_long cmd) @@ -561,9 +549,7 @@ netbsd32_from_pppoediscparms(struct pppo NETBSD32PTR32(s32p-service_name, p-service_name); s32p-service_name_len = p-service_name_len; } -#endif -#if NSPPP 0 static inline void netbsd32_from_spppauthcfg(struct spppauthcfg *p, struct netbsd32_spppauthcfg *s32p, u_long cmd) @@ -583,7 +569,6 @@ netbsd32_from_spppauthcfg(struct spppaut NETBSD32PTR32(s32p-hisname, p-hisname); NETBSD32PTR32(s32p-hissecret, p-hissecret); } -#endif static inline void netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd) @@ -1124,18 +1109,14 @@ netbsd32_ioctl(struct lwp *l, const stru case SIOCGIFMEDIA32: IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq); -#if NPPPOE 0 case PPPOESETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOESETPARMS, pppoediscparms); case PPPOEGETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOEGETPARMS, pppoediscparms); -#endif -#if NSPPP 0 case SPPPGETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg); case SPPPSETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPSETAUTHCFG, spppauthcfg); -#endif case SIOCSDRVSPEC32: IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv); Index: src/sys/net/files.net diff -u src/sys/net/files.net:1.5 src/sys/net/files.net:1.6 --- src/sys/net/files.net:1.5 Sun May 31 23:40:19 2015 +++ src/sys/net/files.net Mon Jun 1 00:15:07 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.net,v 1.5 2015/05/31 23:40:19 roy Exp $ +# $NetBSD: files.net,v 1.6 2015/06/01 00:15:07 roy Exp $ # XXX CLEANUP define net @@ -29,7 +29,7 @@ file net/if_ppp.c ppp needs-flag file net/if_srt.c srt file net/if_stf.c stf inet inet6 needs-flag file net/if_sl.c sl needs-flag -file net/if_spppsubr.c sppp needs-flag +file net/if_spppsubr.c sppp file net/if_strip.c strip needs-flag file net/if_tokensubr.c token needs-flag file net/if_tap.c tap
CVS commit: src/sys
Module Name:src Committed By: roy Date: Mon Jun 1 00:15:08 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c src/sys/net: files.net Removed Files: src/sys/modules/compat_netbsd32: pppoe.h sppp.h Log Message: Back out prior gimpy1@ we don't #include driver .h in netbsd32 To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.1 -r0 src/sys/modules/compat_netbsd32/pppoe.h \ src/sys/modules/compat_netbsd32/sppp.h cvs rdiff -u -r1.5 -r1.6 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src Committed By: matt Date: Sun May 31 22:15:52 UTC 2015 Modified Files: src/sys/arch/evbarm/tegra: platform.h Log Message: Increase kernel VA space for kernels that don't use direct mapped memory. (512MB - 1.25GB) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/tegra/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: roy
Date: Sun May 31 22:16:16 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
Support SPPPGETAUTHCFG and SPPPSETAUTHCFG.
To generate a diff of this commit:
cvs rdiff -u -r1.75 -r1.76 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.75 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.76
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.75 Sun May 31 15:08:14 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 22:16:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.76 2015/05/31 22:16:16 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.75 2015/05/31 15:08:14 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.76 2015/05/31 22:16:16 roy Exp $);
+
+#include sppp.h
#include sys/param.h
#include sys/systm.h
@@ -65,6 +67,10 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc
#include net/if.h
#include net/route.h
+#if NSPPP 0
+#include net/if_sppp.h
+#endif
+
#include net/bpf.h
#include netinet/in.h
#include netinet/in_var.h
@@ -159,6 +165,28 @@ netbsd32_to_ifmediareq(struct netbsd32_i
p-ifm_ulist = (int *)NETBSD32PTR64(s32p-ifm_ulist);
}
+#if NSPPP 0
+static inline void
+netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p,
+struct spppauthcfg *p, u_long cmd)
+{
+
+ memcpy(p-ifname, s32p-ifname, sizeof p-ifname);
+ p-hisauth = s32p-hisauth;
+ p-myauth = s32p-myauth;
+ p-myname_length = s32p-myname_length;
+ p-mysecret_length = s32p-mysecret_length;
+ p-hisname_length = s32p-hisname_length;
+ p-hissecret_length = s32p-hissecret_length;
+ p-myauthflags = s32p-myauthflags;
+ p-hisauthflags = s32p-hisauthflags;
+ p-myname = (char *)NETBSD32PTR64(s32p-myname);
+ p-mysecret = (char *)NETBSD32PTR64(s32p-mysecret);
+ p-hisname = (char *)NETBSD32PTR64(s32p-hisname);
+ p-hissecret = (char *)NETBSD32PTR64(s32p-hissecret);
+}
+#endif
+
static inline void
netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd)
{
@@ -501,6 +529,28 @@ netbsd32_from_ifmediareq(struct ifmediar
#endif
}
+#if NSPPP 0
+static inline void
+netbsd32_from_spppauthcfg(struct spppauthcfg *p,
+struct netbsd32_spppauthcfg *s32p, u_long cmd)
+{
+
+ memcpy(s32p-ifname, p-ifname, sizeof s32p-ifname);
+ s32p-hisauth = p-hisauth;
+ s32p-myauth = p-myauth;
+ s32p-myname_length = p-myname_length;
+ s32p-mysecret_length = p-mysecret_length;
+ s32p-hisname_length = p-hisname_length;
+ s32p-hissecret_length = p-hissecret_length;
+ s32p-myauthflags = p-myauthflags;
+ s32p-hisauthflags = p-hisauthflags;
+ NETBSD32PTR32(s32p-myname, p-myname);
+ NETBSD32PTR32(s32p-mysecret, p-mysecret);
+ NETBSD32PTR32(s32p-hisname, p-hisname);
+ NETBSD32PTR32(s32p-hissecret, p-hissecret);
+}
+#endif
+
static inline void
netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd)
{
@@ -1040,6 +1090,13 @@ netbsd32_ioctl(struct lwp *l, const stru
case SIOCGIFMEDIA32:
IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq);
+#if NSPPP 0
+ case SPPPGETAUTHCFG32:
+ IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg);
+ case SPPPSETAUTHCFG32:
+ IOCTL_STRUCT_CONV_TO(SPPPSETAUTHCFG, spppauthcfg);
+#endif
+
case SIOCSDRVSPEC32:
IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv);
case SIOCGDRVSPEC32:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.49 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.50
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.49 Wed May 27 21:42:43 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Sun May 31 22:16:16 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.49 2015/05/27 21:42:43 matt Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.50 2015/05/31 22:16:16 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -426,6 +426,25 @@ struct netbsd32_ifmediareq {
/* from sys/sockio.h */
#define SIOCGIFMEDIA32 _IOWR('i', 54, struct netbsd32_ifmediareq) /* get net media */
+/* from net/if_sppp.h */
+struct netbsd32_spppauthcfg {
+ char ifname[IFNAMSIZ]; /* pppoe interface name */
+ u_int hisauth; /* one of SPPP_AUTHPROTO_* above */
+ u_int myauth; /* one of SPPP_AUTHPROTO_* above */
+ u_int myname_length; /* includes terminating 0 */
+ u_int mysecret_length; /* includes terminating 0 */
+ u_int hisname_length; /* includes terminating 0 */
+ u_int hissecret_length; /* includes terminating 0 */
+ u_int myauthflags;
+ u_int hisauthflags;
+ netbsd32_charp myname;
+ netbsd32_charp mysecret;
+ netbsd32_charp hisname;
+ netbsd32_charp hissecret;
+};
+#define
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: roy Date: Sun May 31 22:16:16 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: Support SPPPGETAUTHCFG and SPPPSETAUTHCFG. To generate a diff of this commit: cvs rdiff -u -r1.75 -r1.76 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.49 -r1.50 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/tegra
Module Name:src Committed By: matt Date: Sun May 31 22:15:52 UTC 2015 Modified Files: src/sys/arch/evbarm/tegra: platform.h Log Message: Increase kernel VA space for kernels that don't use direct mapped memory. (512MB - 1.25GB) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/tegra/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/tegra/platform.h diff -u src/sys/arch/evbarm/tegra/platform.h:1.1 src/sys/arch/evbarm/tegra/platform.h:1.2 --- src/sys/arch/evbarm/tegra/platform.h:1.1 Sun Mar 29 10:41:59 2015 +++ src/sys/arch/evbarm/tegra/platform.h Sun May 31 22:15:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: platform.h,v 1.1 2015/03/29 10:41:59 jmcneill Exp $ */ +/* $NetBSD: platform.h,v 1.2 2015/05/31 22:15:52 matt Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -31,8 +31,13 @@ #include arm/nvidia/tegra_reg.h +#ifdef __HAVE_MM_MD_DIRECT_MAPPED_PHYS #define KERNEL_VM_BASE 0xc000 #define KERNEL_VM_SIZE 0x2000 /* 0x2000 = 512MB */ +#else +#define KERNEL_VM_BASE 0x9000 +#define KERNEL_VM_SIZE 0x5000 /* 0x5000 = 1.25GB */ +#endif #define CONSADDR_VA (CONSADDR - TEGRA_APB_BASE + TEGRA_APB_VBASE)
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: roy
Date: Sun May 31 22:19:41 UTC 2015
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h
Log Message:
Add support for PPPOEGETPARMS and PPPOESETPARMS.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.50 -r1.51 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.76 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.77
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.76 Sun May 31 22:16:16 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 22:19:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.c,v 1.76 2015/05/31 22:16:16 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,8 +31,9 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.76 2015/05/31 22:16:16 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $);
+#include pppoe.h
#include sppp.h
#include sys/param.h
@@ -67,6 +68,9 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc
#include net/if.h
#include net/route.h
+#if NPPPOE 0
+#include net/if_pppoe.h
+#endif
#if NSPPP 0
#include net/if_sppp.h
#endif
@@ -165,6 +169,21 @@ netbsd32_to_ifmediareq(struct netbsd32_i
p-ifm_ulist = (int *)NETBSD32PTR64(s32p-ifm_ulist);
}
+#if NPPPOE 0
+static inline void
+netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p,
+struct pppoediscparms *p, u_long cmd)
+{
+
+ memcpy(p-ifname, s32p-ifname, sizeof p-ifname);
+ memcpy(p-eth_ifname, s32p-eth_ifname, sizeof p-eth_ifname);
+ p-ac_name = (char *)NETBSD32PTR64(s32p-ac_name);
+ p-ac_name_len = s32p-ac_name_len;
+ p-service_name = (char *)NETBSD32PTR64(s32p-service_name);
+ p-service_name_len = s32p-service_name_len;
+}
+#endif
+
#if NSPPP 0
static inline void
netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p,
@@ -529,6 +548,21 @@ netbsd32_from_ifmediareq(struct ifmediar
#endif
}
+#if NPPPOE 0
+static inline void
+netbsd32_from_pppoediscparms(struct pppoediscparms *p,
+struct netbsd32_pppoediscparms *s32p, u_long cmd)
+{
+
+ memcpy(s32p-ifname, p-ifname, sizeof s32p-ifname);
+ memcpy(s32p-eth_ifname, p-eth_ifname, sizeof s32p-eth_ifname);
+ NETBSD32PTR32(s32p-ac_name, p-ac_name);
+ s32p-ac_name_len = p-ac_name_len;
+ NETBSD32PTR32(s32p-service_name, p-service_name);
+ s32p-service_name_len = p-service_name_len;
+}
+#endif
+
#if NSPPP 0
static inline void
netbsd32_from_spppauthcfg(struct spppauthcfg *p,
@@ -1090,6 +1124,12 @@ netbsd32_ioctl(struct lwp *l, const stru
case SIOCGIFMEDIA32:
IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq);
+#if NPPPOE 0
+ case PPPOESETPARMS32:
+ IOCTL_STRUCT_CONV_TO(PPPOESETPARMS, pppoediscparms);
+ case PPPOEGETPARMS32:
+ IOCTL_STRUCT_CONV_TO(PPPOEGETPARMS, pppoediscparms);
+#endif
#if NSPPP 0
case SPPPGETAUTHCFG32:
IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg);
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.50 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.51
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.50 Sun May 31 22:16:16 2015
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Sun May 31 22:19:41 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.50 2015/05/31 22:16:16 roy Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.51 2015/05/31 22:19:41 roy Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -426,6 +426,18 @@ struct netbsd32_ifmediareq {
/* from sys/sockio.h */
#define SIOCGIFMEDIA32 _IOWR('i', 54, struct netbsd32_ifmediareq) /* get net media */
+/* from net/if_pppoe.h */
+struct netbsd32_pppoediscparms {
+ char ifname[IFNAMSIZ]; /* pppoe interface name */
+ char eth_ifname[IFNAMSIZ]; /* external ethernet interface name */
+ netbsd32_charp ac_name; /* access concentrator name (or NULL) */
+ netbsd32_size_t ac_name_len; /* on write: length of buffer for ac_name */
+ netbsd32_charp service_name; /* service name (or NULL) */
+ netbsd32_size_t service_name_len; /* on write: length of buffer for service name */
+};
+#define PPPOESETPARMS32 _IOW('i', 110, struct netbsd32_pppoediscparms)
+#define PPPOEGETPARMS32 _IOWR('i', 111, struct netbsd32_pppoediscparms)
+
/* from net/if_sppp.h */
struct netbsd32_spppauthcfg {
char ifname[IFNAMSIZ]; /* pppoe interface name */
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: roy Date: Sun May 31 22:19:41 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h Log Message: Add support for PPPOEGETPARMS and PPPOESETPARMS. To generate a diff of this commit: cvs rdiff -u -r1.76 -r1.77 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r1.50 -r1.51 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: roy Date: Sun May 31 22:09:38 UTC 2015 Modified Files: src/sys/net: files.net Log Message: Allow sppp to be #if NSPPP 0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: roy Date: Sun May 31 22:09:38 UTC 2015 Modified Files: src/sys/net: files.net Log Message: Allow sppp to be #if NSPPP 0 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/net/files.net diff -u src/sys/net/files.net:1.2 src/sys/net/files.net:1.3 --- src/sys/net/files.net:1.2 Tue Dec 2 19:32:09 2014 +++ src/sys/net/files.net Sun May 31 22:09:38 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.net,v 1.2 2014/12/02 19:32:09 christos Exp $ +# $NetBSD: files.net,v 1.3 2015/05/31 22:09:38 roy Exp $ # XXX CLEANUP define net @@ -29,7 +29,7 @@ file net/if_ppp.c ppp needs-flag file net/if_srt.c srt file net/if_stf.c stf inet inet6 needs-flag file net/if_sl.c sl needs-flag -file net/if_spppsubr.c sppp +file net/if_spppsubr.c sppp needs-flag file net/if_strip.c strip needs-flag file net/if_tokensubr.c token needs-flag file net/if_tap.c tap
CVS commit: src/sys
Module Name:src Committed By: roy Date: Sun May 31 23:40:20 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c src/sys/net: files.net Added Files: src/sys/modules/compat_netbsd32: pppoe.h sppp.h Log Message: Revert prior change, optionally include PPPOE and SPPP support again. Fix compat_netbsd32 module building by enforcing both. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_netbsd32/pppoe.h \ src/sys/modules/compat_netbsd32/sppp.h cvs rdiff -u -r1.4 -r1.5 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: roy Date: Sun May 31 23:40:20 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c src/sys/net: files.net Added Files: src/sys/modules/compat_netbsd32: pppoe.h sppp.h Log Message: Revert prior change, optionally include PPPOE and SPPP support again. Fix compat_netbsd32 module building by enforcing both. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.79 src/sys/compat/netbsd32/netbsd32_ioctl.c cvs rdiff -u -r0 -r1.1 src/sys/modules/compat_netbsd32/pppoe.h \ src/sys/modules/compat_netbsd32/sppp.h cvs rdiff -u -r1.4 -r1.5 src/sys/net/files.net Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_ioctl.c diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.78 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.79 --- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.78 Sun May 31 22:58:50 2015 +++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 23:40:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $ */ +/* $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -31,7 +31,10 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $); +__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.79 2015/05/31 23:40:20 roy Exp $); + +#include pppoe.h +#include sppp.h #include sys/param.h #include sys/systm.h @@ -65,8 +68,12 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc #include net/if.h #include net/route.h +#if NPPPOE 0 #include net/if_pppoe.h +#endif +#if NSPPP 0 #include net/if_sppp.h +#endif #include net/bpf.h #include netinet/in.h @@ -162,6 +169,7 @@ netbsd32_to_ifmediareq(struct netbsd32_i p-ifm_ulist = (int *)NETBSD32PTR64(s32p-ifm_ulist); } +#if NPPPOE 0 static inline void netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p, struct pppoediscparms *p, u_long cmd) @@ -174,7 +182,9 @@ netbsd32_to_pppoediscparms(struct netbsd p-service_name = (char *)NETBSD32PTR64(s32p-service_name); p-service_name_len = s32p-service_name_len; } +#endif +#if NSPPP 0 static inline void netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p, struct spppauthcfg *p, u_long cmd) @@ -194,6 +204,7 @@ netbsd32_to_spppauthcfg(struct netbsd32_ p-hisname = (char *)NETBSD32PTR64(s32p-hisname); p-hissecret = (char *)NETBSD32PTR64(s32p-hissecret); } +#endif static inline void netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd) @@ -537,6 +548,7 @@ netbsd32_from_ifmediareq(struct ifmediar #endif } +#if NPPPOE 0 static inline void netbsd32_from_pppoediscparms(struct pppoediscparms *p, struct netbsd32_pppoediscparms *s32p, u_long cmd) @@ -549,7 +561,9 @@ netbsd32_from_pppoediscparms(struct pppo NETBSD32PTR32(s32p-service_name, p-service_name); s32p-service_name_len = p-service_name_len; } +#endif +#if NSPPP 0 static inline void netbsd32_from_spppauthcfg(struct spppauthcfg *p, struct netbsd32_spppauthcfg *s32p, u_long cmd) @@ -569,6 +583,7 @@ netbsd32_from_spppauthcfg(struct spppaut NETBSD32PTR32(s32p-hisname, p-hisname); NETBSD32PTR32(s32p-hissecret, p-hissecret); } +#endif static inline void netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd) @@ -1109,14 +1124,18 @@ netbsd32_ioctl(struct lwp *l, const stru case SIOCGIFMEDIA32: IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq); +#if NPPPOE 0 case PPPOESETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOESETPARMS, pppoediscparms); case PPPOEGETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOEGETPARMS, pppoediscparms); +#endif +#if NSPPP 0 case SPPPGETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg); case SPPPSETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPSETAUTHCFG, spppauthcfg); +#endif case SIOCSDRVSPEC32: IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv); Index: src/sys/net/files.net diff -u src/sys/net/files.net:1.4 src/sys/net/files.net:1.5 --- src/sys/net/files.net:1.4 Sun May 31 23:01:04 2015 +++ src/sys/net/files.net Sun May 31 23:40:19 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.net,v 1.4 2015/05/31 23:01:04 roy Exp $ +# $NetBSD: files.net,v 1.5 2015/05/31 23:40:19 roy Exp $ # XXX CLEANUP define net @@ -29,7 +29,7 @@ file net/if_ppp.c ppp needs-flag file net/if_srt.c srt file net/if_stf.c stf inet inet6 needs-flag file net/if_sl.c sl needs-flag -file net/if_spppsubr.c sppp +file net/if_spppsubr.c sppp needs-flag file net/if_strip.c strip needs-flag file net/if_tokensubr.c token needs-flag file net/if_tap.c tap Added files: Index: src/sys/modules/compat_netbsd32/pppoe.h diff -u /dev/null src/sys/modules/compat_netbsd32/pppoe.h:1.1 --- /dev/null Sun May 31 23:40:20 2015 +++ src/sys/modules/compat_netbsd32/pppoe.h Sun May 31 23:40:20 2015 @@ -0,0 +1,2 @@
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: roy Date: Sun May 31 22:58:50 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c Log Message: It seems we cannot depend on kernel config in modules, so always compile in PPP(,oE) support. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/compat/netbsd32/netbsd32_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_ioctl.c diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.77 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.78 --- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.77 Sun May 31 22:19:41 2015 +++ src/sys/compat/netbsd32/netbsd32_ioctl.c Sun May 31 22:58:50 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $ */ +/* $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -31,10 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.77 2015/05/31 22:19:41 roy Exp $); - -#include pppoe.h -#include sppp.h +__KERNEL_RCSID(0, $NetBSD: netbsd32_ioctl.c,v 1.78 2015/05/31 22:58:50 roy Exp $); #include sys/param.h #include sys/systm.h @@ -68,12 +65,8 @@ __KERNEL_RCSID(0, $NetBSD: netbsd32_ioc #include net/if.h #include net/route.h -#if NPPPOE 0 #include net/if_pppoe.h -#endif -#if NSPPP 0 #include net/if_sppp.h -#endif #include net/bpf.h #include netinet/in.h @@ -169,7 +162,6 @@ netbsd32_to_ifmediareq(struct netbsd32_i p-ifm_ulist = (int *)NETBSD32PTR64(s32p-ifm_ulist); } -#if NPPPOE 0 static inline void netbsd32_to_pppoediscparms(struct netbsd32_pppoediscparms *s32p, struct pppoediscparms *p, u_long cmd) @@ -182,9 +174,7 @@ netbsd32_to_pppoediscparms(struct netbsd p-service_name = (char *)NETBSD32PTR64(s32p-service_name); p-service_name_len = s32p-service_name_len; } -#endif -#if NSPPP 0 static inline void netbsd32_to_spppauthcfg(struct netbsd32_spppauthcfg *s32p, struct spppauthcfg *p, u_long cmd) @@ -204,7 +194,6 @@ netbsd32_to_spppauthcfg(struct netbsd32_ p-hisname = (char *)NETBSD32PTR64(s32p-hisname); p-hissecret = (char *)NETBSD32PTR64(s32p-hissecret); } -#endif static inline void netbsd32_to_ifdrv(struct netbsd32_ifdrv *s32p, struct ifdrv *p, u_long cmd) @@ -548,7 +537,6 @@ netbsd32_from_ifmediareq(struct ifmediar #endif } -#if NPPPOE 0 static inline void netbsd32_from_pppoediscparms(struct pppoediscparms *p, struct netbsd32_pppoediscparms *s32p, u_long cmd) @@ -561,9 +549,7 @@ netbsd32_from_pppoediscparms(struct pppo NETBSD32PTR32(s32p-service_name, p-service_name); s32p-service_name_len = p-service_name_len; } -#endif -#if NSPPP 0 static inline void netbsd32_from_spppauthcfg(struct spppauthcfg *p, struct netbsd32_spppauthcfg *s32p, u_long cmd) @@ -583,7 +569,6 @@ netbsd32_from_spppauthcfg(struct spppaut NETBSD32PTR32(s32p-hisname, p-hisname); NETBSD32PTR32(s32p-hissecret, p-hissecret); } -#endif static inline void netbsd32_from_ifdrv(struct ifdrv *p, struct netbsd32_ifdrv *s32p, u_long cmd) @@ -1124,18 +1109,14 @@ netbsd32_ioctl(struct lwp *l, const stru case SIOCGIFMEDIA32: IOCTL_STRUCT_CONV_TO(SIOCGIFMEDIA, ifmediareq); -#if NPPPOE 0 case PPPOESETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOESETPARMS, pppoediscparms); case PPPOEGETPARMS32: IOCTL_STRUCT_CONV_TO(PPPOEGETPARMS, pppoediscparms); -#endif -#if NSPPP 0 case SPPPGETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPGETAUTHCFG, spppauthcfg); case SPPPSETAUTHCFG32: IOCTL_STRUCT_CONV_TO(SPPPSETAUTHCFG, spppauthcfg); -#endif case SIOCSDRVSPEC32: IOCTL_STRUCT_CONV_TO(SIOCSDRVSPEC, ifdrv);
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: roy Date: Sun May 31 22:58:50 UTC 2015 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.c Log Message: It seems we cannot depend on kernel config in modules, so always compile in PPP(,oE) support. To generate a diff of this commit: cvs rdiff -u -r1.77 -r1.78 src/sys/compat/netbsd32/netbsd32_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/route
Module Name:src Committed By: ozaki-r Date: Mon Jun 1 01:36:30 UTC 2015 Modified Files: src/tests/net/route: t_flags.sh Log Message: Improve stability of route_flags_xresolve tests Insert delays to give route monitor a chance to complete its work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/route/t_flags.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/route
Module Name:src Committed By: ozaki-r Date: Mon Jun 1 01:36:30 UTC 2015 Modified Files: src/tests/net/route: t_flags.sh Log Message: Improve stability of route_flags_xresolve tests Insert delays to give route monitor a chance to complete its work. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/route/t_flags.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/net/route/t_flags.sh diff -u src/tests/net/route/t_flags.sh:1.2 src/tests/net/route/t_flags.sh:1.3 --- src/tests/net/route/t_flags.sh:1.2 Wed May 20 01:30:42 2015 +++ src/tests/net/route/t_flags.sh Mon Jun 1 01:36:30 2015 @@ -1,4 +1,4 @@ -# $NetBSD: t_flags.sh,v 1.2 2015/05/20 01:30:42 ozaki-r Exp $ +# $NetBSD: t_flags.sh,v 1.3 2015/06/01 01:36:30 ozaki-r Exp $ # # Copyright (c) 2015 The NetBSD Foundation, Inc. # All rights reserved. @@ -341,9 +341,15 @@ test_xresolve_rtm() rump.route -n monitor ./mon.log pid=$! + # Give route monitor a chance to setup a routing socket + sleep 1 + atf_check -s exit:0 -o ignore rump.ping -n -w 1 -c 1 $ip $DEBUG rump.netstat -rn -f inet - $DEBUG cat ./mon.log + + # Give route monitor a chance to output a routing message + sleep 1 + cat ./mon.log atf_check -s exit:0 grep -q $rtm ./mon.log
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: skrll
Date: Sun May 31 08:13:18 UTC 2015
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
No need to cpu_dcache_wbinv_all now that a9_mpsubr.S invalidates L1 only
as it should
To generate a diff of this commit:
cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/rpi/rpi_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.65 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.66
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.65 Wed May 27 09:40:51 2015
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Sun May 31 08:13:18 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.65 2015/05/27 09:40:51 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.66 2015/05/31 08:13:18 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.65 2015/05/27 09:40:51 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.66 2015/05/31 08:13:18 skrll Exp $);
#include opt_arm_debug.h
#include opt_bcm283x.h
@@ -503,8 +503,6 @@ rpi_bootstrap(void)
extern void cortex_mpstart(void);
- cpu_dcache_wbinv_all();
-
for (size_t i = 1; i arm_cpu_max; i++) {
bus_space_tag_t iot = bcm2835_bs_tag;
bus_space_handle_t ioh = BCM2836_ARM_LOCAL_VBASE;
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: abs Date: Sun May 31 07:04:18 UTC 2015 Modified Files: src/sys/arch/vax/vsa: vsbus.c Log Message: Add missing break - from Felix Deichmann in PR port-vax/49935 To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/vsa/vsbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/vax/vsa
Module Name:src Committed By: abs Date: Sun May 31 07:04:18 UTC 2015 Modified Files: src/sys/arch/vax/vsa: vsbus.c Log Message: Add missing break - from Felix Deichmann in PR port-vax/49935 To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/sys/arch/vax/vsa/vsbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/vax/vsa/vsbus.c diff -u src/sys/arch/vax/vsa/vsbus.c:1.60 src/sys/arch/vax/vsa/vsbus.c:1.61 --- src/sys/arch/vax/vsa/vsbus.c:1.60 Thu Jun 28 13:58:21 2012 +++ src/sys/arch/vax/vsa/vsbus.c Sun May 31 07:04:18 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $ */ +/* $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $ */ /* * Copyright (c) 1996, 1999 Ludd, University of Lule}, Sweden. * All rights reserved. @@ -33,7 +33,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.60 2012/06/28 13:58:21 abs Exp $); +__KERNEL_RCSID(0, $NetBSD: vsbus.c,v 1.61 2015/05/31 07:04:18 abs Exp $); #include opt_cputype.h @@ -138,6 +138,7 @@ vsbus_attach(device_t parent, device_t s sc-sc_intclr = (char *)sc-sc_vsregs + 15; sc-sc_intmsk = (char *)sc-sc_vsregs + 12; vsbus_dma_init(sc, 32768); + break; #endif default:
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src Committed By: skrll Date: Sun May 31 08:13:18 UTC 2015 Modified Files: src/sys/arch/evbarm/rpi: rpi_machdep.c Log Message: No need to cpu_dcache_wbinv_all now that a9_mpsubr.S invalidates L1 only as it should To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/evbarm/rpi/rpi_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src
Committed By: njoly
Date: Sun May 31 10:50:04 UTC 2015
Modified Files:
src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h
linux_syscalls.c linux_sysent.c linux_systrace_args.c
Log Message:
Regen for write(2) size argument fix.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/amd64/linux_syscall.h \
src/sys/compat/linux/arch/amd64/linux_syscallargs.h \
src/sys/compat/linux/arch/amd64/linux_syscalls.c \
src/sys/compat/linux/arch/amd64/linux_sysent.c
cvs rdiff -u -r1.1 -r1.2 \
src/sys/compat/linux/arch/amd64/linux_systrace_args.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/linux_syscall.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscall.h:1.56 src/sys/compat/linux/arch/amd64/linux_syscall.h:1.57
--- src/sys/compat/linux/arch/amd64/linux_syscall.h:1.56 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/linux/arch/amd64/linux_syscall.h Sun May 31 10:50:04 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscall.h,v 1.56 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: linux_syscall.h,v 1.57 2015/05/31 10:50:04 njoly Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.54 2015/03/07 03:25:19 christos Exp
+ * created from NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
*/
#ifndef _LINUX_SYS_SYSCALL_H_
@@ -15,7 +15,7 @@
/* syscall: read ret: ssize_t args: int void * size_t */
#define LINUX_SYS_read 0
-/* syscall: write ret: ssize_t args: int const void * int */
+/* syscall: write ret: ssize_t args: int const void * size_t */
#define LINUX_SYS_write 1
/* syscall: open ret: int args: const char * int linux_umode_t */
Index: src/sys/compat/linux/arch/amd64/linux_syscallargs.h
diff -u src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.56 src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.57
--- src/sys/compat/linux/arch/amd64/linux_syscallargs.h:1.56 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/linux/arch/amd64/linux_syscallargs.h Sun May 31 10:50:04 2015
@@ -1,10 +1,10 @@
-/* $NetBSD: linux_syscallargs.h,v 1.56 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: linux_syscallargs.h,v 1.57 2015/05/31 10:50:04 njoly Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.54 2015/03/07 03:25:19 christos Exp
+ * created from NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
*/
#ifndef _LINUX_SYS_SYSCALLARGS_H_
Index: src/sys/compat/linux/arch/amd64/linux_syscalls.c
diff -u src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.56 src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.57
--- src/sys/compat/linux/arch/amd64/linux_syscalls.c:1.56 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/linux/arch/amd64/linux_syscalls.c Sun May 31 10:50:04 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_syscalls.c,v 1.56 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: linux_syscalls.c,v 1.57 2015/05/31 10:50:04 njoly Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.54 2015/03/07 03:25:19 christos Exp
+ * created from NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_syscalls.c,v 1.56 2015/03/07 16:41:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_syscalls.c,v 1.57 2015/05/31 10:50:04 njoly Exp $);
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/linux/arch/amd64/linux_sysent.c
diff -u src/sys/compat/linux/arch/amd64/linux_sysent.c:1.56 src/sys/compat/linux/arch/amd64/linux_sysent.c:1.57
--- src/sys/compat/linux/arch/amd64/linux_sysent.c:1.56 Sat Mar 7 16:41:53 2015
+++ src/sys/compat/linux/arch/amd64/linux_sysent.c Sun May 31 10:50:04 2015
@@ -1,14 +1,14 @@
-/* $NetBSD: linux_sysent.c,v 1.56 2015/03/07 16:41:53 christos Exp $ */
+/* $NetBSD: linux_sysent.c,v 1.57 2015/05/31 10:50:04 njoly Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.54 2015/03/07 03:25:19 christos Exp
+ * created from NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.56 2015/03/07 16:41:53 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_sysent.c,v 1.57 2015/05/31 10:50:04 njoly Exp $);
#if defined(_KERNEL_OPT)
#include opt_sysv.h
@@ -36,1070 +36,1928 @@ __KERNEL_RCSID(0, $NetBSD: linux_sysent
#define s(type) sizeof(type)
#define n(type) (sizeof(type)/sizeof (register_t))
-#define ns(type) n(type), s(type)
+#define ns(type) .sy_narg = n(type), .sy_argsize = s(type)
struct sysent linux_sysent[] = {
- {
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src
Committed By: njoly
Date: Sun May 31 10:49:28 UTC 2015
Modified Files:
src/sys/compat/linux/arch/amd64: syscalls.master
Log Message:
Fix write(2) size argument (int - size_t).
To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/amd64/syscalls.master
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/arch/amd64/syscalls.master
diff -u src/sys/compat/linux/arch/amd64/syscalls.master:1.54 src/sys/compat/linux/arch/amd64/syscalls.master:1.55
--- src/sys/compat/linux/arch/amd64/syscalls.master:1.54 Sat Mar 7 03:25:19 2015
+++ src/sys/compat/linux/arch/amd64/syscalls.master Sun May 31 10:49:27 2015
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.54 2015/03/07 03:25:19 christos Exp $
+ $NetBSD: syscalls.master,v 1.55 2015/05/31 10:49:27 njoly Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
@@ -66,7 +66,7 @@
0 NOARGS { ssize_t|sys||read(int fd, void *buf, size_t nbyte); }
1 NOARGS { ssize_t|sys||write(int fd, const void *buf, \
- int nbyte); }
+ size_t nbyte); }
2 STD { int|linux_sys||open(const char *path, int flags, \
linux_umode_t mode); }
3 NOARGS { int|sys||close(int fd); }
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src Committed By: njoly Date: Sun May 31 10:50:04 UTC 2015 Modified Files: src/sys/compat/linux/arch/amd64: linux_syscall.h linux_syscallargs.h linux_syscalls.c linux_sysent.c linux_systrace_args.c Log Message: Regen for write(2) size argument fix. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/compat/linux/arch/amd64/linux_syscall.h \ src/sys/compat/linux/arch/amd64/linux_syscallargs.h \ src/sys/compat/linux/arch/amd64/linux_syscalls.c \ src/sys/compat/linux/arch/amd64/linux_sysent.c cvs rdiff -u -r1.1 -r1.2 \ src/sys/compat/linux/arch/amd64/linux_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/linux/arch/amd64
Module Name:src Committed By: njoly Date: Sun May 31 10:49:28 UTC 2015 Modified Files: src/sys/compat/linux/arch/amd64: syscalls.master Log Message: Fix write(2) size argument (int - size_t). To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/sys/compat/linux/arch/amd64/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun May 31 14:41:59 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: tegra_i2c.c tegra_var.h
Log Message:
add external function for writing to dvc (I2C5) devices
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_i2c.c
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/nvidia/tegra_var.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.4 src/sys/arch/arm/nvidia/tegra_i2c.c:1.5
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.4 Sun May 17 01:26:22 2015
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Sun May 31 14:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.4 2015/05/17 01:26:22 jmcneill Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.5 2015/05/31 14:41:59 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: tegra_i2c.c,v 1.4 2015/05/17 01:26:22 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: tegra_i2c.c,v 1.5 2015/05/31 14:41:59 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -418,3 +418,20 @@ tegra_i2c_read(struct tegra_i2c_softc *s
return tegra_i2c_wait(sc, flags);
}
+
+void
+tegra_i2c_dvc_write(uint8_t addr, uint32_t data, size_t datalen)
+{
+ bus_space_tag_t bst = armv7_generic_bs_tag;
+ bus_space_handle_t bsh;
+
+ bus_space_subregion(bst, tegra_apb_bsh, TEGRA_I2C5_OFFSET,
+ TEGRA_I2C5_SIZE, bsh);
+
+ bus_space_write_4(bst, bsh, I2C_CMD_ADDR0_REG, addr 1);
+ bus_space_write_4(bst, bsh, I2C_CMD_DATA1_REG, data);
+ bus_space_write_4(bst, bsh, I2C_CNFG_REG,
+ __SHIFTIN(datalen - 1, I2C_CNFG_LENGTH) |
+ I2C_CNFG_NEW_MASTER_FSM |
+ I2C_CNFG_SEND);
+}
Index: src/sys/arch/arm/nvidia/tegra_var.h
diff -u src/sys/arch/arm/nvidia/tegra_var.h:1.20 src/sys/arch/arm/nvidia/tegra_var.h:1.21
--- src/sys/arch/arm/nvidia/tegra_var.h:1.20 Sat May 30 13:25:55 2015
+++ src/sys/arch/arm/nvidia/tegra_var.h Sun May 31 14:41:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_var.h,v 1.20 2015/05/30 13:25:55 jmcneill Exp $ */
+/* $NetBSD: tegra_var.h,v 1.21 2015/05/31 14:41:59 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -140,6 +140,8 @@ void tegra_pmc_power(u_int, bool);
void tegra_pmc_remove_clamping(u_int);
void tegra_pmc_hdmi_enable(void);
+void tegra_i2c_dvc_write(uint8_t, uint32_t, size_t);
+
psize_t tegra_mc_memsize(void);
void tegra_xusbpad_sata_enable(void);
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sun May 31 14:41:59 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: tegra_i2c.c tegra_var.h Log Message: add external function for writing to dvc (I2C5) devices To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/tegra_i2c.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/nvidia/tegra_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun May 31 14:43:59 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: enable MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/JETSONTK1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/JETSONTK1 diff -u src/sys/arch/evbarm/conf/JETSONTK1:1.27 src/sys/arch/evbarm/conf/JETSONTK1:1.28 --- src/sys/arch/evbarm/conf/JETSONTK1:1.27 Sat May 30 15:36:27 2015 +++ src/sys/arch/evbarm/conf/JETSONTK1 Sun May 31 14:43:59 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: JETSONTK1,v 1.27 2015/05/30 15:36:27 jmcneill Exp $ +# $NetBSD: JETSONTK1,v 1.28 2015/05/31 14:43:59 jmcneill Exp $ # # NVIDIA Jetson TK1 - Tegra K1 development kit # https://developer.nvidia.com/jetson-tk1 @@ -12,7 +12,7 @@ options CPU_CORTEXA15 options SOC_TEGRA124 options BOARD_JETSONTK1 options CPUFREQ_BOOT=2292 -#options MULTIPROCESSOR +options MULTIPROCESSOR #options MEMSIZE=2048 options DIAGNOSTIC # internal consistency checks
CVS commit: src/sys/arch/arm/nvidia
Module Name:src
Committed By: jmcneill
Date: Sun May 31 14:42:56 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: soc_tegra124.c
Log Message:
set VDD_CPU to 1.4V
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/soc_tegra124.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/soc_tegra124.c
diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.4 src/sys/arch/arm/nvidia/soc_tegra124.c:1.5
--- src/sys/arch/arm/nvidia/soc_tegra124.c:1.4 Sun May 17 06:15:50 2015
+++ src/sys/arch/arm/nvidia/soc_tegra124.c Sun May 31 14:42:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: soc_tegra124.c,v 1.4 2015/05/17 06:15:50 matt Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.5 2015/05/31 14:42:56 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -30,7 +30,7 @@
#include opt_multiprocessor.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: soc_tegra124.c,v 1.4 2015/05/17 06:15:50 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: soc_tegra124.c,v 1.5 2015/05/31 14:42:56 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -77,6 +77,11 @@ static struct tegra124_cpufreq_rate {
void
tegra124_cpuinit(void)
{
+ /* Set VDD_CPU voltage to 1.4V */
+ tegra_car_periph_i2c_enable(4, 20400);
+ tegra_i2c_dvc_write(0x40, 0x4f00, 2);
+ delay(1);
+
tegra_cpufreq_register(tegra124_cpufreq_func);
}
CVS commit: src/sys/arch/arm/nvidia
Module Name:src Committed By: jmcneill Date: Sun May 31 14:42:56 UTC 2015 Modified Files: src/sys/arch/arm/nvidia: soc_tegra124.c Log Message: set VDD_CPU to 1.4V To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/nvidia/soc_tegra124.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun May 31 14:43:59 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: JETSONTK1 Log Message: enable MULTIPROCESSOR To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/conf/JETSONTK1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
