PERFORCE change 228308 for review
Brooks Davis
brooks at FreeBSD.org
Wed May 1 22:58:12 UTC 2013
http://p4web.freebsd.org/@@228308?ac=10
Change 228308 by brooks at brooks_zenith on 2013/05/01 22:57:42
IFC @ 228268 to loop back changes merged yesterday.
Affected files ...
.. //depot/projects/ctsrd/beribsd/src/MAINTAINERS#6 integrate
.. //depot/projects/ctsrd/beribsd/src/UPDATING#10 integrate
.. //depot/projects/ctsrd/beribsd/src/etc/Makefile#8 integrate
.. //depot/projects/ctsrd/beribsd/src/lib/Makefile#7 integrate
.. //depot/projects/ctsrd/beribsd/src/libexec/rtld-elf/rtld.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/master.passwd#3 integrate
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/ssh/sshd_config#1 branch
.. //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/sshd_config#2 delete
.. //depot/projects/ctsrd/beribsd/src/sbin/dumpon/dumpon.8#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsck.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsck_ffs.8#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsutil.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/main.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/pass5.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man4/Makefile#15 integrate
.. //depot/projects/ctsrd/beribsd/src/share/man/man4/ntb.4#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files#19 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files.amd64#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/conf/files.powerpc#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c#2 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#10 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/bktr/msp34xx.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_bus_fdt.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#13 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/adapter.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/common/common.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/common/t4_hw.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/firmware/t4fw_interface.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/osdep.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/t4_main.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/tom/t4_ddp.c#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/e1000/if_em.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/e1000/if_igb.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/e1000/if_lem.c#9 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/hwpmc/hwpmc_core.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/hwpmc/hwpmc_intel.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/hwpmc/hwpmc_soft.c#4 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/hwpmc/pmc_events.h#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ixgbe/ixgbe.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/netmap/netmap.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/netmap/netmap_kern.h#6 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ntb/if_ntb/if_ntb.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ntb/ntb_hw/ntb_hw.c#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ntb/ntb_hw/ntb_hw.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/ntb/ntb_hw/ntb_regs.h#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/fs/nfsserver/nfs_nfsdport.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/kern/uipc_socket.c#8 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/Makefile#7 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/modules/ntb/Makefile#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/modules/ntb/if_ntb/Makefile#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/modules/ntb/ntb_hw/Makefile#1 branch
.. //depot/projects/ctsrd/beribsd/src/sys/net/netmap.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/net/netmap_user.h#5 integrate
.. //depot/projects/ctsrd/beribsd/src/sys/xen/xenstore/xenstore.c#3 integrate
.. //depot/projects/ctsrd/beribsd/src/tools/tools/netmap/README#4 integrate
.. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_virtio_net.c#5 integrate
Differences ...
==== //depot/projects/ctsrd/beribsd/src/MAINTAINERS#6 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: head/MAINTAINERS 248805 2013-03-28 02:44:15Z imp $
+$FreeBSD: head/MAINTAINERS 250087 2013-04-30 01:15:10Z peter $
Please note that the content of this file is strictly advisory.
No locks listed here are valid. The only strict review requirements
@@ -64,7 +64,6 @@
lpr gad Pre-commit review requested, particularly for
lpd/recvjob.c and lpd/printjob.c.
newsyslog(8) gad Heads-up appreciated. I'm going thru the PR's for it.
-cvs peter Heads-up appreciated, try not to break it.
nvi peter Try not to break it.
libz peter Try not to break it.
groff ru Recommends pre-commit review.
==== //depot/projects/ctsrd/beribsd/src/UPDATING#10 (text+ko) ====
@@ -31,6 +31,9 @@
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20130429:
+ Fix a bug that allows NFS clients to issue READDIR on files.
+
20130426:
The WITHOUT_IDEA option has been removed because
the IDEA patent expired.
@@ -101,6 +104,14 @@
while having the GNU version installed as gnupatch, rebuild
and install world with the WITH_BSD_PATCH knob set.
+20130121:
+ Due to the use of the new -l option to install(1) during build
+ and install, you must take care not to directly set the INSTALL
+ make variable in your /etc/make.conf, /etc/src.conf, or on the
+ command line. If you with to use the -C flag for all installs
+ you may be able to add INSTALL+=-C to /etc/make.conf or
+ /etc/src.conf.
+
20130118:
The install(1) option -M has changed meaning and now takes an
argument that is a file or path to append logs to. In the
@@ -1833,4 +1844,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: head/UPDATING 249960 2013-04-27 00:03:07Z eadler $
+$FreeBSD: head/UPDATING 250119 2013-04-30 20:53:28Z brooks $
==== //depot/projects/ctsrd/beribsd/src/etc/Makefile#8 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: head/etc/Makefile 247162 2013-02-22 19:57:18Z ache $
+# $FreeBSD: head/etc/Makefile 250116 2013-04-30 19:26:44Z brooks $
.include <bsd.own.mk>
@@ -328,7 +328,7 @@
MTREES+= ../${mtree} /
.endfor
-distrib-dirs:
+distrib-dirs: ${MTREES:N/*}
@set ${MTREES}; \
while test $$# -ge 2; do \
m=${.CURDIR}/$$1; \
==== //depot/projects/ctsrd/beribsd/src/lib/Makefile#7 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: head/lib/Makefile 249634 2013-04-19 05:13:57Z kientzle $
+# $FreeBSD: head/lib/Makefile 250112 2013-04-30 18:14:22Z brooks $
.include <bsd.own.mk>
@@ -253,7 +253,9 @@
_libusb= libusb
.endif
+.if !defined(LIBRARIES_ONLY)
afterinstall:
- ln -hfs ../include ${DESTDIR}/usr/lib/include
+ ${INSTALL_SYMLINK} ../include ${DESTDIR}/usr/lib/include
+.endif
.include <bsd.subdir.mk>
==== //depot/projects/ctsrd/beribsd/src/libexec/rtld-elf/rtld.c#8 (text+ko) ====
@@ -25,7 +25,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: head/libexec/rtld-elf/rtld.c 249525 2013-04-15 20:06:56Z kib $
+ * $FreeBSD: head/libexec/rtld-elf/rtld.c 250075 2013-04-29 21:12:25Z kib $
*/
/*
@@ -784,7 +784,7 @@
/*
* Now, execute the substitution loop.
*/
- for (p = real, resp = res;;) {
+ for (p = real, resp = res, *resp = '\0';;) {
p1 = strstr(p, kw);
if (p1 != NULL) {
/* Copy the prefix before keyword. */
@@ -793,6 +793,7 @@
/* Keyword replacement. */
memcpy(resp, subst, subst_len);
resp += subst_len;
+ *resp = '\0';
p = p1 + kw_len;
} else
break;
==== //depot/projects/ctsrd/beribsd/src/release/picobsd/floppy.tree/etc/master.passwd#3 (text+ko) ====
@@ -1,10 +1,11 @@
-# $FreeBSD: head/release/picobsd/floppy.tree/etc/master.passwd 201061 2009-12-27 21:17:31Z luigi $
+# $FreeBSD: head/release/picobsd/floppy.tree/etc/master.passwd 250100 2013-04-30 13:20:11Z luigi $
root:$1$xOOaGnKU$U9QdsCI40XXcCUMBN.7Az.:0:0::0:0:Charlie &:/root:/bin/sh
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/nonexistent
operator:*:2:20::0:0:System &:/usr/guest/operator:/bin/csh
bin:*:3:7::0:0:Binaries Commands and Source,,,:/:/nonexistent
tty:*:4:65533::0:0:Tty Sandbox:/:/nonexistent
+sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/nonexistent
_dhcp:*:65:65::0:0:dhcp programs:/var/empty:/usr/sbin/nologin
user:*:1002:1002:Sample User:0:0:user:/home/user:/bin/sh
==== //depot/projects/ctsrd/beribsd/src/sbin/dumpon/dumpon.8#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)swapon.8 8.1 (Berkeley) 6/5/93
-.\" $FreeBSD: head/sbin/dumpon/dumpon.8 242486 2012-11-02 17:30:08Z alfred $
+.\" $FreeBSD: head/sbin/dumpon/dumpon.8 250095 2013-04-30 07:22:03Z joel $
.\"
-.Dd May 12, 1995
+.Dd April 29, 2013
.Dt DUMPON 8
.Os
.Sh NAME
@@ -59,14 +59,21 @@
variable in the boot time configuration file
.Pa /etc/rc.conf .
.Pp
-For most systems the size of the specified dump device must be at
+The default type of kernel crash dump is the mini crash dump.
+Mini crash dumps hold only memory pages in use by the kernel.
+Alternatively, full memory dumps can be enabled by setting the
+.Va debug.minidump
+.Xr sysctl 8
+variable to 0.
+.Pp
+For systems using full memory dumps, the size of the specified dump
+device must be at
least the size of physical memory.
Even though an additional 64 kB header is added to the dump, the BIOS for a
platform typically holds back some memory, so it is not usually
necessary to size the dump device larger than the actual amount of RAM
available in the machine.
-.Pp
-The
+Also, when using full memory dumps, the
.Nm
utility will refuse to enable a dump device which is smaller than the
total amount of physical memory as reported by the
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsck.h#5 (text+ko) ====
@@ -57,7 +57,7 @@
* SUCH DAMAGE.
*
* @(#)fsck.h 8.4 (Berkeley) 5/9/95
- * $FreeBSD: head/sbin/fsck_ffs/fsck.h 248658 2013-03-23 20:00:02Z mckusick $
+ * $FreeBSD: head/sbin/fsck_ffs/fsck.h 250056 2013-04-29 20:13:09Z des $
*/
#ifndef _FSCK_H_
@@ -74,6 +74,7 @@
#define MINBUFS 10 /* minimum number of buffers required */
#define MAXBUFS 40 /* maximum space to allocate to buffers */
#define INOBUFSIZE 64*1024 /* size of buffer to read inodes in pass1 */
+#define ZEROBUFSIZE (dev_bsize * 128) /* size of zero buffer used by -Z */
union dinode {
struct ufs1_dinode dp1;
@@ -306,7 +307,8 @@
int bkgrdflag; /* use a snapshot to run on an active system */
int bflag; /* location of alternate super block */
int debug; /* output debugging info */
-int Eflag; /* zero out empty data blocks */
+int Eflag; /* delete empty data blocks */
+int Zflag; /* zero empty data blocks */
int inoopt; /* trim out unused inodes */
char ckclean; /* only do work if not cleanly unmounted */
int cvtlevel; /* convert to newer file system format */
@@ -402,6 +404,7 @@
void bufinit(void);
void blwrite(int fd, char *buf, ufs2_daddr_t blk, ssize_t size);
void blerase(int fd, ufs2_daddr_t blk, long size);
+void blzero(int fd, ufs2_daddr_t blk, long size);
void cacheino(union dinode *dp, ino_t inumber);
void catch(int);
void catchquit(int);
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsck_ffs.8#4 (text+ko) ====
@@ -27,7 +27,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fsck.8 8.4 (Berkeley) 5/9/95
-.\" $FreeBSD: head/sbin/fsck_ffs/fsck_ffs.8 231377 2012-02-10 12:01:19Z trasz $
+.\" $FreeBSD: head/sbin/fsck_ffs/fsck_ffs.8 250056 2013-04-29 20:13:09Z des $
.\"
.Dd February 10, 2012
.Dt FSCK_FFS 8
@@ -38,7 +38,7 @@
.Nd file system consistency check and interactive repair
.Sh SYNOPSIS
.Nm
-.Op Fl BEFfnpry
+.Op Fl BEFfnpryZ
.Op Fl b Ar block
.Op Fl c Ar level
.Op Fl m Ar mode
@@ -280,6 +280,15 @@
.Nm ;
this should be used with great caution as this is a free license
to continue after essentially unlimited trouble has been encountered.
+.It Fl Z
+Similar to
+.Fl E ,
+but overwrites unused blocks with zeroes.
+If both
+.Fl E
+and
+.Fl Z
+are specified, blocks are first zeroed and then erased.
.El
.Pp
Inconsistencies checked are as follows:
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/fsutil.c#5 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sbin/fsck_ffs/fsutil.c 248691 2013-03-24 22:37:10Z mckusick $");
+__FBSDID("$FreeBSD: head/sbin/fsck_ffs/fsutil.c 250056 2013-04-29 20:13:09Z des $");
#include <sys/param.h>
#include <sys/time.h>
@@ -618,6 +618,35 @@
return;
}
+void
+blzero(int fd, ufs2_daddr_t blk, long size)
+{
+ static char *zero;
+ off_t offset, len;
+
+ if (fd < 0)
+ return;
+ len = ZEROBUFSIZE;
+ if (zero == NULL) {
+ zero = calloc(len, 1);
+ if (zero == NULL)
+ errx(EEXIT, "cannot allocate buffer pool");
+ }
+ offset = blk * dev_bsize;
+ if (lseek(fd, offset, 0) < 0)
+ rwerror("SEEK BLK", blk);
+ while (size > 0) {
+ if (size > len)
+ size = len;
+ else
+ len = size;
+ if (write(fd, zero, len) != len)
+ rwerror("WRITE BLK", blk);
+ blk += len / dev_bsize;
+ size -= len;
+ }
+}
+
/*
* Verify cylinder group's magic number and other parameters. If the
* test fails, offer an option to rebuild the whole cylinder group.
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/main.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 247212 2013-02-24 06:44:29Z mckusick $");
+__FBSDID("$FreeBSD: head/sbin/fsck_ffs/main.c 250056 2013-04-29 20:13:09Z des $");
#include <sys/param.h>
#include <sys/file.h>
@@ -82,7 +82,7 @@
sync();
skipclean = 1;
inoopt = 0;
- while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npry")) != -1) {
+ while ((ch = getopt(argc, argv, "b:Bc:CdEfFm:npryZ")) != -1) {
switch (ch) {
case 'b':
skipclean = 0;
@@ -147,6 +147,10 @@
nflag = 0;
break;
+ case 'Z':
+ Zflag++;
+ break;
+
default:
usage();
}
==== //depot/projects/ctsrd/beribsd/src/sbin/fsck_ffs/pass5.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
#endif /* not lint */
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sbin/fsck_ffs/pass5.c 248658 2013-03-23 20:00:02Z mckusick $");
+__FBSDID("$FreeBSD: head/sbin/fsck_ffs/pass5.c 250057 2013-04-29 20:14:11Z des $");
#include <sys/param.h>
#include <sys/sysctl.h>
@@ -252,7 +252,7 @@
frags = 0;
for (j = 0; j < fs->fs_frag; j++) {
if (testbmap(d + j)) {
- if (Eflag && start != -1) {
+ if ((Eflag || Zflag) && start != -1) {
clear_blocks(start, d + j - 1);
start = -1;
}
@@ -274,7 +274,7 @@
ffs_fragacct(fs, blk, newcg->cg_frsum, 1);
}
}
- if (Eflag && start != -1)
+ if ((Eflag || Zflag) && start != -1)
clear_blocks(start, d - 1);
if (fs->fs_contigsumsize > 0) {
int32_t *sump = cg_clustersum(newcg);
@@ -581,11 +581,16 @@
}
}
-static void clear_blocks(ufs2_daddr_t start, ufs2_daddr_t end)
+static void
+clear_blocks(ufs2_daddr_t start, ufs2_daddr_t end)
{
if (debug)
printf("Zero frags %jd to %jd\n", start, end);
- blerase(fswritefd, fsbtodb(&sblock, start),
- lfragtosize(&sblock, end - start + 1));
+ if (Zflag)
+ blzero(fswritefd, fsbtodb(&sblock, start),
+ lfragtosize(&sblock, end - start + 1));
+ if (Eflag)
+ blerase(fswritefd, fsbtodb(&sblock, start),
+ lfragtosize(&sblock, end - start + 1));
}
==== //depot/projects/ctsrd/beribsd/src/share/man/man4/Makefile#15 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/18/93
-# $FreeBSD: head/share/man/man4/Makefile 249083 2013-04-04 07:12:24Z mav $
+# $FreeBSD: head/share/man/man4/Makefile 250110 2013-04-30 16:59:25Z carl $
.include <bsd.own.mk>
@@ -333,6 +333,7 @@
ng_vlan.4 \
nmdm.4 \
nsp.4 \
+ ${_ntb.4} \
null.4 \
${_nvd.4} \
${_nve.4} \
@@ -647,6 +648,8 @@
netintro.4 networking.4
MLINKS+=${_nfe.4} ${_if_nfe.4}
MLINKS+=nge.4 if_nge.4
+MLINKS+=${_ntb.4} ${_if_ntb.4} \
+ ${_ntb.4} ${_ntb_hw.4}
MLINKS+=${_nve.4} ${_if_nve.4}
MLINKS+=${_nxge.4} ${_if_nxge.4}
MLINKS+=patm.4 if_patm.4
@@ -784,6 +787,9 @@
.if ${MACHINE_CPUARCH} == "amd64"
_bhyve.4= bhyve.4
+_if_ntb.4= if_ntb.4
+_ntb.4= ntb.4
+_ntb_hw.4= ntb_hw.4
_qlxgb.4= qlxgb.4
_sfxge.4= sfxge.4
==== //depot/projects/ctsrd/beribsd/src/sys/amd64/conf/NOTES#7 (text+ko) ====
@@ -4,7 +4,7 @@
# This file contains machine dependent kernel configuration notes. For
# machine independent notes, look in /sys/conf/NOTES.
#
-# $FreeBSD: head/sys/amd64/conf/NOTES 247870 2013-03-06 07:17:53Z bryanv $
+# $FreeBSD: head/sys/amd64/conf/NOTES 250079 2013-04-29 22:48:53Z carl $
#
#
@@ -366,6 +366,10 @@
device iwn6050fw
device wpifw
+# Intel Non-Transparent Bridge (NTB) hardware
+device ntb_hw # Hardware Abstraction Layer for the NTB
+device if_ntb # Simulated ethernet device using the NTB
+
#
#XXX this stores pointers in a 32bit field that is defined by the hardware
#device pst
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files#19 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: head/sys/conf/files 249663 2013-04-19 23:49:34Z jkim $
+# $FreeBSD: head/sys/conf/files 250114 2013-04-30 18:33:29Z brooks $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files.amd64#8 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.amd64 249432 2013-04-12 23:10:56Z jkim $
+# $FreeBSD: head/sys/conf/files.amd64 250079 2013-04-29 22:48:53Z carl $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -211,6 +211,8 @@
dev/lindev/full.c optional lindev
dev/lindev/lindev.c optional lindev
dev/nfe/if_nfe.c optional nfe pci
+dev/ntb/if_ntb/if_ntb.c optional if_ntb
+dev/ntb/ntb_hw/ntb_hw.c optional if_ntb ntb_hw
dev/nvd/nvd.c optional nvd nvme
dev/nve/if_nve.c optional nve pci
dev/nvme/nvme.c optional nvme
==== //depot/projects/ctsrd/beribsd/src/sys/conf/files.powerpc#8 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: head/sys/conf/files.powerpc 249825 2013-04-24 01:20:10Z rpaulo $
+# $FreeBSD: head/sys/conf/files.powerpc 250114 2013-04-30 18:33:29Z brooks $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
==== //depot/projects/ctsrd/beribsd/src/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_ani.c#2 (text+ko) ====
@@ -704,7 +704,7 @@
return AH_TRUE;
}
/* if we're turning off ANI, reset regs back to INI settings */
- if (AH_PRIVATE(ah)->ah_config.ath_hal_enable_ani) {
+ if (ah->ah_config.ath_hal_enable_ani) {
HAL_ANI_CMD savefunc = ahp->ah_ani_function;
/* temporarly allow all functions so we can reset */
ahp->ah_ani_function = HAL_ANI_ALL;
==== //depot/projects/ctsrd/beribsd/src/sys/dev/altera/jtag_uart/altera_jtag_uart.h#10 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/altera/jtag_uart/altera_jtag_uart.h 245380 2013-01-13 16:57:11Z rwatson $
+ * $FreeBSD: head/sys/dev/altera/jtag_uart/altera_jtag_uart.h 250113 2013-04-30 18:29:05Z brooks $
*/
#ifndef _DEV_ALTERA_JTAG_UART_H_
==== //depot/projects/ctsrd/beribsd/src/sys/dev/bktr/msp34xx.c#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/bktr/msp34xx.c 172836 2007-10-20 23:23:23Z julian $
+ * $FreeBSD: head/sys/dev/bktr/msp34xx.c 250088 2013-04-30 05:08:17Z pluknet $
*/
/*
@@ -134,7 +134,6 @@
/* thread */
struct proc *kthread;
- char *threaddesc;
int active,restart,rmmod;
@@ -1147,12 +1146,6 @@
msp->bass = 32768;
msp->treble = 32768;
msp->input = -1;
- msp->threaddesc = malloc(15 * sizeof(char), M_DEVBUF, M_NOWAIT);
- if (msp->threaddesc == NULL) {
- free(msp, M_DEVBUF);
- return ENOMEM;
- }
- snprintf(msp->threaddesc, 14, "%s_msp34xx_thread", bktr->bktr_xname);
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
@@ -1163,7 +1156,6 @@
if (-1 != rev1)
rev2 = msp3400c_read(bktr, I2C_MSP3400C_DFP, 0x1f);
if ((-1 == rev1) || (0 == rev1 && 0 == rev2)) {
- free(msp->threaddesc, M_DEVBUF);
free(msp, M_DEVBUF);
bktr->msp3400c_info = NULL;
printf("%s: msp3400: error while reading chip version\n", bktr_name(bktr));
@@ -1199,10 +1191,9 @@
/* startup control thread */
err = kproc_create(msp->simple ? msp3410d_thread : msp3400c_thread,
bktr, &msp->kthread, (RFFDG | RFPROC), 0,
- msp->threaddesc);
+ "%s_msp34xx_thread", bktr->bktr_xname);
if (err) {
printf("%s: Error returned by kproc_create: %d", bktr_name(bktr), err);
- free(msp->threaddesc, M_DEVBUF);
free(msp, M_DEVBUF);
bktr->msp3400c_info = NULL;
return ENXIO;
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_bus_fdt.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_fdt.c 246128 2013-01-30 18:01:20Z sbz $");
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_bus_fdt.c 250114 2013-04-30 18:33:29Z brooks $");
#include <sys/param.h>
#include <sys/systm.h>
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cfi/cfi_core.c#13 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 233553 2012-03-27 15:13:12Z jchandra $");
+__FBSDID("$FreeBSD: head/sys/dev/cfi/cfi_core.c 250115 2013-04-30 18:48:11Z brooks $");
#include "opt_cfi.h"
@@ -352,7 +352,7 @@
#ifdef CFI_SUPPORT_STRATAFLASH
/*
- * Store the Intel factory PPR in the environment. In many
+ * Store the Intel factory PPR in the environment. In some
* cases it is the most unique ID on a board.
*/
if (cfi_intel_get_factory_pr(sc, &ppr) == 0) {
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/adapter.h#8 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/cxgbe/adapter.h 249392 2013-04-11 22:49:29Z np $
+ * $FreeBSD: head/sys/dev/cxgbe/adapter.h 250092 2013-04-30 05:51:52Z np $
*
*/
@@ -757,6 +757,13 @@
return ((pi->link_cfg.supported & FW_PORT_CAP_SPEED_10G) != 0);
}
+static inline bool
+is_40G_port(const struct port_info *pi)
+{
+
+ return ((pi->link_cfg.supported & FW_PORT_CAP_SPEED_40G) != 0);
+}
+
static inline int
tx_resume_threshold(struct sge_eq *eq)
{
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/common/common.h#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/cxgbe/common/common.h 248925 2013-03-30 02:26:20Z np $
+ * $FreeBSD: head/sys/dev/cxgbe/common/common.h 250090 2013-04-30 05:32:07Z np $
*
*/
@@ -424,7 +424,7 @@
int t4_load_fw(struct adapter *adapter, const u8 *fw_data, unsigned int size);
int t4_load_boot(struct adapter *adap, u8 *boot_data,
unsigned int boot_addr, unsigned int size);
-unsigned int t4_flash_cfg_addr(struct adapter *adapter);
+int t4_flash_cfg_addr(struct adapter *adapter);
int t4_load_cfg(struct adapter *adapter, const u8 *cfg_data, unsigned int size);
int t4_get_fw_version(struct adapter *adapter, u32 *vers);
int t4_get_tp_version(struct adapter *adapter, u32 *vers);
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/common/t4_hw.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: head/sys/dev/cxgbe/common/t4_hw.c 249629 2013-04-18 22:54:41Z np $");
+__FBSDID("$FreeBSD: head/sys/dev/cxgbe/common/t4_hw.c 250090 2013-04-30 05:32:07Z np $");
#include "opt_inet.h"
@@ -176,9 +176,7 @@
u32 pcie_fw;
pcie_fw = t4_read_reg(adap, A_PCIE_FW);
- if (!(pcie_fw & F_PCIE_FW_ERR))
- CH_ERR(adap, "Firmware error report called with no error\n");
- else
+ if (pcie_fw & F_PCIE_FW_ERR)
CH_ERR(adap, "Firmware reports adapter error: %s\n",
reason[G_PCIE_FW_EVAL(pcie_fw)]);
}
@@ -512,6 +510,7 @@
#define VPD_BASE_OLD 0
#define VPD_LEN 1024
#define VPD_INFO_FLD_HDR_SIZE 3
+#define CHELSIO_VPD_UNIQUE_ID 0x82
/**
* t4_seeprom_read - read a serial EEPROM location
@@ -676,7 +675,7 @@
* it at 0.
*/
ret = t4_seeprom_read(adapter, VPD_BASE, (u32 *)(vpd));
- addr = *vpd == 0x82 ? VPD_BASE : VPD_BASE_OLD;
+ addr = *vpd == CHELSIO_VPD_UNIQUE_ID ? VPD_BASE : VPD_BASE_OLD;
for (i = 0; i < sizeof(vpd); i += 4) {
ret = t4_seeprom_read(adapter, addr + i, (u32 *)(vpd + i));
@@ -714,8 +713,10 @@
i = vpd[sn - VPD_INFO_FLD_HDR_SIZE + 2];
memcpy(p->sn, vpd + sn, min(i, SERNUM_LEN));
strstrip(p->sn);
+ i = vpd[pn - VPD_INFO_FLD_HDR_SIZE + 2];
memcpy(p->pn, vpd + pn, min(i, PN_LEN));
strstrip((char *)p->pn);
+ i = vpd[na - VPD_INFO_FLD_HDR_SIZE + 2];
memcpy(p->na, vpd + na, min(i, MACADDR_LEN));
strstrip((char *)p->na);
@@ -1034,14 +1035,19 @@
* @adapter: the adapter
*
* Return the address within the flash where the Firmware Configuration
- * File is stored.
+ * File is stored, or an error if the device FLASH is too small to contain
+ * a Firmware Configuration File.
*/
-unsigned int t4_flash_cfg_addr(struct adapter *adapter)
+int t4_flash_cfg_addr(struct adapter *adapter)
{
- if (adapter->params.sf_size == 0x100000)
- return FLASH_FPGA_CFG_START;
- else
- return FLASH_CFG_START;
+ /*
+ * If the device FLASH isn't large enough to hold a Firmware
+ * Configuration File, return an error.
+ */
+ if (adapter->params.sf_size < FLASH_CFG_START + FLASH_CFG_MAX_SIZE)
+ return -ENOSPC;
+
+ return FLASH_CFG_START;
}
/**
@@ -1054,12 +1060,16 @@
*/
int t4_load_cfg(struct adapter *adap, const u8 *cfg_data, unsigned int size)
{
- int ret, i, n;
+ int ret, i, n, cfg_addr;
unsigned int addr;
unsigned int flash_cfg_start_sec;
unsigned int sf_sec_size = adap->params.sf_size / adap->params.sf_nsec;
- addr = t4_flash_cfg_addr(adap);
+ cfg_addr = t4_flash_cfg_addr(adap);
+ if (cfg_addr < 0)
+ return cfg_addr;
+
+ addr = cfg_addr;
flash_cfg_start_sec = addr / SF_SEC_SIZE;
if (size > FLASH_CFG_MAX_SIZE) {
@@ -1839,7 +1849,8 @@
}
#define ADVERT_MASK (FW_PORT_CAP_SPEED_100M | FW_PORT_CAP_SPEED_1G |\
- FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_ANEG)
+ FW_PORT_CAP_SPEED_10G | FW_PORT_CAP_SPEED_40G | \
+ FW_PORT_CAP_SPEED_100G | FW_PORT_CAP_ANEG)
/**
* t4_link_start - apply link configuration to MAC/PHY
@@ -2406,8 +2417,13 @@
addr = EDC_REG(A_EDC_INT_CAUSE, idx);
cnt_addr = EDC_REG(A_EDC_ECC_STATUS, idx);
} else {
- addr = A_MC_INT_CAUSE;
- cnt_addr = A_MC_ECC_STATUS;
+ if (is_t4(adapter)) {
+ addr = A_MC_INT_CAUSE;
+ cnt_addr = A_MC_ECC_STATUS;
+ } else {
+ addr = A_MC_P_INT_CAUSE;
+ cnt_addr = A_MC_P_ECC_STATUS;
+ }
}
v = t4_read_reg(adapter, addr) & MEM_INT_MASK;
@@ -2514,12 +2530,19 @@
static void pl_intr_handler(struct adapter *adap)
{
static struct intr_info pl_intr_info[] = {
- { F_FATALPERR, "T4 fatal parity error", -1, 1 },
+ { F_FATALPERR, "Fatal parity error", -1, 1 },
{ F_PERRVFID, "PL VFID_MAP parity error", -1, 1 },
{ 0 }
};
- if (t4_handle_intr_status(adap, A_PL_PL_INT_CAUSE, pl_intr_info))
+ static struct intr_info t5_pl_intr_info[] = {
+ { F_PL_BUSPERR, "PL bus parity error", -1, 1 },
+ { F_FATALPERR, "Fatal parity error", -1, 1 },
+ { 0 }
+ };
+
+ if (t4_handle_intr_status(adap, A_PL_PL_INT_CAUSE,
+ is_t4(adap) ? pl_intr_info : t5_pl_intr_info))
t4_fatal_err(adap);
}
@@ -2652,7 +2675,6 @@
A_PCIE_CORE_UTL_SYSTEM_BUS_AGENT_STATUS,
A_PCIE_CORE_UTL_PCI_EXPRESS_PORT_STATUS,
A_PCIE_NONFAT_ERR, A_PCIE_INT_CAUSE,
- A_MC_INT_CAUSE,
A_MA_INT_WRAP_STATUS, A_MA_PARITY_ERROR_STATUS, A_MA_INT_CAUSE,
A_EDC_INT_CAUSE, EDC_REG(A_EDC_INT_CAUSE, 1),
A_CIM_HOST_INT_CAUSE, A_CIM_HOST_UPACC_INT_CAUSE,
@@ -2672,6 +2694,9 @@
for (i = 0; i < ARRAY_SIZE(cause_reg); ++i)
t4_write_reg(adapter, cause_reg[i], 0xffffffff);
+ t4_write_reg(adapter, is_t4(adapter) ? A_MC_INT_CAUSE :
+ A_MC_P_INT_CAUSE, 0xffffffff);
+
t4_write_reg(adapter, A_PL_INT_CAUSE, GLBL_INTR_MASK);
(void) t4_read_reg(adapter, A_PL_INT_CAUSE); /* flush */
}
@@ -4666,8 +4691,8 @@
V_FW_PARAMS_CMD_VFN(vf));
c.retval_len16 = htonl(FW_LEN16(c));
- for (i = 0; i < nparams; i++, p += 2)
- *p = htonl(*params++);
+ for (i = 0; i < nparams; i++, p += 2, params++)
+ *p = htonl(*params);
ret = t4_wr_mbox(adap, mbox, &c, sizeof(c), &c);
if (ret == 0)
@@ -4706,8 +4731,10 @@
c.retval_len16 = htonl(FW_LEN16(c));
while (nparams--) {
- *p++ = htonl(*params++);
- *p++ = htonl(*val++);
+ *p++ = htonl(*params);
+ params++;
+ *p++ = htonl(*val);
+ val++;
}
return t4_wr_mbox(adap, mbox, &c, sizeof(c), NULL);
@@ -5299,6 +5326,8 @@
speed = SPEED_1000;
else if (stat & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_10G))
speed = SPEED_10000;
+ else if (stat & V_FW_PORT_CMD_LSPEED(FW_PORT_CAP_SPEED_40G))
+ speed = SPEED_40000;
for_each_port(adap, i) {
pi = adap2pinfo(adap, i);
@@ -5312,6 +5341,7 @@
lc->link_ok = link_ok;
lc->speed = speed;
lc->fc = fc;
+ lc->supported = ntohs(p->u.info.pcap);
t4_os_link_changed(adap, i, link_ok);
}
if (mod != pi->mod_type) {
==== //depot/projects/ctsrd/beribsd/src/sys/dev/cxgbe/firmware/t4fw_interface.h#6 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: head/sys/dev/cxgbe/firmware/t4fw_interface.h 247291 2013-02-26 00:27:27Z np $
+ * $FreeBSD: head/sys/dev/cxgbe/firmware/t4fw_interface.h 250090 2013-04-30 05:32:07Z np $
*
*/
@@ -80,6 +80,7 @@
********************************/
enum fw_wr_opcodes {
+ FW_FRAG_WR = 0x1d,
FW_FILTER_WR = 0x02,
FW_ULPTX_WR = 0x04,
FW_TP_WR = 0x05,
@@ -203,6 +204,24 @@
#define V_FW_WR_LEN16(x) ((x) << S_FW_WR_LEN16)
#define G_FW_WR_LEN16(x) (((x) >> S_FW_WR_LEN16) & M_FW_WR_LEN16)
+struct fw_frag_wr {
+ __be32 op_to_fragoff16;
+ __be32 flowid_len16;
+ __be64 r4;
+};
+
+#define S_FW_FRAG_WR_EOF 15
+#define M_FW_FRAG_WR_EOF 0x1
+#define V_FW_FRAG_WR_EOF(x) ((x) << S_FW_FRAG_WR_EOF)
+#define G_FW_FRAG_WR_EOF(x) (((x) >> S_FW_FRAG_WR_EOF) & M_FW_FRAG_WR_EOF)
+#define F_FW_FRAG_WR_EOF V_FW_FRAG_WR_EOF(1U)
+
+#define S_FW_FRAG_WR_FRAGOFF16 8
+#define M_FW_FRAG_WR_FRAGOFF16 0x7f
+#define V_FW_FRAG_WR_FRAGOFF16(x) ((x) << S_FW_FRAG_WR_FRAGOFF16)
+#define G_FW_FRAG_WR_FRAGOFF16(x) \
+ (((x) >> S_FW_FRAG_WR_FRAGOFF16) & M_FW_FRAG_WR_FRAGOFF16)
+
/* valid filter configurations for compressed tuple
* Encodings: TPL - Compressed TUPLE for filter in addition to 4-tuple
* FR - FRAGMENT, FC - FCoE, MT - MPS MATCH TYPE, M - MPS MATCH,
@@ -2996,6 +3015,9 @@
FW_LDST_ADDRSPC_FUNC_I2C = 0x002A, /* legacy */
FW_LDST_ADDRSPC_LE = 0x0030,
FW_LDST_ADDRSPC_I2C = 0x0038,
+ FW_LDST_ADDRSPC_PCIE_CFGS = 0x0040,
+ FW_LDST_ADDRSPC_PCIE_DBG = 0x0041,
+ FW_LDST_ADDRSPC_PCIE_PHY = 0x0042,
};
/*
@@ -3482,13 +3504,20 @@
FW_PARAMS_PARAM_DEV_INTFVER_ISCSIPDU = 0x08,
FW_PARAMS_PARAM_DEV_INTFVER_ISCSI = 0x09,
FW_PARAMS_PARAM_DEV_INTFVER_FCOE = 0x0A,
- FW_PARAMS_PARAM_DEV_FWREV = 0x0B,
- FW_PARAMS_PARAM_DEV_TPREV = 0x0C,
- FW_PARAMS_PARAM_DEV_CF = 0x0D,
- FW_PARAMS_PARAM_DEV_BYPASS = 0x0E,
- FW_PARAMS_PARAM_DEV_PHYFW = 0x0F,
- FW_PARAMS_PARAM_DEV_LOAD = 0x10,
- FW_PARAMS_PARAM_DEV_DIAG = 0x11,
+ FW_PARAMS_PARAM_DEV_FWREV = 0x0B,
+ FW_PARAMS_PARAM_DEV_TPREV = 0x0C,
+ FW_PARAMS_PARAM_DEV_CF = 0x0D,
+ FW_PARAMS_PARAM_DEV_BYPASS = 0x0E,
+ FW_PARAMS_PARAM_DEV_PHYFW = 0x0F,
+ FW_PARAMS_PARAM_DEV_LOAD = 0x10,
+ FW_PARAMS_PARAM_DEV_DIAG = 0x11,
+ FW_PARAMS_PARAM_DEV_UCLK = 0x12, /* uP clock in khz */
+ FW_PARAMS_PARAM_DEV_MAXORDIRD_QP = 0x13, /* max supported QP IRD/ORD
+ */
+ FW_PARAMS_PARAM_DEV_MAXIRD_ADAPTER= 0x14,/* max supported ADAPTER IRD
+ */
+ FW_PARAMS_PARAM_DEV_INTFVER_FCOEPDU = 0x15,
+ FW_PARAMS_PARAM_DEV_MCINIT = 0x16,
};
/*
@@ -5860,6 +5889,9 @@
FW_PORT_TYPE_SFP = 9, /* No, 1, Yes, No, No, No, 10G */
FW_PORT_TYPE_BP_AP = 10, /* No, 1, No, No, Yes, Yes, 10G, BP ANGE */
FW_PORT_TYPE_BP4_AP = 11, /* No, 4, No, No, Yes, Yes, 10G, BP ANGE */
+ FW_PORT_TYPE_QSFP_10G = 12, /* No, 1, Yes, No, No, No, 10G */
+ FW_PORT_TYPE_QSFP = 14, /* No, 4, Yes, No, No, No, 40G */
+ FW_PORT_TYPE_BP40_BA = 15, /* No, 4, No, No, Yes, Yes, 40G/10G/1G, BP ANGE */
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list