date:20171228

svn commit: r327336 - head/sys/netinet

2017-12-28 Thread Cy Schubert

Author: cy
Date: Fri Dec 29 07:23:18 2017
New Revision: 327336
URL: https://svnweb.freebsd.org/changeset/base/327336

Log:
  Correct the comment describing badrs which is bad router solicitiation,
  not bad router advertisement.
  
  MFC after:3 days

Modified:
  head/sys/netinet/icmp6.h

Modified: head/sys/netinet/icmp6.h
==
--- head/sys/netinet/icmp6.hFri Dec 29 06:22:05 2017(r327335)
+++ head/sys/netinet/icmp6.hFri Dec 29 07:23:18 2017(r327336)
@@ -628,7 +628,7 @@ struct icmp6stat {
uint64_t icp6s_nd_badopt;   /* bad ND options */
uint64_t icp6s_badns;   /* bad neighbor solicitation */
uint64_t icp6s_badna;   /* bad neighbor advertisement */
-   uint64_t icp6s_badrs;   /* bad router advertisement */
+   uint64_t icp6s_badrs;   /* bad router solicitation */
uint64_t icp6s_badra;   /* bad router advertisement */
uint64_t icp6s_badredirect; /* bad redirect message */
 };
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327335 - head/sbin/fsdb

2017-12-28 Thread Xin LI

Author: delphij
Date: Fri Dec 29 06:22:05 2017
New Revision: 327335
URL: https://svnweb.freebsd.org/changeset/base/327335

Log:
  The fix in r327273 turns a memory leak into freeing wild pointer.
  Fix this by freeing only the initialized pointer.

Modified:
  head/sbin/fsdb/fsdb.c

Modified: head/sbin/fsdb/fsdb.c
==
--- head/sbin/fsdb/fsdb.c   Fri Dec 29 05:01:07 2017(r327334)
+++ head/sbin/fsdb/fsdb.c   Fri Dec 29 06:22:05 2017(r327335)
@@ -565,8 +565,10 @@ CMDFUNCSTART(findblk)
 end:
 curinum = ocurrent;
 curinode = ginode(curinum);
-free(wantedblk32);
-free(wantedblk64);
+if (is_ufs2)
+   free(wantedblk64);
+else
+   free(wantedblk32);
 return 0;
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327334 - head/share/misc

2017-12-28 Thread Eitan Adler

Author: eadler
Date: Fri Dec 29 05:01:07 2017
New Revision: 327334
URL: https://svnweb.freebsd.org/changeset/base/327334

Log:
  bsd-family-tree: add NetBSD 6.0.6
  
  This was a missing release. Released on the same day as 6.1.5 per
  https://blog.netbsd.org/tnf/entry/netbsd_6_1_5_and

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Fri Dec 29 04:49:59 2017
(r327333)
+++ head/share/misc/bsd-family-tree Fri Dec 29 05:01:07 2017
(r327334)
@@ -290,6 +290,9 @@ FreeBSD 5.2   |  | |  
  | |   |  |  | |  ||   |
  | |   |  |  | |   NetBSD  |   |
  | |   |  |  | |6.0.5  |   |
+ | |   |  |  | |  ||   |
+ | |   |  |  | |   NetBSD  |   |
+ | |   |  |  | |6.0.6  |   |
  | |   |  |  | |   |   |
  | |   |  |  | |`-NetBSD 6.1   |   |
  | |FreeBSD   |  |   | |   |
@@ -703,6 +706,7 @@ DragonFly 3.8.1 2014-06-16 [DFB]
 DragonFly 3.6.32014-06-17 [DFB]
 FreeBSD 9.32014-07-05 [FBD]
 DragonFly 3.8.22014-08-08 [DFB]
+NetBSD 6.0.6   2014-09-22 [NDB]
 NetBSD 6.1.5   2014-09-22 [NBD]
 Mac OS X 10.10 2014-10-16 [APL]
 OpenBSD 5.62014-11-01 [OBD]
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327333 - head/share/misc

2017-12-28 Thread Eitan Adler

Author: eadler
Date: Fri Dec 29 04:49:59 2017
New Revision: 327333
URL: https://svnweb.freebsd.org/changeset/base/327333

Log:
  bsd-family-tree: add HardenedBSD
  
  This adds HardenedBSD which is a pseudo-fork of FreeBSD. It hasn't had a
  release yet, but does does have active users and a community. As such
  document it as a branch off of FreeBSD-stable. Ideally this adds enough
  space so that future releases are easy enough to add.

Modified:
  head/share/misc/bsd-family-tree

Modified: head/share/misc/bsd-family-tree
==
--- head/share/misc/bsd-family-tree Fri Dec 29 02:30:21 2017
(r327332)
+++ head/share/misc/bsd-family-tree Fri Dec 29 04:49:59 2017
(r327333)
@@ -357,15 +357,23 @@ FreeBSD 5.2   |  | |  
  |  FreeBSD   |   | |  |   DragonFly 5.0.0
  |   11.1  FreeBSD| |  |   |
  | |10.4  | | OpenBSD 6.2  DragonFly 5.0.1
- | |  | |  |   |
- | |  | |  |   DragonFly 5.0.2
- | |  | |  |   |
- | |  | |  |   |
- | v  | |  |   |
- || |  |   |
-FreeBSD 12 -current   | NetBSD -current   OpenBSD -currentDragonFly 
-current
- || |  |   |
- vv v  v   v
+ | |  |   v |  |   |
+ | |  | |  |   DragonFly 5.0.2
+ | |  | |  |   |
+ | |   FreeBSD  |  |   |
+ | |   10-stable|  |   |
+ |  FreeBSD\|  |   |
+ |  11-stable   \   |  |   |
+ |/  `| |  |   |
+ | HardenedBSD| |  |   |
+ |  11-stable  HardenedBSD  |  |   |
+ |  10-stable   |  |   |
+ |  |  |   |
+ |  |  |   |
+ |  |  |   |
+FreeBSD 12 -current   NetBSD -current   OpenBSD -currentDragonFly -current
+ |  |  |   |
+ v  v  v   v
 
 Time
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327332 - head/sys/dev/cxgbe

2017-12-28 Thread Navdeep Parhar

Author: np
Date: Fri Dec 29 02:30:21 2017
New Revision: 327332
URL: https://svnweb.freebsd.org/changeset/base/327332

Log:
  cxgbe(4): Reduce duplication by consolidating minor variations of the
  same code into a single routine.
  
  Sponsored by: Chelsio Communications

Modified:
  head/sys/dev/cxgbe/t4_sge.c

Modified: head/sys/dev/cxgbe/t4_sge.c
==
--- head/sys/dev/cxgbe/t4_sge.c Fri Dec 29 00:59:56 2017(r327331)
+++ head/sys/dev/cxgbe/t4_sge.c Fri Dec 29 02:30:21 2017(r327332)
@@ -198,6 +198,8 @@ static int free_ring(struct adapter *, bus_dma_tag_t, 
 static int alloc_iq_fl(struct vi_info *, struct sge_iq *, struct sge_fl *,
 int, int);
 static int free_iq_fl(struct vi_info *, struct sge_iq *, struct sge_fl *);
+static void add_iq_sysctls(struct sysctl_ctx_list *, struct sysctl_oid *,
+struct sge_iq *);
 static void add_fl_sysctls(struct adapter *, struct sysctl_ctx_list *,
 struct sysctl_oid *, struct sge_fl *);
 static int alloc_fwq(struct adapter *);
@@ -2824,6 +2826,27 @@ free_iq_fl(struct vi_info *vi, struct sge_iq *iq, stru
 }
 
 static void
+add_iq_sysctls(struct sysctl_ctx_list *ctx, struct sysctl_oid *oid,
+struct sge_iq *iq)
+{
+   struct sysctl_oid_list *children = SYSCTL_CHILDREN(oid);
+
+   SYSCTL_ADD_UAUTO(ctx, children, OID_AUTO, "ba", CTLFLAG_RD, >ba,
+   "bus address of descriptor ring");
+   SYSCTL_ADD_INT(ctx, children, OID_AUTO, "dmalen", CTLFLAG_RD, NULL,
+   iq->qsize * IQ_ESIZE, "descriptor ring size in bytes");
+   SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "abs_id",
+   CTLTYPE_INT | CTLFLAG_RD, >abs_id, 0, sysctl_uint16, "I",
+   "absolute id of the queue");
+   SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cntxt_id",
+   CTLTYPE_INT | CTLFLAG_RD, >cntxt_id, 0, sysctl_uint16, "I",
+   "SGE context id of the queue");
+   SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "cidx",
+   CTLTYPE_INT | CTLFLAG_RD, >cidx, 0, sysctl_uint16, "I",
+   "consumer index");
+}
+
+static void
 add_fl_sysctls(struct adapter *sc, struct sysctl_ctx_list *ctx,
 struct sysctl_oid *oid, struct sge_fl *fl)
 {
@@ -2890,22 +2913,8 @@ alloc_fwq(struct adapter *sc)
 
oid = SYSCTL_ADD_NODE(>ctx, children, OID_AUTO, "fwq", CTLFLAG_RD,
NULL, "firmware event queue");
-   children = SYSCTL_CHILDREN(oid);
+   add_iq_sysctls(>ctx, oid, fwq);
 
-   SYSCTL_ADD_UAUTO(>ctx, children, OID_AUTO, "ba", CTLFLAG_RD,
-   >ba, "bus address of descriptor ring");
-   SYSCTL_ADD_INT(>ctx, children, OID_AUTO, "dmalen", CTLFLAG_RD, NULL,
-   fwq->qsize * IQ_ESIZE, "descriptor ring size in bytes");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "abs_id",
-   CTLTYPE_INT | CTLFLAG_RD, >abs_id, 0, sysctl_uint16, "I",
-   "absolute id of the queue");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "cntxt_id",
-   CTLTYPE_INT | CTLFLAG_RD, >cntxt_id, 0, sysctl_uint16, "I",
-   "SGE context id of the queue");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "cidx",
-   CTLTYPE_INT | CTLFLAG_RD, >cidx, 0, sysctl_uint16, "I",
-   "consumer index");
-
return (0);
 }
 
@@ -3007,19 +3016,7 @@ alloc_rxq(struct vi_info *vi, struct sge_rxq *rxq, int
NULL, "rx queue");
children = SYSCTL_CHILDREN(oid);
 
-   SYSCTL_ADD_UAUTO(>ctx, children, OID_AUTO, "ba", CTLFLAG_RD,
-   >iq.ba, "bus address of descriptor ring");
-   SYSCTL_ADD_INT(>ctx, children, OID_AUTO, "dmalen", CTLFLAG_RD, NULL,
-   rxq->iq.qsize * IQ_ESIZE, "descriptor ring size in bytes");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "abs_id",
-   CTLTYPE_INT | CTLFLAG_RD, >iq.abs_id, 0, sysctl_uint16, "I",
-   "absolute id of the queue");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "cntxt_id",
-   CTLTYPE_INT | CTLFLAG_RD, >iq.cntxt_id, 0, sysctl_uint16, "I",
-   "SGE context id of the queue");
-   SYSCTL_ADD_PROC(>ctx, children, OID_AUTO, "cidx",
-   CTLTYPE_INT | CTLFLAG_RD, >iq.cidx, 0, sysctl_uint16, "I",
-   "consumer index");
+   add_iq_sysctls(>ctx, oid, >iq);
 #if defined(INET) || defined(INET6)
