svn commit: r322652 - stable/10/sbin/route

2017-08-18 Thread Konstantin Belousov
Author: kib
Date: Fri Aug 18 11:22:49 2017
New Revision: 322652
URL: https://svnweb.freebsd.org/changeset/base/322652

Log:
  MFC r322550:
  Typo, the '-6' option selects inet6.
  
  Approved by:  re (delphij)

Modified:
  stable/10/sbin/route/route.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sbin/route/route.8
==
--- stable/10/sbin/route/route.8Fri Aug 18 10:38:49 2017
(r322651)
+++ stable/10/sbin/route/route.8Fri Aug 18 11:22:49 2017
(r322652)
@@ -68,7 +68,7 @@ Specify
 address family as family hint for subcommands.
 .It Fl 6
 Specify
-.Cm inet
+.Cm inet6
 address family as family hint for subcommands.
 .It Fl d
 Run in debug-only mode, i.e., do not actually modify the routing table.
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"


svn commit: r322661 - in stable/10/sys/dev: mpr mps

2017-08-18 Thread Kenneth D. Merry
Author: ken
Date: Fri Aug 18 15:38:08 2017
New Revision: 322661
URL: https://svnweb.freebsd.org/changeset/base/322661

Log:
  MFC r321502, r321714, r321733, r321737, r321799, r322364:
  

r321502 | scottl | 2017-07-25 19:48:13 -0600 (Tue, 25 Jul 2017) | 2 lines
  
Quiet a message that sounds far more dire than it really is.
  

r321714 | scottl | 2017-07-30 00:53:58 -0600 (Sun, 30 Jul 2017) | 13 lines
  
Split the interrupt setup code into two parts: allocation and 
configuration.
Do the allocation before requesting the IOCFacts message.  This triggers
the LSI firmware to recognize the multiqueue should be enabled if 
available.
Multiqueue isn't used by the driver yet, but this also fixes a problem 
with
the cached IOCFacts not matching latter checks, leading to potential 
problems
with error recovery.
  
As a side-effect, fetch the driver tunables as early as possible.
  
Reviewed by:slm
Obtained from:  Netflix
Differential Revision:  D9243
  

r321733 | scottl | 2017-07-30 16:34:24 -0600 (Sun, 30 Jul 2017) | 5 lines
  
Change from using underbar function names to normal function names for
the informational print functions.  Collapse the debug API a bit to be
more generic and not require as much code duplication.  While here, fix
a bug in MPS that was already fixed in MPR.
  

r321737 | scottl | 2017-07-30 18:05:49 -0600 (Sun, 30 Jul 2017) | 3 lines
  
Don't re-parse PCI IDs in order to set card-specific flags, use
the flags field in the PCIID table.
  

r321799 | scottl | 2017-07-31 10:55:56 -0600 (Mon, 31 Jul 2017) | 4 lines
  
Fix a logic bug in the split PCI interrupt code that slipped through
  
Reported by:Harry Schmalzbauer
  

r322364 | ken | 2017-08-10 08:59:17 -0600 (Thu, 10 Aug 2017) | 39 lines
  
Changes to make mps(4) and mpr(4) handle reinit with reallocation.
  
When the mps(4) and mpr(4) drivers need to reinitialize the
firmware, they sometimes need to reallocate all of the memory
allocated by the driver.  The reallocation happens whenever the IOC
Facts change.  That should only happen after a firmware upgrade.
  
If the reinitialization happens as a result of a timed out command
sent to the card, the command that timed out and triggered the
reinit may have been freed if iocfacts_allocate() reallocated all
memory.  If the caller attempts to access the command after that,
the kernel will panic because the caller will be dereferencing
freed memory.
  
The solution is to set a flag in the softc when we reallocate,
and avoid dereferencing the command strucure if we've reallocated.
  
