Re: svn commit: r302420 - head
On Fri, Jul 08, 2016 at 02:19:09AM +, Glen Barber wrote: > Author: gjb > Date: Fri Jul 8 02:19:09 2016 > New Revision: 302420 > URL: https://svnweb.freebsd.org/changeset/base/302420 > > Log: > Spell '12.x' correctly in UPDATING. > > Submitted by: lidl > Approved by:re (implicit) > Sponsored by: The FreeBSD Foundation > > Modified: > head/UPDATING > > Modified: head/UPDATING > == > --- head/UPDATING Fri Jul 8 02:03:42 2016(r302419) > +++ head/UPDATING Fri Jul 8 02:19:09 2016(r302420) > @@ -17,7 +17,7 @@ the tip of head, and then rebuild withou > from older version of current across the gcc/clang cutover is a bit fragile. > > NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: > - FreeBSD 11.x has many debugging features turned on, in both the kernel > + FreeBSD 12.x has many debugging features turned on, in both the kernel > and userland. These features attempt to detect incorrect use of > system primitives, and encourage loud failure through extra sanity > checking and fail stop semantics. They also substantially impact 11.x still have debugging features turned on? ___ 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: r302420 - head
On 8 Jul 2016, at 11:38, Slawa Olhovchenkov wrote: On Fri, Jul 08, 2016 at 02:19:09AM +, Glen Barber wrote: Author: gjb Date: Fri Jul 8 02:19:09 2016 New Revision: 302420 URL: https://svnweb.freebsd.org/changeset/base/302420 Log: Spell '12.x' correctly in UPDATING. Submitted by: lidl Approved by: re (implicit) Sponsored by: The FreeBSD Foundation Modified: head/UPDATING Modified: head/UPDATING == --- head/UPDATING Fri Jul 8 02:03:42 2016(r302419) +++ head/UPDATING Fri Jul 8 02:19:09 2016(r302420) @@ -17,7 +17,7 @@ the tip of head, and then rebuild withou from older version of current across the gcc/clang cutover is a bit fragile. NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: - FreeBSD 11.x has many debugging features turned on, in both the kernel + FreeBSD 12.x has many debugging features turned on, in both the kernel and userland. These features attempt to detect incorrect use of system primitives, and encourage loud failure through extra sanity checking and fail stop semantics. They also substantially impact 11.x still have debugging features turned on? Glen turned them off in r302410. Regards, Kristof ___ 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: r302431 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:08:26 2016 New Revision: 302431 URL: https://svnweb.freebsd.org/changeset/base/302431 Log: Document 302110, Merge netmap support from ncxgbe/ncxl to vcxgbe/vcxl Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 12:47:09 2016(r302430) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:08:26 2016(r302431) @@ -1296,6 +1296,11 @@ The &man.lagg.4; driver has been updated to remove support for the fec protocol. + + netmap + support from the ncxgbe/ncxl interfaces has been merged into the + vcxgbe/vcxl interfaces for the &man.cxgbe.4; driver. + ___ 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: r302432 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:09:55 2016 New Revision: 302432 URL: https://svnweb.freebsd.org/changeset/base/302432 Log: Document 289549, Update hostapd/wpa_supplicant to version 2.5. Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:08:26 2016(r302431) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:09:55 2016(r302432) @@ -505,9 +505,9 @@ The &man.nvi.1; utility has been updated to version 2.1.3. - The &man.wpa.supplicant.8; and + The &man.wpa.supplicant.8; and &man.hostapd.8; utilities have been updated to version - 2.4. + 2.5. The &man.resolvconf.8; utility has been updated to version ___ 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: r302433 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:12:24 2016 New Revision: 302433 URL: https://svnweb.freebsd.org/changeset/base/302433 Log: Document 293190, Update less to v481 Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:09:55 2016(r302432) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:12:24 2016(r302433) @@ -513,6 +513,9 @@ &man.resolvconf.8; utility has been updated to version 3.7.3. + less has + been updated to version v481. + bmake has been updated to version 20150606. ___ 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: r302434 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:21:51 2016 New Revision: 302434 URL: https://svnweb.freebsd.org/changeset/base/302434 Log: Document 300436, bsdinstall/zfsboot GPT+BIOS+GELI installs make use of GELIBOOT Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:12:24 2016(r302433) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:21:51 2016(r302434) @@ -639,6 +639,11 @@ and &man.sade.8; utility have been updated to include native ZFS support. + + &man.bsdinstall.8;/zfsboot GPT+BIOS+GELI installs now make use + of GELIBOOT which allows ZFS Boot Environments to be used with + GELI encrypted ZFS pools. + The &os; installation utility, &man.bsdinstall.8;, has been updated to set the canmount &man.zfs.8; property to ___ 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: r302435 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:26:17 2016 New Revision: 302435 URL: https://svnweb.freebsd.org/changeset/base/302435 Log: Document 301973, Add bsdconfig `wifi' (aka `wireless' or `wlan') module Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:21:51 2016(r302434) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:26:17 2016(r302435) @@ -644,6 +644,9 @@ of GELIBOOT which allows ZFS Boot Environments to be used with GELI encrypted ZFS pools. + A module to configure wifi devices has been added + to &man.bsdinstall.8; + The &os; installation utility, &man.bsdinstall.8;, has been updated to set the canmount &man.zfs.8; property to ___ 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: r302436 - head/release/doc/en_US.ISO8859-1/relnotes
Author: skreuzer (doc,ports committer) Date: Fri Jul 8 13:29:47 2016 New Revision: 302436 URL: https://svnweb.freebsd.org/changeset/base/302436 Log: Document 300291, Enable NEW_PCIB on arm64. Approved by: re (gjb, implicit, relnotes) Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml Modified: head/release/doc/en_US.ISO8859-1/relnotes/article.xml == --- head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:26:17 2016(r302435) +++ head/release/doc/en_US.ISO8859-1/relnotes/article.xml Fri Jul 8 13:29:47 2016(r302436) @@ -1038,6 +1038,10 @@ To retain the previous behavior, add KERN_DEBUGDIR="" to &man.src.conf.5;. + + + NEW_PCIB is enabled by default. + ___ 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: r302438 - head/sys/conf
Author: ngie
Date: Fri Jul 8 16:29:45 2016
New Revision: 302438
URL: https://svnweb.freebsd.org/changeset/base/302438
Log:
Revert r302403
lang/gcc{48,49,5} lacks -fformat-extensions support (causing build errors,
which
is what prompted r302403 to be committed). devel/amd64-gcc on the other hand
(which is used by Jenkins), has the support.
This fixes the Jenkins failure emails due to excessive warnings being produced
with "make buildkernel".
Discussed with: lwhsu
Reported by: Jenkins (FreeBSD_HEAD_amd64_gcc job)
Sponsored by: EMC / Isilon Storage Division
Modified:
head/sys/conf/kern.mk
Modified: head/sys/conf/kern.mk
==
--- head/sys/conf/kern.mk Fri Jul 8 15:57:55 2016(r302437)
+++ head/sys/conf/kern.mk Fri Jul 8 16:29:45 2016(r302438)
@@ -62,7 +62,7 @@ CWARNEXTRA?= -Wno-uninitialized
FORMAT_EXTENSIONS= -Wno-format
.elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600
FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__
-.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201
+.else
FORMAT_EXTENSIONS= -fformat-extensions
.endif
___
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: r302439 - head/sys/net
Author: cem Date: Fri Jul 8 17:04:21 2016 New Revision: 302439 URL: https://svnweb.freebsd.org/changeset/base/302439 Log: iflib: Fix typo in 'iflib_rx_miss_bufs' sysctl name It looks like these sysctls were copy-pasted from netmap. Most were changed from 'ixl_' prefix to 'iflib_', but this one was missed. Fix the "can't re-use a leaf (ixl_rx_miss_bufs)!" warning. Reported by: dim@ and others Sponsored by: EMC / Isilon Storage Division Modified: head/sys/net/iflib.c Modified: head/sys/net/iflib.c == --- head/sys/net/iflib.cFri Jul 8 16:29:45 2016(r302438) +++ head/sys/net/iflib.cFri Jul 8 17:04:21 2016(r302439) @@ -626,12 +626,12 @@ MODULE_DEPEND(iflib, netmap, 1, 1, 1); /* * device-specific sysctl variables: * - * ixl_crcstrip: 0: keep CRC in rx frames (default), 1: strip it. + * iflib_crcstrip: 0: keep CRC in rx frames (default), 1: strip it. * During regular operations the CRC is stripped, but on some * hardware reception of frames not multiple of 64 is slower, * so using crcstrip=0 helps in benchmarks. * - * ixl_rx_miss, ixl_rx_miss_bufs: + * iflib_rx_miss, iflib_rx_miss_bufs: * count packets that might be missed due to lost interrupts. */ SYSCTL_DECL(_dev_netmap); @@ -646,7 +646,7 @@ SYSCTL_INT(_dev_netmap, OID_AUTO, iflib_ int iflib_rx_miss, iflib_rx_miss_bufs; SYSCTL_INT(_dev_netmap, OID_AUTO, iflib_rx_miss, CTLFLAG_RW, &iflib_rx_miss, 0, "potentially missed rx intr"); -SYSCTL_INT(_dev_netmap, OID_AUTO, ixl_rx_miss_bufs, +SYSCTL_INT(_dev_netmap, OID_AUTO, iflib_rx_miss_bufs, CTLFLAG_RW, &iflib_rx_miss_bufs, 0, "potentially missed rx intr bufs"); /* ___ 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: r302438 - head/sys/conf
On 7/8/16 9:29 AM, Garrett Cooper wrote:
> Author: ngie
> Date: Fri Jul 8 16:29:45 2016
> New Revision: 302438
> URL: https://svnweb.freebsd.org/changeset/base/302438
>
> Log:
> Revert r302403
>
> lang/gcc{48,49,5} lacks -fformat-extensions support (causing build errors,
> which
> is what prompted r302403 to be committed). devel/amd64-gcc on the other hand
> (which is used by Jenkins), has the support.
>
> This fixes the Jenkins failure emails due to excessive warnings being
> produced
> with "make buildkernel".
>
> Discussed with: lwhsu
> Reported by: Jenkins (FreeBSD_HEAD_amd64_gcc job)
> Sponsored by: EMC / Isilon Storage Division
>
> Modified:
> head/sys/conf/kern.mk
>
> Modified: head/sys/conf/kern.mk
> ==
> --- head/sys/conf/kern.mk Fri Jul 8 15:57:55 2016(r302437)
> +++ head/sys/conf/kern.mk Fri Jul 8 16:29:45 2016(r302438)
> @@ -62,7 +62,7 @@ CWARNEXTRA?=-Wno-uninitialized
> FORMAT_EXTENSIONS= -Wno-format
> .elif ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 30600
> FORMAT_EXTENSIONS= -D__printf__=__freebsd_kprintf__
> -.elif ${COMPILER_TYPE} == "gcc" && ${COMPILER_VERSION} == 40201
> +.else
> FORMAT_EXTENSIONS= -fformat-extensions
> .endif
>
>
This needs to be MFC'd to stable/11.
--
Regards,
Bryan Drewery
___
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: r302438 - head/sys/conf
> On Jul 8, 2016, at 10:10, Bryan Drewery wrote: ... > This needs to be MFC'd to stable/11. Yup. I'm going to open a commit request soon. Thanks :), -Ngie > > -- > Regards, > Bryan Drewery ___ 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: r302440 - head/sys/dev/cxgbe
Author: np
Date: Fri Jul 8 18:13:23 2016
New Revision: 302440
URL: https://svnweb.freebsd.org/changeset/base/302440
Log:
cxgbe(4): Add sysctl to display the RSS indirection table size for an
interface.
dev.cxl..rss_size
dev.vcxl..rss_size
MFC after:3 days
Modified:
head/sys/dev/cxgbe/t4_main.c
Modified: head/sys/dev/cxgbe/t4_main.c
==
--- head/sys/dev/cxgbe/t4_main.cFri Jul 8 17:04:21 2016
(r302439)
+++ head/sys/dev/cxgbe/t4_main.cFri Jul 8 18:13:23 2016
(r302440)
@@ -4870,6 +4870,8 @@ vi_sysctls(struct vi_info *vi)
&vi->first_rxq, 0, "index of first rx queue");
SYSCTL_ADD_INT(ctx, children, OID_AUTO, "first_txq", CTLFLAG_RD,
&vi->first_txq, 0, "index of first tx queue");
+ SYSCTL_ADD_UINT(ctx, children, OID_AUTO, "rss_size", CTLFLAG_RD, NULL,
+ vi->rss_size, "size of RSS indirection table");
if (IS_MAIN_VI(vi)) {
SYSCTL_ADD_PROC(ctx, children, OID_AUTO, "rsrv_noflowq",
___
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: r302446 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Fri Jul 8 19:16:50 2016
New Revision: 302446
URL: https://svnweb.freebsd.org/changeset/base/302446
Log:
[ath_hal] extend the TX/RX descriptor layout to include location/beamforming
fields.
* extend the TX timestamp to 32 bits, as the AR5416 and later does a full
32 bit TX timestamp instead of 15 or 16 bits.
* add RX descriptor fields for PHY uploaded information (coming soon)
* add flags for RX/TX fast timestamp, hardware upload, etc
* add a flag for TX to request ToD/ToA location information.
Modified:
head/sys/dev/ath/ath_hal/ah_desc.h
Modified: head/sys/dev/ath/ath_hal/ah_desc.h
==
--- head/sys/dev/ath/ath_hal/ah_desc.h Fri Jul 8 19:16:45 2016
(r302445)
+++ head/sys/dev/ath/ath_hal/ah_desc.h Fri Jul 8 19:16:50 2016
(r302446)
@@ -46,7 +46,8 @@
*/
struct ath_tx_status {
uint16_tts_seqnum; /* h/w assigned sequence number */
- uint16_tts_tstamp; /* h/w assigned timestamp */
+ uint16_tts_pad1[1];
+ uint32_tts_tstamp; /* h/w assigned timestamp */
uint8_t ts_status; /* frame status, 0 => xmit ok */
uint8_t ts_rate;/* h/w transmit rate index */
int8_t ts_rssi;/* tx ack RSSI */
@@ -86,6 +87,7 @@ struct ath_tx_status {
#defineHAL_TX_DESC_CFG_ERR 0x10/* Error in 20/40 desc config */
#defineHAL_TX_DATA_UNDERRUN0x20/* Tx buffer underrun */
#defineHAL_TX_DELIM_UNDERRUN 0x40/* Tx delimiter underrun */
+#defineHAL_TX_FAST_TS 0x80/* Tx locationing timestamp */
/*
* Receive descriptor status. This structure is filled
@@ -128,6 +130,9 @@ struct ath_rx_status {
uint16_trs_flags; /* misc flags */
uint8_t rs_num_delims; /* number of delims in aggr */
uint8_t rs_spare0; /* padding */
+ uint8_t rs_ness;/* number of extension spatial streams
*/
+ uint8_t rs_hw_upload_data_type; /* hw upload format */
+ uint16_trs_spare1;
uint32_trs_evm0;/* evm bytes */
uint32_trs_evm1;
uint32_trs_evm2;
@@ -156,6 +161,11 @@ struct ath_rx_status {
#defineHAL_RX_HI_RX_CHAIN 0x0080 /* SM power save: hi Rx chain
control */
#defineHAL_RX_IS_APSD 0x0100 /* Is ASPD trigger frame */
#defineHAL_RX_STBC 0x0200 /* Is an STBC frame */
+#defineHAL_RX_LOC_INFO 0x0400 /* RX locationing information */
+
+#defineHAL_RX_HW_UPLOAD_DATA 0x1000 /* This is a hardware data
frame */
+#defineHAL_RX_HW_SOUNDING 0x2000 /* Rx sounding frame (TxBF,
positioning) */
+#defineHAL_RX_UPLOAD_VALID 0x4000 /* This hardware data frame is
valid */
/*
* This is the format of RSSI[2] on the AR9285/AR9485.
@@ -282,6 +292,7 @@ struct ath_desc_status {
#defineHAL_TXDESC_LOWRXCHAIN 0x0400 /* switch to low RX chain */
#defineHAL_TXDESC_LDPC 0x1000 /* Set LDPC TX for all rates */
#defineHAL_TXDESC_HWTS 0x2000 /* Request Azimuth Timestamp in
TX payload */
+#defineHAL_TXDESC_POS 0x4000 /* Request ToD/ToA locationing
*/
/* flags passed to rx descriptor setup methods */
#defineHAL_RXDESC_INTREQ 0x0020 /* enable per-descriptor
interrupt */
___
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: r302448 - in head/sys: amd64/cloudabi64 arm64/cloudabi64
Author: ed Date: Fri Jul 8 20:09:21 2016 New Revision: 302448 URL: https://svnweb.freebsd.org/changeset/base/302448 Log: Don't forget to set sa->narg for CloudABI system calls. It turns out that this value is not used within the system call code under normal conditions, except when using tracing tools like ktrace. If we forget to set this value, it is set to random garbage. This may cause ktrace to hang indefinitely, making it impossible to kill. Reported by: Michael Plass PR: 210800 MFC before: 11.0-RELEASE Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Modified: head/sys/amd64/cloudabi64/cloudabi64_sysvec.c == --- head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Fri Jul 8 19:19:30 2016(r302447) +++ head/sys/amd64/cloudabi64/cloudabi64_sysvec.c Fri Jul 8 20:09:21 2016(r302448) @@ -96,6 +96,7 @@ cloudabi64_fetch_syscall_args(struct thr if (sa->code >= CLOUDABI64_SYS_MAXSYSCALL) return (ENOSYS); sa->callp = &cloudabi64_sysent[sa->code]; + sa->narg = sa->callp->sy_narg; /* Fetch system call arguments. */ sa->args[0] = frame->tf_rdi; Modified: head/sys/arm64/cloudabi64/cloudabi64_sysvec.c == --- head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Fri Jul 8 19:19:30 2016(r302447) +++ head/sys/arm64/cloudabi64/cloudabi64_sysvec.c Fri Jul 8 20:09:21 2016(r302448) @@ -77,6 +77,7 @@ cloudabi64_fetch_syscall_args(struct thr if (sa->code >= CLOUDABI64_SYS_MAXSYSCALL) return (ENOSYS); sa->callp = &cloudabi64_sysent[sa->code]; + sa->narg = sa->callp->sy_narg; /* Fetch system call arguments. */ for (i = 0; i < MAXARGS; i++) ___ 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: r302449 - head
Author: bdrewery
Date: Fri Jul 8 20:15:58 2016
New Revision: 302449
URL: https://svnweb.freebsd.org/changeset/base/302449
Log:
Use TARGET here to fix check/delete-old after r302391.
usr.bin/Makefie.arm is used to install ofwdump so TARGET=arm should cover
all of the cases.
MFC after:now
Sponsored by: EMC / Isilon Storage Division
Modified:
head/ObsoleteFiles.inc
Modified: head/ObsoleteFiles.inc
==
--- head/ObsoleteFiles.inc Fri Jul 8 20:09:21 2016(r302448)
+++ head/ObsoleteFiles.inc Fri Jul 8 20:15:58 2016(r302449)
@@ -8014,7 +8014,7 @@ OLD_FILES+=usr/share/man/man5/usbd.conf.
.if ${TARGET_ARCH} != "i386" && ${TARGET_ARCH} != "amd64"
OLD_FILES+=usr/share/man/man8/boot_i386.8.gz
.endif
-.if ${TARGET_ARCH} != "aarch64" && ${TARGET_CPUARCH} != "arm" && \
+.if ${TARGET_ARCH} != "aarch64" && ${TARGET} != "arm" && \
${TARGET_ARCH} != "powerpc" && ${TARGET_ARCH} != "powerpc64" && \
${TARGET_ARCH} != "sparc64"
OLD_FILES+=usr/share/man/man8/ofwdump.8.gz
___
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: r302450 - in head/contrib/llvm/projects/libunwind: include src
Author: emaste
Date: Fri Jul 8 20:20:46 2016
New Revision: 302450
URL: https://svnweb.freebsd.org/changeset/base/302450
Log:
libunwind: update to upstream snapshot r272680
The key improvement is that it may be built without cross-unwinding
support, which significantly reduces the stack space requirement.
MFC after:1 week
Relnotes: yes
Sponsored by: The FreeBSD Foundation
Differential Revision:https://reviews.freebsd.org/D7123
Modified:
head/contrib/llvm/projects/libunwind/include/__libunwind_config.h
head/contrib/llvm/projects/libunwind/include/libunwind.h
head/contrib/llvm/projects/libunwind/src/AddressSpace.hpp
head/contrib/llvm/projects/libunwind/src/CompactUnwinder.hpp
head/contrib/llvm/projects/libunwind/src/Registers.hpp
head/contrib/llvm/projects/libunwind/src/Unwind-EHABI.cpp
head/contrib/llvm/projects/libunwind/src/UnwindCursor.hpp
head/contrib/llvm/projects/libunwind/src/UnwindLevel1.c
head/contrib/llvm/projects/libunwind/src/UnwindRegistersRestore.S
head/contrib/llvm/projects/libunwind/src/UnwindRegistersSave.S
head/contrib/llvm/projects/libunwind/src/config.h
head/contrib/llvm/projects/libunwind/src/libunwind.cpp
Directory Properties:
head/contrib/llvm/projects/libunwind/ (props changed)
Modified: head/contrib/llvm/projects/libunwind/include/__libunwind_config.h
==
--- head/contrib/llvm/projects/libunwind/include/__libunwind_config.h Fri Jul
8 20:15:58 2016(r302449)
+++ head/contrib/llvm/projects/libunwind/include/__libunwind_config.h Fri Jul
8 20:20:46 2016(r302450)
@@ -17,4 +17,47 @@
#define _LIBUNWIND_ARM_EHABI 0
#endif
+#if defined(_LIBUNWIND_IS_NATIVE_ONLY)
+# if defined(__i386__)
+# define _LIBUNWIND_TARGET_I386 1
+# define _LIBUNWIND_CONTEXT_SIZE 8
+# define _LIBUNWIND_CURSOR_SIZE 19
+# elif defined(__x86_64__)
+# define _LIBUNWIND_TARGET_X86_64 1
+# define _LIBUNWIND_CONTEXT_SIZE 21
+# define _LIBUNWIND_CURSOR_SIZE 33
+# elif defined(__ppc__)
+# define _LIBUNWIND_TARGET_PPC 1
+# define _LIBUNWIND_CONTEXT_SIZE 117
+# define _LIBUNWIND_CURSOR_SIZE 128
+# elif defined(__aarch64__)
+# define _LIBUNWIND_TARGET_AARCH64 1
+# define _LIBUNWIND_CONTEXT_SIZE 66
+# define _LIBUNWIND_CURSOR_SIZE 78
+# elif defined(__arm__)
+# define _LIBUNWIND_TARGET_ARM 1
+# define _LIBUNWIND_CONTEXT_SIZE 60
+# define _LIBUNWIND_CURSOR_SIZE 67
+# elif defined(__or1k__)
+# define _LIBUNWIND_TARGET_OR1K 1
+# define _LIBUNWIND_CONTEXT_SIZE 16
+# define _LIBUNWIND_CURSOR_SIZE 28
+# elif defined(__riscv__)
+# define _LIBUNWIND_TARGET_RISCV 1
+# define _LIBUNWIND_CONTEXT_SIZE 128 /* XXX */
+# define _LIBUNWIND_CURSOR_SIZE 140 /* XXX */
+# else
+# error "Unsupported architecture."
+# endif
+#else // !_LIBUNWIND_IS_NATIVE_ONLY
+# define _LIBUNWIND_TARGET_I386 1
+# define _LIBUNWIND_TARGET_X86_64 1
+# define _LIBUNWIND_TARGET_PPC 1
+# define _LIBUNWIND_TARGET_AARCH64 1
+# define _LIBUNWIND_TARGET_ARM 1
+# define _LIBUNWIND_TARGET_OR1K 1
+# define _LIBUNWIND_CONTEXT_SIZE 128
+# define _LIBUNWIND_CURSOR_SIZE 140
+#endif // _LIBUNWIND_IS_NATIVE_ONLY
+
#endif // LIBUNWIND_CONFIG_H__
Modified: head/contrib/llvm/projects/libunwind/include/libunwind.h
==
--- head/contrib/llvm/projects/libunwind/include/libunwind.hFri Jul 8
20:15:58 2016(r302449)
+++ head/contrib/llvm/projects/libunwind/include/libunwind.hFri Jul 8
20:20:46 2016(r302450)
@@ -46,12 +46,12 @@ enum {
};
struct unw_context_t {
- uint64_t data[128];
+ uint64_t data[_LIBUNWIND_CONTEXT_SIZE];
};
typedef struct unw_context_t unw_context_t;
struct unw_cursor_t {
- uint64_t data[140];
+ uint64_t data[_LIBUNWIND_CURSOR_SIZE];
};
typedef struct unw_cursor_t unw_cursor_t;
@@ -295,77 +295,6 @@ enum {
UNW_PPC_SPEFSCR = 112
};
-// 64-bit RISC-V registers
-enum {
- UNW_RISCV_X0 = 0,
- UNW_RISCV_X1 = 1,
- UNW_RISCV_RA = 1,
- UNW_RISCV_X2 = 2,
- UNW_RISCV_SP = 2,
- UNW_RISCV_X3 = 3,
- UNW_RISCV_X4 = 4,
- UNW_RISCV_X5 = 5,
- UNW_RISCV_X6 = 6,
- UNW_RISCV_X7 = 7,
- UNW_RISCV_X8 = 8,
- UNW_RISCV_X9 = 9,
- UNW_RISCV_X10 = 10,
- UNW_RISCV_X11 = 11,
- UNW_RISCV_X12 = 12,
- UNW_RISCV_X13 = 13,
- UNW_RISCV_X14 = 14,
- UNW_RISCV_X15 = 15,
- UNW_RISCV_X16 = 16,
- UNW_RISCV_X17 = 17,
- UNW_RISCV_X18 = 18,
- UNW_RISCV_X19 = 19,
- UNW_RISCV_X20 = 20,
- UNW_RISCV_X21 = 21,
- UNW_RISCV_X22 = 22,
- UNW_RISCV_X23 = 23,
- UNW_RISCV_X24 = 24,
- UNW_RISCV_X25 = 25,
- UNW_RISCV_X26 = 26,
- UNW_RISCV_X27 = 27,
- UNW_RISCV_X28 = 28,
- UNW_RISCV_X29 = 29,
- UNW_RISCV_X30 = 30,
- UNW_RISCV_X31 = 31,
- // reserved block
- UNW_RISCV_D0 = 64,
- UNW_RISCV_D1 = 65,
- UNW_RISCV_D2 = 66,
- UNW_RISCV_D3 = 67,
- UNW_RISCV_D4 = 68,
- UNW_RISCV_D5 = 69,
- UNW_RISCV_D6 = 70,
- UNW_RISCV_D7 = 71,
- UNW_RISCV_D8 = 72,
- UNW_RISCV_D9 =
svn commit: r302452 - head/tools/tools/sysbuild
Author: phk
Date: Fri Jul 8 20:33:20 2016
New Revision: 302452
URL: https://svnweb.freebsd.org/changeset/base/302452
Log:
Add missing PORTS_OPTS to two make commands
Modified:
head/tools/tools/sysbuild/sysbuild.sh
Modified: head/tools/tools/sysbuild/sysbuild.sh
==
--- head/tools/tools/sysbuild/sysbuild.sh Fri Jul 8 20:30:20 2016
(r302451)
+++ head/tools/tools/sysbuild/sysbuild.sh Fri Jul 8 20:33:20 2016
(r302452)
@@ -242,7 +242,7 @@ ports_build() (
do
b=`echo $p | tr / _`
t=`echo $p | sed "s,${pd},,"`
- pn=`cd $p && make package-name`
+ pn=`cd $p && make package-name ${PORTS_OPTS}`
if [ "x`basename $p`" == "xpkg" ] ; then
log_it "Very Special: $t ($pn)"
@@ -289,7 +289,7 @@ ports_build() (
else
log_it FAIL build $p
fi
- make clean
+ make clean ${PORTS_OPTS}
) > _.$b 2>&1 < /dev/null
done
)
___
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: r302456 - head/gnu/lib/libgcc
Author: emaste
Date: Fri Jul 8 21:17:24 2016
New Revision: 302456
URL: https://svnweb.freebsd.org/changeset/base/302456
Log:
libunwind: enable only the native unwinder by default
This significantly reduces stack space requirements, and runtimes
require only native unwinding.
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/gnu/lib/libgcc/Makefile
Modified: head/gnu/lib/libgcc/Makefile
==
--- head/gnu/lib/libgcc/MakefileFri Jul 8 20:50:44 2016
(r302455)
+++ head/gnu/lib/libgcc/MakefileFri Jul 8 21:17:24 2016
(r302456)
@@ -89,7 +89,7 @@ LIB2ADDEH = gcc_personality_v0.c \
UnwindRegistersSave.S \
libunwind.cpp
-CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR}
+CFLAGS+= -I${UNWINDINCDIR} -I${.CURDIR} -D_LIBUNWIND_IS_NATIVE_ONLY
.if empty(CXXFLAGS:M-std=*)
CXXFLAGS+= -std=c++11
.endif
___
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: r302459 - head/usr.sbin/bhyve
Author: mav
Date: Fri Jul 8 21:25:37 2016
New Revision: 302459
URL: https://svnweb.freebsd.org/changeset/base/302459
Log:
Allow AHCI controller to support up to 32 arbitrary devices.
While old syntax is still supported, new syntax looks like this:
-s 3,ahci,hd:/dev/zvol/XXX,hd:/dev/zvol/YYY,cd:/storage/ZZZ.iso
Sponsored by: iXsystems, Inc.
Modified:
head/usr.sbin/bhyve/bhyve.8
head/usr.sbin/bhyve/pci_ahci.c
Modified: head/usr.sbin/bhyve/bhyve.8
==
--- head/usr.sbin/bhyve/bhyve.8 Fri Jul 8 21:20:09 2016(r302458)
+++ head/usr.sbin/bhyve/bhyve.8 Fri Jul 8 21:25:37 2016(r302459)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd June 24, 2016
+.Dd July 8, 2016
.Dt BHYVE 8
.Os
.Sh NAME
@@ -171,6 +171,8 @@ Virtio network interface.
Virtio block storage interface.
.It Li virtio-rnd
Virtio RNG interface.
+.It Li ahci
+AHCI controller attached to arbitraty devices.
.It Li ahci-cd
AHCI controller attached to an ATAPI CD/DVD.
.It Li ahci-hd
@@ -347,15 +349,11 @@ null-modem device.
.Bd -literal -offset indent
bhyve -c 4 \\
-s 0,amd_hostbridge -s 1,lpc \\
- -s 1:0,ahci-hd,/images/disk.1 \\
- -s 1:1,ahci-hd,/images/disk.2 \\
- -s 1:2,ahci-hd,/images/disk.3 \\
- -s 1:3,ahci-hd,/images/disk.4 \\
- -s 1:4,ahci-hd,/images/disk.5 \\
- -s 1:5,ahci-hd,/images/disk.6 \\
- -s 1:6,ahci-hd,/images/disk.7 \\
- -s 1:7,ahci-hd,/images/disk.8 \\
- -s 2,ahci-cd,/images/install.iso \\
+ -s 1:0,ahci,hd:/images/disk.1,hd:/images/disk.2,\\
+hd:/images/disk.3,hd:/images/disk.4,\\
+hd:/images/disk.5,hd:/images/disk.6,\\
+hd:/images/disk.7,hd:/images/disk.8,\\
+cd:/images/install.iso \\
-s 3,virtio-net,tap0 \\
-l com1,/dev/nmdm0A \\
-A -H -P -m 8G
Modified: head/usr.sbin/bhyve/pci_ahci.c
==
--- head/usr.sbin/bhyve/pci_ahci.c Fri Jul 8 21:20:09 2016
(r302458)
+++ head/usr.sbin/bhyve/pci_ahci.c Fri Jul 8 21:25:37 2016
(r302459)
@@ -1,5 +1,6 @@
/*-
* Copyright (c) 2013 Zhixiang Yu
+ * Copyright (c) 2015-2016 Alexander Motin
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -57,7 +58,8 @@ __FBSDID("$FreeBSD$");
#include "ahci.h"
#include "block_if.h"
-#defineMAX_PORTS 6 /* Intel ICH8 AHCI supports 6 ports */
+#defineDEF_PORTS 6 /* Intel ICH8 AHCI supports 6 ports */
+#defineMAX_PORTS 32 /* AHCI supports 32 ports */
#definePxSIG_ATA 0x0101 /* ATA drive */
#definePxSIG_ATAPI 0xeb140101 /* ATAPI drive */
@@ -2221,20 +2223,16 @@ pci_ahci_read(struct vmctx *ctx, int vcp
static int
pci_ahci_init(struct vmctx *ctx, struct pci_devinst *pi, char *opts, int atapi)
{
- char bident[sizeof("XX:X:X")];
+ char bident[sizeof("XX:XX:XX")];
struct blockif_ctxt *bctxt;
struct pci_ahci_softc *sc;
- int ret, slots;
+ int ret, slots, p;
MD5_CTX mdctx;
u_char digest[16];
+ char *next, *next2;
ret = 0;
- if (opts == NULL) {
- fprintf(stderr, "pci_ahci: backing device required\n");
- return (1);
- }
-
#ifdef AHCI_DEBUG
dbg = fopen("/tmp/log", "w+");
#endif
@@ -2242,58 +2240,83 @@ pci_ahci_init(struct vmctx *ctx, struct
sc = calloc(1, sizeof(struct pci_ahci_softc));
pi->pi_arg = sc;
sc->asc_pi = pi;
- sc->ports = MAX_PORTS;
+ pthread_mutex_init(&sc->mtx, NULL);
+ sc->ports = 0;
+ sc->pi = 0;
+ slots = 32;
+
+ for (p = 0; p < MAX_PORTS && opts != NULL; p++, opts = next) {
+ /* Identify and cut off type of present port. */
+ if (strncmp(opts, "hd:", 3) == 0) {
+ atapi = 0;
+ opts += 3;
+ } else if (strncmp(opts, "cd:", 3) == 0) {
+ atapi = 1;
+ opts += 3;
+ }
+
+ /* Find and cut off the next port options. */
+ next = strstr(opts, ",hd:");
+ next2 = strstr(opts, ",cd:");
+ if (next == NULL || (next2 != NULL && next2 < next))
+ next = next2;
+ if (next != NULL) {
+ next[0] = 0;
+ next++;
+ }
- /*
-* Only use port 0 for a backing device. All other ports will be
-* marked as unused
-*/
- sc->port[0].atapi = atapi;
+ if (opts[0] == 0)
+ continue;
- /*
-* Attempt to open the backing image. Use the PCI
-* slot/func for the identifier string.
-*/
- snprintf(bident, sizeof(bident), "%d:%d", pi->pi_slot, pi->pi_func);
- bctxt = blockif_open(opts, bident);
- if (bctxt == NULL) {
svn commit: r302460 - head/usr.sbin/bhyve
Author: mav
Date: Fri Jul 8 21:30:18 2016
New Revision: 302460
URL: https://svnweb.freebsd.org/changeset/base/302460
Log:
Add emulation for multiple (up to 16) MSI vectors for AHCI.
It was useless before, but may improve performance now if multiple devices
are configured and guest supports this feature.
Sponsored by: iXsystems, Inc.
Modified:
head/usr.sbin/bhyve/pci_ahci.c
head/usr.sbin/bhyve/pci_emul.h
Modified: head/usr.sbin/bhyve/pci_ahci.c
==
--- head/usr.sbin/bhyve/pci_ahci.c Fri Jul 8 21:25:37 2016
(r302459)
+++ head/usr.sbin/bhyve/pci_ahci.c Fri Jul 8 21:30:18 2016
(r302460)
@@ -135,6 +135,7 @@ struct ahci_port {
uint8_t *cmd_lst;
uint8_t *rfis;
char ident[20 + 1];
+ int port;
int atapi;
int reset;
int waitforclear;
@@ -219,47 +220,95 @@ static inline void lba_to_msf(uint8_t *b
}
/*
- * generate HBA intr depending on whether or not ports within
- * the controller have an interrupt pending.
+ * Generate HBA interrupts on global IS register write.
*/
static void
-ahci_generate_intr(struct pci_ahci_softc *sc)
+ahci_generate_intr(struct pci_ahci_softc *sc, uint32_t mask)
{
- struct pci_devinst *pi;
- int i;
-
- pi = sc->asc_pi;
+ struct pci_devinst *pi = sc->asc_pi;
+ struct ahci_port *p;
+ int i, nmsg;
+ uint32_t mmask;
+ /* Update global IS from PxIS/PxIE. */
for (i = 0; i < sc->ports; i++) {
- struct ahci_port *pr;
- pr = &sc->port[i];
- if (pr->is & pr->ie)
+ p = &sc->port[i];
+ if (p->is & p->ie)
sc->is |= (1 << i);
}
+ DPRINTF("%s(%08x) %08x\n", __func__, mask, sc->is);
- DPRINTF("%s %x\n", __func__, sc->is);
+ /* If there is nothing enabled -- clear legacy interrupt and exit. */
+ if (sc->is == 0 || (sc->ghc & AHCI_GHC_IE) == 0) {
+ if (sc->lintr) {
+ pci_lintr_deassert(pi);
+ sc->lintr = 0;
+ }
+ return;
+ }
- if (sc->is && (sc->ghc & AHCI_GHC_IE)) {
- if (pci_msi_enabled(pi)) {
- /*
-* Generate an MSI interrupt on every edge
-*/
- pci_generate_msi(pi, 0);
- } else if (!sc->lintr) {
- /*
-* Only generate a pin-based interrupt if one wasn't
-* in progress
-*/
+ /* If there is anything and no MSI -- assert legacy interrupt. */
+ nmsg = pci_msi_maxmsgnum(pi);
+ if (nmsg == 0) {
+ if (!sc->lintr) {
sc->lintr = 1;
pci_lintr_assert(pi);
}
- } else if (sc->lintr) {
- /*
-* No interrupts: deassert pin-based signal if it had
-* been asserted
-*/
- pci_lintr_deassert(pi);
- sc->lintr = 0;
+ return;
+ }
+
+ /* Assert respective MSIs for ports that were touched. */
+ for (i = 0; i < nmsg; i++) {
+ if (sc->ports <= nmsg || i < nmsg - 1)
+ mmask = 1 << i;
+ else
+ mmask = 0x << i;
+ if (sc->is & mask && mmask & mask)
+ pci_generate_msi(pi, i);
+ }
+}
+
+/*
+ * Generate HBA interrupt on specific port event.
+ */
+static void
+ahci_port_intr(struct ahci_port *p)
+{
+ struct pci_ahci_softc *sc = p->pr_sc;
+ struct pci_devinst *pi = sc->asc_pi;
+ int nmsg;
+
+ DPRINTF("%s(%d) %08x/%08x %08x\n", __func__,
+ p->port, p->is, p->ie, sc->is);
+
+ /* If there is nothing enabled -- we are done. */
+ if ((p->is & p->ie) == 0)
+ return;
+
+ /* In case of non-shared MSI always generate interrupt. */
+ nmsg = pci_msi_maxmsgnum(pi);
+ if (sc->ports <= nmsg || p->port < nmsg - 1) {
+ sc->is |= (1 << p->port);
+ if ((sc->ghc & AHCI_GHC_IE) == 0)
+ return;
+ pci_generate_msi(pi, p->port);
+ return;
+ }
+
+ /* If IS for this port is already set -- do nothing. */
+ if (sc->is & (1 << p->port))
+ return;
+
+ sc->is |= (1 << p->port);
+
+ /* If interrupts are enabled -- generate one. */
+ if ((sc->ghc & AHCI_GHC_IE) == 0)
+ return;
+ if (nmsg > 0) {
+ pci_generate_msi(pi, nmsg - 1);
+ } else if (!sc->lintr) {
+ sc->lintr = 1;
+ pci_lintr_assert(pi);
}
}
@@ -297,8 +346,10 @@ ahci_write_fis(struct ahci_port *p, enum
svn commit: r302461 - in head/sys: contrib/dev/ath/ath_hal/ar9300 dev/ath dev/ath/ath_hal dev/ath/ath_hal/ar5210 dev/ath/ath_hal/ar5211 dev/ath/ath_hal/ar5212 dev/ath/ath_hal/ar5416
Author: adrian
Date: Fri Jul 8 21:34:39 2016
New Revision: 302461
URL: https://svnweb.freebsd.org/changeset/base/302461
Log:
[ath_hal] retire a "long RX desc" flag, store/use the TX/RX timestamp length.
* the code already stored the length of the RX desc, which I never used.
So, use that and retire the new flag I introduced a while ago.
* Introduce a TX timestamp length field and capability.
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
head/sys/dev/ath/ath_hal/ah.c
head/sys/dev/ath/ath_hal/ah.h
head/sys/dev/ath/ath_hal/ah_internal.h
head/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c
head/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c
head/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c
head/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c
head/sys/dev/ath/if_ath.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Fri Jul 8
21:30:18 2016(r302460)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_attach.c Fri Jul 8
21:34:39 2016(r302461)
@@ -2878,7 +2878,6 @@ ar9300_fill_capability_info(struct ath_h
#if ATH_SUPPORT_SPECTRAL
p_cap->halSpectralScanSupport = AH_TRUE;
#endif
-
ahpriv->ah_rfsilent = ar9300_eeprom_get(ahp, EEP_RF_SILENT);
if (ahpriv->ah_rfsilent & EEP_RFSILENT_ENABLED) {
ahp->ah_gpio_select = MS(ahpriv->ah_rfsilent, EEP_RFSILENT_GPIO_SEL);
@@ -2998,8 +2997,8 @@ ar9300_fill_capability_info(struct ath_h
p_cap->hal_cfend_fix_support = AH_FALSE;
p_cap->hal_aggr_extra_delim_war = AH_FALSE;
#endif
-p_cap->halHasLongRxDescTsf = AH_TRUE;
-//p_cap->hal_rx_desc_timestamp_bits = 32;
+p_cap->halTxTstampPrecision = 32;
+p_cap->halRxTstampPrecision = 32;
p_cap->halRxTxAbortSupport = AH_TRUE;
p_cap->hal_ani_poll_interval = AR9300_ANI_POLLINTERVAL;
p_cap->hal_channel_switch_time_usec = AR9300_CHANNEL_SWITCH_TIME_USEC;
Modified: head/sys/dev/ath/ath_hal/ah.c
==
--- head/sys/dev/ath/ath_hal/ah.c Fri Jul 8 21:30:18 2016
(r302460)
+++ head/sys/dev/ath/ath_hal/ah.c Fri Jul 8 21:34:39 2016
(r302461)
@@ -749,7 +749,7 @@ ath_hal_getcapability(struct ath_hal *ah
case HAL_CAP_HT20_SGI:
return pCap->halHTSGI20Support ? HAL_OK : HAL_ENOTSUPP;
case HAL_CAP_RXTSTAMP_PREC: /* rx desc tstamp precision (bits) */
- *result = pCap->halTstampPrecision;
+ *result = pCap->halRxTstampPrecision;
return HAL_OK;
case HAL_CAP_ANT_DIV_COMB: /* AR9285/AR9485 LNA diversity */
return pCap->halAntDivCombSupport ? HAL_OK : HAL_ENOTSUPP;
@@ -778,8 +778,6 @@ ath_hal_getcapability(struct ath_hal *ah
}
case HAL_CAP_RXDESC_SELFLINK: /* hardware supports self-linked final
RX descriptors correctly */
return pCap->halHasRxSelfLinkedTail ? HAL_OK : HAL_ENOTSUPP;
- case HAL_CAP_LONG_RXDESC_TSF: /* 32 bit TSF in RX descriptor?
*/
- return pCap->halHasLongRxDescTsf ? HAL_OK : HAL_ENOTSUPP;
case HAL_CAP_BB_READ_WAR: /* Baseband read WAR */
return pCap->halHasBBReadWar? HAL_OK : HAL_ENOTSUPP;
case HAL_CAP_SERIALISE_WAR: /* PCI register serialisation */
@@ -791,6 +789,9 @@ ath_hal_getcapability(struct ath_hal *ah
return pCap->halRxUsingLnaMixing ? HAL_OK : HAL_ENOTSUPP;
case HAL_CAP_DO_MYBEACON: /* Hardware supports filtering
my-beacons */
return pCap->halRxDoMyBeacon ? HAL_OK : HAL_ENOTSUPP;
+ case HAL_CAP_TXTSTAMP_PREC: /* tx desc tstamp precision (bits) */
+ *result = pCap->halTxTstampPrecision;
+ return HAL_OK;
default:
return HAL_EINVAL;
}
Modified: head/sys/dev/ath/ath_hal/ah.h
==
--- head/sys/dev/ath/ath_hal/ah.h Fri Jul 8 21:30:18 2016
(r302460)
+++ head/sys/dev/ath/ath_hal/ah.h Fri Jul 8 21:34:39 2016
(r302461)
@@ -194,12 +194,12 @@ typedef enum {
HAL_CAP_BSSIDMATCH = 238, /* hardware has disable bssid match */
HAL_CAP_STREAMS = 239, /* how many 802.11n spatial streams are
available */
HAL_CAP_RXDESC_SELFLINK = 242, /* support a self-linked tail RX
descriptor */
- HAL_CAP_LONG_RXDESC_TSF = 243, /* hardware supports 32bit TSF in RX
descriptor */
HAL_CAP_BB_READ_WAR = 244, /* baseband read WAR */
HAL_CAP_SERIALISE_WAR = 245, /* serialise register access on PCI */
HAL_CAP_ENFORCE_TXOP= 246, /* Enforce TXOP if supported */
HAL_CAP_RX_LNA_MIXING = 247, /* RX hardware uses LNA mixing */
HAL_CAP_DO_MYBEACON
svn commit: r302462 - head/sys/dev/ath
Author: adrian Date: Fri Jul 8 21:35:44 2016 New Revision: 302462 URL: https://svnweb.freebsd.org/changeset/base/302462 Log: [ath] include ath_hal accessor macro changes. I missed this in the previous commit. Modified: head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/if_athvar.h == --- head/sys/dev/ath/if_athvar.hFri Jul 8 21:34:39 2016 (r302461) +++ head/sys/dev/ath/if_athvar.hFri Jul 8 21:35:44 2016 (r302462) @@ -1370,9 +1370,12 @@ void ath_intr(void *); 0, NULL) == HAL_OK) #defineath_hal_gtxto_supported(_ah) \ (ath_hal_getcapability(_ah, HAL_CAP_GTXTO, 0, NULL) == HAL_OK) -#defineath_hal_has_long_rxdesc_tsf(_ah) \ - (ath_hal_getcapability(_ah, HAL_CAP_LONG_RXDESC_TSF, \ - 0, NULL) == HAL_OK) +#defineath_hal_get_rx_tsf_prec(_ah, _pr) \ + (ath_hal_getcapability((_ah), HAL_CAP_RXTSTAMP_PREC, 0, (_pr)) \ + == HAL_OK) +#defineath_hal_get_tx_tsf_prec(_ah, _pr) \ + (ath_hal_getcapability((_ah), HAL_CAP_TXTSTAMP_PREC, 0, (_pr)) \ + == HAL_OK) #defineath_hal_setuprxdesc(_ah, _ds, _size, _intreq) \ ((*(_ah)->ah_setupRxDesc)((_ah), (_ds), (_size), (_intreq))) #defineath_hal_rxprocdesc(_ah, _ds, _dspa, _dsnext, _rs) \ ___ 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: r302463 - head/sys/dev/ath/ath_hal
Author: adrian
Date: Fri Jul 8 21:37:04 2016
New Revision: 302463
URL: https://svnweb.freebsd.org/changeset/base/302463
Log:
[ath_hal] add capability bit for querying/controlling the ToA/ToD positioning
code.
Modified:
head/sys/dev/ath/ath_hal/ah.h
Modified: head/sys/dev/ath/ath_hal/ah.h
==
--- head/sys/dev/ath/ath_hal/ah.h Fri Jul 8 21:35:44 2016
(r302462)
+++ head/sys/dev/ath/ath_hal/ah.h Fri Jul 8 21:37:04 2016
(r302463)
@@ -199,6 +199,7 @@ typedef enum {
HAL_CAP_ENFORCE_TXOP= 246, /* Enforce TXOP if supported */
HAL_CAP_RX_LNA_MIXING = 247, /* RX hardware uses LNA mixing */
HAL_CAP_DO_MYBEACON = 248, /* Supports HAL_RX_FILTER_MYBEACON */
+ HAL_CAP_TOA_LOCATIONING = 249, /* time of flight / arrival locationing
*/
HAL_CAP_TXTSTAMP_PREC = 250, /* tx desc tstamp precision (bits) */
} HAL_CAPABILITY_TYPE;
___
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: r302464 - head/sys/dev/ath
Author: adrian Date: Fri Jul 8 22:20:35 2016 New Revision: 302464 URL: https://svnweb.freebsd.org/changeset/base/302464 Log: [ath] add a new buf flag, marking a buffer as involved with ToA/ToD positioning. Modified: head/sys/dev/ath/if_athvar.h Modified: head/sys/dev/ath/if_athvar.h == --- head/sys/dev/ath/if_athvar.hFri Jul 8 21:37:04 2016 (r302463) +++ head/sys/dev/ath/if_athvar.hFri Jul 8 22:20:35 2016 (r302464) @@ -314,8 +314,9 @@ typedef TAILQ_HEAD(ath_bufhead_s, ath_bu #defineATH_BUF_BUSY0x0002 /* (tx) desc owned by h/w */ #defineATH_BUF_FIFOEND 0x0004 #defineATH_BUF_FIFOPTR 0x0008 +#defineATH_BUF_TOA_PROBE 0x0010 /* ToD/ToA exchange probe */ -#defineATH_BUF_FLAGS_CLONE (ATH_BUF_MGMT) +#defineATH_BUF_FLAGS_CLONE (ATH_BUF_MGMT | ATH_BUF_TOA_PROBE) /* * DMA state for tx/rx descriptors. ___ 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: r302465 - in head/sys/boot: fdt uboot/lib
Author: gonzo
Date: Fri Jul 8 22:32:03 2016
New Revision: 302465
URL: https://svnweb.freebsd.org/changeset/base/302465
Log:
Remove extra 0x before %p format strings introduced by r296182
Modified:
head/sys/boot/fdt/fdt_loader_cmd.c
head/sys/boot/uboot/lib/elf_freebsd.c
head/sys/boot/uboot/lib/glue.c
Modified: head/sys/boot/fdt/fdt_loader_cmd.c
==
--- head/sys/boot/fdt/fdt_loader_cmd.c Fri Jul 8 22:20:35 2016
(r302464)
+++ head/sys/boot/fdt/fdt_loader_cmd.c Fri Jul 8 22:32:03 2016
(r302465)
@@ -421,7 +421,7 @@ fdt_setup_fdtp()
/* If we were given the address of a valid blob in memory, use it. */
if (fdt_to_load != NULL) {
if (fdt_load_dtb_addr(fdt_to_load) == 0) {
- printf("Using DTB from memory address 0x%p.\n",
+ printf("Using DTB from memory address %p.\n",
fdt_to_load);
return (0);
}
Modified: head/sys/boot/uboot/lib/elf_freebsd.c
==
--- head/sys/boot/uboot/lib/elf_freebsd.c Fri Jul 8 22:20:35 2016
(r302464)
+++ head/sys/boot/uboot/lib/elf_freebsd.c Fri Jul 8 22:32:03 2016
(r302465)
@@ -85,7 +85,7 @@ __elfN(uboot_exec)(struct preloaded_file
return (error);
entry = (void *)e->e_entry;
- printf("Kernel entry at 0x%p...\n", entry);
+ printf("Kernel entry at %p...\n", entry);
dev_cleanup();
printf("Kernel args: %s\n", fp->f_args);
Modified: head/sys/boot/uboot/lib/glue.c
==
--- head/sys/boot/uboot/lib/glue.c Fri Jul 8 22:20:35 2016
(r302464)
+++ head/sys/boot/uboot/lib/glue.c Fri Jul 8 22:32:03 2016
(r302465)
@@ -469,7 +469,7 @@ ub_dump_di(int handle)
int i;
printf("device info (%d):\n", handle);
- printf(" cookie\t= 0x%p\n", di->cookie);
+ printf(" cookie\t= %p\n", di->cookie);
printf(" type\t\t= 0x%08x\n", di->type);
if (di->type == DEV_TYP_NET) {
___
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: r302466 - head/sys/contrib/dev/ath/ath_hal/ar9300
Author: adrian
Date: Fri Jul 8 22:37:52 2016
New Revision: 302466
URL: https://svnweb.freebsd.org/changeset/base/302466
Log:
[ath_hal] Add setting positioning bit and clear sounding-disable bit.
* If fast_ts is set then the TX timestamp is the fast timestamp, not
normal TSF.
* If the TX descriptor has the position bit set then request locationing
and clear sounding-disable. This way we (a) get the response with
the TX timestamp from the location side of things, and (b) we get
a CSI dump of the response ACK, which we will eventually use in the
locationing path.
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.cFri Jul 8
22:32:03 2016(r302465)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_xmit_ds.cFri Jul 8
22:37:52 2016(r302466)
@@ -335,6 +335,9 @@ ar9300_proc_tx_desc(struct ath_hal *ah,
ts->ts_ba_low = ads->status5;
ts->ts_ba_high = ads->status6;
}
+if (ads->status8 & AR_tx_fast_ts) {
+ts->ts_flags |= HAL_TX_FAST_TS;
+}
/*
* Extract the transmit rate.
@@ -624,6 +627,11 @@ ar9300_set_11n_tx_desc(
ads->ds_ctl18 = 0;
ads->ds_ctl19 = AR_not_sounding; /* set not sounding for normal frame */
+/* ToA/ToD positioning */
+if (flags & HAL_TXDESC_POS) {
+ads->ds_ctl12 |= AR_loc_mode;
+ads->ds_ctl19 &= ~AR_not_sounding;
+}
/*
* Clear Ness1/2/3 (Number of Extension Spatial Streams) fields.
___
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: r302467 - head/sys/contrib/dev/ath/ath_hal/ar9300
Author: adrian
Date: Fri Jul 8 22:39:37 2016
New Revision: 302467
URL: https://svnweb.freebsd.org/changeset/base/302467
Log:
[ath_hal] add locationing / tx-beamforming RX status descriptor decoding.
* LOC_INFO is mostly just "did this packet come with a locationing
timestamp instead of TSF";
* Decode not-sounding, uploaded-data, data-valid, data type and
number of extension spatial streams.
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.cFri Jul 8
22:37:52 2016(r302466)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_recv_ds.cFri Jul 8
22:39:37 2016(r302467)
@@ -94,8 +94,15 @@ ar9300_proc_rx_desc_fast(struct ath_hal
rxs->rs_moreaggr = (rxsp->status11 & AR_rx_more_aggr) ? 1 : 0;
rxs->rs_antenna = (MS(rxsp->status4, AR_rx_antenna) & 0x7);
rxs->rs_flags = (rxsp->status11 & AR_apsd_trig) ? HAL_RX_IS_APSD : 0;
-rxs->rs_flags |= (rxsp->status4 & AR_gi) ? HAL_RX_GI : 0;
-rxs->rs_flags |= (rxsp->status4 & AR_2040) ? HAL_RX_2040 : 0;
+rxs->rs_flags |= (rxsp->status4 & AR_gi) ? HAL_RX_GI : 0;
+rxs->rs_flags |= (rxsp->status4 & AR_2040) ? HAL_RX_2040 : 0;
+
+/* TX beamforming; CSI for locationing */
+rxs->rs_flags |= (rxsp->status2 & AR_hw_upload_data) ?
HAL_RX_HW_UPLOAD_DATA : 0;
+rxs->rs_flags |= (rxsp->status4 & AR_rx_not_sounding) ? 0 :
HAL_RX_HW_SOUNDING;
+rxs->rs_ness = MS(rxsp->status4, AR_rx_ness);
+rxs->rs_flags |= (rxsp->status4 & AR_hw_upload_data_valid) ?
HAL_RX_UPLOAD_VALID : 0;
+rxs->rs_hw_upload_data_type = MS(rxsp->status11, AR_hw_upload_data_type);
/* Copy EVM information */
rxs->rs_evm0 = rxsp->status6;
@@ -133,9 +140,9 @@ ar9300_proc_rx_desc_fast(struct ath_hal
if (rxsp->status11 & AR_crc_err) {
rxs->rs_status |= HAL_RXERR_CRC;
-/*
-* ignore CRC flag for phy reports
-*/
+/*
+ * ignore CRC flag for phy reports
+ */
if (rxsp->status11 & AR_phyerr) {
u_int phyerr = MS(rxsp->status11, AR_phy_err_code);
rxs->rs_status |= HAL_RXERR_PHY;
@@ -164,6 +171,23 @@ ar9300_proc_rx_desc_fast(struct ath_hal
} else if (rxsp->status11 & AR_michael_err) {
rxs->rs_status |= HAL_RXERR_MIC;
}
+} else {
+if (rxsp->status11 & AR_position_bit) {
+#if 1
+rxs->rs_flags |= HAL_RX_LOC_INFO;
+#else
+/*
+ * If the locationing counter is enabled, Osprey always
+ * seems to put AR_position_bit in each frame.
+ * So, only do this if we also have a valid upload
+ * and it's type "1" (which I'm guessing is CSI.)
+ */
+if ((rxs->rs_flags & HAL_RX_UPLOAD_VALID) &&
+(rxs->rs_hw_upload_data_type == 1)) {
+rxs->rs_flags |= HAL_RX_LOC_INFO;
+}
+#endif
+}
}
#if 0
rxs->rs_channel = AH_PRIVATE(ah)->ah_curchan->channel;
___
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: r302468 - head/sys/contrib/dev/ath/ath_hal/ar9300
Author: adrian
Date: Fri Jul 8 22:59:15 2016
New Revision: 302468
URL: https://svnweb.freebsd.org/changeset/base/302468
Log:
[ath_hal] add in locationing timer support and capabilities.
* add support to read the timer and capability
* add support to enable/disable the location timer.
On AR9380 at least, enabling the location timer is required to make
the timer tick, otherwise location packets return a timestamp of 0.
However, it then makes /all/ RX packets use the RX location timestamp
instead of the TSF timestamp.
So, unless I find another magical way to do location timestamping,
we will have to dynamically switch things on/off and ensure the
TX/RX path handles the "different" timestamps correctly.
Tested:
* AR9380, STA mode
Modified:
head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
Modified: head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c
==
--- head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Fri Jul 8
22:39:37 2016(r302467)
+++ head/sys/contrib/dev/ath/ath_hal/ar9300/ar9300_misc.c Fri Jul 8
22:59:15 2016(r302468)
@@ -26,7 +26,9 @@
#include "ar9300/ar9300.h"
#include "ar9300/ar9300reg.h"
#include "ar9300/ar9300phy.h"
+#include "ar9300/ar9300desc.h"
+static u_int32_t ar9300_read_loc_timer(struct ath_hal *ah);
void
ar9300_get_hw_hangs(struct ath_hal *ah, hal_hw_hangs_t *hangs)
@@ -947,6 +949,14 @@ ar9300_get_capability(struct ath_hal *ah
return (HAL_ENOTSUPP);
(*result) = !! (ahp->ah_misc_mode & AR_PCU_TXOP_TBTT_LIMIT_ENA);
return (HAL_OK);
+case HAL_CAP_TOA_LOCATIONING:
+if (capability == 0)
+return HAL_OK;
+if (capability == 2) {
+*result = ar9300_read_loc_timer(ah);
+return (HAL_OK);
+}
+return HAL_ENOTSUPP;
default:
return ath_hal_getcapability(ah, type, capability, result);
}
@@ -1060,6 +1070,14 @@ ar9300_set_capability(struct ath_hal *ah
}
return AH_TRUE;
+case HAL_CAP_TOA_LOCATIONING:
+if (capability == 0)
+return AH_TRUE;
+if (capability == 1) {
+ar9300_update_loc_ctl_reg(ah, setting);
+return AH_TRUE;
+}
+return AH_FALSE;
/* fall thru... */
default:
return ath_hal_setcapability(ah, type, capability, setting, status);
@@ -3855,6 +3873,13 @@ ar9300SetDfs3StreamFix(struct ath_hal *a
return AH_FALSE;
}
+static u_int32_t
+ar9300_read_loc_timer(struct ath_hal *ah)
+{
+
+return OS_REG_READ(ah, AR_LOC_TIMER_REG);
+}
+
HAL_BOOL
ar9300_set_ctl_pwr(struct ath_hal *ah, u_int8_t *ctl_array)
{
___
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: r302469 - head/tools/tools/locale
Author: bapt
Date: Fri Jul 8 23:07:48 2016
New Revision: 302469
URL: https://svnweb.freebsd.org/changeset/base/302469
Log:
Allow to install various components of the locales independantly
Modified:
head/tools/tools/locale/Makefile
Modified: head/tools/tools/locale/Makefile
==
--- head/tools/tools/locale/MakefileFri Jul 8 22:59:15 2016
(r302468)
+++ head/tools/tools/locale/MakefileFri Jul 8 23:07:48 2016
(r302469)
@@ -54,8 +54,9 @@ all:
@echo ""
@find . -name *failed
-install:
.for t in ${TYPES}
+install: install-${t}
+install-${t}:
. if ${KNOWN:M${t}}
rm -rf ${.CURDIR}/${t}.draft
rm -rf ${.CURDIR}/../../../share/${t}
___
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: r302470 - head/sys/arm/allwinner
Author: manu
Date: Fri Jul 8 23:08:59 2016
New Revision: 302470
URL: https://svnweb.freebsd.org/changeset/base/302470
Log:
Check that the pin function exists before setting it.
This is needed for Allwinner A13 which has gpio pins with only "out" function.
Modified:
head/sys/arm/allwinner/a10_gpio.c
Modified: head/sys/arm/allwinner/a10_gpio.c
==
--- head/sys/arm/allwinner/a10_gpio.c Fri Jul 8 23:07:48 2016
(r302469)
+++ head/sys/arm/allwinner/a10_gpio.c Fri Jul 8 23:08:59 2016
(r302470)
@@ -198,11 +198,15 @@ a10_gpio_get_function(struct a10_gpio_so
return (0);
}
-static void
+static int
a10_gpio_set_function(struct a10_gpio_softc *sc, uint32_t pin, uint32_t f)
{
uint32_t bank, data, offset;
+ /* Check if the function exists in the padconf data */
+ if (sc->padconf->pins[pin].functions[f] == NULL)
+ return (EINVAL);
+
/* Must be called with lock held. */
A10_GPIO_LOCK_ASSERT(sc);
@@ -214,6 +218,8 @@ a10_gpio_set_function(struct a10_gpio_so
data &= ~(7 << offset);
data |= (f << offset);
A10_GPIO_WRITE(sc, A10_GPIO_GP_CFG(bank, pin >> 3), data);
+
+ return (0);
}
static uint32_t
@@ -275,9 +281,10 @@ a10_gpio_set_drv(struct a10_gpio_softc *
A10_GPIO_WRITE(sc, A10_GPIO_GP_DRV(bank, pin >> 4), val);
}
-static void
+static int
a10_gpio_pin_configure(struct a10_gpio_softc *sc, uint32_t pin, uint32_t flags)
{
+ int err = 0;
/* Must be called with lock held. */
A10_GPIO_LOCK_ASSERT(sc);
@@ -285,11 +292,14 @@ a10_gpio_pin_configure(struct a10_gpio_s
/* Manage input/output. */
if (flags & (GPIO_PIN_INPUT | GPIO_PIN_OUTPUT)) {
if (flags & GPIO_PIN_OUTPUT)
- a10_gpio_set_function(sc, pin, A10_GPIO_OUTPUT);
+ err = a10_gpio_set_function(sc, pin, A10_GPIO_OUTPUT);
else
- a10_gpio_set_function(sc, pin, A10_GPIO_INPUT);
+ err = a10_gpio_set_function(sc, pin, A10_GPIO_INPUT);
}
+ if (err)
+ return (err);
+
/* Manage Pull-up/pull-down. */
if (flags & (GPIO_PIN_PULLUP | GPIO_PIN_PULLDOWN)) {
if (flags & GPIO_PIN_PULLUP)
@@ -298,6 +308,8 @@ a10_gpio_pin_configure(struct a10_gpio_s
a10_gpio_set_pud(sc, pin, A10_GPIO_PULLDOWN);
} else
a10_gpio_set_pud(sc, pin, A10_GPIO_NONE);
+
+ return (0);
}
static device_t
@@ -372,16 +384,17 @@ static int
a10_gpio_pin_setflags(device_t dev, uint32_t pin, uint32_t flags)
{
struct a10_gpio_softc *sc;
+ int err;
sc = device_get_softc(dev);
if (pin > sc->padconf->npins)
return (EINVAL);
A10_GPIO_LOCK(sc);
- a10_gpio_pin_configure(sc, pin, flags);
+ err = a10_gpio_pin_configure(sc, pin, flags);
A10_GPIO_UNLOCK(sc);
- return (0);
+ return (err);
}
static int
___
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: r302471 - head/usr.bin/mkcsmapper
Author: bapt Date: Fri Jul 8 23:10:55 2016 New Revision: 302471 URL: https://svnweb.freebsd.org/changeset/base/302471 Log: Add RCS Id. Sort options in SYNOPSIS. Fix macro usage. Fix Dd. Submitted by: w...@netbsd.org Obtained from:NetBSD Modified: head/usr.bin/mkcsmapper/mkcsmapper.1 Modified: head/usr.bin/mkcsmapper/mkcsmapper.1 == --- head/usr.bin/mkcsmapper/mkcsmapper.1Fri Jul 8 23:08:59 2016 (r302470) +++ head/usr.bin/mkcsmapper/mkcsmapper.1Fri Jul 8 23:10:55 2016 (r302471) @@ -34,7 +34,7 @@ .\" .\" $FreeBSD$ .\" -.Dd Sep 6, 2009 +.Dd September 6, 2009 .Dt MKCSMAPPER 1 .Os .Sh NAME @@ -43,9 +43,8 @@ .Xr iconv 3 .Sh SYNOPSIS .Nm -.Op Fl mpd -.Fl o -.Ar outfile +.Op Fl dmp +.Fl o Ar outfile .Ar infile .Sh DESCRIPTION The @@ -82,7 +81,8 @@ Generate pivot data from .Sh HISTORY .Nm first appeared in -.Nx 2.0 , and made its appearance in +.Nx 2.0 , +and made its appearance in .Fx 9.0 . .Sh AUTHORS This manual page was written by ___ 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: r302472 - in head/sys: arm/allwinner arm/allwinner/a13 arm/allwinner/clk arm/conf conf
Author: manu
Date: Fri Jul 8 23:38:25 2016
New Revision: 302472
URL: https://svnweb.freebsd.org/changeset/base/302472
Log:
Add support for Allwinner A13.
Reviewed by: jmcneill
Relnotes: yes
Differential Revision:https://reviews.freebsd.org/D6809
Added:
head/sys/arm/allwinner/a13/
head/sys/arm/allwinner/a13/a13_padconf.c (contents, props changed)
head/sys/arm/allwinner/a13/files.a13 (contents, props changed)
Modified:
head/sys/arm/allwinner/a10_codec.c
head/sys/arm/allwinner/a10_ehci.c
head/sys/arm/allwinner/a10_gpio.c
head/sys/arm/allwinner/allwinner_machdep.c
head/sys/arm/allwinner/aw_ccu.c
head/sys/arm/allwinner/clk/aw_gate.c
head/sys/arm/allwinner/clk/aw_pll.c
head/sys/arm/allwinner/clk/aw_usbclk.c
head/sys/arm/allwinner/std.a10
head/sys/arm/conf/A10
head/sys/conf/options.arm
Modified: head/sys/arm/allwinner/a10_codec.c
==
--- head/sys/arm/allwinner/a10_codec.c Fri Jul 8 23:10:55 2016
(r302471)
+++ head/sys/arm/allwinner/a10_codec.c Fri Jul 8 23:38:25 2016
(r302472)
@@ -720,13 +720,19 @@ CHANNEL_DECLARE(a10codec_chan);
* Device interface
*/
+static struct ofw_compat_data compat_data[] = {
+ {"allwinner,sun4i-a10-codec", 1},
+ {"allwinner,sun7i-a20-codec", 1},
+ {NULL, 0},
+};
+
static int
a10codec_probe(device_t dev)
{
if (!ofw_bus_status_okay(dev))
return (ENXIO);
- if (!ofw_bus_is_compatible(dev, "allwinner,sun7i-a20-codec"))
+ if (ofw_bus_search_compatible(dev, compat_data)->ocd_data == 0)
return (ENXIO);
device_set_desc(dev, "Allwinner Audio Codec");
Modified: head/sys/arm/allwinner/a10_ehci.c
==
--- head/sys/arm/allwinner/a10_ehci.c Fri Jul 8 23:10:55 2016
(r302471)
+++ head/sys/arm/allwinner/a10_ehci.c Fri Jul 8 23:38:25 2016
(r302472)
@@ -112,6 +112,7 @@ static const struct aw_ehci_conf a31_ehc
static struct ofw_compat_data compat_data[] = {
{ "allwinner,sun4i-a10-ehci", (uintptr_t)&a10_ehci_conf },
+ { "allwinner,sun5i-a13-ehci", (uintptr_t)&a10_ehci_conf },
{ "allwinner,sun6i-a31-ehci", (uintptr_t)&a31_ehci_conf },
{ "allwinner,sun7i-a20-ehci", (uintptr_t)&a10_ehci_conf },
{ "allwinner,sun8i-a83t-ehci", (uintptr_t)&a31_ehci_conf },
Modified: head/sys/arm/allwinner/a10_gpio.c
==
--- head/sys/arm/allwinner/a10_gpio.c Fri Jul 8 23:10:55 2016
(r302471)
+++ head/sys/arm/allwinner/a10_gpio.c Fri Jul 8 23:38:25 2016
(r302472)
@@ -80,6 +80,11 @@ __FBSDID("$FreeBSD$");
extern const struct allwinner_padconf a10_padconf;
#endif
+/* Defined in a13_padconf.c */
+#ifdef SOC_ALLWINNER_A13
+extern const struct allwinner_padconf a13_padconf;
+#endif
+
/* Defined in a20_padconf.c */
#ifdef SOC_ALLWINNER_A20
extern const struct allwinner_padconf a20_padconf;
@@ -115,6 +120,9 @@ static struct ofw_compat_data compat_dat
#ifdef SOC_ALLWINNER_A10
{"allwinner,sun4i-a10-pinctrl", (uintptr_t)&a10_padconf},
#endif
+#ifdef SOC_ALLWINNER_A13
+ {"allwinner,sun5i-a13-pinctrl", (uintptr_t)&a13_padconf},
+#endif
#ifdef SOC_ALLWINNER_A20
{"allwinner,sun7i-a20-pinctrl", (uintptr_t)&a20_padconf},
#endif
Added: head/sys/arm/allwinner/a13/a13_padconf.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/sys/arm/allwinner/a13/a13_padconf.cFri Jul 8 23:38:25 2016
(r302472)
@@ -0,0 +1,129 @@
+/*-
+ * Copyright (c) 2016 Emmanuel Vadot
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+
svn commit: r302473 - head/usr.bin/mkcsmapper
Author: bapt
Date: Fri Jul 8 23:40:25 2016
New Revision: 302473
URL: https://svnweb.freebsd.org/changeset/base/302473
Log:
Sync usage between program and man page. Increase column width. [1]
Simplifay the usage() function
Replace errx/strerror with errc
Submitted by: w...@netbsd.org [1]
Obtained from:NetBSD
Modified:
head/usr.bin/mkcsmapper/mkcsmapper.1
head/usr.bin/mkcsmapper/yacc.y
Modified: head/usr.bin/mkcsmapper/mkcsmapper.1
==
--- head/usr.bin/mkcsmapper/mkcsmapper.1Fri Jul 8 23:38:25 2016
(r302472)
+++ head/usr.bin/mkcsmapper/mkcsmapper.1Fri Jul 8 23:40:25 2016
(r302473)
@@ -34,7 +34,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 6, 2009
+.Dd July 9, 2016
.Dt MKCSMAPPER 1
.Os
.Sh NAME
@@ -43,9 +43,10 @@
.Xr iconv 3
.Sh SYNOPSIS
.Nm
-.Op Fl dmp
-.Fl o Ar outfile
-.Ar infile
+.Op Fl d
+.Op Fl m | Fl p
+.Op Fl o Ar outfile
+.Op Ar infile
.Sh DESCRIPTION
The
.Nm
@@ -59,7 +60,7 @@ A pivot file, which the possible source
pairs or the set of mappings to use for a compound encoding.
.Pp
The following options are available:
-.Bl -tag -width 0123
+.Bl -tag -width XoXoutfileXX
.It Fl d
Turns on debug mode.
.It Fl m
Modified: head/usr.bin/mkcsmapper/yacc.y
==
--- head/usr.bin/mkcsmapper/yacc.y Fri Jul 8 23:38:25 2016
(r302472)
+++ head/usr.bin/mkcsmapper/yacc.y Fri Jul 8 23:40:25 2016
(r302473)
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-/* $NetBSD: yacc.y,v 1.7 2006/09/09 14:35:17 tnozaki Exp $ */
+/* $NetBSD: yacc.y,v 1.11 2016/06/28 09:22:16 wiz Exp $*/
%{
/*-
@@ -664,18 +664,15 @@ do_mkpv(FILE *in)
if (ret && output)
unlink(output); /* dump failure */
if (ret)
- errx(EXIT_FAILURE, "%s\n", strerror(ret));
+ errc(EXIT_FAILURE, ret, "");
}
static void
usage(void)
{
- warnx("usage: \n"
- "\t%s [-d] [-o outfile] [infile]\n"
- "\t%s -m [-d] [-o outfile] [infile]\n"
- "\t%s -p [-d] [-o outfile] [infile]\n",
- getprogname(), getprogname(), getprogname());
- exit(1);
+ fprintf(stderr, "Usage: %s [-d] [-m|-p] [-o outfile] [infile]\n",
+ getprogname());
+ exit(EXIT_FAILURE);
}
int
___
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: r302474 - in head: cddl/lib/libdtrace tests/sys/netinet
Author: gnn
Date: Fri Jul 8 23:44:09 2016
New Revision: 302474
URL: https://svnweb.freebsd.org/changeset/base/302474
Log:
On FreeBSD there is a setsockopt option SO_USER_COOKIE which allows
setting a 32 bit value on each socket. This can be used by applications
and DTrace as a rendezvous point so that an applicaton's data can
more easily be captured at run time. Expose the user cookie via
DTrace by updating the translator in tcp.d and add a quick test
program, a TCP server, that sets the cookie on each connection
accepted.
Reviewed by: hiren
MFC after:1 week
Sponsored by: Limelight Networks
Differential Revision:https://reviews.freebsd.org/D7152
Added:
head/tests/sys/netinet/tcp_user_cookie.c (contents, props changed)
Modified:
head/cddl/lib/libdtrace/tcp.d
head/tests/sys/netinet/Makefile
Modified: head/cddl/lib/libdtrace/tcp.d
==
--- head/cddl/lib/libdtrace/tcp.d Fri Jul 8 23:40:25 2016
(r302473)
+++ head/cddl/lib/libdtrace/tcp.d Fri Jul 8 23:44:09 2016
(r302474)
@@ -126,6 +126,7 @@ typedef struct tcpsinfo {
int tcps_retransmit;/* retransmit send event, boolean */
int tcps_srtt; /* smoothed RTT in units of
(TCP_RTT_SCALE*hz) */
int tcps_debug; /* socket has SO_DEBUG set */
+ int tcps_cookie;/* expose the socket's SO_USER_COOKIE */
int32_t tcps_dupacks; /* consecutive dup acks received */
uint32_t tcps_rtttime; /* RTT measurement start time */
uint32_t tcps_rtseq;/* sequence # being timed */
@@ -224,6 +225,8 @@ translator tcpsinfo_t < struct tcpcb *p
tcps_srtt = p == NULL ? -1 : p->t_srtt; /* smoothed RTT
in units of (TCP_RTT_SCALE*hz) */
tcps_debug =p == NULL ? 0 :
p->t_inpcb->inp_socket->so_options & 1;
+ tcps_cookie = p == NULL ? -1 :
+ p->t_inpcb->inp_socket->so_user_cookie;
tcps_dupacks = p == NULL ? -1 : p->t_dupacks;
tcps_rtttime = p == NULL ? -1 : p->t_rtttime;
tcps_rtseq =p == NULL ? -1 : p->t_rtseq;
Modified: head/tests/sys/netinet/Makefile
==
--- head/tests/sys/netinet/Makefile Fri Jul 8 23:40:25 2016
(r302473)
+++ head/tests/sys/netinet/Makefile Fri Jul 8 23:44:09 2016
(r302474)
@@ -5,7 +5,7 @@ BINDIR= ${TESTSDIR}
ATF_TESTS_SH= fibs_test
-PROGS= udp_dontroute
+PROGS= udp_dontroute tcp_user_cookie
MAN=
Added: head/tests/sys/netinet/tcp_user_cookie.c
==
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/tests/sys/netinet/tcp_user_cookie.cFri Jul 8 23:44:09 2016
(r302474)
@@ -0,0 +1,111 @@
+/*
+ * Copyright (c) 2016 Limelight Networks
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions, and the following disclaimer,
+ * without modification.
+ * 2. Redistributions in binary form must reproduce at minimum a disclaimer
+ * substantially similar to the "NO WARRANTY" disclaimer below
+ * ("Disclaimer") and any redistribution must be conditioned upon
+ * including a substantially similar Disclaimer requirement for further
+ * binary redistribution.
+ *
+ * NO WARRANTY
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGES.
+ *
+ * Authors: George Neville-Neil
+ *
+ * $FreeBSD$
+ */
+
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#define buflen 80
+
+/*
+ * Setup a TCP server listening on a port for connections, all of
+ * which subseuqently have their user cookie set.
+ */
+int
+main(int argc, char **argv)
+{
+ struct sockaddr_in srv;
+ int sock, accepted, port, cookie;
+ int ret;
+ ch
svn commit: r302475 - in head/contrib/llvm/projects/libunwind: include src
Author: emaste
Date: Sat Jul 9 00:35:20 2016
New Revision: 302475
URL: https://svnweb.freebsd.org/changeset/base/302475
Log:
libunwind: limit stack usage in unwind cursor
This may be reworked upstream but in the interim should address the
stack usage issue reported in the PR.
PR: 206384
MFC after:1 week
Sponsored by: The FreeBSD Foundation
Modified:
head/contrib/llvm/projects/libunwind/include/__libunwind_config.h
head/contrib/llvm/projects/libunwind/src/DwarfParser.hpp
Modified: head/contrib/llvm/projects/libunwind/include/__libunwind_config.h
==
--- head/contrib/llvm/projects/libunwind/include/__libunwind_config.h Fri Jul
8 23:44:09 2016(r302474)
+++ head/contrib/llvm/projects/libunwind/include/__libunwind_config.h Sat Jul
9 00:35:20 2016(r302475)
@@ -22,30 +22,37 @@
# define _LIBUNWIND_TARGET_I386 1
# define _LIBUNWIND_CONTEXT_SIZE 8
# define _LIBUNWIND_CURSOR_SIZE 19
+# define _LIBUNWIND_MAX_REGISTER 9
# elif defined(__x86_64__)
# define _LIBUNWIND_TARGET_X86_64 1
# define _LIBUNWIND_CONTEXT_SIZE 21
# define _LIBUNWIND_CURSOR_SIZE 33
+# define _LIBUNWIND_MAX_REGISTER 17
# elif defined(__ppc__)
# define _LIBUNWIND_TARGET_PPC 1
# define _LIBUNWIND_CONTEXT_SIZE 117
# define _LIBUNWIND_CURSOR_SIZE 128
+# define _LIBUNWIND_MAX_REGISTER 113
# elif defined(__aarch64__)
# define _LIBUNWIND_TARGET_AARCH64 1
# define _LIBUNWIND_CONTEXT_SIZE 66
# define _LIBUNWIND_CURSOR_SIZE 78
+# define _LIBUNWIND_MAX_REGISTER 96
# elif defined(__arm__)
# define _LIBUNWIND_TARGET_ARM 1
# define _LIBUNWIND_CONTEXT_SIZE 60
# define _LIBUNWIND_CURSOR_SIZE 67
+# define _LIBUNWIND_MAX_REGISTER 96
# elif defined(__or1k__)
# define _LIBUNWIND_TARGET_OR1K 1
# define _LIBUNWIND_CONTEXT_SIZE 16
# define _LIBUNWIND_CURSOR_SIZE 28
+# define _LIBUNWIND_MAX_REGISTER 32
# elif defined(__riscv__)
# define _LIBUNWIND_TARGET_RISCV 1
# define _LIBUNWIND_CONTEXT_SIZE 128 /* XXX */
# define _LIBUNWIND_CURSOR_SIZE 140 /* XXX */
+# define _LIBUNWIND_MAX_REGISTER 96
# else
# error "Unsupported architecture."
# endif
@@ -58,6 +65,7 @@
# define _LIBUNWIND_TARGET_OR1K 1
# define _LIBUNWIND_CONTEXT_SIZE 128
# define _LIBUNWIND_CURSOR_SIZE 140
+# define _LIBUNWIND_MAX_REGISTER 120
#endif // _LIBUNWIND_IS_NATIVE_ONLY
#endif // LIBUNWIND_CONFIG_H__
Modified: head/contrib/llvm/projects/libunwind/src/DwarfParser.hpp
==
--- head/contrib/llvm/projects/libunwind/src/DwarfParser.hppFri Jul 8
23:44:09 2016(r302474)
+++ head/contrib/llvm/projects/libunwind/src/DwarfParser.hppSat Jul 9
00:35:20 2016(r302475)
@@ -62,7 +62,7 @@ public:
};
enum {
-kMaxRegisterNumber = 120
+kMaxRegisterNumber = _LIBUNWIND_MAX_REGISTER
};
enum RegisterSavedWhere {
kRegisterUnused,
___
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: r302350 - in head: share/man/man9 sys/kern sys/sys
On Tue, 5 Jul 2016 18:47:18 + (UTC) Gleb Smirnoff wrote: > Author: glebius > Date: Tue Jul 5 18:47:17 2016 > New Revision: 302350 > URL: https://svnweb.freebsd.org/changeset/base/302350 > > Log: > The paradigm of a callout is that it has three consequent states: > not scheduled -> scheduled -> running -> not scheduled. The API and > the manual page assume that, some comments in the code assume that, > and looks like some contributors to the code also did. The problem is > that this paradigm isn't true. A callout can be scheduled and running > at the same time, which makes API description ambigouous. In such > case callout_stop() family of functions/macros should return 1 and 0 > at the same time, since it successfully unscheduled future callout > but the current one is running. Before this change we returned 1 in > such a case, with an exception that if running callout was migrating > we returned 0, unless CS_MIGRBLOCK was specified. > > With this change, we now return 0 in case if future callout was > unscheduled, but another one is still in action, indicating to API > users that resources are not yet safe to be freed. > > However, the sleepqueue code relies on getting 1 return code in > that case, and there already was CS_MIGRBLOCK flag, that covered one > of the edge cases. In the new return path we will also use this flag, > to keep sleepqueue safe. > Since the flag CS_MIGRBLOCK doesn't block migration and now isn't > limited to migration edge case, rename it to CS_EXECUTING. > > This change fixes panics on a high loaded TCP server. > > Reviewed by:jch, hselasky, rrs, kib > Approved by:re (gjb) > Differential Revision: https://reviews.freebsd.org/D7042 > Hi, this change also breaks ARP reliably in my nfsroot setup for multiple MIPS board. The cause is following: before this change, the sequence of calls: callout_init(&la->lle_timer, 1); ret = callout_stop(&ls->lle_timer); would result in ret == -1 after the change, same sequence causes callout_stop to return 1. This does not bode well for lle entries that were allocated, but for which callout_reset was never called, because we have several constructs in the source tree that do something like if (callout_stop(&lle->lle_timer) > 0) LLE_REMREF(lle); This results in panics as described in: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=210884 -- Alexander Kabaev pgpCIQAIpPC7t.pgp Description: Цифровая подпись OpenPGP
svn commit: r302476 - head/sys/net
Author: pfg
Date: Sat Jul 9 02:33:45 2016
New Revision: 302476
URL: https://svnweb.freebsd.org/changeset/base/302476
Log:
ng_mppc(4):: basic readability cleanups.
In particular use __unreachable() to appease static analyzers.
No functional change.
CID: 1356591
MFC after:3 days
Modified:
head/sys/net/mppcc.c
head/sys/net/mppcd.c
Modified: head/sys/net/mppcc.c
==
--- head/sys/net/mppcc.cSat Jul 9 00:35:20 2016(r302475)
+++ head/sys/net/mppcc.cSat Jul 9 02:33:45 2016(r302476)
@@ -232,8 +232,9 @@ int MPPC_Compress(u_char **src, u_char *
} else if (off < 8192) {/* 16-bit offset; 320 <= offset < 8192
*/
putbits16(*dst, 0xc000|(off-320), 16, &olen, &l);
} else {/* NOTREACHED */
+ __unreachable();
rtn &= ~MPPC_OK;
- return rtn;
+ return (rtn);
}
/* Encode length of match. */
Modified: head/sys/net/mppcd.c
==
--- head/sys/net/mppcd.cSat Jul 9 00:35:20 2016(r302475)
+++ head/sys/net/mppcd.cSat Jul 9 02:33:45 2016(r302476)
@@ -170,7 +170,7 @@ int MPPC_Decompress(u_char **src, u_char
rtn &= ~MPPC_OK;
return (rtn);
}
- } else {/* NOTREACHED */
+ } else {/* This shouldn't happen. */
rtn &= ~MPPC_OK;
return (rtn);
}
___
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: r302480 - head/usr.bin/pathchk
Author: eadler
Date: Sat Jul 9 04:56:28 2016
New Revision: 302480
URL: https://svnweb.freebsd.org/changeset/base/302480
Log:
Add -P to pathchk usage
Modified:
head/usr.bin/pathchk/pathchk.c
Modified: head/usr.bin/pathchk/pathchk.c
==
--- head/usr.bin/pathchk/pathchk.c Sat Jul 9 03:27:01 2016
(r302479)
+++ head/usr.bin/pathchk/pathchk.c Sat Jul 9 04:56:28 2016
(r302480)
@@ -89,7 +89,7 @@ static void
usage(void)
{
- fprintf(stderr, "usage: pathchk [-p] pathname ...\n");
+ fprintf(stderr, "usage: pathchk [-Pp] pathname ...\n");
exit(1);
}
___
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: r302481 - head/usr.bin/mkcsmapper
Author: bapt Date: Sat Jul 9 06:52:55 2016 New Revision: 302481 URL: https://svnweb.freebsd.org/changeset/base/302481 Log: Revert the change from errx/strerror to errc to appease gcc 4.2 Modified: head/usr.bin/mkcsmapper/yacc.y Modified: head/usr.bin/mkcsmapper/yacc.y == --- head/usr.bin/mkcsmapper/yacc.y Sat Jul 9 04:56:28 2016 (r302480) +++ head/usr.bin/mkcsmapper/yacc.y Sat Jul 9 06:52:55 2016 (r302481) @@ -664,7 +664,7 @@ do_mkpv(FILE *in) if (ret && output) unlink(output); /* dump failure */ if (ret) - errc(EXIT_FAILURE, ret, ""); + errx(EXIT_FAILURE, "%s\n", strerror(ret)); } static 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"