SYSCTL_ADD_U64(>ctx, children, OID_AUTO, "lro_queued", CTLFLAG_RD,
>lro.lro_queued, 0, NULL);
@@ -3075,22 +3072,7 @@ alloc_ofld_rxq(struct vi_info *vi, struct sge_ofld_rxq
snprintf(name, sizeof(name), "%d", idx);
oid = SYSCTL_ADD_NODE(>ctx, children, OID_AUTO, name, CTLFLAG_RD,
NULL, "rx queue");
-   children = SYSCTL_CHILDREN(oid);
-
-   SYSCTL_ADD_UAUTO(>ctx, children, OID_AUTO, "ba", CTLFLAG_RD,
-   _rxq->iq.ba, "bus address of descriptor ring");
-   SYSCTL_ADD_INT(>ctx, children, OID_AUTO, "dmalen", CTLFLAG_RD, NULL,
-   ofld_rxq->iq.qsize * IQ_ESIZE, "descriptor ring size in bytes");
-

svn commit: r327331 - head/sys/dev/txp

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Fri Dec 29 00:59:56 2017
New Revision: 327331
URL: https://svnweb.freebsd.org/changeset/base/327331

Log:
  if_txpreg.h: drop clauses 3 and 4.
  
  Obtained from:OpenBSD (CVS 1.35)

Modified:
  head/sys/dev/txp/if_txpreg.h

Modified: head/sys/dev/txp/if_txpreg.h
==
--- head/sys/dev/txp/if_txpreg.hFri Dec 29 00:56:15 2017
(r327330)
+++ head/sys/dev/txp/if_txpreg.hFri Dec 29 00:59:56 2017
(r327331)
@@ -1,8 +1,8 @@
-/* $OpenBSD: if_txpreg.h,v 1.34 2001/11/05 17:25:58 art Exp $ */
+/* $OpenBSD: if_txpreg.h,v 1.35 2003/06/04 19:36:33 deraadt Exp $ */
 /* $FreeBSD$ */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause
  *
  * Copyright (c) 2001 Aaron Campbell .
  * All rights reserved.
@@ -15,11 +15,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Aaron Campbell.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327329 - head/sys/dev/txp

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Fri Dec 29 00:27:12 2017
New Revision: 327329
URL: https://svnweb.freebsd.org/changeset/base/327329

Log:
  dev/txp: Update if_txpreg.h to match OpenBSD's version.
  
  Resolve a minor mismatch: TXP_CMD_READ_VERSION instead of
  TXP_CMD_VERSIONS_READ.
  Curiously the later is defined but not used in OpenBSD.
  
  Obtained from:OpenBSD (CVS 1.31-1.34)
  MFC after:1 week

Modified:
  head/sys/dev/txp/if_txp.c
  head/sys/dev/txp/if_txpreg.h

Modified: head/sys/dev/txp/if_txp.c
==
--- head/sys/dev/txp/if_txp.c   Fri Dec 29 00:21:50 2017(r327328)
+++ head/sys/dev/txp/if_txp.c   Fri Dec 29 00:27:12 2017(r327329)
@@ -373,7 +373,7 @@ txp_attach(device_t dev)
 * diagnose sleep image specific issues.
 */
rsp = NULL;
-   if (txp_ext_command(sc, TXP_CMD_READ_VERSION, 0, 0, 0, NULL, 0,
+   if (txp_ext_command(sc, TXP_CMD_VERSIONS_READ, 0, 0, 0, NULL, 0,
, TXP_CMD_WAIT)) {
device_printf(dev, "can not read sleep image version\n");
error = ENXIO;

Modified: head/sys/dev/txp/if_txpreg.h
==
--- head/sys/dev/txp/if_txpreg.hFri Dec 29 00:21:50 2017
(r327328)
+++ head/sys/dev/txp/if_txpreg.hFri Dec 29 00:27:12 2017
(r327329)
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_txpreg.h,v 1.30 2001/06/23 04:18:02 jason Exp $ */
+/* $OpenBSD: if_txpreg.h,v 1.34 2001/11/05 17:25:58 art Exp $ */
 /* $FreeBSD$ */
 
 /*-
@@ -166,7 +166,7 @@
 #defineTXP_CMD_FILTER_TABLE_MODE_WRITE 0x3d
 #defineTXP_CMD_FILTER_TCL_WRITE0x3e
 #defineTXP_CMD_FILTER_TBL_READ 0x3f
-#defineTXP_CMD_READ_VERSION0x43
+#defineTXP_CMD_VERSIONS_READ   0x43
 #defineTXP_CMD_FILTER_DEFINE   0x45
 #defineTXP_CMD_ADD_WAKEUP_PKT  0x46
 #defineTXP_CMD_ADD_SLEEP_PKT   0x47
@@ -384,6 +384,7 @@ struct txp_frag_desc {
 #defineFRAG_FLAGS_TYPE_OPT 0x03/* type: options */
 #defineFRAG_FLAGS_TYPE_RX  0x04/* type: command */
 #defineFRAG_FLAGS_TYPE_RESP0x05/* type: response */
+#defineFRAG_FLAGS_VALID0x80/* valid descriptor */
 
 struct txp_opt_desc {
uint8_t opt_desctype:3,
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327318 - in head/sys: conf powerpc/ofw

2017-12-28 Thread Nathan Whitehorn

Author: nwhitehorn
Date: Thu Dec 28 23:49:53 2017
New Revision: 327318
URL: https://svnweb.freebsd.org/changeset/base/327318

Log:
  Remove ELF note for Open Firmware. It is marked optional in a single 1996
  draft of a never-finalized standard (CHRP) and is irrelevant in practice
  on FreeBSD since we load the kernel with loader(8) on Open Firmware
  platforms anyway. Moreover, loader(8), which is directly loaded by Open
  Firmware, has never had an equivalent note.
  
  MFC after:2 weeks

Deleted:
  head/sys/powerpc/ofw/ofwmagic.S
Modified:
  head/sys/conf/files.powerpc

Modified: head/sys/conf/files.powerpc
==
--- head/sys/conf/files.powerpc Thu Dec 28 22:57:34 2017(r327317)
+++ head/sys/conf/files.powerpc Thu Dec 28 23:49:53 2017(r327318)
@@ -158,7 +158,6 @@ powerpc/ofw/ofw_real.c  optionalaim
 powerpc/ofw/ofw_syscons.c  optionalsc aim
 powerpc/ofw/ofwcall32.Soptionalaim powerpc
 powerpc/ofw/ofwcall64.Soptionalaim powerpc64
-powerpc/ofw/ofwmagic.S optionalaim
 powerpc/ofw/openpic_ofw.c  optionalaim | fdt
 powerpc/ofw/rtas.c optionalaim
 powerpc/powermac/ata_kauai.c   optionalpowermac ata | powermac atamacio
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327319 - head/sys/vm

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 23:50:21 2017
New Revision: 327319
URL: https://svnweb.freebsd.org/changeset/base/327319

Log:
  Clean up the comment.
  
  Reviewed by:  alc, markj
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week
  Differential revision:https://reviews.freebsd.org/D13671

Modified:
  head/sys/vm/vm_swapout.c

Modified: head/sys/vm/vm_swapout.c
==
--- head/sys/vm/vm_swapout.cThu Dec 28 23:49:53 2017(r327318)
+++ head/sys/vm/vm_swapout.cThu Dec 28 23:50:21 2017(r327319)
@@ -715,8 +715,7 @@ loop:
}
 
/*
-* We would like to bring someone in. (only if there is space).
-* [What checks the space? ]
+* We would like to bring someone in.
 */
faultin(p);
PROC_UNLOCK(p);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327317 - in head/lib/libutil: . tests

2017-12-28 Thread Bartek Rutkowski

Author: robak (ports committer)
Date: Thu Dec 28 22:57:34 2017
New Revision: 327317
URL: https://svnweb.freebsd.org/changeset/base/327317

Log:
  humanize_number(3): fix math edge case in rounding large numbers
  
  Fix for remainder overflow, when in rare cases adding remainder to divider
  exceeded 1 and turned the total to 1000 in final formatting, taking up
  the space for the unit character.
  
  The fix continues the division of the original number if the above case
  happens -- added the appropriate check to the for loop performing
  the division. This lowers the value shown, to make it fit into the buffer
  space provided (1.0M for 4+1 character buffer, as used by ls).
  
  Add test case for the reported bug and extend test program to support
  providing buffer length (ls -lh uses 5, tests hard-coded 4).
  
  PR:   224498
  Submitted by: Pawel Biernacki 
  Reported by:  Masachika Ishizuka 
  Reviewed by:  cem, kib
  Approved by:  cem, kib
  MFC after:1 week
  Sponsored by: Mysterious Code Ltd.
  Differential Revision:D13578

Modified:
  head/lib/libutil/humanize_number.3
  head/lib/libutil/humanize_number.c
  head/lib/libutil/tests/humanize_number_test.c

Modified: head/lib/libutil/humanize_number.3
==
--- head/lib/libutil/humanize_number.3  Thu Dec 28 22:56:30 2017
(r327316)
+++ head/lib/libutil/humanize_number.3  Thu Dec 28 22:57:34 2017
(r327317)
@@ -200,3 +200,9 @@ The
 .Dv HN_IEC_PREFIXES
 flag was introduced in
 .Fx 9.0 .
+.Sh CAVEATS
+For numbers greater than 999 using buffer length of 4 and less can cause
+rounding errors.
+When using
+.Dv HN_IEC_PREFIXES
+the same error occurs for buffer length of 5 or less.

Modified: head/lib/libutil/humanize_number.c
==
--- head/lib/libutil/humanize_number.c  Thu Dec 28 22:56:30 2017
(r327316)
+++ head/lib/libutil/humanize_number.c  Thu Dec 28 22:57:34 2017
(r327317)
@@ -145,7 +145,8 @@ humanize_number(char *buf, size_t len, int64_t quotien
 */
for (i = 0;
(quotient >= max || (quotient == max - 1 &&
-   remainder >= divisordeccut)) && i < maxscale; i++) {
+   (remainder >= divisordeccut || remainder >=
+   divisor / 2))) && i < maxscale; i++) {
remainder = quotient % divisor;
quotient /= divisor;
}

Modified: head/lib/libutil/tests/humanize_number_test.c
==
--- head/lib/libutil/tests/humanize_number_test.c   Thu Dec 28 22:56:30 
2017(r327316)
+++ head/lib/libutil/tests/humanize_number_test.c   Thu Dec 28 22:57:34 
2017(r327317)
@@ -49,333 +49,337 @@ static struct {
int64_t num;
int flags;
int scale;
+   size_t buflen;
 } test_args[] = {
/* tests 0-13 test 1000 suffixes */
-   { 2, "0 ", (int64_t)0L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "1 k", (int64_t)500L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "1 M", (int64_t)500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "1 G", (int64_t)500*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "1 T", (int64_t)500*1000*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE 
},
-   { 3, "1 P", (int64_t)500*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE },
-   { 3, "1 E", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE },
-   { 2, "1 ", (int64_t)1L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "2 k", (int64_t)1500L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "2 M", (int64_t)1500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "2 G", (int64_t)1500*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE },
-   { 3, "2 T", (int64_t)1500*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE },
-   { 3, "2 P", (int64_t)1500*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE },
-   { 3, "2 E", (int64_t)1500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE },
+   { 2, "0 ", (int64_t)0L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "1 k", (int64_t)500L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "1 M", (int64_t)500*1000L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "1 G", (int64_t)500*1000*1000L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "1 T", (int64_t)500*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE, 4 },
+   { 3, "1 P", (int64_t)500*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE, 4 },
+   { 3, "1 E", (int64_t)500*1000*1000*1000*1000*1000L, HN_DIVISOR_1000, 
HN_AUTOSCALE, 4 },
+   { 2, "1 ", (int64_t)1L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "2 k", (int64_t)1500L, HN_DIVISOR_1000, HN_AUTOSCALE, 4 },
+   { 3, "2 M", (int64_t)1500*1000L,

svn commit: r327316 - head/sys/vm

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 22:56:30 2017
New Revision: 327316
URL: https://svnweb.freebsd.org/changeset/base/327316

Log:
  In vm_swapout_map_deactivate_pages(), it is enough to lock the map for read.
  
  Reviewed by:  alc, markj (as part of the larger patch)
  Tested by:pho (again, as part of the larger patch)
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week
  Differential revision:https://reviews.freebsd.org/D13671

Modified:
  head/sys/vm/vm_swapout.c

Modified: head/sys/vm/vm_swapout.c
==
--- head/sys/vm/vm_swapout.cThu Dec 28 22:03:08 2017(r327315)
+++ head/sys/vm/vm_swapout.cThu Dec 28 22:56:30 2017(r327316)
@@ -263,7 +263,7 @@ vm_swapout_map_deactivate_pages(vm_map_t map, long des
vm_object_t obj, bigobj;
int nothingwired;
 
-   if (!vm_map_trylock(map))
+   if (!vm_map_trylock_read(map))
return;
 
bigobj = NULL;
@@ -327,7 +327,7 @@ vm_swapout_map_deactivate_pages(vm_map_t map, long des
vm_map_max(map));
}
 
-   vm_map_unlock(map);
+   vm_map_unlock_read(map);
 }
 
 /*
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327315 - head/sys/dev/sdhci

2017-12-28 Thread Marius Strobl

Author: marius
Date: Thu Dec 28 22:03:08 2017
New Revision: 327315
URL: https://svnweb.freebsd.org/changeset/base/327315

Log:
  Probe Intel Denverton eMMC 5.0 controllers.

Modified:
  head/sys/dev/sdhci/sdhci_pci.c

Modified: head/sys/dev/sdhci/sdhci_pci.c
==
--- head/sys/dev/sdhci/sdhci_pci.c  Thu Dec 28 21:46:09 2017
(r327314)
+++ head/sys/dev/sdhci/sdhci_pci.c  Thu Dec 28 22:03:08 2017
(r327315)
@@ -122,6 +122,12 @@ static const struct sdhci_device {
SDHCI_QUIRK_MMC_DDR52 |
SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 |
SDHCI_QUIRK_PRESET_VALUE_BROKEN },
+   { 0x19db8086,   0x, "Intel Denverton eMMC 5.0 Controller",
+   SDHCI_QUIRK_INTEL_POWER_UP_RESET |
+   SDHCI_QUIRK_WAIT_WHILE_BUSY |
+   SDHCI_QUIRK_MMC_DDR52 |
+   SDHCI_QUIRK_CAPS_BIT63_FOR_MMC_HS400 |
+   SDHCI_QUIRK_PRESET_VALUE_BROKEN },
{ 0x22948086,   0x, "Intel Braswell eMMC 4.5.1 Controller",
SDHCI_QUIRK_DATA_TIMEOUT_1MHZ |
SDHCI_QUIRK_INTEL_POWER_UP_RESET |
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327314 - head/sys/x86/x86

2017-12-28 Thread Marius Strobl

Author: marius
Date: Thu Dec 28 21:46:09 2017
New Revision: 327314
URL: https://svnweb.freebsd.org/changeset/base/327314

Log:
  With the advent of interrupt remapping, Intel has repurposed bit 11
  (now: Interrupt_Index[15]) and assigned the previously reserved bits
  55:48 (Interrupt_Index[14:0] goes into 63:49 while Destination Field
  used 63:56 and bit 48 now is Interrupt_Format) in the IO redirection
  tables (see the VT-d specification, "5.1.5.1 I/OxAPIC Programming").
  Thus, when not using interrupt remapping, ensure that all previously
  reserved bits in the high part of the RTEs are zero instead of doing
  a read-modify-write for their Destination Field bits only.
  Otherwise, on machines based on Apollo Lake and its derivatives such
  as Denverton, typically some of the previously preserved bits remain
  set after boot when not employing interrupt remapping. The result is
  that INTx interrupts are not getting delivered.
  Note: With an AMD IOMMU, interrupt remapping apparently bypasses the
  IO APIC altogether.
  
  Submitted by: loos (modulo comment)
  Reviewed by:  jhb (modulo comment)

Modified:
  head/sys/x86/x86/io_apic.c

Modified: head/sys/x86/x86/io_apic.c
==
--- head/sys/x86/x86/io_apic.c  Thu Dec 28 21:35:53 2017(r327313)
+++ head/sys/x86/x86/io_apic.c  Thu Dec 28 21:46:09 2017(r327314)
@@ -308,7 +308,7 @@ static void
 ioapic_program_intpin(struct ioapic_intsrc *intpin)
 {
struct ioapic *io = (struct ioapic *)intpin->io_intsrc.is_pic;
-   uint32_t low, high, value;
+   uint32_t low, high;
 #ifdef ACPI_DMAR
int error;
 #endif
@@ -354,7 +354,11 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin)
}
 #endif
 
-   /* Set the destination. */
+   /*
+* Set the destination.  Note that with Intel interrupt remapping,
+* the previously reserved bits 55:48 now have a purpose so ensure
+* these are zero.
+*/
low = IOART_DESTPHY;
high = intpin->io_cpu << APIC_ID_SHIFT;
 
@@ -392,10 +396,7 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin)
}
 
/* Write the values to the APIC. */
-   value = ioapic_read(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin));
-   value &= ~IOART_DEST;
-   value |= high;
-   ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), value);
+   ioapic_write(io->io_addr, IOAPIC_REDTBL_HI(intpin->io_intpin), high);
intpin->io_lowreg = low;
ioapic_write(io->io_addr, IOAPIC_REDTBL_LO(intpin->io_intpin), low);
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327313 - head/sys/i386/conf

