Date: Tue, 1 May 2018 18:28:42 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r333148 - in user/markj/netdump: . etc/rc.d include lib/libbluetooth lib/libc/sys lib/libsysdecode share/man/man4 stand/common stand/liblua sys/arm/allwinner sys/arm/at91 sys/arm/conf s... Message-ID: <201805011828.w41ISg5W071932@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Tue May 1 18:28:42 2018 New Revision: 333148 URL: https://svnweb.freebsd.org/changeset/base/333148 Log: MFH at r333147. Added: user/markj/netdump/tests/sys/capsicum/bindat_connectat.c - copied unchanged from r333147, head/tests/sys/capsicum/bindat_connectat.c user/markj/netdump/usr.sbin/bhyve/gdb.c - copied unchanged from r333147, head/usr.sbin/bhyve/gdb.c user/markj/netdump/usr.sbin/bhyve/gdb.h - copied unchanged from r333147, head/usr.sbin/bhyve/gdb.h Deleted: user/markj/netdump/share/man/man4/lmc.4 user/markj/netdump/sys/dev/lmc/ user/markj/netdump/sys/modules/lmc/ user/markj/netdump/tools/kerneldoc/subsys/Doxyfile-dev_lmc user/markj/netdump/usr.sbin/lmcconfig/ Modified: user/markj/netdump/ObsoleteFiles.inc user/markj/netdump/UPDATING user/markj/netdump/etc/rc.d/devmatch user/markj/netdump/include/Makefile user/markj/netdump/lib/libbluetooth/bluetooth.3 user/markj/netdump/lib/libbluetooth/bluetooth.h user/markj/netdump/lib/libc/sys/bindat.2 user/markj/netdump/lib/libc/sys/connectat.2 user/markj/netdump/lib/libsysdecode/Makefile user/markj/netdump/share/man/man4/Makefile user/markj/netdump/share/man/man4/ixgb.4 user/markj/netdump/share/man/man4/rights.4 user/markj/netdump/share/man/man4/sn.4 user/markj/netdump/stand/common/zfs_cmd.c user/markj/netdump/stand/liblua/float.h user/markj/netdump/stand/liblua/locale.h user/markj/netdump/stand/liblua/math.h user/markj/netdump/sys/arm/allwinner/aw_machdep.c user/markj/netdump/sys/arm/at91/at91_aic.c user/markj/netdump/sys/arm/at91/at91_common.c user/markj/netdump/sys/arm/at91/at91_gpio.h user/markj/netdump/sys/arm/at91/at91_mci.c user/markj/netdump/sys/arm/at91/at91_mcireg.h user/markj/netdump/sys/arm/at91/at91_ohci.c user/markj/netdump/sys/arm/at91/at91_ohci_fdt.c user/markj/netdump/sys/arm/at91/at91_pdcreg.h user/markj/netdump/sys/arm/at91/at91_pinctrl.c user/markj/netdump/sys/arm/at91/at91_pio.c user/markj/netdump/sys/arm/at91/at91_pioreg.h user/markj/netdump/sys/arm/at91/at91_piovar.h user/markj/netdump/sys/arm/at91/at91_pmc.c user/markj/netdump/sys/arm/at91/at91_pmcreg.h user/markj/netdump/sys/arm/at91/at91_pmcvar.h user/markj/netdump/sys/arm/at91/at91_rtc.c user/markj/netdump/sys/arm/at91/at91_rtcreg.h user/markj/netdump/sys/arm/at91/at91_sdramc.c user/markj/netdump/sys/arm/at91/at91_shdwc.c user/markj/netdump/sys/arm/at91/at91_smc.c user/markj/netdump/sys/arm/at91/at91_smc.h user/markj/netdump/sys/arm/at91/at91_spireg.h user/markj/netdump/sys/arm/at91/at91_ssc.c user/markj/netdump/sys/arm/at91/at91_sscreg.h user/markj/netdump/sys/arm/at91/at91_streg.h user/markj/netdump/sys/arm/at91/at91_tcb.c user/markj/netdump/sys/arm/at91/at91_twi.c user/markj/netdump/sys/arm/at91/at91_twiio.h user/markj/netdump/sys/arm/at91/at91_twireg.h user/markj/netdump/sys/arm/at91/at91board.h user/markj/netdump/sys/arm/at91/at91rm9200_devices.c user/markj/netdump/sys/arm/at91/at91rm9200var.h user/markj/netdump/sys/arm/at91/at91sam9x5.c user/markj/netdump/sys/arm/at91/at91soc.c user/markj/netdump/sys/arm/at91/at91soc.h user/markj/netdump/sys/arm/at91/board_bwct.c user/markj/netdump/sys/arm/at91/board_eb9200.c user/markj/netdump/sys/arm/at91/board_hl200.c user/markj/netdump/sys/arm/at91/board_hl201.c user/markj/netdump/sys/arm/at91/board_kb920x.c user/markj/netdump/sys/arm/at91/board_tsc4370.c user/markj/netdump/sys/arm/at91/if_ate.c user/markj/netdump/sys/arm/at91/if_atereg.h user/markj/netdump/sys/arm/conf/genboardid.awk user/markj/netdump/sys/arm/include/_bus.h user/markj/netdump/sys/arm/include/at91_gpio.h user/markj/netdump/sys/arm/include/atags.h user/markj/netdump/sys/arm/include/board.h user/markj/netdump/sys/cam/cam_periph.c user/markj/netdump/sys/conf/NOTES user/markj/netdump/sys/conf/files user/markj/netdump/sys/dev/cxgbe/common/t4_msg.h user/markj/netdump/sys/dev/cxgbe/offload.h user/markj/netdump/sys/dev/cxgbe/t4_main.c user/markj/netdump/sys/dev/cxgbe/t4_sge.c user/markj/netdump/sys/dev/cxgbe/tom/t4_connect.c user/markj/netdump/sys/dev/exca/exca.c user/markj/netdump/sys/dev/exca/excareg.h user/markj/netdump/sys/dev/exca/excavar.h user/markj/netdump/sys/dev/iicbus/icee.c user/markj/netdump/sys/dev/ixgb/if_ixgb.c user/markj/netdump/sys/dev/nand/nfc_at91.h user/markj/netdump/sys/dev/nvme/nvme_ctrlr.c user/markj/netdump/sys/dev/nvme/nvme_ns.c user/markj/netdump/sys/dev/nvme/nvme_qpair.c user/markj/netdump/sys/dev/oce/oce_if.h user/markj/netdump/sys/dev/oce/oce_mbox.c user/markj/netdump/sys/dev/pccbb/pccbbvar.h user/markj/netdump/sys/dev/uart/uart_dev_snps.c user/markj/netdump/sys/kern/link_elf.c user/markj/netdump/sys/kern/uipc_syscalls.c user/markj/netdump/sys/modules/Makefile user/markj/netdump/sys/net/iflib.c user/markj/netdump/sys/powerpc/booke/locore.S user/markj/netdump/sys/powerpc/mpc85xx/mpc85xx.c user/markj/netdump/sys/powerpc/mpc85xx/mpc85xx.h user/markj/netdump/sys/powerpc/mpc85xx/platform_mpc85xx.c user/markj/netdump/sys/powerpc/powermac/macio.c user/markj/netdump/sys/x86/acpica/acpi_wakeup.c user/markj/netdump/sys/x86/include/x86_var.h user/markj/netdump/tests/sys/capsicum/Makefile user/markj/netdump/tools/tools/nanobsd/dhcpd/common user/markj/netdump/tools/tools/nanobsd/dhcpd/os-base user/markj/netdump/tools/tools/nanobsd/embedded/beaglebone.cfg user/markj/netdump/tools/tools/nanobsd/embedded/common user/markj/netdump/tools/tools/nanobsd/embedded/i386.cfg user/markj/netdump/tools/tools/nanobsd/embedded/pandaboard.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-amd64-uefi-bios.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-amd64-uefi.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-amd64.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-armv7.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-i386.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-mips.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-mips64.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-powerpc.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-powerpc64.cfg user/markj/netdump/tools/tools/nanobsd/embedded/qemu-sparc64.cfg user/markj/netdump/tools/tools/nanobsd/embedded/rpi.cfg user/markj/netdump/tools/tools/nanobsd/embedded/rpi2.cfg user/markj/netdump/tools/tools/nanobsd/embedded/rpi3.cfg user/markj/netdump/tools/tools/nanobsd/embedded/sam9260ek.cfg user/markj/netdump/tools/tools/nanobsd/embedded/sam9g20ek.cfg user/markj/netdump/usr.bin/seq/seq.1 user/markj/netdump/usr.bin/seq/seq.c user/markj/netdump/usr.sbin/Makefile user/markj/netdump/usr.sbin/bhyve/Makefile user/markj/netdump/usr.sbin/bhyve/bhyve.8 user/markj/netdump/usr.sbin/bhyve/bhyverun.c user/markj/netdump/usr.sbin/bhyve/mem.c user/markj/netdump/usr.sbin/bhyve/mem.h user/markj/netdump/usr.sbin/pwd_mkdb/pwd_mkdb.8 user/markj/netdump/usr.sbin/pwd_mkdb/pwd_mkdb.c Directory Properties: user/markj/netdump/ (props changed) Modified: user/markj/netdump/ObsoleteFiles.inc ============================================================================== --- user/markj/netdump/ObsoleteFiles.inc Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/ObsoleteFiles.inc Tue May 1 18:28:42 2018 (r333148) @@ -38,6 +38,13 @@ # xargs -n1 | sort | uniq -d; # done +# 20180501: retire lmc +OLD_FILES+=usr/include/dev/lmc/if_lmc.h +OLD_DIRS+=usr/include/dev/lmc +OLD_FILES+=usr/sbin/lmcconfig +OLD_FILES+=usr/share/man/man4/lmc.4.gz +OLD_FILES+=usr/share/man/man4/if_lmc.4.gz +OLD_FILES+=usr/share/man/man8/lmcconfig.8.gz # 20180417: remove fuswintr and suswintr OLD_FILES+=usr/share/man/man9/fuswintr.9.gz OLD_FILES+=usr/share/man/man9/suswintr.9.gz Modified: user/markj/netdump/UPDATING ============================================================================== --- user/markj/netdump/UPDATING Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/UPDATING Tue May 1 18:28:42 2018 (r333148) @@ -51,6 +51,12 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: ****************************** SPECIAL WARNING: ****************************** +20180501: + The lmc(4) driver has been removed. This was a WAN interface + card that was already reportedly rare in 2003, and had an ambiguous + license. If you have device lmc in your kernel config file it must + be removed. + 20180413: Support for Arcnet networks has been removed. If you have device arcnet or device cm in your kernel config file they must be Modified: user/markj/netdump/etc/rc.d/devmatch ============================================================================== --- user/markj/netdump/etc/rc.d/devmatch Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/etc/rc.d/devmatch Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,6 @@ #!/bin/sh -# Copyright (c) 2018 Warner Losh -# All rights reserved. +# Copyright (c) 2018 M. Warner Losh # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: user/markj/netdump/include/Makefile ============================================================================== --- user/markj/netdump/include/Makefile Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/include/Makefile Tue May 1 18:28:42 2018 (r333148) @@ -45,7 +45,7 @@ LDIRS= bsm cam geom net net80211 netgraph netinet neti LSUBDIRS= cam/ata cam/mmc cam/nvme cam/scsi \ dev/acpica dev/agp dev/an dev/bktr dev/ciss dev/filemon dev/firewire \ dev/hwpmc dev/hyperv \ - dev/ic dev/iicbus dev/io dev/lmc dev/mfi dev/mmc dev/nvme \ + dev/ic dev/iicbus dev/io dev/mfi dev/mmc dev/nvme \ dev/ofw dev/pbio dev/pci ${_dev_powermac_nvram} dev/ppbus dev/smbus \ dev/speaker dev/tcp_log dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/msdosfs fs/nandfs fs/nfs fs/nullfs \ Modified: user/markj/netdump/lib/libbluetooth/bluetooth.3 ============================================================================== --- user/markj/netdump/lib/libbluetooth/bluetooth.3 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/lib/libbluetooth/bluetooth.3 Tue May 1 18:28:42 2018 (r333148) @@ -25,7 +25,7 @@ .\" $Id: bluetooth.3,v 1.5 2003/05/20 23:04:30 max Exp $ .\" $FreeBSD$ .\" -.Dd April 30, 2018 +.Dd May 1, 2018 .Dt BLUETOOTH 3 .Os .Sh NAME @@ -132,7 +132,7 @@ .Fn bt_devremote_name "char const *devname" "const bdaddr_t *remote" \ "time_t to" "uint16_t clk_off" "uint8_t ps_rep_mode" "uint8_t ps_mode" .Ft char * -.Fn bt_devremote_name_gen "char const *devname" "const bdaddr_t *remote" +.Fn bt_devremote_name_gen "char const *btooth_devname" "const bdaddr_t *remote" .Ft int .Fn bdaddr_same "const bdaddr_t *a" "const bdaddr_t *b" .Ft int Modified: user/markj/netdump/lib/libbluetooth/bluetooth.h ============================================================================== --- user/markj/netdump/lib/libbluetooth/bluetooth.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/lib/libbluetooth/bluetooth.h Tue May 1 18:28:42 2018 (r333148) @@ -189,9 +189,9 @@ int bt_devinfo (struct bt_devinfo *di); int bt_devenum (bt_devenum_cb_t cb, void *arg); static __inline char * -bt_devremote_name_gen(char const *devname, const bdaddr_t *remote) +bt_devremote_name_gen(char const *btooth_devname, const bdaddr_t *remote) { - return (bt_devremote_name(devname, remote, 0, 0x0000, + return (bt_devremote_name(btooth_devname, remote, 0, 0x0000, NG_HCI_SCAN_REP_MODE0, NG_HCI_MANDATORY_PAGE_SCAN_MODE)); } Modified: user/markj/netdump/lib/libc/sys/bindat.2 ============================================================================== --- user/markj/netdump/lib/libc/sys/bindat.2 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/lib/libc/sys/bindat.2 Tue May 1 18:28:42 2018 (r333148) @@ -46,7 +46,15 @@ The .Fn bindat system call assigns the local protocol address to a socket. -It works just like the +When passed the special value +.Dv AT_FDCWD +in the +.Fa fd +parameter, the behavior is identical to a call to +.Xr bind 2 . +Otherwise, +.Fn bindat +works like the .Xr bind 2 system call with two exceptions: .Pp @@ -60,15 +68,6 @@ If the file path stored in the field of the sockaddr_un structure is a relative path, it is located relative to the directory associated with the file descriptor .Fa fd . -If -.Fn bindat -is passed the special value -.Dv AT_FDCWD -in the -.Fa fd -parameter, the current working directory is used and the behavior is identical -to a call to -.Xr bind 2 . .El .Sh RETURN VALUES .Rv -std bindat @@ -77,7 +76,7 @@ The .Fn bindat system call may fail with the same errors as the .Xr bind 2 -system call for a UNIX domain socket or with the following errors: +system call or with the following errors: .Bl -tag -width Er .It Bq Er EBADF The Modified: user/markj/netdump/lib/libc/sys/connectat.2 ============================================================================== --- user/markj/netdump/lib/libc/sys/connectat.2 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/lib/libc/sys/connectat.2 Tue May 1 18:28:42 2018 (r333148) @@ -46,7 +46,15 @@ The .Fn connectat system call initiates a connection on a socket. -It works just like the +When passed the special value +.Dv AT_FDCWD +in the +.Fa fd +parameter, the behavior is identical to a call to +.Xr connect 2 . +Otherwise, +.Fn connectat +works like the .Xr connect 2 system call with two exceptions: .Pp @@ -60,15 +68,6 @@ If the file path stored in the field of the sockaddr_un structure is a relative path, it is located relative to the directory associated with the file descriptor .Fa fd . -If -.Fn connectat -is passed the special value -.Dv AT_FDCWD -in the -.Fa fd -parameter, the current working directory is used and the behavior is identical -to a call to -.Xr connect 2 . .El .Sh RETURN VALUES .Rv -std connectat @@ -77,7 +76,7 @@ The .Fn connectat system call may fail with the same errors as the .Xr connect 2 -system call for a UNIX domain socket or with the following errors: +system call or with the following errors: .Bl -tag -width Er .It Bq Er EBADF The Modified: user/markj/netdump/lib/libsysdecode/Makefile ============================================================================== --- user/markj/netdump/lib/libsysdecode/Makefile Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/lib/libsysdecode/Makefile Tue May 1 18:28:42 2018 (r333148) @@ -120,9 +120,6 @@ CFLAGS+=-DPF # Workaround duplicate declarations in <netinet/ip_compat.h> CFLAGS.gcc.ioctl.c+= -Wno-redundant-decls -# Workaround warning for unused ssi_cables[] in <dev/lmc/if_lmc.h> -CFLAGS.gcc.ioctl.c+= -Wno-unused - CFLAGS.gcc+= ${CFLAGS.gcc.${.IMPSRC}} DEPENDOBJS+= tables.h Modified: user/markj/netdump/share/man/man4/Makefile ============================================================================== --- user/markj/netdump/share/man/man4/Makefile Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/share/man/man4/Makefile Tue May 1 18:28:42 2018 (r333148) @@ -266,7 +266,6 @@ MAN= aac.4 \ ${_linux.4} \ liquidio.4 \ lm75.4 \ - lmc.4 \ lo.4 \ lp.4 \ lpbb.4 \ @@ -480,7 +479,7 @@ MAN= aac.4 \ sio.4 \ sis.4 \ sk.4 \ - smartpqi.4 \ + ${_smartpqi.4} \ smb.4 \ smbus.4 \ smp.4 \ @@ -689,7 +688,6 @@ MLINKS+=lagg.4 trunk.4 MLINKS+=lagg.4 if_lagg.4 MLINKS+=le.4 if_le.4 MLINKS+=lge.4 if_lge.4 -MLINKS+=lmc.4 if_lmc.4 MLINKS+=lo.4 loop.4 MLINKS+=lp.4 plip.4 MLINKS+=malo.4 if_malo.4 @@ -880,6 +878,7 @@ _qlxgb.4= qlxgb.4 _qlxgbe.4= qlxgbe.4 _qlnxe.4= qlnxe.4 _sfxge.4= sfxge.4 +_smartpqi.4= smartpqi.4 MLINKS+=qlxge.4 if_qlxge.4 MLINKS+=qlxgb.4 if_qlxgb.4 Modified: user/markj/netdump/share/man/man4/ixgb.4 ============================================================================== --- user/markj/netdump/share/man/man4/ixgb.4 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/share/man/man4/ixgb.4 Tue May 1 18:28:42 2018 (r333148) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 18, 2006 +.Dd April 30, 2018 .Dt IXGB 4 .Os .Sh NAME @@ -51,6 +51,12 @@ module at boot time, place the following line in .Bd -literal -offset indent if_ixgb_load="YES" .Ed +.Sh DEPRECATION NOTICE +The +.Nm +driver is not present in +.Fx 12.0 +and later. .Sh DESCRIPTION The .Nm Modified: user/markj/netdump/share/man/man4/rights.4 ============================================================================== --- user/markj/netdump/share/man/man4/rights.4 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/share/man/man4/rights.4 Tue May 1 18:28:42 2018 (r333148) @@ -32,7 +32,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 17, 2016 +.Dd April 30, 2018 .Dt RIGHTS 4 .Os .Sh NAME @@ -94,8 +94,15 @@ Permit and .Xr acl_set_fd_np 3 . .It Dv CAP_BIND -Permit -.Xr bind 2 . +When not in capabilities mode, permit +.Xr bind 2 +and +.Xr bindat 2 +with special value +.Dv AT_FDCWD +in the +.Fa fd +parameter. Note that sockets can also become bound implicitly as a result of .Xr connect 2 or @@ -116,9 +123,16 @@ An alias to and .Dv CAP_LOOKUP . .It Dv CAP_CONNECT -Permit -.Xr connect 2 ; -also required for +When not in capabilities mode, permit +.Xr connect 2 +and +.Xr connectat 2 +with special value +.Dv AT_FDCWD +in the +.Fa fd +parameter. +This right is also required for .Xr sendto 2 with a non-NULL destination address. .It Dv CAP_CONNECTAT Modified: user/markj/netdump/share/man/man4/sn.4 ============================================================================== --- user/markj/netdump/share/man/man4/sn.4 Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/share/man/man4/sn.4 Tue May 1 18:28:42 2018 (r333148) @@ -1,6 +1,5 @@ .\" -.\" Copyright (c) 2000 Warner Losh -.\" All rights reserved. +.\" Copyright (c) 2000 M. Warner Losh .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions Modified: user/markj/netdump/stand/common/zfs_cmd.c ============================================================================== --- user/markj/netdump/stand/common/zfs_cmd.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/stand/common/zfs_cmd.c Tue May 1 18:28:42 2018 (r333148) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2018 Warner Losh <imp@freebd.org> - * All rights reserved. + * Copyright (c) 2018 M. Warner Losh <imp@freebd.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/stand/liblua/float.h ============================================================================== --- user/markj/netdump/stand/liblua/float.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/stand/liblua/float.h Tue May 1 18:28:42 2018 (r333148) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2018 M Warner Losh - * All rights reserved. + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/stand/liblua/locale.h ============================================================================== --- user/markj/netdump/stand/liblua/locale.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/stand/liblua/locale.h Tue May 1 18:28:42 2018 (r333148) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2018 M Warner Losh - * All rights reserved. + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/stand/liblua/math.h ============================================================================== --- user/markj/netdump/stand/liblua/math.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/stand/liblua/math.h Tue May 1 18:28:42 2018 (r333148) @@ -1,6 +1,5 @@ /*- - * Copyright (c) 2018 M Warner Losh - * All rights reserved. + * Copyright (c) 2018 M. Warner Losh * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/allwinner/aw_machdep.c ============================================================================== --- user/markj/netdump/sys/arm/allwinner/aw_machdep.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/allwinner/aw_machdep.c Tue May 1 18:28:42 2018 (r333148) @@ -164,30 +164,6 @@ allwinner_cpu_reset(platform_t plat) while (1); } -/* - * To use early printf on Allwinner SoC, add to kernel config - * options SOCDEV_PA=0x01C00000 - * options SOCDEV_VA=0x10000000 - * options EARLY_PRINTF - * And remove the if 0 -*/ -#if 0 -#ifdef EARLY_PRINTF -static void -allwinner_early_putc(int c) -{ - volatile uint32_t * UART_STAT_REG = (uint32_t *)0x1002807C; - volatile uint32_t * UART_TX_REG = (uint32_t *)0x10028000; - const uint32_t UART_TXRDY = (1 << 2); - - while ((*UART_STAT_REG & UART_TXRDY) == 0) - continue; - *UART_TX_REG = c; -} -early_putc_t *early_putc = allwinner_early_putc; -#endif /* EARLY_PRINTF */ -#endif - #if defined(SOC_ALLWINNER_A10) static platform_method_t a10_methods[] = { PLATFORMMETHOD(platform_attach, a10_attach), Modified: user/markj/netdump/sys/arm/at91/at91_aic.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_aic.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_aic.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_common.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_common.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_common.c Tue May 1 18:28:42 2018 (r333148) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 M. Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_gpio.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_gpio.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_gpio.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 M. Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_mci.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_mci.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_mci.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Bernd Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2010 Greg Ansley. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/at91_mcireg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_mcireg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_mcireg.h Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2006 Berndt Walter. All rights reserved. - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_ohci.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_ohci.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_ohci.c Tue May 1 18:28:42 2018 (r333148) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_ohci_fdt.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_ohci_fdt.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_ohci_fdt.c Tue May 1 18:28:42 2018 (r333148) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_pdcreg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pdcreg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pdcreg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_pinctrl.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pinctrl.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pinctrl.c Tue May 1 18:28:42 2018 (r333148) @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2014 Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_pio.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pio.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pio.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * Copyright (C) 2012 Ian Lepore. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/at91_pioreg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pioreg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pioreg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_piovar.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_piovar.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_piovar.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_pmc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pmc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pmc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2010 Greg Ansley. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/at91_pmcreg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pmcreg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pmcreg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. All rights reserved. + * Copyright (c) 2005 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_pmcvar.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_pmcvar.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_pmcvar.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. All rights reserved. + * Copyright (c) 2005 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_rtc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_rtc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_rtc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2012 Ian Lepore. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/at91_rtcreg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_rtcreg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_rtcreg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_sdramc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_sdramc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_sdramc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_shdwc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_shdwc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_shdwc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_smc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_smc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_smc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 M. Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_smc.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_smc.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_smc.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 M. Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_spireg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_spireg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_spireg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_ssc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_ssc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_ssc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_sscreg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_sscreg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_sscreg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_streg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_streg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_streg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2005 M. Warner Losh. All rights reserved. + * Copyright (c) 2005 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_tcb.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_tcb.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_tcb.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2014 Warner Losh. All rights reserved. + * Copyright (c) 2014 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_twi.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_twi.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_twi.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_twiio.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_twiio.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_twiio.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91_twireg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91_twireg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91_twireg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91board.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91board.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91board.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2008 Warner Losh. All rights reserved. + * Copyright (c) 2008 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91rm9200_devices.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91rm9200_devices.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91rm9200_devices.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 M. Warner Losh. All Rights Reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91rm9200var.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91rm9200var.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91rm9200var.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 M. Warner Losh. All rights reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91sam9x5.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91sam9x5.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91sam9x5.c Tue May 1 18:28:42 2018 (r333148) @@ -3,7 +3,7 @@ * * Copyright (c) 2005 Olivier Houchard. All rights reserved. * Copyright (c) 2010 Greg Ansley. All rights reserved. - * Copyright (c) 2012 M. Warner Losh.. All rights reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91soc.c ============================================================================== --- user/markj/netdump/sys/arm/at91/at91soc.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91soc.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 Warner Losh. All rights reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/at91soc.h ============================================================================== --- user/markj/netdump/sys/arm/at91/at91soc.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/at91soc.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 Warner Losh. All rights reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_bwct.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_bwct.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_bwct.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2012 Warner Losh. All rights reserved. + * Copyright (c) 2005-2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_eb9200.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_eb9200.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_eb9200.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2012 Warner Losh. All rights reserved. + * Copyright (c) 2005-2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_hl200.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_hl200.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_hl200.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2012 Warner Losh. All rights reserved. + * Copyright (c) 2005-2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_hl201.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_hl201.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_hl201.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2008 Warner Losh. All rights reserved. + * Copyright (c) 2005-2008 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_kb920x.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_kb920x.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_kb920x.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2012 Warner Losh. All rights reserved. + * Copyright (c) 2005-2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/at91/board_tsc4370.c ============================================================================== --- user/markj/netdump/sys/arm/at91/board_tsc4370.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/board_tsc4370.c Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005-2008 Olivier Houchard. All rights reserved. - * Copyright (c) 2005-2012 Warner Losh. All rights reserved. + * Copyright (c) 2005-2012 M. Warner Losh. * Copyright (c) 2007-2014 Ian Lepore. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/if_ate.c ============================================================================== --- user/markj/netdump/sys/arm/at91/if_ate.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/if_ate.c Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * Copyright (c) 2009 Greg Ansley. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/at91/if_atereg.h ============================================================================== --- user/markj/netdump/sys/arm/at91/if_atereg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/at91/if_atereg.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2006 M. Warner Losh. All rights reserved. + * Copyright (c) 2006 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/conf/genboardid.awk ============================================================================== --- user/markj/netdump/sys/arm/conf/genboardid.awk Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/conf/genboardid.awk Tue May 1 18:28:42 2018 (r333148) @@ -4,7 +4,7 @@ #- # SPDX-License-Identifier: BSD-2-Clause-FreeBSD # -# Copyright (c) 2012 M. Warner Losh. All Rights Reserved. +# Copyright (c) 2012 M. Warner Losh. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/include/_bus.h ============================================================================== --- user/markj/netdump/sys/arm/include/_bus.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/include/_bus.h Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2005 M. Warner Losh. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/include/at91_gpio.h ============================================================================== --- user/markj/netdump/sys/arm/include/at91_gpio.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/include/at91_gpio.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (C) 2006 M. Warner Losh. All rights reserved. + * Copyright (C) 2006 M. Warner Losh. * Copyright (C) 2012 Ian Lepore. All rights reserved. * * Redistribution and use in source and binary forms, with or without Modified: user/markj/netdump/sys/arm/include/atags.h ============================================================================== --- user/markj/netdump/sys/arm/include/atags.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/include/atags.h Tue May 1 18:28:42 2018 (r333148) @@ -2,7 +2,6 @@ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * * Copyright (c) 2012 M. Warner Losh. - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/arm/include/board.h ============================================================================== --- user/markj/netdump/sys/arm/include/board.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/arm/include/board.h Tue May 1 18:28:42 2018 (r333148) @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause-FreeBSD * - * Copyright (c) 2012 Warner Losh. All rights reserved. + * Copyright (c) 2012 M. Warner Losh. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions Modified: user/markj/netdump/sys/cam/cam_periph.c ============================================================================== --- user/markj/netdump/sys/cam/cam_periph.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/cam/cam_periph.c Tue May 1 18:28:42 2018 (r333148) @@ -1148,6 +1148,10 @@ cam_periph_ccbwait(union ccb *ccb) ccb->ccb_h.status, ccb->ccb_h.pinfo.index)); } +/* + * Dispatch a CCB and wait for it to complete. If the CCB has set a + * callback function (ccb->ccb_h.cbfcnp), it will be overwritten and lost. + */ int cam_periph_runccb(union ccb *ccb, int (*error_routine)(union ccb *ccb, @@ -1201,9 +1205,9 @@ cam_periph_runccb(union ccb *ccb, /* * If we're polling, then we need to ensure that we have ample resources - * in the periph. - * cam_periph_error can reschedule the ccb by calling xpt_action and returning - * ERESTART, so we have to effect the polling in the do loop below. + * in the periph. cam_periph_error can reschedule the ccb by calling + * xpt_action and returning ERESTART, so we have to effect the polling + * in the do loop below. */ if (must_poll) { timeout = xpt_poll_setup(ccb); Modified: user/markj/netdump/sys/conf/NOTES ============================================================================== --- user/markj/netdump/sys/conf/NOTES Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/conf/NOTES Tue May 1 18:28:42 2018 (r333148) @@ -1986,7 +1986,6 @@ device xmphy # XaQti XMAC II # Yukon II Gigabit controllers, including 88E8021, 88E8022, 88E8061, # 88E8062, 88E8035, 88E8036, 88E8038, 88E8050, 88E8052, 88E8053, # 88E8055, 88E8056 and D-Link 560T/550SX. -# lmc: Support for the LMC/SBE wide-area network interface cards. # mlx5: Mellanox ConnectX-4 and ConnectX-4 LX IB and Eth shared code module. # mlx5en:Mellanox ConnectX-4 and ConnectX-4 LX PCIe Ethernet adapters. # my: Myson Fast Ethernet (MTD80X, MTD89X) @@ -2139,9 +2138,6 @@ device ti # Alteon Networks Tigon I/II gigabit Ether device txp # 3Com 3cR990 (``Typhoon'') device vx # 3Com 3c590, 3c595 (``Vortex'') device vxge # Exar/Neterion XFrame 3100 10GbE - -# PCI WAN adapters. -device lmc # PCI IEEE 802.11 Wireless NICs device ath # Atheros pci/cardbus NIC's Modified: user/markj/netdump/sys/conf/files ============================================================================== --- user/markj/netdump/sys/conf/files Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/conf/files Tue May 1 18:28:42 2018 (r333148) @@ -2373,7 +2373,6 @@ lio_23xx_nic.bin.fw optional lio \ compile-with "${NORMAL_FW}" \ no-obj no-implicit-rule \ clean "lio_23xx_nic.bin.fw" -dev/lmc/if_lmc.c optional lmc dev/malo/if_malo.c optional malo dev/malo/if_malohal.c optional malo dev/malo/if_malo_pci.c optional malo pci Modified: user/markj/netdump/sys/dev/cxgbe/common/t4_msg.h ============================================================================== --- user/markj/netdump/sys/dev/cxgbe/common/t4_msg.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/dev/cxgbe/common/t4_msg.h Tue May 1 18:28:42 2018 (r333148) @@ -308,9 +308,14 @@ union opcode_tid { /* partitioning of TID fields that also carry a queue id */ #define S_TID_TID 0 -#define M_TID_TID 0x3fff +#define M_TID_TID 0x7ff #define V_TID_TID(x) ((x) << S_TID_TID) #define G_TID_TID(x) (((x) >> S_TID_TID) & M_TID_TID) + +#define S_TID_COOKIE 11 +#define M_TID_COOKIE 0x7 +#define V_TID_COOKIE(x) ((x) << S_TID_COOKIE) +#define G_TID_COOKIE(x) (((x) >> S_TID_COOKIE) & M_TID_COOKIE) #define S_TID_QID 14 #define M_TID_QID 0x3ff Modified: user/markj/netdump/sys/dev/cxgbe/offload.h ============================================================================== --- user/markj/netdump/sys/dev/cxgbe/offload.h Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/dev/cxgbe/offload.h Tue May 1 18:28:42 2018 (r333148) @@ -66,9 +66,10 @@ struct stid_region { }; /* - * Max # of ATIDs. The absolute HW max is 16K but we keep it lower. + * Max # of ATIDs. The absolute HW max is 14b (enough for 16K) but we reserve + * the upper 3b for use as a cookie to demux the reply. */ -#define MAX_ATIDS 8192U +#define MAX_ATIDS 2048U union aopen_entry { void *data; Modified: user/markj/netdump/sys/dev/cxgbe/t4_main.c ============================================================================== --- user/markj/netdump/sys/dev/cxgbe/t4_main.c Tue May 1 17:48:50 2018 (r333147) +++ user/markj/netdump/sys/dev/cxgbe/t4_main.c Tue May 1 18:28:42 2018 (r333148) @@ -469,6 +469,8 @@ TUNABLE_INT("hw.cxgbe.num_vis", &t4_num_vis); static int pcie_relaxed_ordering = -1; TUNABLE_INT("hw.cxgbe.pcie_relaxed_ordering", &pcie_relaxed_ordering); +static int t4_panic_on_fatal_err = 0; +TUNABLE_INT("hw.cxgbe.panic_on_fatal_err", &t4_panic_on_fatal_err); #ifdef TCP_OFFLOAD /* @@ -1317,17 +1319,17 @@ t4_detach_common(device_t dev) sc = device_get_softc(dev); *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805011828.w41ISg5W071932>