The changes are largely the same in both drivers, since mpr(4) is a
derivative of mps(4).
  
 o In iocfacts_allocate(), if the IOC Facts have changed and we
   need to reallocate, set the REALLOCATED flag in the softc.
  
 o Change wait_command() to take a struct mps_command ** instead of
   a struct mps_command *.  This allows us to NULL out the caller's
   command pointer if we have to reinit the controller and the data
   structures get reallocated.  (The REALLOCATED flag will be set
   in the softc if that has happened.)
  
 o In every place that calls wait_command(), make sure we handle
   the case where the command is NULL after the call.
  
 o The mpr(4) driver has mpr_request_polled() which can also
   reinitialize the card.  Also check for reallocation there.
  
Reviewed by:scottl, slm
Sponsored by:   Spectra Logic
  

  
  Approved by:  re (marius)

Modified:
  stable/10/sys/dev/mpr/mpr.c
  stable/10/sys/dev/mpr/mpr_config.c
  stable/10/sys/dev/mpr/mpr_pci.c
  stable/10/sys/dev/mpr/mpr_sas.c
  stable/10/sys/dev/mpr/mpr_sas_lsi.c
  stable/10/sys/dev/mpr/mpr_table.c
  stable/10/sys/dev/mpr/mpr_table.h
  stable/10/sys/dev/mpr/mpr_user.c
  stable/10/sys/dev/mpr/mprvar.h
  stable/10/sys/dev/mps/mps.c
  stable/10/sys/dev/mps/mps_config.c
  stable/10/sys/dev/mps/mps_pci.c
  stable/10/sys/dev/mps/mps_sas.c
  stable/10/sys/dev/mps/mps_sas_lsi.c
  stable/10/sys/dev/mps/mps_table.c
  stable/10/sys/dev/mps/mps_table.h
  stable/10/sys/dev/mps/mps_user.c
  stable/10/sys/dev/mps/mpsvar.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/dev/mpr/mpr.c
=

svn commit: r322666 - stable/10/release/arm

2017-08-18 Thread Glen Barber
Author: gjb
Date: Fri Aug 18 16:43:59 2017
New Revision: 322666
URL: https://svnweb.freebsd.org/changeset/base/322666

Log:
  Create hard links to the installed dtb files for the BEAGLEBONE [1]
  and WANDBOARD [2] images to fix a boot issue.
  
  This is a direct commit to stable/10, as the change is not needed
  for head and stable/11.
  
  Approved by:  re (marius)
  Help from:manu [1], ian [2]
  Tested by:gjb [1], ian [2]
  Sponsored by: The FreeBSD Foundation

Modified:
  stable/10/release/arm/BEAGLEBONE.conf
  stable/10/release/arm/WANDBOARD.conf

Modified: stable/10/release/arm/BEAGLEBONE.conf
==
--- stable/10/release/arm/BEAGLEBONE.conf   Fri Aug 18 16:42:58 2017
(r322665)
+++ stable/10/release/arm/BEAGLEBONE.conf   Fri Aug 18 16:43:59 2017
(r322666)
@@ -28,6 +28,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
${FATMOUNT}/ubldr.bin
+   chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone.dtb \
+   ${UFSMOUNT}/boot/dtb/am335x-bone.dtb
+   chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/beaglebone-black.dtb \
+   ${UFSMOUNT}/boot/dtb/am335x-boneblack.dtb
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}

Modified: stable/10/release/arm/WANDBOARD.conf
==
--- stable/10/release/arm/WANDBOARD.confFri Aug 18 16:42:58 2017
(r322665)
+++ stable/10/release/arm/WANDBOARD.confFri Aug 18 16:43:59 2017
(r322666)
@@ -31,6 +31,10 @@ arm_install_uboot() {
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr ${FATMOUNT}/ubldr
chroot ${CHROOTDIR} cp -p ${UFSMOUNT}/boot/ubldr.bin \
${FATMOUNT}/ubldr.bin
+   chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6dl-wandboard.dtb \
+   ${UFSMOUNT}/boot/dtb/imx6dl-wandboard-revb1.dtb
+   chroot ${CHROOTDIR} ln ${UFSMOUNT}/boot/dtb/imx6q-wandboard.dtb
+   ${UFSMOUNT}/boot/dtb/imx6q-wandboard-revb1.dtb
chroot ${CHROOTDIR} touch ${UFSMOUNT}/firstboot
sync
umount_loop ${CHROOTDIR}/${FATMOUNT}
___
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"