2017-12-28 Thread John Baldwin

Author: jhb
Date: Thu Dec 28 21:35:53 2017
New Revision: 327313
URL: https://svnweb.freebsd.org/changeset/base/327313

Log:
  Remove a few more dangling references to ie(4).

Modified:
  head/sys/i386/conf/GENERIC
  head/sys/i386/conf/NOTES

Modified: head/sys/i386/conf/GENERIC
==
--- head/sys/i386/conf/GENERIC  Thu Dec 28 21:26:40 2017(r327312)
+++ head/sys/i386/conf/GENERIC  Thu Dec 28 21:35:53 2017(r327313)
@@ -283,7 +283,6 @@ device  ed  # NE[12]000, 
SMC Ultra, 3c503, DS8390 car
 device ex  # Intel EtherExpress Pro/10 and Pro/10+
 device ep  # Etherlink III based cards
 device fe  # Fujitsu MB8696x based cards
-device ie  # EtherExpress 8/16, 3C507, StarLAN 10 
etc.
 device sn  # SMC's 9000 series of Ethernet chips
 device xe  # Xircom pccard Ethernet
 

Modified: head/sys/i386/conf/NOTES
==
--- head/sys/i386/conf/NOTESThu Dec 28 21:26:40 2017(r327312)
+++ head/sys/i386/conf/NOTESThu Dec 28 21:35:53 2017(r327313)
@@ -528,8 +528,6 @@ hint.mse.0.irq="5"
 # ed:   Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503
 #   HP PC Lan+, various PC Card devices
 #   (requires miibus)
-# ie:   AT StarLAN 10 and EN100; 3Com 3C507; unknown NI5210;
-#   Intel EtherExpress
 # ipw: Intel PRO/Wireless 2100 IEEE 802.11 adapter
 # iwi: Intel PRO/Wireless 2200BG/2225BG/2915ABG IEEE 802.11 adapters
 #  Requires the iwi firmware module
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327312 - head/sys/dev/e1000

2017-12-28 Thread Sean Bruno

Author: sbruno
Date: Thu Dec 28 21:26:40 2017
New Revision: 327312
URL: https://svnweb.freebsd.org/changeset/base/327312

Log:
  e1000: Add support for Ice Lake and Cannon Lake
  
  Ths add initial support for Ice Lake and Cannon Lake ethernet devices.
  
  This also addressed errata 1.5.4.4 for Sky Lake and Kabby Lake devices:
  
https://www.intel.com/content/dam/www/public/us/en/documents/specification-updates/i218-i219-ethernet-connection-spec-update.pdf?asset=9561
  
  Submitted by: Kevin Bowling 
  Relnotes: Yes
  Sponsored by: Limelight Networks
  Differential Revision:https://reviews.freebsd.org/D13660

Modified:
  head/sys/dev/e1000/e1000_api.c
  head/sys/dev/e1000/e1000_hw.h
  head/sys/dev/e1000/e1000_ich8lan.c
  head/sys/dev/e1000/e1000_ich8lan.h
  head/sys/dev/e1000/if_em.c

Modified: head/sys/dev/e1000/e1000_api.c
==
--- head/sys/dev/e1000/e1000_api.c  Thu Dec 28 21:23:39 2017
(r327311)
+++ head/sys/dev/e1000/e1000_api.c  Thu Dec 28 21:26:40 2017
(r327312)
@@ -311,6 +311,16 @@ s32 e1000_set_mac_type(struct e1000_hw *hw)
case E1000_DEV_ID_PCH_SPT_I219_V5:
mac->type = e1000_pch_spt;
break;
+   case E1000_DEV_ID_PCH_CNP_I219_LM6:
+   case E1000_DEV_ID_PCH_CNP_I219_V6:
+   case E1000_DEV_ID_PCH_CNP_I219_LM7:
+   case E1000_DEV_ID_PCH_CNP_I219_V7:
+   case E1000_DEV_ID_PCH_ICP_I219_LM8:
+   case E1000_DEV_ID_PCH_ICP_I219_V8:
+   case E1000_DEV_ID_PCH_ICP_I219_LM9:
+   case E1000_DEV_ID_PCH_ICP_I219_V9:
+   mac->type = e1000_pch_cnp;
+   break;
case E1000_DEV_ID_82575EB_COPPER:
case E1000_DEV_ID_82575EB_FIBER_SERDES:
case E1000_DEV_ID_82575GB_QUAD_COPPER:
@@ -462,6 +472,7 @@ s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool i
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+   case e1000_pch_cnp:
e1000_init_function_pointers_ich8lan(hw);
break;
case e1000_82575:

Modified: head/sys/dev/e1000/e1000_hw.h
==
--- head/sys/dev/e1000/e1000_hw.h   Thu Dec 28 21:23:39 2017
(r327311)
+++ head/sys/dev/e1000/e1000_hw.h   Thu Dec 28 21:26:40 2017
(r327312)
@@ -147,6 +147,14 @@ struct e1000_hw;
 #define E1000_DEV_ID_PCH_SPT_I219_V4   0x15D8
 #define E1000_DEV_ID_PCH_SPT_I219_LM5  0x15E3
 #define E1000_DEV_ID_PCH_SPT_I219_V5   0x15D6
+#define E1000_DEV_ID_PCH_CNP_I219_LM6  0x15BD
+#define E1000_DEV_ID_PCH_CNP_I219_V6   0x15BE
+#define E1000_DEV_ID_PCH_CNP_I219_LM7  0x15BB
+#define E1000_DEV_ID_PCH_CNP_I219_V7   0x15BC
+#define E1000_DEV_ID_PCH_ICP_I219_LM8  0x15DF
+#define E1000_DEV_ID_PCH_ICP_I219_V8   0x15E0
+#define E1000_DEV_ID_PCH_ICP_I219_LM9  0x15E1
+#define E1000_DEV_ID_PCH_ICP_I219_V9   0x15E2
 #define E1000_DEV_ID_82576 0x10C9
 #define E1000_DEV_ID_82576_FIBER   0x10E6
 #define E1000_DEV_ID_82576_SERDES  0x10E7
@@ -233,6 +241,7 @@ enum e1000_mac_type {
e1000_pch2lan,
e1000_pch_lpt,
e1000_pch_spt,
+   e1000_pch_cnp,
e1000_82575,
e1000_82576,
e1000_82580,

Modified: head/sys/dev/e1000/e1000_ich8lan.c
==
--- head/sys/dev/e1000/e1000_ich8lan.c  Thu Dec 28 21:23:39 2017
(r327311)
+++ head/sys/dev/e1000/e1000_ich8lan.c  Thu Dec 28 21:26:40 2017
(r327312)
@@ -345,6 +345,7 @@ static s32 e1000_init_phy_workarounds_pchlan(struct e1
switch (hw->mac.type) {
case e1000_pch_lpt:
case e1000_pch_spt:
+   case e1000_pch_cnp:
if (e1000_phy_is_accessible_pchlan(hw))
break;
 
@@ -493,6 +494,7 @@ static s32 e1000_init_phy_params_pchlan(struct e1000_h
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+   case e1000_pch_cnp:
/* In case the PHY needs to be in mdio slow mode,
 * set slow mode and try to get the PHY id again.
 */
@@ -794,6 +796,7 @@ static s32 e1000_init_mac_params_ich8lan(struct e1000_
/* fall-through */
case e1000_pch_lpt:
case e1000_pch_spt:
+   case e1000_pch_cnp:
/* multicast address update for pch2 */
mac->ops.update_mc_addr_list =
e1000_update_mc_addr_list_pch2lan;
@@ -1831,6 +1834,7 @@ void e1000_init_function_pointers_ich8lan(struct e1000
case e1000_pch2lan:
case e1000_pch_lpt:
case e1000_pch_spt:
+   case e1000_pch_cnp:
hw->phy.ops.init_params =

svn commit: r327299 - head/stand/fdt

2017-12-28 Thread Kyle Evans

Author: kevans
Date: Thu Dec 28 21:12:27 2017
New Revision: 327299
URL: https://svnweb.freebsd.org/changeset/base/327299

Log:
  stand/fdt: Avoid bailout when dtbo has no fixups
  
  In the case of a simple dtbo where fragment uses target-path and the overlay
  contains no references, /__fixups__ will not be included by either our dtc
  or dtc from ports, but the file still has valid fragments to be applied.
  
  Additional testing found that /__symbols__ might also be omitted if it's
  empty, which is not necessarily an error.
  
  Reviewed by:  gonzo, imp
  Differential Revision:https://reviews.freebsd.org/D13663

Modified:
  head/stand/fdt/fdt_overlay.c

Modified: head/stand/fdt/fdt_overlay.c
==
--- head/stand/fdt/fdt_overlay.cThu Dec 28 21:09:36 2017
(r327298)
+++ head/stand/fdt/fdt_overlay.cThu Dec 28 21:12:27 2017
(r327299)
@@ -324,10 +324,16 @@ fdt_overlay_do_fixups(void *main_fdtp, void *overlay_f
main_symbols_o = fdt_path_offset(main_fdtp, "/__symbols__");
overlay_fixups_o = fdt_path_offset(overlay_fdtp, "/__fixups__");
 
-   if (main_symbols_o < 0)
+   if (main_symbols_o < 0) {
+   if (main_symbols_o == -FDT_ERR_NOTFOUND)
+   return (0);
return (-1);
-   if (overlay_fixups_o < 0)
+   }
+   if (overlay_fixups_o < 0) {
+   if (overlay_fixups_o == -FDT_ERR_NOTFOUND)
+   return (0);
return (-1);
+   }
 
for (fixup_prop_o = fdt_first_property_offset(overlay_fdtp, 
overlay_fixups_o);
fixup_prop_o >= 0;
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327298 - head/stand/fdt

2017-12-28 Thread Kyle Evans

Author: kevans
Date: Thu Dec 28 21:09:36 2017
New Revision: 327298
URL: https://svnweb.freebsd.org/changeset/base/327298

Log:
  stand/fdt: Fix loading of multiple fdt_overlays
  
  fdt_load_dtb_overlays was written to unload previous overlay when a new
  valid one is come across. fdt_apply_overlays further down is written to
  iterate over all .dtbo's currently loaded and apply them one-by-one. Correct
  fdt_load_dtb_overlays to stop dropping valid overlays that were previously
  loaded and match expectations.
  
  Reviewed by:  gonzo, imp
  Differential Revision:https://reviews.freebsd.org/D13659

Modified:
  head/stand/fdt/fdt_loader_cmd.c

Modified: head/stand/fdt/fdt_loader_cmd.c
==
--- head/stand/fdt/fdt_loader_cmd.c Thu Dec 28 20:40:56 2017
(r327297)
+++ head/stand/fdt/fdt_loader_cmd.c Thu Dec 28 21:09:36 2017
(r327298)
@@ -281,14 +281,12 @@ fdt_load_dtb_file(const char * filename)
 static int
 fdt_load_dtb_overlay(const char * filename)
 {
-   struct preloaded_file *bfp, *oldbfp;
+   struct preloaded_file *bfp;
struct fdt_header header;
int err;
 
debugf("fdt_load_dtb_overlay(%s)\n", filename);
 
-   oldbfp = file_findfile(filename, "dtbo");
-
/* Attempt to load and validate a new dtb from a file. */
if ((bfp = file_loadraw(filename, "dtbo", 1)) == NULL) {
printf("failed to load file '%s'\n", filename);
@@ -309,10 +307,6 @@ fdt_load_dtb_overlay(const char * filename)
fdt_strerror(err));
return (1);
}
-
-   /* A new dtb was validated, discard any previous file. */
-   if (oldbfp)
-   file_discard(oldbfp);
 
return (0);
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327297 - head/sys/netinet6

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 20:40:56 2017
New Revision: 327297
URL: https://svnweb.freebsd.org/changeset/base/327297

Log:
  Fix some typos.
  
  Obtained from:OpenBSD (CVS v1.5)

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==
--- head/sys/netinet6/ip6_id.c  Thu Dec 28 20:35:21 2017(r327296)
+++ head/sys/netinet6/ip6_id.c  Thu Dec 28 20:40:56 2017(r327297)
@@ -81,7 +81,7 @@ __FBSDID("$FreeBSD$");
  * The transaction id is determined by:
  * id[n] = seed xor (g^X[n] mod n)
  *
- * Effectivly the id is restricted to the lower (bits - 1) bits, thus
+ * Effectively the id is restricted to the lower (bits - 1) bits, thus
  * yielding two different cycles by toggling the msb on and off.
  * This avoids reuse issues caused by reseeding.
  */
@@ -172,7 +172,7 @@ pmod(u_int32_t gen, u_int32_t expo, u_int32_t mod)
 }
 
 /*
- * Initalizes the seed and chooses a suitable generator. Also toggles
+ * Initializes the seed and chooses a suitable generator. Also toggles
  * the msb flag. The msb flag is used to generate two distinct
  * cycles of random numbers and thus avoiding reuse of ids.
  *
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327296 - head/sys/netinet6

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 20:35:21 2017
New Revision: 327296
URL: https://svnweb.freebsd.org/changeset/base/327296

Log:
  netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license.
  
  This bring back r327293 from OpenBSD, with the important difference that
  we are now getting it from their ip6_id.c file.
  
  Obtained from:OpenBSD (CVS v1.3)

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==
--- head/sys/netinet6/ip6_id.c  Thu Dec 28 20:26:51 2017(r327295)
+++ head/sys/netinet6/ip6_id.c  Thu Dec 28 20:35:21 2017(r327296)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause)
+ * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause)
  *
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
@@ -48,11 +48,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
@@ -65,7 +60,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.
  *
- * $OpenBSD: ip6_id.c,v 1.2 2003/12/10 07:21:01 itojun Exp $
+ * $OpenBSD: ip6_id.c,v 1.3 2003/12/12 06:57:12 itojun Exp $
  */
 
 #include 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327295 - head/sys/netinet6

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 20:26:51 2017
New Revision: 327295
URL: https://svnweb.freebsd.org/changeset/base/327295

Log:
  Start syncing changes from OpenBSD's ip6_id.c instead of ip_id.c.
  
  correct non-repetitive ID code, based on comments from niels provos.
  - seed2 is necessary, but use it as "seed2 + x" not "seed2 ^ x".
  - skipping number is not needed, so disable it for 16bit generator (makes
the repetition period to 3)
  
  Obtained from:OpenBSD (CVS rev. 1.2)
  MFC after:1 week

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==
--- head/sys/netinet6/ip6_id.c  Thu Dec 28 20:10:10 2017(r327294)
+++ head/sys/netinet6/ip6_id.c  Thu Dec 28 20:26:51 2017(r327295)
@@ -65,7 +65,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.
  *
- * $OpenBSD: ip_id.c,v 1.6 2002/03/15 18:19:52 millert Exp $
+ * $OpenBSD: ip6_id.c,v 1.2 2003/12/10 07:21:01 itojun Exp $
  */
 
 #include 
@@ -232,15 +232,12 @@ static u_int32_t
 randomid(struct randomtab *p)
 {
int i, n;
-   u_int32_t tmp;
 
if (p->ru_counter >= p->ru_max || time_uptime > p->ru_reseed)
initid(p);
 
-   tmp = arc4random();
-
/* Skip a random number of ids */
-   n = tmp & 0x3; tmp = tmp >> 2;
+   n = arc4random() & 0x3;
if (p->ru_counter + n >= p->ru_max)
initid(p);
 
@@ -251,7 +248,7 @@ randomid(struct randomtab *p)
 
p->ru_counter += i;
 
-   return (p->ru_seed ^ pmod(p->ru_g, p->ru_seed2 ^ p->ru_x, p->ru_n)) |
+   return (p->ru_seed ^ pmod(p->ru_g, p->ru_seed2 + p->ru_x, p->ru_n)) |
p->ru_msb;
 }
 
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327294 - head/sys/netinet6

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 20:10:10 2017
New Revision: 327294
URL: https://svnweb.freebsd.org/changeset/base/327294

Log:
  Revert r327293
  netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license.
  
  I was looking at the wrong file. There is an important merge that must be
  done before I can bring this change.

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==
--- head/sys/netinet6/ip6_id.c  Thu Dec 28 19:42:53 2017(r327293)
+++ head/sys/netinet6/ip6_id.c  Thu Dec 28 20:10:10 2017(r327294)
@@ -1,5 +1,5 @@
 /*-
- * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause)
+ * SPDX-License-Identifier: (BSD-3-Clause AND BSD-4-Clause)
  *
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
@@ -48,6 +48,11 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *must display the following acknowledgement:
+ *  This product includes software developed by Niels Provos.
+ * 4. The name of the author may not be used to endorse or promote products
+ *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327293 - head/sys/netinet6

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 19:42:53 2017
New Revision: 327293
URL: https://svnweb.freebsd.org/changeset/base/327293

Log:
  netinet6/ip6_id.c: niels kindly dropped clause 3/4 from the license.
  
  This file is supposed to be based on the OpenBSD CVS v1.6 but checking
  the OpenBSD repository the license had already dropped the 2&3 clasues by
  then. Catch up with the licensing.
  
  Obtained from:OpenBSD (CVS 1.2)

Modified:
  head/sys/netinet6/ip6_id.c

Modified: head/sys/netinet6/ip6_id.c
==
--- head/sys/netinet6/ip6_id.c  Thu Dec 28 18:51:35 2017(r327292)
+++ head/sys/netinet6/ip6_id.c  Thu Dec 28 19:42:53 2017(r327293)
@@ -1,4 +1,6 @@
 /*-
+ * SPDX-License-Identifier: (BSD-3-Clause AND BSD-2-Clause)
+ *
  * Copyright (C) 2003 WIDE Project.
  * All rights reserved.
  *
@@ -30,8 +32,6 @@
  */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause AND BSD-3-Clause
- *
  * Copyright 1998 Niels Provos 
  * All rights reserved.
  *
@@ -48,11 +48,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- *  This product includes software developed by Niels Provos.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327292 - head/sys/dev/pccard

2017-12-28 Thread John Baldwin

Author: jhb
Date: Thu Dec 28 18:51:35 2017
New Revision: 327292
URL: https://svnweb.freebsd.org/changeset/base/327292

Log:
  Minor formatting and style tweaks to some comments.

Modified:
  head/sys/dev/pccard/pccardvar.h

Modified: head/sys/dev/pccard/pccardvar.h
==
--- head/sys/dev/pccard/pccardvar.h Thu Dec 28 17:55:58 2017
(r327291)
+++ head/sys/dev/pccard/pccardvar.h Thu Dec 28 18:51:35 2017
(r327292)
@@ -89,15 +89,14 @@ struct pccard_product {
 
 /**
  * Note: There's no cis3 or cis4 reported for NOMATCH / pnpinfo events for
- * pccard It's unclear if we actually need that for automatic loading or
- * not. These stirngs are informative, according to the standard. Some Linux
- * drivers match on them, for example. However, FreeBSD's hardware probing is a
- * little different than Linux so it turns out we don't need them. Some cards
- * use CIS3 or CIS4 for a textual representation of the MAC address. In short,
- * they aren't needed even though our friends in Linux have them. It is my
+ * pccard.  It's unclear if we actually need that for automatic loading or
+ * not.  These strings are informative, according to the standard.  Some Linux
+ * drivers match on them, for example.  However, FreeBSD's hardware probing is 
a
+ * little different than Linux, so it turns out we don't need them.  Some cards
+ * use CIS3 or CIS4 for a textual representation of the MAC address.  In short,
  * belief that all the entries in Linux don't actually need to be separate 
there
- * either, but it's hard to eliminate them and retest on old, possibly rare,
- * hardware so they persist. Despite years of collecting ~300 different PC 
Cards
+ * either, but they persist since it's hard to eliminate them and retest on 
old,
+ * possibly rare, hardware.  Despite years of collecting ~300 different PC 
Cards
  * off E-Bay, I've not been able to find any that need CIS3/CIS4 to select 
which
  * device attaches.
  */
@@ -111,7 +110,7 @@ typedef int (*pccard_product_match_fn) (device_t dev,
 #include "card_if.h"
 
 /*
- * make this inline so that we don't have to worry about dangling references
+ * Make this inline so that we don't have to worry about dangling references
  * to it in the modules or the code.
  */
 static inline const struct pccard_product *
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327291 - head/sys/conf

2017-12-28 Thread John Baldwin

Author: jhb
Date: Thu Dec 28 17:55:58 2017
New Revision: 327291
URL: https://svnweb.freebsd.org/changeset/base/327291

Log:
  Remove a stale reference to ie(4).
  
  This was missed in r304513.
  
  Submitted by: kib

Modified:
  head/sys/conf/files.i386

Modified: head/sys/conf/files.i386
==
--- head/sys/conf/files.i386Thu Dec 28 17:51:53 2017(r327290)
+++ head/sys/conf/files.i386Thu Dec 28 17:55:58 2017(r327291)
@@ -518,7 +518,7 @@ i386/ibcs2/ibcs2_util.c optional ibcs2
 i386/ibcs2/ibcs2_xenix.c   optional ibcs2
 i386/ibcs2/ibcs2_xenix_sysent.coptional ibcs2
 i386/ibcs2/imgact_coff.c   optional ibcs2
-i386/isa/elink.c   optional ep | ie
+i386/isa/elink.c   optional ep
 i386/isa/npx.c standard
 i386/isa/pmtimer.c optional pmtimer
 i386/isa/prof_machdep.coptional profiling-routine
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327290 - head/libexec/rpc.sprayd

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 17:51:53 2017
New Revision: 327290
URL: https://svnweb.freebsd.org/changeset/base/327290

Log:
  rpc.sprayd: Remove 3rd and 4th clauses in christos' license.
  
  Obtained from:NetBSD

Modified:
  head/libexec/rpc.sprayd/rpc.sprayd.8
  head/libexec/rpc.sprayd/sprayd.c

Modified: head/libexec/rpc.sprayd/rpc.sprayd.8
==
--- head/libexec/rpc.sprayd/rpc.sprayd.8Thu Dec 28 17:44:30 2017
(r327289)
+++ head/libexec/rpc.sprayd/rpc.sprayd.8Thu Dec 28 17:51:53 2017
(r327290)
@@ -1,4 +1,4 @@
-.\"$NetBSD: rpc.sprayd.8,v 1.9 2003/02/25 10:34:50 wiz Exp $
+.\"$NetBSD: rpc.sprayd.8,v 1.10 2009/10/21 01:07:46 snj Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
 .\" All rights reserved.
@@ -11,11 +11,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"notice, this list of conditions and the following disclaimer in the
 .\"documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"must display the following acknowledgement:
-.\"This product includes software developed by Christos Zoulas.
-.\" 4. The name of the author may not be used to endorse or promote products
-.\"derived from this software without specific prior written permission.
 .\"
 .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
 .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES

Modified: head/libexec/rpc.sprayd/sprayd.c
==
--- head/libexec/rpc.sprayd/sprayd.cThu Dec 28 17:44:30 2017
(r327289)
+++ head/libexec/rpc.sprayd/sprayd.cThu Dec 28 17:51:53 2017
(r327290)
@@ -1,7 +1,7 @@
-/* $NetBSD: sprayd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $  */
+/* $NetBSD: sprayd.c,v 1.15 2009/10/21 01:07:46 snj Exp $  */
 
 /*-
- * SPDX-License-Identifier: BSD-4-Clause
+ * SPDX-License-Identifier: BSD-2-Clause-NetBSD
  *
  * Copyright (c) 1994 Christos Zoulas
  * All rights reserved.
@@ -14,11 +14,6 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *notice, this list of conditions and the following disclaimer in the
  *documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *must display the following acknowledgement:
- * This product includes software developed by Christos Zoulas.
- * 4. The name of the author may not be used to endorse or promote products
- *derived from this software without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327289 - head/libexec/rpc.sprayd

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 17:44:30 2017
New Revision: 327289
URL: https://svnweb.freebsd.org/changeset/base/327289

Log:
  rpc.sprayd: Bring some changes from NetBSD.
  
  Most notable, other than some style issues:
  CVS 1.11:
do not use LOG_CONS.
  CVS 1.13:
consistently use exit instead of return in main().
use LOG_WARNING instead of LOG_ERR for non critical errors.
  
  Obtained from:NetBSD
  MFC after:2 weeks

Modified:
  head/libexec/rpc.sprayd/rpc.sprayd.8
  head/libexec/rpc.sprayd/sprayd.c

Modified: head/libexec/rpc.sprayd/rpc.sprayd.8
==
--- head/libexec/rpc.sprayd/rpc.sprayd.8Thu Dec 28 14:26:33 2017
(r327288)
+++ head/libexec/rpc.sprayd/rpc.sprayd.8Thu Dec 28 17:44:30 2017
(r327289)
@@ -1,3 +1,4 @@
+.\"$NetBSD: rpc.sprayd.8,v 1.9 2003/02/25 10:34:50 wiz Exp $
 .\"
 .\" Copyright (c) 1994 Christos Zoulas
 .\" All rights reserved.
@@ -29,11 +30,12 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd June 22, 1994
+.Dd December 27, 2017
 .Dt RPC.SPRAYD 8
 .Os
 .Sh NAME
-.Nm rpc.sprayd
+.Nm rpc.sprayd ,
+.Nm sprayd
 .Nd spray server
 .Sh SYNOPSIS
 .Nm /usr/libexec/rpc.sprayd

Modified: head/libexec/rpc.sprayd/sprayd.c
==
--- head/libexec/rpc.sprayd/sprayd.cThu Dec 28 14:26:33 2017
(r327288)
+++ head/libexec/rpc.sprayd/sprayd.cThu Dec 28 17:44:30 2017
(r327289)
@@ -1,3 +1,5 @@
+/* $NetBSD: sprayd.c,v 1.14 2006/05/09 20:18:07 mrg Exp $  */
+
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
@@ -64,7 +66,7 @@ static int from_inetd = 1;
 void
 cleanup(int sig __unused)
 {
-   (void) rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
+   (void)rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
exit(0);
 }
 
@@ -93,17 +95,17 @@ main(int argc, char *argv[])
if (!from_inetd) {
daemon(0, 0);
 
-   (void) rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
+   (void)rpcb_unset(SPRAYPROG, SPRAYVERS, NULL);
 
-   (void) signal(SIGINT, cleanup);
-   (void) signal(SIGTERM, cleanup);
-   (void) signal(SIGHUP, cleanup);
+   (void)signal(SIGINT, cleanup);
+   (void)signal(SIGTERM, cleanup);
+   (void)signal(SIGHUP, cleanup);
} else {
-   (void) signal(SIGALRM, die);
+   (void)signal(SIGALRM, die);
alarm(TIMEOUT);
}
 
-   openlog("rpc.sprayd", LOG_CONS|LOG_PID, LOG_DAEMON);
+   openlog("rpc.sprayd", LOG_PID, LOG_DAEMON);
 
if (from_inetd) {
transp = svc_tli_create(0, NULL, NULL, 0, 0);
@@ -120,7 +122,7 @@ main(int argc, char *argv[])
syslog(LOG_ERR,
"unable to register (SPRAYPROG, SPRAYVERS, %s)",
(!from_inetd)?"udp":"(inetd)");
-   return 1;
+   exit(1);
}
 
svc_run();
@@ -138,7 +140,7 @@ spray_service(struct svc_req *rqstp, SVCXPRT *transp)
switch (rqstp->rq_proc) {
case SPRAYPROC_CLEAR:
scum.counter = 0;
-   (void) gettimeofday(, 0);
+   (void)gettimeofday(, 0);
/*FALLTHROUGH*/
 
case NULLPROC:
@@ -150,7 +152,7 @@ spray_service(struct svc_req *rqstp, SVCXPRT *transp)
return;
 
case SPRAYPROC_GET:
-   (void) gettimeofday(, 0);
+   (void)gettimeofday(, 0);
timersub(, , );
scum.clock.sec = get.tv_sec;
scum.clock.usec = get.tv_usec;
@@ -163,6 +165,6 @@ spray_service(struct svc_req *rqstp, SVCXPRT *transp)
 
if (!svc_sendreply(transp, (xdrproc_t)xdr_spraycumul, )) {
svcerr_systemerr(transp);
-   syslog(LOG_ERR, "bad svc_sendreply");
+   syslog(LOG_WARNING, "bad svc_sendreply");
}
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r325726 - head/sys/kern

2017-12-28 Thread Jilles Tjoelker

On Thu, Dec 28, 2017 at 12:40:31PM +, Antoine Brodin wrote:
> On Sat, Nov 11, 2017 at 10:39 PM, Mateusz Guzik  wrote:
> > Author: mjg
> > Date: Sat Nov 11 22:39:33 2017
> > New Revision: 325726
> > URL: https://svnweb.freebsd.org/changeset/base/325726

> > Log:
> >   Avoid locking and refing in sysctl_kern_proc_args if possible.

> >   Turns out the sysctl is called a lot e.g. by pkg-static.

> > Modified:
> >   head/sys/kern/kern_proc.c

> There is a regression after this commit: x11-toolkits/gnustep-gui no
> longer builds.
> You can find a failure log at
> http://pb2.nyi.freebsd.org/data/111i386-default-PR224618/2017-12-28_12h28m51s/logs/errors/gnustep-gui-0.25.1_3.log
> The failure seems to be from lang/gnustep-base:

>   /* get the argument vectors */
>   vectors = kvm_getargv(kptr, proc_ptr, 0);

It looks like the new fast path only works properly if p->p_args is not
NULL. If p->p_args is NULL, this usually means that the arguments are
longer than ps_arg_cache_limit and must be retrieved from (pageable)
process memory and not wired p->p_args->ar_args. It is possible to
duplicate that piece of code as well but that is probably not worth it.

A simple reproducer is

sh -c 'n=$(sysctl -n kern.ps_arg_cache_limit);
exec ps -p "$$" -o "args=$(printf "%0${n}d" 0)"'

On head, the second line is [ps] indicating that KERN_PROC_ARGS did not
return the expected string. On stable/10 and stable/11, the second line
is a truncated version of the command line like
ps -p 86963 -o args=00

A prerequisite for this reproducer is that kern.ps_arg_cache_limit is
not set so high that it is impractical to exceed it but not {ARG_MAX}.

-- 
Jilles Tjoelker
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r327287 - head/sys/i386/isa

2017-12-28 Thread Konstantin Belousov

On Thu, Dec 28, 2017 at 02:14:36PM +, Pedro F. Giffuni wrote:
> Author: pfg
> Date: Thu Dec 28 14:14:35 2017
> New Revision: 327287
> URL: https://svnweb.freebsd.org/changeset/base/327287
> 
> Log:
>   sys/i386/isa/elink*: sync with (older) NetBSD.
>   
>   Make it easier to identify the point where we started diverging from
>   NetBSD. Newer versions of these files have been updated to a new license
>   so this information may become useful some day.
>   
>   Obtained from:  NetBSD
> 
> Modified:
>   head/sys/i386/isa/elink.c
>   head/sys/i386/isa/elink.h

I think that these files, if touched, should be moved to sys/dev/ep.
Also files.i386 seems to reference ghost options 'ie'.
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327288 - head/sys/sys

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 14:26:33 2017
New Revision: 327288
URL: https://svnweb.freebsd.org/changeset/base/327288

Log:
  sys/sys/chio.h: add NetBSD RCS ID.
  
  Make it easier to identify the point where we started diverging from
  NetBSD. Newer versions of this file has been updated to a new license so
  this information may become useful some day.
  
  Obtained from:NetBSD

Modified:
  head/sys/sys/chio.h

Modified: head/sys/sys/chio.h
==
--- head/sys/sys/chio.h Thu Dec 28 14:14:35 2017(r327287)
+++ head/sys/sys/chio.h Thu Dec 28 14:26:33 2017(r327288)
@@ -1,3 +1,5 @@
+/* $NetBSD: chio.h,v 1.9 1997/09/29 17:32:26 mjacob Exp $  */
+
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327287 - head/sys/i386/isa

2017-12-28 Thread Pedro F. Giffuni

Author: pfg
Date: Thu Dec 28 14:14:35 2017
New Revision: 327287
URL: https://svnweb.freebsd.org/changeset/base/327287

Log:
  sys/i386/isa/elink*: sync with (older) NetBSD.
  
  Make it easier to identify the point where we started diverging from
  NetBSD. Newer versions of these files have been updated to a new license
  so this information may become useful some day.
  
  Obtained from:NetBSD

Modified:
  head/sys/i386/isa/elink.c
  head/sys/i386/isa/elink.h

Modified: head/sys/i386/isa/elink.c
==
--- head/sys/i386/isa/elink.c   Thu Dec 28 13:23:13 2017(r327286)
+++ head/sys/i386/isa/elink.c   Thu Dec 28 14:14:35 2017(r327287)
@@ -1,7 +1,9 @@
+/* $NetBSD: elink.c,v 1.6 1995/01/07 21:37:54 mycroft Exp $*/
+
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
- * Copyright (c) 1994 Charles Hannum.  All rights reserved.
+ * Copyright (c) 1994, 1995 Charles Hannum.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -46,9 +48,9 @@ __FBSDID("$FreeBSD$");
 #include 
 
 /*
- * Issue a `global reset' to all cards.  We have to be careful to do this only
- * once during autoconfig, to prevent resetting boards that have already been
- * configured.
+ * Issue a `global reset' to all cards, and reset the ID state machines.  We
+ * have to be careful to do the global reset only once during autoconfig, to
+ * prevent resetting boards that have already been configured.
  */
 void
 elink_reset()
@@ -59,8 +61,8 @@ elink_reset()
x = 1;
outb(ELINK_ID_PORT, ELINK_RESET);
}
-   outb(ELINK_ID_PORT, 0);
-   outb(ELINK_ID_PORT, 0);
+   outb(ELINK_ID_PORT, 0x00);
+   outb(ELINK_ID_PORT, 0x00);
 
return;
 }

Modified: head/sys/i386/isa/elink.h
==
--- head/sys/i386/isa/elink.h   Thu Dec 28 13:23:13 2017(r327286)
+++ head/sys/i386/isa/elink.h   Thu Dec 28 14:14:35 2017(r327287)
@@ -1,3 +1,5 @@
+/* $NetBSD: elink.h,v 1.3 1994/10/27 04:17:11 cgd Exp $*/
+
 /*-
  * SPDX-License-Identifier: BSD-4-Clause
  *
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327286 - head/sys/fs/procfs

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 13:23:13 2017
New Revision: 327286
URL: https://svnweb.freebsd.org/changeset/base/327286

Log:
  Reuse kern_proc_vmmap_resident() for procfs_map resident count.
  
  The existing algorithm in procfs_map() to calculate count of resident
  pages in an entry is too primitive, resulting in too long run time for
  large sparse mapping entries.  Re-use the kern_proc_vmmap_resident()
  from kern_proc.c which only looks at the existing pages in the
  iterations.
  
  Also, this makes procfs to honor kern.proc_vmmap_skip_resident_count,
  if user does not need this information.
  
  Reported by:  Glenn Weinberg 
  PR:   224532
  No objections from:   des (procfs maintainer)
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week
  Differential revision:https://reviews.freebsd.org/D13595

Modified:
  head/sys/fs/procfs/procfs_map.c

Modified: head/sys/fs/procfs/procfs_map.c
==
--- head/sys/fs/procfs/procfs_map.c Thu Dec 28 13:16:32 2017
(r327285)
+++ head/sys/fs/procfs/procfs_map.c Thu Dec 28 13:23:13 2017
(r327286)
@@ -84,12 +84,17 @@ procfs_doprocmap(PFS_FILL_ARGS)
vm_map_t map;
vm_map_entry_t entry, tmp_entry;
struct vnode *vp;
-   char *fullpath, *freepath;
+   char *fullpath, *freepath, *type;
struct ucred *cred;
-   int error;
+   vm_object_t obj, tobj, lobj;
+   int error, privateresident, ref_count, resident, shadow_count, flags;
+   vm_offset_t e_start, e_end;
+   vm_eflags_t e_eflags;
+   vm_prot_t e_prot;
unsigned int last_timestamp;
+   bool super;
 #ifdef COMPAT_FREEBSD32
-   int wrap32 = 0;
+   bool wrap32;
 #endif
 
PROC_LOCK(p);
@@ -102,11 +107,12 @@ procfs_doprocmap(PFS_FILL_ARGS)
return (EOPNOTSUPP);
 
 #ifdef COMPAT_FREEBSD32
-if (SV_CURPROC_FLAG(SV_ILP32)) {
-if (!(SV_PROC_FLAG(p, SV_ILP32)))
-return (EOPNOTSUPP);
-wrap32 = 1;
-}
+   wrap32 = false;
+   if (SV_CURPROC_FLAG(SV_ILP32)) {
+   if (!(SV_PROC_FLAG(p, SV_ILP32)))
+   return (EOPNOTSUPP);
+   wrap32 = true;
+   }
 #endif
 
vm = vmspace_acquire_ref(p);
@@ -116,14 +122,6 @@ procfs_doprocmap(PFS_FILL_ARGS)
vm_map_lock_read(map);
for (entry = map->header.next; entry != >header;
 entry = entry->next) {
-   vm_object_t obj, tobj, lobj;
-   int ref_count, shadow_count, flags;
-   vm_offset_t e_start, e_end, addr;
-   int resident, privateresident;
-   char *type;
-   vm_eflags_t e_eflags;
-   vm_prot_t e_prot;
-
if (entry->eflags & MAP_ENTRY_IS_SUB_MAP)
continue;
 
@@ -132,6 +130,7 @@ procfs_doprocmap(PFS_FILL_ARGS)
e_start = entry->start;
e_end = entry->end;
privateresident = 0;
+   resident = 0;
obj = entry->object.vm_object;
if (obj != NULL) {
VM_OBJECT_RLOCK(obj);
@@ -140,20 +139,17 @@ procfs_doprocmap(PFS_FILL_ARGS)
}
cred = (entry->cred) ? entry->cred : (obj ? obj->cred : NULL);
 
-   resident = 0;
-   addr = entry->start;
-   while (addr < entry->end) {
-   if (pmap_extract(map->pmap, addr))
-   resident++;
-   addr += PAGE_SIZE;
-   }
-
-   for (lobj = tobj = obj; tobj; tobj = tobj->backing_object) {
+   for (lobj = tobj = obj; tobj != NULL;
+   tobj = tobj->backing_object) {
if (tobj != obj)
VM_OBJECT_RLOCK(tobj);
-   if (lobj != obj)
-   VM_OBJECT_RUNLOCK(lobj);
lobj = tobj;
+   }
+   if (obj != NULL)
+   kern_proc_vmmap_resident(map, entry, , );
+   for (tobj = obj; tobj != NULL; tobj = tobj->backing_object) {
+   if (tobj != obj && tobj != lobj)
+   VM_OBJECT_RUNLOCK(tobj);
}
last_timestamp = map->timestamp;
vm_map_unlock_read(map);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327285 - in head/sys: kern sys

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 13:16:32 2017
New Revision: 327285
URL: https://svnweb.freebsd.org/changeset/base/327285

Log:
  Make kern_proc_vmmap_resident() externally accesible, and move the
  vmmap_skip_res_cnt control check inside it.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week
  Differential revision:https://reviews.freebsd.org/D13595

Modified:
  head/sys/kern/kern_proc.c
  head/sys/sys/proc.h

Modified: head/sys/kern/kern_proc.c
==
--- head/sys/kern/kern_proc.c   Thu Dec 28 13:01:27 2017(r327284)
+++ head/sys/kern/kern_proc.c   Thu Dec 28 13:16:32 2017(r327285)
@@ -2280,9 +2280,9 @@ sysctl_kern_proc_ovmmap(SYSCTL_HANDLER_ARGS)
 CTASSERT(sizeof(struct kinfo_vmentry) == KINFO_VMENTRY_SIZE);
 #endif
 
-static void
+void
 kern_proc_vmmap_resident(vm_map_t map, vm_map_entry_t entry,
-struct kinfo_vmentry *kve)
+int *resident_count, bool *super)
 {
vm_object_t obj, tobj;
vm_page_t m, m_adv;
@@ -2290,6 +2290,11 @@ kern_proc_vmmap_resident(vm_map_t map, vm_map_entry_t 
vm_paddr_t locked_pa;
vm_pindex_t pi, pi_adv, pindex;
 
+   *super = false;
+   *resident_count = 0;
+   if (vmmap_skip_res_cnt)
+   return;
+
locked_pa = 0;
obj = entry->object.vm_object;
addr = entry->start;
@@ -2322,7 +2327,7 @@ kern_proc_vmmap_resident(vm_map_t map, vm_map_entry_t 
(addr & (pagesizes[1] - 1)) == 0 &&
(pmap_mincore(map->pmap, addr, _pa) &
MINCORE_SUPER) != 0) {
-   kve->kve_flags |= KVME_FLAG_SUPER;
+   *super = true;
pi_adv = atop(pagesizes[1]);
} else {
/*
@@ -2334,7 +2339,7 @@ kern_proc_vmmap_resident(vm_map_t map, vm_map_entry_t 
 */
pi_adv = 1;
}
-   kve->kve_resident += pi_adv;
+   *resident_count += pi_adv;
 next:;
}
PA_UNLOCK_COND(locked_pa);
@@ -2358,6 +2363,7 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, s
vm_offset_t addr;
unsigned int last_timestamp;
int error;
+   bool super;
 
PROC_LOCK_ASSERT(p, MA_OWNED);
 
@@ -2390,8 +2396,10 @@ kern_proc_vmmap_out(struct proc *p, struct sbuf *sb, s
if (obj->backing_object == NULL)
kve->kve_private_resident =
obj->resident_page_count;
-   if (!vmmap_skip_res_cnt)
-   kern_proc_vmmap_resident(map, entry, kve);
+   kern_proc_vmmap_resident(map, entry,
+   >kve_resident, );
+   if (super)
+   kve->kve_flags |= KVME_FLAG_SUPER;
for (tobj = obj; tobj != NULL;
tobj = tobj->backing_object) {
if (tobj != obj && tobj != lobj)
@@ -3112,6 +3120,7 @@ resume_all_proc(void)
 
cp = curproc;
sx_xlock(_lock);
+again:
LIST_REMOVE(cp, p_list);
LIST_INSERT_HEAD(, cp, p_list);
for (;;) {
@@ -3131,6 +3140,12 @@ resume_all_proc(void)
} else {
PROC_UNLOCK(p);
}
+   }
+   /*  Did the loop above missed any stopped process ? */
+   LIST_FOREACH(p, , p_list) {
+   /* No need for proc lock. */
+   if ((p->p_flag & P_TOTAL_STOP) != 0)
+   goto again;
}
sx_xunlock(_lock);
 }

Modified: head/sys/sys/proc.h
==
--- head/sys/sys/proc.h Thu Dec 28 13:01:27 2017(r327284)
+++ head/sys/sys/proc.h Thu Dec 28 13:16:32 2017(r327285)
@@ -184,6 +184,8 @@ struct td_sched;
 struct thread;
 struct trapframe;
 struct turnstile;
+struct vm_map;
+struct vm_map_entry;
 
 /*
  * XXX: Does this belong in resource.h or resourcevar.h instead?
@@ -1004,6 +1006,8 @@ void  fork_exit(void (*)(void *, struct trapframe *), 
v
struct trapframe *);
 void   fork_return(struct thread *, struct trapframe *);
 intinferior(struct proc *p);
+void   kern_proc_vmmap_resident(struct vm_map *map, struct vm_map_entry *entry,
+   int *resident_count, bool *super);
 void   kern_yield(int);
 void   kick_proc0(void);
 void   killjobc(void);
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327284 - head/usr.sbin/cpucontrol

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 13:01:27 2017
New Revision: 327284
URL: https://svnweb.freebsd.org/changeset/base/327284

Log:
  Style.  Remove useless return.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week

Modified:
  head/usr.sbin/cpucontrol/intel.c

Modified: head/usr.sbin/cpucontrol/intel.c
==
--- head/usr.sbin/cpucontrol/intel.cThu Dec 28 12:59:48 2017
(r327283)
+++ head/usr.sbin/cpucontrol/intel.cThu Dec 28 13:01:27 2017
(r327284)
@@ -88,7 +88,7 @@ intel_update(const char *dev, const char *path)
intel_fw_header_t *fw_header;
intel_cpu_signature_t *ext_table;
intel_ext_header_t *ext_header;
-   uint32_t signature, flags;
+   uint32_t sig, signature, flags;
int32_t revision;
ssize_t ext_size;
size_t ext_table_size;
@@ -231,7 +231,8 @@ intel_update(const char *dev, const char *path)
for (i = 0; i < (ext_table_size / sizeof(uint32_t)); i++)
sum += *((uint32_t *)ext_header + i);
if (sum != 0) {
-   WARNX(2, "%s: extended signature table checksum 
invalid",
+   WARNX(2,
+   "%s: extended signature table checksum invalid",
path);
goto no_table;
}
@@ -246,10 +247,10 @@ no_table:
 */
if (signature == fw_header->cpu_signature &&
(flags & fw_header->cpu_flags) != 0)
-   goto matched;
+   goto matched;
else if (have_ext_table != 0) {
for (i = 0; i < ext_header->sig_count; i++) {
-   uint32_t sig = ext_table[i].cpu_signature;
+   sig = ext_table[i].cpu_signature;
if (signature == sig &&
(flags & ext_table[i].cpu_flags) != 0)
goto matched;
@@ -264,14 +265,14 @@ matched:
goto fail;
}
fprintf(stderr, "%s: updating cpu %s from rev %#x to rev %#x... ",
-   path, dev, revision, fw_header->revision);
+   path, dev, revision, fw_header->revision);
args.data = fw_data;
args.size = data_size;
error = ioctl(devfd, CPUCTL_UPDATE, );
if (error < 0) {
-   error = errno;
+   error = errno;
fprintf(stderr, "failed.\n");
-   errno = error;
+   errno = error;
WARN(0, "ioctl()");
goto fail;
}
@@ -285,5 +286,4 @@ fail:
close(devfd);
if (fd >= 0)
close(fd);
-   return;
 }
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327283 - head/usr.sbin/cpucontrol

2017-12-28 Thread Konstantin Belousov

Author: kib
Date: Thu Dec 28 12:59:48 2017
New Revision: 327283
URL: https://svnweb.freebsd.org/changeset/base/327283

Log:
  Complete r327264 by fixing yet another return without cleanup.
  
  Sponsored by: The FreeBSD Foundation
  MFC after:1 week

Modified:
  head/usr.sbin/cpucontrol/intel.c

Modified: head/usr.sbin/cpucontrol/intel.c
==
--- head/usr.sbin/cpucontrol/intel.cThu Dec 28 08:25:47 2017
(r327282)
+++ head/usr.sbin/cpucontrol/intel.cThu Dec 28 12:59:48 2017
(r327283)
@@ -147,7 +147,7 @@ intel_update(const char *dev, const char *path)
fd = open(path, O_RDONLY, 0);
if (fd < 0) {
WARN(0, "open(%s)", path);
-   return;
+   goto fail;
}
error = fstat(fd, );
if (error != 0) {
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r325726 - head/sys/kern

2017-12-28 Thread Antoine Brodin

On Sat, Nov 11, 2017 at 10:39 PM, Mateusz Guzik  wrote:
> Author: mjg
> Date: Sat Nov 11 22:39:33 2017
> New Revision: 325726
> URL: https://svnweb.freebsd.org/changeset/base/325726
>
> Log:
>   Avoid locking and refing in sysctl_kern_proc_args if possible.
>
>   Turns out the sysctl is called a lot e.g. by pkg-static.
>
> Modified:
>   head/sys/kern/kern_proc.c

Hi,

There is a regression after this commit: x11-toolkits/gnustep-gui no
longer builds.
You can find a failure log at
http://pb2.nyi.freebsd.org/data/111i386-default-PR224618/2017-12-28_12h28m51s/logs/errors/gnustep-gui-0.25.1_3.log
The failure seems to be from lang/gnustep-base:

  /* get the argument vectors */
  vectors = kvm_getargv(kptr, proc_ptr, 0);

Cheers,

Antoine
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r327282 - head/share/misc

2017-12-28 Thread Eitan Adler

Author: eadler
Date: Thu Dec 28 08:25:47 2017
New Revision: 327282
URL: https://svnweb.freebsd.org/changeset/base/327282

Log:
  Update pci_vendors to 2017.12.20

Modified:
  head/share/misc/pci_vendors

Modified: head/share/misc/pci_vendors
==
--- head/share/misc/pci_vendors Thu Dec 28 08:22:26 2017(r327281)
+++ head/share/misc/pci_vendors Thu Dec 28 08:25:47 2017(r327282)
@@ -3,8 +3,8 @@
 #
 #  List of PCI ID's
 #
-#  Version: 2017.12.06
-#  Date:2017-12-06 03:15:02
+#  Version: 2017.12.20
+#  Date:2017-12-20 03:15:01
 #
 #  Maintained by Albert Pool, Martin Mares, and other volunteers from
 #  the PCI ID Project at http://pci-ids.ucw.cz/.
@@ -586,6 +586,7 @@
0096  SAS3004 PCI-Express Fusion-MPT SAS-3
0097  SAS3008 PCI-Express Fusion-MPT SAS-3
1000 3090  SAS9311-8i
+   1000 30a0  SAS9300-8e
1000 30e0  SAS9300-8i
1000 3130  SAS 9300-16i
1028 1f45  HBA330 Adapter
@@ -2508,6 +2509,7 @@
6842  Thames LE [Radeon HD 7000M Series]
6843  Thames [Radeon HD 7670M]
6861  Vega 10 XT [Radeon PRO WX 9100]
+   6862  Vega 10 XT [Radeon PRO SSG]
6863  Vega 10 XTX [Radeon Vega Frontier Edition]
687f  Vega 10 XT [Radeon RX Vega 64]
6888  Cypress XT [FirePro V8800]
@@ -4043,6 +4045,11 @@
1423  Family 15h (Models 30h-3fh) I/O Memory Management Unit
1424  Family 15h (Models 30h-3fh) Processor Root Port
1426  Family 15h (Models 30h-3fh) Processor Root Port
+   142e  Liverpool Processor Function 0
+   142f  Liverpool Processor Function 1
+   1430  Liverpool Processor Function 2
+   1431  Liverpool Processor Function 3
+   1432  Liverpool Processor Function 4
1436  Liverpool Processor Root Complex
1437  Liverpool I/O Memory Management Unit
1438  Liverpool Processor Root Port
@@ -5652,6 +5659,22 @@
90a3  Aeolia Memory (DDR3/SPM)
90a4  Aeolia USB 3.0 xHCI Host Controller
90bc  SxS Pro+ memory card
+   90c8  Belize ACPI
+   90c9  Belize Ethernet Controller
+   90ca  Belize SATA AHCI Controller
+   90cb  Belize SD/MMC Host Controller
+   90cc  Belize PCI Express Glue and Miscellaneous Devices
+   90cd  Belize DMA Controller
+   90ce  Belize Memory (DDR3/SPM)
+   90cf  Belize USB 3.0 xHCI Host Controller
+   90d7  Baikal ACPI
+   90d8  Baikal Ethernet Controller
+   90d9  Baikal SATA AHCI Controller
+   90da  Baikal SD/MMC Host Controller
+   90db  Baikal PCI Express Glue and Miscellaneous Devices
+   90dc  Baikal DMA Controller
+   90dd  Baikal Memory (DDR3/SPM)
+   90de  Baikal USB 3.0 xHCI Host Controller
 104e  Oak Technology, Inc
0017  OTI-64017
0107  OTI-107 [Spitfire]
@@ -10836,11 +10859,12 @@
13d8  GM204M [GeForce GTX 970M]
13d9  GM204M [GeForce GTX 965M]
13da  GM204M [GeForce GTX 980 Mobile]
-   13e7  GM204 [GeForce GTX 980 Engineering Sample]
+   13e7  GM204GL [GeForce GTX 980 Engineering Sample]
13f0  GM204GL [Quadro M5000]
13f1  GM204GL [Quadro M4000]
13f2  GM204GL [Tesla M60]
13f3  GM204GL [Tesla M6]
+   10de 1184  GRID M6-8Q
13f8  GM204GLM [Quadro M5000M / M5000 SE]
13f9  GM204GLM [Quadro M4000M]
13fa  GM204GLM [Quadro M3000M]
@@ -10939,7 +10963,7 @@
1cb3  GP107GL [Quadro P400]
1d01  GP108 [GeForce GT 1030]
1d10  GP108M [GeForce MX150]
-   1d81  GV100
+   1d81  GV100 [TITAN V]
1db1  GV100 [Tesla V100 SXM2]
1db4  GV100 [Tesla V100 PCIe]
 10df  Emulex Corporation
@@ -15644,6 +15668,7 @@
0252  XR17V252 Dual UART PCI controller
0254  XR17V254 Quad UART PCI controller
0258  XR17V258 Octal UART PCI controller
+   0352  XR17V3521 Dual PCIe UART
 13a9  Siemens Medical Systems, Ultrasound Group
 13aa  Broadband Networks Inc
 13ab  Arcom Control Systems Ltd
@@ -18255,6 +18280,8 @@
 1556  PLDA
1100  PCI Express Core Reference Design
110f  PCI Express Core Reference Design Virtual Function
+   1110  XpressRich Reference Design
+   1113  XpressSwitch
 1557  MEDIASTAR Co Ltd
 1558  CLEVO/KAPOK Computer
 1559  SI LOGIC Ltd
@@ -18410,6 +18437,7 @@
020b  MT27710 Family [ConnectX-4 Lx Flash Recovery]
020d  MT28800 Family [ConnectX-5 Flash Recovery]
020f  MT28908A0 Family [ConnectX-6 Flash Recovery]
+   0210  MT28908A0 Family [ConnectX-6 Secure Flash Recovery]
0211  MT416842 Family [BlueField SoC Flash Recovery]
 # reserved for RM#105916
024e  MT53100 [Spectrum-2, Flash recovery mode]
@@ -18474,6 +18502,7 @@
15b3 0050  ConnectX-4 100 GbE Dual Port QSFP28 Adapter
1014  MT27700 Family [ConnectX-4 Virtual Function]
1015  MT27710 Family

svn commit: r327281 - in head: bin/sh/tests/builtins share/man/man4 share/man/man5 share/man/man9

2017-12-28 Thread Eitan Adler

Author: eadler
Date: Thu Dec 28 08:22:26 2017
New Revision: 327281
URL: https://svnweb.freebsd.org/changeset/base/327281

Log:
  Fix a few speelling errors
  
  - man pages
  - bin/sh
  
  Reviewed by:  jilles

Modified:
  head/bin/sh/tests/builtins/var-assign.0
  head/share/man/man4/ip.4
  head/share/man/man4/nand.4
  head/share/man/man5/rc.conf.5
  head/share/man/man9/iflibdd.9
  head/share/man/man9/iflibtxrx.9
  head/share/man/man9/uio.9

Modified: head/bin/sh/tests/builtins/var-assign.0
==
--- head/bin/sh/tests/builtins/var-assign.0 Thu Dec 28 07:31:14 2017
(r327280)
+++ head/bin/sh/tests/builtins/var-assign.0 Thu Dec 28 08:22:26 2017
(r327281)
@@ -47,7 +47,7 @@ do
${SH} -c "VAR=1; VAR=0 ${cmd}; exit \${VAR}" >/dev/null 2>&1
 done
 
-# For other built-ins and utilites they do not.
+# For other built-ins and utilities they do not.
 set -- ${UTILS}
 for cmd in "$@"
 do

Modified: head/share/man/man4/ip.4
==
--- head/share/man/man4/ip.4Thu Dec 28 07:31:14 2017(r327280)
+++ head/share/man/man4/ip.4Thu Dec 28 08:22:26 2017(r327281)
@@ -224,7 +224,7 @@ or the socket should be bound to a local address and t
 .Dv IP_SENDSRCADDR
 should be
 .Dv INADDR_ANY .
-In the latter case bound address is overriden via generic source address
+In the latter case bound address is overridden via generic source address
 selection logic, which would choose IP address of interface closest to
 destination.
 .Pp

Modified: head/share/man/man4/nand.4
==
--- head/share/man/man4/nand.4  Thu Dec 28 07:31:14 2017(r327280)
+++ head/share/man/man4/nand.4  Thu Dec 28 08:22:26 2017(r327281)
@@ -41,7 +41,7 @@ The
 .Fx
 .Nm
 framework consists of a set of interfaces that aim to provide an extensible,
-object oriented environement for NAND controllers and NAND Flash memory chips
+object oriented environment for NAND controllers and NAND Flash memory chips
 from various hardware vendors, and to allow for uniform and flexible
 management of the NAND devices.
 It comprises of the following major components:

Modified: head/share/man/man5/rc.conf.5
==
--- head/share/man/man5/rc.conf.5   Thu Dec 28 07:31:14 2017
(r327280)
+++ head/share/man/man5/rc.conf.5   Thu Dec 28 08:22:26 2017
(r327281)
@@ -989,7 +989,7 @@ is set to the list of
 instances that should be started at system boot time.
 If
 .Va pflog_instances
-is set, for each whitespace-seperated
+is set, for each whitespace-separated
 .Ar element
 in the list,
 .Ao Ar element Ac Ns Va _dev
@@ -1031,7 +1031,7 @@ If multiple instances of
 .Xr ftp-proxy 8
 are desired at boot time,
 .Va ftpproxy_instances
-should contain a whitespace-seperated list of instance names.
+should contain a whitespace-separated list of instance names.
 For each
 .Ar element
 in the list, a variable named

Modified: head/share/man/man9/iflibdd.9
==
--- head/share/man/man9/iflibdd.9   Thu Dec 28 07:31:14 2017
(r327280)
+++ head/share/man/man9/iflibdd.9   Thu Dec 28 08:22:26 2017
(r327281)
@@ -179,7 +179,7 @@
 .Fc
 .Sh FUNCTIONS
 The above named functions are device dependent configuration functions.
-These routines are registerd with iflib by the driver and are called from the
+These routines are registered with iflib by the driver and are called from the
 corresponding iflib function to configure device specific functions and
 registers.
 .Ss Device Dependent Functions

Modified: head/share/man/man9/iflibtxrx.9
==
--- head/share/man/man9/iflibtxrx.9 Thu Dec 28 07:31:14 2017
(r327280)
+++ head/share/man/man9/iflibtxrx.9 Thu Dec 28 08:22:26 2017
(r327281)
@@ -190,7 +190,7 @@ event.
 .Sh FUNCTIONS
 All function calls are associated exclusively with either packet transmission
 or receipt.
-The void *sc passed as the first arguement to all of the following functions
+The void *sc passed as the first argument to all of the following functions
 represents the driver's softc.
 .Ss Transmit Packet Functions
 .Bl -ohang -offset indent

Modified: head/share/man/man9/uio.9
==
--- head/share/man/man9/uio.9   Thu Dec 28 07:31:14 2017(r327280)
+++ head/share/man/man9/uio.9   Thu Dec 28 08:22:26 2017(r327281)
@@ -149,7 +149,7 @@ transfers when the request partially overlaps the buff
 When
 .Va uio_offset
 is greater than or equal to the buffer size, the result is success
-with no bytes transfered, effectively signaling EOF.
+with no bytes

37 matches

Mail list logo