svn commit: r257240 - in head/sys: arm/conf dev/mvs
Author: zbb Date: Mon Oct 28 07:18:24 2013 New Revision: 257240 URL: http://svnweb.freebsd.org/changeset/base/257240 Log: Run mvs SATA driver on Armada XP instead of old mv_sata The mvs driver seems to be more functional than mv_sata and is not causing random interrupt storms during boot. Modified: head/sys/arm/conf/ARMADAXP head/sys/dev/mvs/mvs_soc.c Modified: head/sys/arm/conf/ARMADAXP == --- head/sys/arm/conf/ARMADAXP Mon Oct 28 05:55:47 2013(r257239) +++ head/sys/arm/conf/ARMADAXP Mon Oct 28 07:18:24 2013(r257240) @@ -76,8 +76,7 @@ devicepass device da # SATA -device ata -#devicemvs +device mvs # Serial ports device uart Modified: head/sys/dev/mvs/mvs_soc.c == --- head/sys/dev/mvs/mvs_soc.c Mon Oct 28 05:55:47 2013(r257239) +++ head/sys/dev/mvs/mvs_soc.c Mon Oct 28 07:18:24 2013(r257240) @@ -66,6 +66,8 @@ static struct { {MV_DEV_88F6282, 0x00, Marvell 88F6282, 2, MVS_Q_GENIIE|MVS_Q_SOC}, {MV_DEV_MV78100, 0x00, Marvell MV78100, 2, MVS_Q_GENIIE|MVS_Q_SOC}, {MV_DEV_MV78100_Z0, 0x00,Marvell MV78100, 2, MVS_Q_GENIIE|MVS_Q_SOC}, + {MV_DEV_MV78260, 0x00, Marvell MV78260, 2, MVS_Q_GENIIE|MVS_Q_SOC}, + {MV_DEV_MV78460, 0x00, Marvell MV78460, 2, MVS_Q_GENIIE|MVS_Q_SOC}, {0, 0x00, NULL, 0, 0} }; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257241 - in head/sys: compat/ndis dev/ath dev/bwi dev/cxgb dev/cxgb/ulp/tom dev/cxgbe dev/cxgbe/common dev/cxgbe/tom dev/hyperv/netvsc dev/if_ndis dev/malo dev/oce dev/qlxgb dev/qlxgbe...
Author: glebius Date: Mon Oct 28 07:29:16 2013 New Revision: 257241 URL: http://svnweb.freebsd.org/changeset/base/257241 Log: Include necessary headers that now are available due to pollution via if_var.h. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/compat/ndis/subr_usbd.c head/sys/dev/ath/if_ath_pci.c head/sys/dev/bwi/if_bwi_pci.c head/sys/dev/cxgb/cxgb_sge.c head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c head/sys/dev/cxgb/ulp/tom/cxgb_listen.c head/sys/dev/cxgbe/common/t4_hw.c head/sys/dev/cxgbe/t4_l2t.c head/sys/dev/cxgbe/t4_sge.c head/sys/dev/cxgbe/t4_tracer.c head/sys/dev/cxgbe/tom/t4_tom.c head/sys/dev/hyperv/netvsc/hv_net_vsc.c head/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c head/sys/dev/if_ndis/if_ndis_pccard.c head/sys/dev/if_ndis/if_ndis_pci.c head/sys/dev/malo/if_malo_pci.c head/sys/dev/malo/if_malohal.c head/sys/dev/oce/oce_if.h head/sys/dev/qlxgb/qla_os.h head/sys/dev/qlxgbe/ql_os.h head/sys/dev/qlxge/qls_os.h head/sys/dev/siba/siba_bwn.c head/sys/dev/siba/siba_core.c head/sys/dev/usb/net/if_ipheth.c head/sys/dev/usb/net/if_smsc.c head/sys/dev/virtio/network/if_vtnet.c head/sys/dev/vmware/vmxnet3/if_vmx.c head/sys/net/ieee8023ad_lacp.c head/sys/net/if_bridge.c head/sys/net/if_clone.c head/sys/net/if_vlan.c head/sys/net80211/ieee80211_amrr.c head/sys/net80211/ieee80211_dfs.c head/sys/net80211/ieee80211_radiotap.c head/sys/net80211/ieee80211_regdomain.c head/sys/net80211/ieee80211_rssadapt.c head/sys/netgraph/ng_eiface.c head/sys/netgraph/ng_ether.c head/sys/netgraph/ng_fec.c head/sys/netinet/in.c head/sys/netinet/ip_divert.c head/sys/netinet/siftr.c head/sys/netinet/toecore.c head/sys/netinet6/in6.c head/sys/netpfil/ipfw/ip_fw_dynamic.c Modified: head/sys/compat/ndis/subr_usbd.c == --- head/sys/compat/ndis/subr_usbd.cMon Oct 28 07:18:24 2013 (r257240) +++ head/sys/compat/ndis/subr_usbd.cMon Oct 28 07:29:16 2013 (r257241) @@ -56,6 +56,7 @@ __FBSDID($FreeBSD$); #include net/if.h #include net/if_var.h #include net/if_media.h +#include net/ethernet.h #include net80211/ieee80211_var.h #include net80211/ieee80211_ioctl.h Modified: head/sys/dev/ath/if_ath_pci.c == --- head/sys/dev/ath/if_ath_pci.c Mon Oct 28 07:18:24 2013 (r257240) +++ head/sys/dev/ath/if_ath_pci.c Mon Oct 28 07:29:16 2013 (r257241) @@ -37,6 +37,7 @@ __FBSDID($FreeBSD$); #include sys/param.h #include sys/systm.h +#include sys/malloc.h #include sys/module.h #include sys/kernel.h #include sys/lock.h @@ -53,6 +54,7 @@ __FBSDID($FreeBSD$); #include net/if.h #include net/if_media.h #include net/if_arp.h +#include net/ethernet.h #include net80211/ieee80211_var.h Modified: head/sys/dev/bwi/if_bwi_pci.c == --- head/sys/dev/bwi/if_bwi_pci.c Mon Oct 28 07:18:24 2013 (r257240) +++ head/sys/dev/bwi/if_bwi_pci.c Mon Oct 28 07:29:16 2013 (r257241) @@ -56,6 +56,7 @@ __FBSDID($FreeBSD$); #include net/if_var.h #include net/if_media.h #include net/if_arp.h +#include net/ethernet.h #include net80211/ieee80211_var.h #include net80211/ieee80211_radiotap.h Modified: head/sys/dev/cxgb/cxgb_sge.c == --- head/sys/dev/cxgb/cxgb_sge.cMon Oct 28 07:18:24 2013 (r257240) +++ head/sys/dev/cxgb/cxgb_sge.cMon Oct 28 07:29:16 2013 (r257241) @@ -56,9 +56,10 @@ __FBSDID($FreeBSD$); #include sys/socket.h #include sys/sglist.h +#include net/if.h +#include net/if_var.h #include net/bpf.h #include net/ethernet.h -#include net/if.h #include net/if_vlan_var.h #include netinet/in_systm.h Modified: head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c == --- head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Mon Oct 28 07:18:24 2013 (r257240) +++ head/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c Mon Oct 28 07:29:16 2013 (r257241) @@ -52,6 +52,7 @@ __FBSDID($FreeBSD$); #include sys/taskqueue.h #include net/if.h +#include net/if_var.h #include net/ethernet.h #include net/route.h Modified: head/sys/dev/cxgb/ulp/tom/cxgb_listen.c == --- head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Oct 28 07:18:24 2013 (r257240) +++ head/sys/dev/cxgb/ulp/tom/cxgb_listen.c Mon Oct 28 07:29:16 2013 (r257241) @@ -36,6 +36,7 @@ __FBSDID($FreeBSD$); #include sys/socketvar.h #include sys/sysctl.h #include net/if.h +#include net/if_var.h #include net/route.h #include netinet/in.h #include netinet/ip.h Modified: head/sys/dev/cxgbe/common/t4_hw.c
svn commit: r257242 - in head/sys: net sys
Author: glebius Date: Mon Oct 28 07:45:03 2013 New Revision: 257242 URL: http://svnweb.freebsd.org/changeset/base/257242 Log: Instead of putting ifnet declaration into eventhandler.h, move bpf(4) and vlan(4) related event declarations to bpf.h and if_vlan_var.h. To avoid dependency on eventhandler.h, protect these declarations with ifdef SYS_EVENTHANDLER_H. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/net/bpf.h head/sys/net/if_vlan_var.h head/sys/sys/eventhandler.h Modified: head/sys/net/bpf.h == --- head/sys/net/bpf.h Mon Oct 28 07:29:16 2013(r257241) +++ head/sys/net/bpf.h Mon Oct 28 07:45:03 2013(r257242) @@ -1310,4 +1310,12 @@ bpf_peers_present(struct bpf_if *bpf) */ #define BPF_MEMWORDS 16 +#ifdef SYS_EVENTHANDLER_H +/* BPF attach/detach events */ +struct ifnet; +typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */, +int /* 1 ='s attach */); +EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); +#endif /* SYS_EVENTHANDLER_H */ + #endif /* _NET_BPF_H_ */ Modified: head/sys/net/if_vlan_var.h == --- head/sys/net/if_vlan_var.h Mon Oct 28 07:29:16 2013(r257241) +++ head/sys/net/if_vlan_var.h Mon Oct 28 07:45:03 2013(r257242) @@ -150,6 +150,14 @@ extern int (*vlan_tag_p)(struct ifnet *, extern int (*vlan_setcookie_p)(struct ifnet *, void *); extern void *(*vlan_cookie_p)(struct ifnet *); +#ifdef SYS_EVENTHANDLER_H +/* VLAN state change events */ +typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); +typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); +EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); +EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); +#endif /* SYS_EVENTHANDLER_H */ + #endif /* _KERNEL */ #endif /* _NET_IF_VLAN_VAR_H_ */ Modified: head/sys/sys/eventhandler.h == --- head/sys/sys/eventhandler.h Mon Oct 28 07:29:16 2013(r257241) +++ head/sys/sys/eventhandler.h Mon Oct 28 07:45:03 2013(r257242) @@ -203,19 +203,6 @@ typedef void (*vfs_unmounted_notify_fn)( EVENTHANDLER_DECLARE(vfs_mounted, vfs_mounted_notify_fn); EVENTHANDLER_DECLARE(vfs_unmounted, vfs_unmounted_notify_fn); -/* VLAN state change events */ -struct ifnet; -typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); -typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); -EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); -EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); - -/* BPF attach/detach events */ -struct ifnet; -typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */, -int /* 1 ='s attach */); -EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); - /* * Process events * process_fork and exit handlers are called without Giant. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257244 - head/sys/net
Author: glebius Date: Mon Oct 28 08:03:40 2013 New Revision: 257244 URL: http://svnweb.freebsd.org/changeset/base/257244 Log: - Make the prophecy from 1997 happen and remove if_var.h inclusion from if.h. - Remove unnecessary includes and declarations from if.h - Remove unnecessary includes and declarations from if_var.h [1] - Mark some declarations that are about to be removed in near future with comments, explaning why this declaration is still necessary. - Protect eventhandler declarations with #ifdef SYS_EVENTHANDLER_H. Obtained from:bdeBSD [1] Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/net/if.h head/sys/net/if_var.h Modified: head/sys/net/if.h == --- head/sys/net/if.h Mon Oct 28 07:47:52 2013(r257243) +++ head/sys/net/if.h Mon Oct 28 08:03:40 2013(r257244) @@ -35,10 +35,6 @@ #include sys/cdefs.h -#ifdef _KERNEL -#include sys/queue.h -#endif - #if __BSD_VISIBLE /* * net/if.h does not depend on sys/time.h on most other systems. This @@ -49,8 +45,6 @@ #include sys/time.h #include sys/socket.h #endif - -struct ifnet; #endif /* @@ -537,10 +531,4 @@ struct if_nameindex*if_nameindex(void); unsigned intif_nametoindex(const char *); __END_DECLS #endif - -#ifdef _KERNEL -/* XXX - this should go away soon. */ -#include net/if_var.h -#endif - #endif /* !_NET_IF_H_ */ Modified: head/sys/net/if_var.h == --- head/sys/net/if_var.h Mon Oct 28 07:47:52 2013(r257243) +++ head/sys/net/if_var.h Mon Oct 28 08:03:40 2013(r257244) @@ -58,38 +58,26 @@ * interfaces. These routines live in the files if.c and route.c */ -#ifdef __STDC__ -/* - * Forward structure declarations for function prototypes [sic]. - */ -struct mbuf; -struct thread; -struct rtentry; -struct rt_addrinfo; +struct rtentry;/* ifa_rtrequest */ +struct rt_addrinfo;/* ifa_rtrequest */ struct socket; -struct ether_header; struct carp_if; struct carp_softc; struct ifvlantrunk; -struct route; +struct route; /* if_output */ struct vnet; -#endif - -#include sys/queue.h /* get TAILQ macros */ #ifdef _KERNEL -#include sys/mbuf.h -#include sys/eventhandler.h +#include sys/mbuf.h /* ifqueue only? */ #include sys/buf_ring.h #include net/vnet.h #endif /* _KERNEL */ #include sys/counter.h #include sys/lock.h /* XXX */ -#include sys/mutex.h /* XXX */ +#include sys/mutex.h /* struct ifqueue */ #include sys/rwlock.h/* XXX */ #include sys/sx.h/* XXX */ -#include sys/event.h /* XXX */ -#include sys/_task.h +#include sys/_task.h /* if_link_task */ #defineIF_DUNIT_NONE -1 @@ -220,8 +208,6 @@ struct ifnet { void*if_pspare[8]; /* 1 netmap, 7 TDB */ }; -typedef void if_init_f_t(void *); - /* * XXX These aliases are terribly dangerous because they could apply * to anything. @@ -367,6 +353,7 @@ voidif_maddr_runlock(struct ifnet *ifp) } while(0) #ifdef _KERNEL +#ifdef SYS_EVENTHANDLER_H /* interface link layer address change event */ typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t); @@ -382,6 +369,7 @@ EVENTHANDLER_DECLARE(ifnet_departure_eve /* Interface link state change event */ typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int); EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t); +#endif /* SYS_EVENTHANDLER_H */ /* * interface groups @@ -404,6 +392,7 @@ struct ifg_list { TAILQ_ENTRY(ifg_list)ifgl_next; }; +#ifdef SYS_EVENTHANDLER_H /* group attach event */ typedef void (*group_attach_event_handler_t)(void *, struct ifg_group *); EVENTHANDLER_DECLARE(group_attach_event, group_attach_event_handler_t); @@ -413,6 +402,7 @@ EVENTHANDLER_DECLARE(group_detach_event, /* group change event */ typedef void (*group_change_event_handler_t)(void *, const char *); EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); +#endif /* SYS_EVENTHANDLER_H */ #defineIF_AFDATA_LOCK_INIT(ifp)\ rw_init((ifp)-if_afdata_lock, if_afdata) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257246 - head/sys/netpfil/pf
Author: glebius Date: Mon Oct 28 10:12:19 2013 New Revision: 257246 URL: http://svnweb.freebsd.org/changeset/base/257246 Log: - Fix VIMAGE build. - Fix build with gcc. Modified: head/sys/netpfil/pf/pf.c Modified: head/sys/netpfil/pf/pf.c == --- head/sys/netpfil/pf/pf.cMon Oct 28 09:43:15 2013(r257245) +++ head/sys/netpfil/pf/pf.cMon Oct 28 10:12:19 2013(r257246) @@ -4554,7 +4554,7 @@ pf_icmp_state_lookup(struct pf_state_key if ((*state)-rule.ptr-type (((*state)-direction == direction) ? PF_IN : PF_OUT) != icmp_dir) { - if (pf_status.debug = PF_DEBUG_MISC) { + if (V_pf_status.debug = PF_DEBUG_MISC) { printf(pf: icmp type %d in wrong direction (%d): , icmp_dir, direction); pf_print_state(*state); @@ -4593,6 +4593,8 @@ pf_test_state_icmp(struct pf_state **sta break; #endif /* INET6 */ + default: + panic(%s: proto %d\n, __func__, pd-proto); } if (pf_icmp_mapping(pd, icmptype, icmp_dir, multi, ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257248 - head/lib/libproc
Author: markj Date: Mon Oct 28 12:42:27 2013 New Revision: 257248 URL: http://svnweb.freebsd.org/changeset/base/257248 Log: Fix the build with gcc. Modified: head/lib/libproc/proc_util.c Modified: head/lib/libproc/proc_util.c == --- head/lib/libproc/proc_util.cMon Oct 28 10:32:14 2013 (r257247) +++ head/lib/libproc/proc_util.cMon Oct 28 12:42:27 2013 (r257248) @@ -145,8 +145,9 @@ proc_wstatus(struct proc_handle *phdl) if (phdl == NULL) return (-1); if (waitpid(phdl-pid, status, WUNTRACED) 0) { - if (errno != EINTR) + if (errno != EINTR) { DPRINTF(waitpid); + } return (-1); } if (WIFSTOPPED(status)) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257249 - in head: share/man/man4 sys/modules/netgraph sys/modules/netgraph/fec sys/netgraph
Author: glebius Date: Mon Oct 28 12:47:05 2013 New Revision: 257249 URL: http://svnweb.freebsd.org/changeset/base/257249 Log: Axe ng_fec(4). It has never been a real netgraph(4) module, since it had no hooks. It has abused ifnet's if_afdata slot and actually abused every subsystem it touched. lagg(4) is a proper trunking solution at ifnet(9) layer. ng_one2many(4) is a proper trunking solution in netgraph(4). Deleted: head/share/man/man4/ng_fec.4 head/sys/modules/netgraph/fec/ head/sys/netgraph/ng_fec.c head/sys/netgraph/ng_fec.h Modified: head/share/man/man4/Makefile head/sys/modules/netgraph/Makefile Modified: head/share/man/man4/Makefile == --- head/share/man/man4/MakefileMon Oct 28 12:42:27 2013 (r257248) +++ head/share/man/man4/MakefileMon Oct 28 12:47:05 2013 (r257249) @@ -295,7 +295,6 @@ MAN=aac.4 \ ng_etf.4 \ ng_ether.4 \ ng_ether_echo.4 \ - ng_fec.4 \ ng_frame_relay.4 \ ng_gif.4 \ ng_gif_demux.4 \ Modified: head/sys/modules/netgraph/Makefile == --- head/sys/modules/netgraph/Makefile Mon Oct 28 12:42:27 2013 (r257248) +++ head/sys/modules/netgraph/Makefile Mon Oct 28 12:47:05 2013 (r257249) @@ -18,7 +18,6 @@ SUBDIR= async \ etf \ ether \ ether_echo \ - fec \ frame_relay \ gif \ gif_demux \ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257250 - head
Author: glebius Date: Mon Oct 28 12:49:07 2013 New Revision: 257250 URL: http://svnweb.freebsd.org/changeset/base/257250 Log: ng_fec(4) removed. Modified: head/ObsoleteFiles.inc Modified: head/ObsoleteFiles.inc == --- head/ObsoleteFiles.inc Mon Oct 28 12:47:05 2013(r257249) +++ head/ObsoleteFiles.inc Mon Oct 28 12:49:07 2013(r257250) @@ -38,6 +38,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20131028: ng_fec(4) removed +OLD_FILES+=usr/include/netgraph/ng_fec.h +OLD_FILES+=usr/share/man/man4/ng_fec.4.gz # 20131023: remove never used iscsi directory OLD_DIRS+=usr/share/examples/iscsi # 20131014: libbsdyml becomes private ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257251 - in head/sys: amd64/conf conf dev/acpica i386/conf x86/iommu
Author: kib Date: Mon Oct 28 13:33:29 2013 New Revision: 257251 URL: http://svnweb.freebsd.org/changeset/base/257251 Log: Import the driver for VT-d DMAR hardware, as specified in the revision 1.3 of Intelб╝ Virtualization Technology for Directed I/O Architecture Specification. The Extended Context and PASIDs from the rev. 2.2 are not supported, but I am not aware of any released hardware which implements them. Code does not use queued invalidation, see comments for the reason, and does not provide interrupt remapping services. Code implements the management of the guest address space per domain and allows to establish and tear down arbitrary mappings, but not partial unmapping. The superpages are created as needed, but not promoted. Faults are recorded, fault records could be obtained programmatically, and printed on the console. Implement the busdma(9) using DMARs. This busdma backend avoids bouncing and provides security against misbehaving hardware and driver bad programming, preventing leaks and corruption of the memory by wild DMA accesses. By default, the implementation is compiled into amd64 GENERIC kernel but disabled; to enable, set hw.dmar.enable=1 loader tunable. Code is written to work on i386, but testing there was low priority, and driver is not enabled in GENERIC. Even with the DMAR turned on, individual devices could be directed to use the bounce busdma with the hw.busdma.pcidomain:bus:device:function.bounce=1 tunable. If DMARs are capable of the pass-through translations, it is used, otherwise, an identity-mapping page table is constructed. The driver was tested on Xeon 5400/5500 chipset legacy machine, Haswell desktop and E5 SandyBridge dual-socket boxes, with ahci(4), ata(4), bce(4), ehci(4), mfi(4), uhci(4), xhci(4) devices. It also works with em(4) and igb(4), but there some fixes are needed for drivers, which are not committed yet. Intel GPUs do not work with DMAR (yet). Many thanks to John Baldwin, who explained me the newbus integration; Peter Holm, who did all testing and helped me to discover and understand several incredible bugs; and to Jim Harris for the access to the EDS and BWG and for listening when I have to explain my findings to somebody. Sponsored by: The FreeBSD Foundation MFC after:1 month Added: head/sys/x86/iommu/ head/sys/x86/iommu/busdma_dmar.c (contents, props changed) head/sys/x86/iommu/busdma_dmar.h (contents, props changed) head/sys/x86/iommu/intel_ctx.c (contents, props changed) head/sys/x86/iommu/intel_dmar.h (contents, props changed) head/sys/x86/iommu/intel_drv.c (contents, props changed) head/sys/x86/iommu/intel_fault.c (contents, props changed) head/sys/x86/iommu/intel_gas.c (contents, props changed) head/sys/x86/iommu/intel_idpgtbl.c (contents, props changed) head/sys/x86/iommu/intel_quirks.c (contents, props changed) head/sys/x86/iommu/intel_reg.h (contents, props changed) head/sys/x86/iommu/intel_utils.c (contents, props changed) Modified: head/sys/amd64/conf/GENERIC head/sys/conf/files.amd64 head/sys/conf/files.i386 head/sys/conf/options head/sys/dev/acpica/acpi_pci.c head/sys/i386/conf/NOTES Modified: head/sys/amd64/conf/GENERIC == --- head/sys/amd64/conf/GENERIC Mon Oct 28 12:49:07 2013(r257250) +++ head/sys/amd64/conf/GENERIC Mon Oct 28 13:33:29 2013(r257251) @@ -94,6 +94,7 @@ devicecpufreq # Bus support. device acpi +optionsACPI_DMAR device pci # Floppy drives Modified: head/sys/conf/files.amd64 == --- head/sys/conf/files.amd64 Mon Oct 28 12:49:07 2013(r257250) +++ head/sys/conf/files.amd64 Mon Oct 28 13:33:29 2013(r257251) @@ -531,6 +531,14 @@ x86/cpufreq/powernow.c optionalcpufreq x86/cpufreq/est.c optionalcpufreq x86/cpufreq/hwpstate.c optionalcpufreq x86/cpufreq/p4tcc.coptionalcpufreq +x86/iommu/busdma_dmar.coptionalacpi acpi_dmar pci +x86/iommu/intel_ctx.c optionalacpi acpi_dmar pci +x86/iommu/intel_drv.c optionalacpi acpi_dmar pci +x86/iommu/intel_fault.coptionalacpi acpi_dmar pci +x86/iommu/intel_gas.c optionalacpi acpi_dmar pci +x86/iommu/intel_idpgtbl.c optionalacpi acpi_dmar pci +x86/iommu/intel_quirks.c optionalacpi acpi_dmar pci +x86/iommu/intel_utils.coptionalacpi acpi_dmar pci x86/isa/atpic.coptionalatpic isa x86/isa/atrtc.cstandard x86/isa/clock.cstandard Modified: head/sys/conf/files.i386
svn commit: r257254 - head/lib/libnetgraph
Author: glebius Date: Mon Oct 28 14:47:33 2013 New Revision: 257254 URL: http://svnweb.freebsd.org/changeset/base/257254 Log: Remove ng_fec(4). Modified: head/lib/libnetgraph/debug.c Modified: head/lib/libnetgraph/debug.c == --- head/lib/libnetgraph/debug.cMon Oct 28 14:27:35 2013 (r257253) +++ head/lib/libnetgraph/debug.cMon Oct 28 14:47:33 2013 (r257254) @@ -68,7 +68,6 @@ __FBSDID($FreeBSD$); #include netgraph/ng_eiface.h #include netgraph/ng_etf.h #include netgraph/ng_ether.h -#include netgraph/ng_fec.h #include netgraph/ng_frame_relay.h #include netgraph/ng_gif.h #include netgraph/ng_gif_demux.h @@ -136,7 +135,6 @@ static const struct ng_cookie cookies[] COOKIE(EIFACE), COOKIE(ETF), COOKIE(ETHER), - COOKIE(FEC), COOKIE(FRAMERELAY), COOKIE(GIF), COOKIE(GIF_DEMUX), ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257255 - head/sys/conf
Author: glebius Date: Mon Oct 28 14:52:08 2013 New Revision: 257255 URL: http://svnweb.freebsd.org/changeset/base/257255 Log: Remove ng_fec(4). Modified: head/sys/conf/files Modified: head/sys/conf/files == --- head/sys/conf/files Mon Oct 28 14:47:33 2013(r257254) +++ head/sys/conf/files Mon Oct 28 14:52:08 2013(r257255) @@ -3205,7 +3205,6 @@ netgraph/ng_echo.coptional netgraph_ec netgraph/ng_eiface.c optional netgraph_eiface netgraph/ng_ether.coptional netgraph_ether netgraph/ng_ether_echo.c optional netgraph_ether_echo -netgraph/ng_fec.c optional netgraph_fec netgraph/ng_frame_relay.c optional netgraph_frame_relay netgraph/ng_gif.c optional netgraph_gif netgraph/ng_gif_demux.coptional netgraph_gif_demux ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257256 - head/sys/contrib/ipfilter/netinet
Author: glebius Date: Mon Oct 28 15:11:37 2013 New Revision: 257256 URL: http://svnweb.freebsd.org/changeset/base/257256 Log: Fix build. We need to include systm.h before if_var.h. Pointy hat to:glebius Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c Modified: head/sys/contrib/ipfilter/netinet/radix_ipf.c == --- head/sys/contrib/ipfilter/netinet/radix_ipf.c Mon Oct 28 14:52:08 2013(r257255) +++ head/sys/contrib/ipfilter/netinet/radix_ipf.c Mon Oct 28 15:11:37 2013(r257256) @@ -9,12 +9,14 @@ #include sys/param.h #include netinet/in.h #include net/if.h -#if !defined(_KERNEL) +#ifdef _KERNEL +#include sys/systm.h +#else # include stddef.h # include stdlib.h # include strings.h # include string.h -#endif +#endif /* !_KERNEL */ #include netinet/ip_compat.h #include netinet/ip_fil.h #ifdef RDX_DEBUG ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257257 - head/sys/conf
Author: glebius Date: Mon Oct 28 15:17:41 2013 New Revision: 257257 URL: http://svnweb.freebsd.org/changeset/base/257257 Log: Remove ng_fec(4). Modified: head/sys/conf/NOTES Modified: head/sys/conf/NOTES == --- head/sys/conf/NOTES Mon Oct 28 15:11:37 2013(r257256) +++ head/sys/conf/NOTES Mon Oct 28 15:17:41 2013(r257257) @@ -728,7 +728,6 @@ options NETGRAPH_DEVICE optionsNETGRAPH_ECHO optionsNETGRAPH_EIFACE optionsNETGRAPH_ETHER -optionsNETGRAPH_FEC optionsNETGRAPH_FRAME_RELAY optionsNETGRAPH_GIF optionsNETGRAPH_GIF_DEMUX ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257258 - in head/sys/arm: at91 econa lpc ti/cpsw versatile xscale/pxa
Author: ian Date: Mon Oct 28 15:20:17 2013 New Revision: 257258 URL: http://svnweb.freebsd.org/changeset/base/257258 Log: Sweep up a bit of arm-land fallout after r257244; include necessary headers directly that are no longer available via accidental include. Modified: head/sys/arm/at91/if_ate.c head/sys/arm/econa/if_ece.c head/sys/arm/lpc/if_lpe.c head/sys/arm/ti/cpsw/if_cpsw.c head/sys/arm/versatile/if_smc_fdt.c head/sys/arm/xscale/pxa/if_smc_smi.c Modified: head/sys/arm/at91/if_ate.c == --- head/sys/arm/at91/if_ate.c Mon Oct 28 15:17:41 2013(r257257) +++ head/sys/arm/at91/if_ate.c Mon Oct 28 15:20:17 2013(r257258) @@ -54,6 +54,7 @@ __FBSDID($FreeBSD$); #include net/if_media.h #include net/if_mib.h #include net/if_types.h +#include net/if_var.h #ifdef INET #include netinet/in.h Modified: head/sys/arm/econa/if_ece.c == --- head/sys/arm/econa/if_ece.c Mon Oct 28 15:17:41 2013(r257257) +++ head/sys/arm/econa/if_ece.c Mon Oct 28 15:20:17 2013(r257258) @@ -46,6 +46,7 @@ __FBSDID($FreeBSD$); #include net/if_dl.h #include net/if_media.h #include net/if_types.h +#include net/if_var.h #include net/if_vlan_var.h #ifdef INET Modified: head/sys/arm/lpc/if_lpe.c == --- head/sys/arm/lpc/if_lpe.c Mon Oct 28 15:17:41 2013(r257257) +++ head/sys/arm/lpc/if_lpe.c Mon Oct 28 15:20:17 2013(r257258) @@ -49,6 +49,7 @@ __FBSDID($FreeBSD$); #include net/if_dl.h #include net/if_media.h #include net/if_types.h +#include net/if_var.h #include net/bpf.h Modified: head/sys/arm/ti/cpsw/if_cpsw.c == --- head/sys/arm/ti/cpsw/if_cpsw.c Mon Oct 28 15:17:41 2013 (r257257) +++ head/sys/arm/ti/cpsw/if_cpsw.c Mon Oct 28 15:20:17 2013 (r257258) @@ -64,6 +64,7 @@ __FBSDID($FreeBSD$); #include net/if_dl.h #include net/if_media.h #include net/if_types.h +#include net/if_var.h #include net/if_vlan_var.h #include netinet/in_systm.h Modified: head/sys/arm/versatile/if_smc_fdt.c == --- head/sys/arm/versatile/if_smc_fdt.c Mon Oct 28 15:17:41 2013 (r257257) +++ head/sys/arm/versatile/if_smc_fdt.c Mon Oct 28 15:20:17 2013 (r257258) @@ -28,11 +28,12 @@ __FBSDID($FreeBSD$); #include sys/param.h +#include sys/bus.h #include sys/kernel.h -#include sys/socket.h - #include sys/module.h -#include sys/bus.h +#include sys/socket.h +#include sys/systm.h +#include sys/taskqueue.h #include machine/bus.h #include machine/resource.h Modified: head/sys/arm/xscale/pxa/if_smc_smi.c == --- head/sys/arm/xscale/pxa/if_smc_smi.cMon Oct 28 15:17:41 2013 (r257257) +++ head/sys/arm/xscale/pxa/if_smc_smi.cMon Oct 28 15:20:17 2013 (r257258) @@ -28,11 +28,12 @@ __FBSDID($FreeBSD$); #include sys/param.h +#include sys/bus.h #include sys/kernel.h -#include sys/socket.h - #include sys/module.h -#include sys/bus.h +#include sys/socket.h +#include sys/systm.h +#include sys/taskqueue.h #include machine/bus.h #include machine/resource.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257258 - in head/sys/arm: at91 econa lpc ti/cpsw versatile xscale/pxa
On Mon, Oct 28, 2013 at 03:20:18PM +, Ian Lepore wrote: I Author: ian I Date: Mon Oct 28 15:20:17 2013 I New Revision: 257258 I URL: http://svnweb.freebsd.org/changeset/base/257258 I I Log: I Sweep up a bit of arm-land fallout after r257244; include necessary I headers directly that are no longer available via accidental include. I I Modified: I head/sys/arm/at91/if_ate.c I head/sys/arm/econa/if_ece.c I head/sys/arm/lpc/if_lpe.c I head/sys/arm/ti/cpsw/if_cpsw.c I head/sys/arm/versatile/if_smc_fdt.c I head/sys/arm/xscale/pxa/if_smc_smi.c Thanks, Ian! I started working on them as soon as I noticed tinderbox message, but surprisingly all arm LINTs built well. That is because I checked in your commit :) Thanks again and sorry for problems. -- Totus tuus, Glebius. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257259 - head/share/man/man4
Author: glebius Date: Mon Oct 28 15:38:26 2013 New Revision: 257259 URL: http://svnweb.freebsd.org/changeset/base/257259 Log: Remove ng_fec.4 Submitted by: Dmitry Luhtionov dmitryluhtionov gmail.com Modified: head/share/man/man4/netgraph.4 Modified: head/share/man/man4/netgraph.4 == --- head/share/man/man4/netgraph.4 Mon Oct 28 15:20:17 2013 (r257258) +++ head/share/man/man4/netgraph.4 Mon Oct 28 15:38:26 2013 (r257259) @@ -1430,7 +1430,6 @@ common networking problems, solved using .Xr ng_eiface 4 , .Xr ng_etf 4 , .Xr ng_ether 4 , -.Xr ng_fec 4 , .Xr ng_frame_relay 4 , .Xr ng_gif 4 , .Xr ng_gif_demux 4 , ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257261 - in head: etc etc/defaults etc/rc.d share/man/man4 share/man/man5 sys/boot/forth
Author: glebius Date: Mon Oct 28 16:21:31 2013 New Revision: 257261 URL: http://svnweb.freebsd.org/changeset/base/257261 Log: Remove more remnants of ng_fec(4). The ng_create_one() and ng_mkpeer() functions in network.subr are now not used anywhere, but I left them, since they can be useful in future in netgraph scripting. Submitted by: pluknet Modified: head/etc/defaults/rc.conf head/etc/network.subr head/etc/rc.d/netif head/share/man/man4/lagg.4 head/share/man/man5/rc.conf.5 head/sys/boot/forth/loader.conf Modified: head/etc/defaults/rc.conf == --- head/etc/defaults/rc.conf Mon Oct 28 15:38:52 2013(r257260) +++ head/etc/defaults/rc.conf Mon Oct 28 16:21:31 2013(r257261) @@ -235,10 +235,6 @@ gif_interfaces= # List of GIF tunnels # Choose correct tunnel addrs. #gifconfig_gif0=10.1.1.1 10.1.2.1# Examples typically for a router. #gifconfig_gif1=10.1.1.2 10.1.2.2# Examples typically for a router. -fec_interfaces= # List of Fast EtherChannels. -#fec_interfaces=fec0 fec1 -#fecconfig_fec0=fxp0 dc0 # Examples typically for two NICs -#fecconfig_fec1=em0 em1 bge0 bge1# Examples typically for four NICs # User ppp configuration. ppp_enable=NO# Start user-ppp (or NO). Modified: head/etc/network.subr == --- head/etc/network.subr Mon Oct 28 15:38:52 2013(r257260) +++ head/etc/network.subr Mon Oct 28 16:21:31 2013(r257261) @@ -1520,54 +1520,6 @@ ng_create_one() done } -# ng_fec_create ifn -# Configure Fast EtherChannel for interface $ifn. Returns 0 if -# FEC arguments were found and configured; returns !0 otherwise. -ng_fec_create() -{ -local req_iface iface bogus -req_iface=$1 - -ngctl shutdown ${req_iface}: /dev/null 21 - -bogus= -while true; do -iface=`ng_create_one fec dummy fec` -if [ -z ${iface} ]; then -exit 2 -fi -if [ ${iface} = ${req_iface} ]; then -break -fi -bogus=${bogus} ${iface} -done - -for iface in ${bogus}; do -ngctl shutdown ${iface}: -done -} - -# fec_up -# Create Fast EtherChannel interfaces. -fec_up() -{ - local i j - - for i in ${fec_interfaces}; do - ng_fec_create $i - for j in `get_if_var $i fecconfig_IF`; do - case ${j} in - '') - continue - ;; - *) - ngctl msg ${i}: add_iface \${j}\ - ;; - esac - done - done -} - # ipx_up ifn # Configure any IPX addresses for interface $ifn. Returns 0 if # IPX arguments were found and configured; returns 1 otherwise. Modified: head/etc/rc.d/netif == --- head/etc/rc.d/netif Mon Oct 28 15:38:52 2013(r257260) +++ head/etc/rc.d/netif Mon Oct 28 16:21:31 2013(r257261) @@ -62,9 +62,6 @@ network_start() # disable SIGINT (Ctrl-c) when running at startup trap : 2 - - # Create Fast EtherChannel interfaces - fec_up fi # Create cloned interfaces Modified: head/share/man/man4/lagg.4 == --- head/share/man/man4/lagg.4 Mon Oct 28 15:38:52 2013(r257260) +++ head/share/man/man4/lagg.4 Mon Oct 28 16:21:31 2013(r257261) @@ -175,7 +175,6 @@ device will be used: (Note the mac address of the wireless device is forced to match the wired device as a workaround.) .Sh SEE ALSO -.Xr ng_fec 4 , .Xr ng_one2many 4 , .Xr sysctl 8 , .Xr ifconfig 8 Modified: head/share/man/man5/rc.conf.5 == --- head/share/man/man5/rc.conf.5 Mon Oct 28 15:38:52 2013 (r257260) +++ head/share/man/man5/rc.conf.5 Mon Oct 28 16:21:31 2013 (r257261) @@ -24,7 +24,7 @@ .\ .\ $FreeBSD$ .\ -.Dd October 19, 2013 +.Dd October 28, 2013 .Dt RC.CONF 5 .Os .Sh NAME @@ -1676,33 +1676,6 @@ Even if this variable is specified to .Dq YES , .Dq :nosticky keyword can be used to override it on per interface basis. -.It Va fec_interfaces -.Pq Vt str -Set to the list of -.Xr ng_fec 4 -Fast EtherChannel interfaces to configure on this host. -A -.Va fecconfig_ Ns Aq Ar interface -variable is assumed to exist for each value of -.Ar interface . -The value of this variable is used to configure link aggregated interfaces
svn commit: r257262 - head/sys/dev/cs
Author: sbruno Date: Mon Oct 28 16:27:01 2013 New Revision: 257262 URL: http://svnweb.freebsd.org/changeset/base/257262 Log: repair build for dev/cs. Reported by: Outback Dingo outbackdi...@gmail.com Modified: head/sys/dev/cs/if_cs_isa.c Modified: head/sys/dev/cs/if_cs_isa.c == --- head/sys/dev/cs/if_cs_isa.c Mon Oct 28 16:21:31 2013(r257261) +++ head/sys/dev/cs/if_cs_isa.c Mon Oct 28 16:27:01 2013(r257262) @@ -32,6 +32,7 @@ __FBSDID($FreeBSD$); #include sys/param.h #include sys/kernel.h #include sys/socket.h +#include sys/callout.h #include sys/module.h #include sys/bus.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
Ping, any response? I'd like to narrow down what's going on here. Thanks! -adrian On 27 October 2013 09:04, Adrian Chadd adr...@freebsd.org wrote: Hm, ok. Can you compile it with IWN_DEBUG and IEEE80211_DEBUG, then do this: sysctl dev.iwn.0.debug=0x1 wlandebug +rate I'd like to see what the selected rate is and what the logged reason for failing to transmit is. I have a 5100 and it works totally fine for me. Thanks! -adrian On 27 October 2013 03:11, Stefan Farfeleder stef...@freebsd.org wrote: On Fri, Oct 25, 2013 at 07:44:54PM +, Adrian Chadd wrote: Author: adrian Date: Fri Oct 25 19:44:53 2013 New Revision: 257133 URL: http://svnweb.freebsd.org/changeset/base/257133 Log: Temporarily disable multi-rate retry (link quality) and eliminate rate index lookups. * My recent(ish) change to iwn(4) and the net80211 rate control API to support 11n rates broke the link quality table use. So, until I or someone else decides to fix it, let's just disable it for now. * Teach iwn_tx_data_raw() to use the iwn_rate_to_plcp() function. * Eliminate two uses of the net80211 rate index lookup functions - they are only for legacy rates and they're not needed here. This fixes some invalid looking rate control TX issues that showed up on my 4965 but it doesn't fix the two TX hangs I've noticed. Those look like DMA related issues. Tested: * 4965, STA mode * 5100, STA mode Hi Adrian, this change completely broke iwn for me. It's a iwn0: Intel WiFi Link 5100 mem 0xf1ffe000-0xf1ff irq 17 at device 0.0 on pci12 built-in device in a Dell Precision m4400. With this change, wpa_supplicant cannot associate any longer. In the logs I see every few seconds Oct 27 10:57:37 mole wpa_supplicant[2256]: wlan0: Trying to associate with xx:xx:xx:xx:xx:xx (SSID='xx' freq=2427 MHz) Oct 27 10:57:47 mole wpa_supplicant[2256]: wlan0: Authentication with xx:xx:xx:xx:xx:xx timed out. Oct 27 10:57:47 mole wpa_supplicant[2256]: wlan0: CTRL-EVENT-DISCONNECTED bssid=xx:xx:xx:xx:xx:xx reason=3 locally_generated=1 If I revert just this revision based on a r257155 checkout, it works again. Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257263 - head/contrib/groff/src/roff/troff
Author: sbruno Date: Mon Oct 28 18:10:35 2013 New Revision: 257263 URL: http://svnweb.freebsd.org/changeset/base/257263 Log: Quiesce warnings -Wdangling-else Thanks to jilles for some reviews and tips. Modified: head/contrib/groff/src/roff/troff/input.cpp head/contrib/groff/src/roff/troff/mtsm.cpp head/contrib/groff/src/roff/troff/node.cpp Modified: head/contrib/groff/src/roff/troff/input.cpp == --- head/contrib/groff/src/roff/troff/input.cpp Mon Oct 28 16:27:01 2013 (r257262) +++ head/contrib/groff/src/roff/troff/input.cpp Mon Oct 28 18:10:35 2013 (r257263) @@ -2789,18 +2789,19 @@ void process_input_stack() case token::TOKEN_TRANSPARENT: { if (bol) { - if (possibly_handle_first_page_transition()) + if (possibly_handle_first_page_transition()) { ; - else { + } else { int cc; do { node *n; cc = get_copy(n); - if (cc != EOF) + if (cc != EOF) { if (cc != '\0') curdiv-transparent_output(transparent_translate(cc)); else curdiv-transparent_output(n); + } } while (cc != '\n' cc != EOF); if (cc == EOF) curdiv-transparent_output('\n'); @@ -2811,9 +2812,9 @@ void process_input_stack() case token::TOKEN_NEWLINE: { if (bol !old_have_input -!curenv-get_prev_line_interrupted()) +!curenv-get_prev_line_interrupted()) { trapping_blank_line(); - else { + } else { curenv-newline(); bol = 1; } Modified: head/contrib/groff/src/roff/troff/mtsm.cpp == --- head/contrib/groff/src/roff/troff/mtsm.cpp Mon Oct 28 16:27:01 2013 (r257262) +++ head/contrib/groff/src/roff/troff/mtsm.cpp Mon Oct 28 18:10:35 2013 (r257263) @@ -482,21 +482,24 @@ void mtsm::flush(FILE *fp, statem *s, st void statem::display_state() { fprintf(stderr, state ); - if (bool_values[MTSM_BR].is_known) + if (bool_values[MTSM_BR].is_known) { if (bool_values[MTSM_BR].value) fprintf(stderr, [br]); else fprintf(stderr, [!br]); - if (bool_values[MTSM_EOL].is_known) + } + if (bool_values[MTSM_EOL].is_known) { if (bool_values[MTSM_EOL].value) fprintf(stderr, [eol]); else fprintf(stderr, [!eol]); - if (int_values[MTSM_SP].is_known) + } + if (int_values[MTSM_SP].is_known) { if (int_values[MTSM_SP].value) fprintf(stderr, [sp %d], int_values[MTSM_SP].value); else fprintf(stderr, [!sp]); + } fprintf(stderr, ); fflush(stderr); } Modified: head/contrib/groff/src/roff/troff/node.cpp == --- head/contrib/groff/src/roff/troff/node.cpp Mon Oct 28 16:27:01 2013 (r257262) +++ head/contrib/groff/src/roff/troff/node.cpp Mon Oct 28 18:10:35 2013 (r257263) @@ -4600,14 +4600,14 @@ void hline_node::tprint(troff_output_fil } else { hunits rem = x - w*i; -if (rem H0) +if (rem H0) { if (n-overlaps_horizontally()) { if (out-is_on()) n-tprint(out); out-right(rem - w); - } - else + } else out-right(rem); +} while (--i = 0) if (out-is_on()) n-tprint(out); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
On Mon, Oct 28, 2013 at 10:17:02AM -0700, Adrian Chadd wrote: Ping, any response? I'd like to narrow down what's going on here. Yeah, I'll have results soon, at the moment rebuilding my kernel. Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257264 - in head/contrib/opie: . libopie
Author: sbruno Date: Mon Oct 28 18:24:31 2013 New Revision: 257264 URL: http://svnweb.freebsd.org/changeset/base/257264 Log: Queisce two category of clang warnings: 1. missing explicit includes for string.h, stdio.h, etc 2. missing explicit declaration for some common functions I have been unable to contact the upstream maintainer for this patch, http://www.inner.net/opie appears to be the source of truth but it unreachable Modified: head/contrib/opie/libopie/accessfile.c head/contrib/opie/libopie/generator.c head/contrib/opie/libopie/lookup.c head/contrib/opie/libopie/newseed.c head/contrib/opie/libopie/parsechallenge.c head/contrib/opie/libopie/passwd.c head/contrib/opie/libopie/randomchallenge.c head/contrib/opie/libopie/verify.c head/contrib/opie/libopie/version.c head/contrib/opie/opie.h head/contrib/opie/opieinfo.c head/contrib/opie/opiekey.c Modified: head/contrib/opie/libopie/accessfile.c == --- head/contrib/opie/libopie/accessfile.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/accessfile.c Mon Oct 28 18:24:31 2013 (r257264) @@ -28,6 +28,7 @@ License Agreement applies to this softwa #include opie_cfg.h #include stdio.h +#include ctype.h #include sys/types.h #include sys/socket.h #include netinet/in.h Modified: head/contrib/opie/libopie/generator.c == --- head/contrib/opie/libopie/generator.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/generator.c Mon Oct 28 18:24:31 2013 (r257264) @@ -49,6 +49,7 @@ $FreeBSD$ #if DEBUG #include syslog.h #endif /* DEBUG */ +#include stdio.h #include opie.h static char *algids[] = { NULL, NULL, NULL, sha1, md4, md5 }; Modified: head/contrib/opie/libopie/lookup.c == --- head/contrib/opie/libopie/lookup.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/lookup.c Mon Oct 28 18:24:31 2013 (r257264) @@ -13,6 +13,7 @@ you didn't get a copy, you may request o #include opie_cfg.h #include stdio.h +#include string.h #include opie.h int opielookup FUNCTION((opie, principal), struct opie *opie AND char *principal) Modified: head/contrib/opie/libopie/newseed.c == --- head/contrib/opie/libopie/newseed.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/newseed.c Mon Oct 28 18:24:31 2013 (r257264) @@ -18,6 +18,9 @@ $FreeBSD$ */ #include opie_cfg.h +#ifndef HAVE_TIME_H +#define HAVE_TIME_H 1 +#endif #if HAVE_TIME_H #include time.h #endif /* HAVE_TIME_H */ @@ -35,6 +38,8 @@ $FreeBSD$ #if DEBUG #include syslog.h #endif /* DEBUG */ +#include stdio.h +#include stdlib.h #include opie.h int opienewseed FUNCTION((seed), char *seed) Modified: head/contrib/opie/libopie/parsechallenge.c == --- head/contrib/opie/libopie/parsechallenge.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/parsechallenge.c Mon Oct 28 18:24:31 2013 (r257264) @@ -19,6 +19,8 @@ you didn't get a copy, you may request o #if HAVE_STRING_H #include string.h #endif /* HAVE_STRING_H */ +#include ctype.h +#include stdlib.h #include opie.h struct algorithm { Modified: head/contrib/opie/libopie/passwd.c == --- head/contrib/opie/libopie/passwd.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/passwd.c Mon Oct 28 18:24:31 2013 (r257264) @@ -20,6 +20,7 @@ you didn't get a copy, you may request o Created by cmetz for OPIE 2.22. */ +#include string.h #include opie_cfg.h #include opie.h Modified: head/contrib/opie/libopie/randomchallenge.c == --- head/contrib/opie/libopie/randomchallenge.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/randomchallenge.c Mon Oct 28 18:24:31 2013 (r257264) @@ -26,6 +26,9 @@ License Agreement applies to this softwa Created at NRL for OPIE 2.2 from opiesubr2.c */ +#include stdio.h +#include string.h +#include stdlib.h #include opie_cfg.h #include opie.h Modified: head/contrib/opie/libopie/verify.c == --- head/contrib/opie/libopie/verify.c Mon Oct 28 18:10:35 2013 (r257263) +++ head/contrib/opie/libopie/verify.c Mon Oct 28 18:24:31 2013 (r257264) @@ -24,6 +24,7 @@ you didn't get a copy, you may request o #ifdef HAVE_STRING_H #include string.h #endif /* HAVE_STRING_H */ +#include ctype.h #include
svn commit: r257265 - head/sys/arm/xscale/ixp425
Author: ian Date: Mon Oct 28 18:43:00 2013 New Revision: 257265 URL: http://svnweb.freebsd.org/changeset/base/257265 Log: Follow r257244; it's now necessary to include if_var.h. Modified: head/sys/arm/xscale/ixp425/if_npe.c Modified: head/sys/arm/xscale/ixp425/if_npe.c == --- head/sys/arm/xscale/ixp425/if_npe.c Mon Oct 28 18:24:31 2013 (r257264) +++ head/sys/arm/xscale/ixp425/if_npe.c Mon Oct 28 18:43:00 2013 (r257265) @@ -65,6 +65,7 @@ __FBSDID($FreeBSD$); #include net/if_media.h #include net/if_mib.h #include net/if_types.h +#include net/if_var.h #ifdef INET #include netinet/in.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
On Mon, Oct 28, 2013 at 10:17:02AM -0700, Adrian Chadd wrote: Ping, any response? I'd like to narrow down what's going on here. http://pastebin.com/veDsb0Xj Does this help in any way? Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
Yeah: Oct 28 19:43:43 mole kernel: iwn5000_tx_done: qid 3 idx 4 retries 7 nkill 0 rate a902 duration 686 status 83 status 0x83 is LONG_LIMIT, which meant it tried to transmit and it failed to get an ACK each time. The rate control says: 0x02: the rate in question bit 8: MCS bit 11: HT40 bits 14+15: transmit antennas A+B .. and it's an association/management frame, which is odd as they're not supposed to be sent as 11n HT40 frames like this. can you do the same experiment but with the patch reverted? I'd like to see what the selected rate is. Thanks! -adrian On 28 October 2013 12:00, Stefan Farfeleder stef...@freebsd.org wrote: On Mon, Oct 28, 2013 at 10:17:02AM -0700, Adrian Chadd wrote: Ping, any response? I'd like to narrow down what's going on here. http://pastebin.com/veDsb0Xj Does this help in any way? Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
On Mon, Oct 28, 2013 at 12:07:17PM -0700, Adrian Chadd wrote: Yeah: Oct 28 19:43:43 mole kernel: iwn5000_tx_done: qid 3 idx 4 retries 7 nkill 0 rate a902 duration 686 status 83 status 0x83 is LONG_LIMIT, which meant it tried to transmit and it failed to get an ACK each time. The rate control says: 0x02: the rate in question bit 8: MCS bit 11: HT40 bits 14+15: transmit antennas A+B .. and it's an association/management frame, which is odd as they're not supposed to be sent as 11n HT40 frames like this. can you do the same experiment but with the patch reverted? I'd like to see what the selected rate is. Ok, here's the output with r257155 and r257133 reverted: http://pastebin.com/CJzsTANv Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257266 - head/sys/x86/iommu
Author: kib Date: Mon Oct 28 19:30:09 2013 New Revision: 257266 URL: http://svnweb.freebsd.org/changeset/base/257266 Log: Remove redundand assignment to error variable and check for its value [1]. Do CTR logging in the case of error as well. Noted by: rdivacky [1] Sponsored by: The FreeBSD Foundation MFC after:1 month Modified: head/sys/x86/iommu/busdma_dmar.c Modified: head/sys/x86/iommu/busdma_dmar.c == --- head/sys/x86/iommu/busdma_dmar.cMon Oct 28 18:43:00 2013 (r257265) +++ head/sys/x86/iommu/busdma_dmar.cMon Oct 28 19:30:09 2013 (r257266) @@ -163,18 +163,15 @@ dmar_bus_dma_tag_create(bus_dma_tag_t pa nsegments, maxsegsz, flags, lockfunc, lockfuncarg, sizeof(struct bus_dma_tag_dmar), (void **)newtag); if (error != 0) - return (error); + goto out; oldtag = (struct bus_dma_tag_dmar *)parent; newtag-common.impl = bus_dma_dmar_impl; newtag-ctx = oldtag-ctx; newtag-owner = oldtag-owner; - error = 0; - if (error != 0) - free(newtag, M_DEVBUF); - else - *dmat = (bus_dma_tag_t)newtag; + *dmat = (bus_dma_tag_t)newtag; +out: CTR4(KTR_BUSDMA, %s returned tag %p tag flags 0x%x error %d, __func__, newtag, (newtag != NULL ? newtag-common.flags : 0), error); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257268 - head/gnu/usr.bin/binutils/ld
Author: brooks Date: Mon Oct 28 19:56:46 2013 New Revision: 257268 URL: http://svnweb.freebsd.org/changeset/base/257268 Log: Enable the --sysroot=/foo option in ld by always building with a sysroot defined. When not building as a cross linker, the sysroot is set to /. Exp-run by: bdrewery (ports/183206) MFC after:3 days Modified: head/gnu/usr.bin/binutils/ld/Makefile Modified: head/gnu/usr.bin/binutils/ld/Makefile == --- head/gnu/usr.bin/binutils/ld/Makefile Mon Oct 28 19:46:01 2013 (r257267) +++ head/gnu/usr.bin/binutils/ld/Makefile Mon Oct 28 19:56:46 2013 (r257268) @@ -31,7 +31,7 @@ CFLAGS+= -DTARGET=\${TARGET_TUPLE}\ CFLAGS+= -DDEFAULT_EMULATION=\${NATIVE_EMULATION}\ CFLAGS+= -DSCRIPTDIR=\${TOOLS_PREFIX}/usr/libdata\ CFLAGS+= -DBFD_VERSION_STRING=\${VERSION}\ -CFLAGS+= -DBINDIR=\${BINDIR}\ -DTARGET_SYSTEM_ROOT=\${TOOLS_PREFIX}\ +CFLAGS+= -DBINDIR=\${BINDIR}\ -DTARGET_SYSTEM_ROOT=\${TOOLS_PREFIX:U/}\ CFLAGS+= -DTOOLBINDIR=\${TOOLS_PREFIX}/${BINDIR}/libexec\ CFLAGS+= -D_GNU_SOURCE CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257269 - head/sys/dev/altera/atse
Author: brooks Date: Mon Oct 28 20:15:59 2013 New Revision: 257269 URL: http://svnweb.freebsd.org/changeset/base/257269 Log: Add a couple includes if net/if_var.h that were missed in r257176. Modified: head/sys/dev/altera/atse/if_atse_fdt.c head/sys/dev/altera/atse/if_atse_nexus.c Modified: head/sys/dev/altera/atse/if_atse_fdt.c == --- head/sys/dev/altera/atse/if_atse_fdt.c Mon Oct 28 19:56:46 2013 (r257268) +++ head/sys/dev/altera/atse/if_atse_fdt.c Mon Oct 28 20:15:59 2013 (r257269) @@ -45,6 +45,7 @@ __FBSDID($FreeBSD$); #include net/ethernet.h #include net/if.h #include net/if_media.h +#include net/if_var.h #include dev/mii/mii.h #include dev/mii/miivar.h Modified: head/sys/dev/altera/atse/if_atse_nexus.c == --- head/sys/dev/altera/atse/if_atse_nexus.cMon Oct 28 19:56:46 2013 (r257268) +++ head/sys/dev/altera/atse/if_atse_nexus.cMon Oct 28 20:15:59 2013 (r257269) @@ -47,6 +47,7 @@ __FBSDID($FreeBSD$); #include net/ethernet.h #include net/if.h #include net/if_media.h +#include net/if_var.h #include dev/mii/mii.h #include dev/mii/miivar.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257270 - head/sys/dev/ath
Author: cognet Date: Mon Oct 28 20:26:34 2013 New Revision: 257270 URL: http://svnweb.freebsd.org/changeset/base/257270 Log: Include sys/ktr.h, since we need it if ATH_DEBUG is defined. Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c == --- head/sys/dev/ath/if_ath_tx.cMon Oct 28 20:15:59 2013 (r257269) +++ head/sys/dev/ath/if_ath_tx.cMon Oct 28 20:26:34 2013 (r257270) @@ -59,6 +59,7 @@ __FBSDID($FreeBSD$); #include sys/kthread.h #include sys/taskqueue.h #include sys/priv.h +#include sys/ktr.h #include machine/bus.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257271 - in head/sys: net sys
Author: glebius Date: Mon Oct 28 20:32:05 2013 New Revision: 257271 URL: http://svnweb.freebsd.org/changeset/base/257271 Log: Style: s/SYS_EVENTHANDLER_H/_SYS_EVENTHANDLER_H_/g Submitted by: bde Modified: head/sys/net/bpf.h head/sys/net/if_clone.h head/sys/net/if_var.h head/sys/net/if_vlan_var.h head/sys/sys/eventhandler.h Modified: head/sys/net/bpf.h == --- head/sys/net/bpf.h Mon Oct 28 20:26:34 2013(r257270) +++ head/sys/net/bpf.h Mon Oct 28 20:32:05 2013(r257271) @@ -1310,12 +1310,12 @@ bpf_peers_present(struct bpf_if *bpf) */ #define BPF_MEMWORDS 16 -#ifdef SYS_EVENTHANDLER_H +#ifdef _SYS_EVENTHANDLER_H_ /* BPF attach/detach events */ struct ifnet; typedef void (*bpf_track_fn)(void *, struct ifnet *, int /* dlt */, int /* 1 ='s attach */); EVENTHANDLER_DECLARE(bpf_track, bpf_track_fn); -#endif /* SYS_EVENTHANDLER_H */ +#endif /* _SYS_EVENTHANDLER_H_ */ #endif /* _NET_BPF_H_ */ Modified: head/sys/net/if_clone.h == --- head/sys/net/if_clone.h Mon Oct 28 20:26:34 2013(r257270) +++ head/sys/net/if_clone.h Mon Oct 28 20:32:05 2013(r257271) @@ -58,7 +58,7 @@ int ifc_name2unit(const char *name, int intifc_alloc_unit(struct if_clone *, int *); void ifc_free_unit(struct if_clone *, int); -#ifdef SYS_EVENTHANDLER_H +#ifdef _SYS_EVENTHANDLER_H_ /* Interface clone event. */ typedef void (*if_clone_event_handler_t)(void *, struct if_clone *); EVENTHANDLER_DECLARE(if_clone_event, if_clone_event_handler_t); Modified: head/sys/net/if_var.h == --- head/sys/net/if_var.h Mon Oct 28 20:26:34 2013(r257270) +++ head/sys/net/if_var.h Mon Oct 28 20:32:05 2013(r257271) @@ -353,7 +353,7 @@ voidif_maddr_runlock(struct ifnet *ifp) } while(0) #ifdef _KERNEL -#ifdef SYS_EVENTHANDLER_H +#ifdef _SYS_EVENTHANDLER_H_ /* interface link layer address change event */ typedef void (*iflladdr_event_handler_t)(void *, struct ifnet *); EVENTHANDLER_DECLARE(iflladdr_event, iflladdr_event_handler_t); @@ -369,7 +369,7 @@ EVENTHANDLER_DECLARE(ifnet_departure_eve /* Interface link state change event */ typedef void (*ifnet_link_event_handler_t)(void *, struct ifnet *, int); EVENTHANDLER_DECLARE(ifnet_link_event, ifnet_link_event_handler_t); -#endif /* SYS_EVENTHANDLER_H */ +#endif /* _SYS_EVENTHANDLER_H_ */ /* * interface groups @@ -392,7 +392,7 @@ struct ifg_list { TAILQ_ENTRY(ifg_list)ifgl_next; }; -#ifdef SYS_EVENTHANDLER_H +#ifdef _SYS_EVENTHANDLER_H_ /* group attach event */ typedef void (*group_attach_event_handler_t)(void *, struct ifg_group *); EVENTHANDLER_DECLARE(group_attach_event, group_attach_event_handler_t); @@ -402,7 +402,7 @@ EVENTHANDLER_DECLARE(group_detach_event, /* group change event */ typedef void (*group_change_event_handler_t)(void *, const char *); EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); -#endif /* SYS_EVENTHANDLER_H */ +#endif /* _SYS_EVENTHANDLER_H_ */ #defineIF_AFDATA_LOCK_INIT(ifp)\ rw_init((ifp)-if_afdata_lock, if_afdata) Modified: head/sys/net/if_vlan_var.h == --- head/sys/net/if_vlan_var.h Mon Oct 28 20:26:34 2013(r257270) +++ head/sys/net/if_vlan_var.h Mon Oct 28 20:32:05 2013(r257271) @@ -150,13 +150,13 @@ externint (*vlan_tag_p)(struct ifnet *, extern int (*vlan_setcookie_p)(struct ifnet *, void *); extern void *(*vlan_cookie_p)(struct ifnet *); -#ifdef SYS_EVENTHANDLER_H +#ifdef _SYS_EVENTHANDLER_H_ /* VLAN state change events */ typedef void (*vlan_config_fn)(void *, struct ifnet *, uint16_t); typedef void (*vlan_unconfig_fn)(void *, struct ifnet *, uint16_t); EVENTHANDLER_DECLARE(vlan_config, vlan_config_fn); EVENTHANDLER_DECLARE(vlan_unconfig, vlan_unconfig_fn); -#endif /* SYS_EVENTHANDLER_H */ +#endif /* _SYS_EVENTHANDLER_H_ */ #endif /* _KERNEL */ Modified: head/sys/sys/eventhandler.h == --- head/sys/sys/eventhandler.h Mon Oct 28 20:26:34 2013(r257270) +++ head/sys/sys/eventhandler.h Mon Oct 28 20:32:05 2013(r257271) @@ -26,8 +26,8 @@ * $FreeBSD$ */ -#ifndef SYS_EVENTHANDLER_H -#define SYS_EVENTHANDLER_H +#ifndef _SYS_EVENTHANDLER_H_ +#define _SYS_EVENTHANDLER_H_ #include sys/lock.h #include sys/ktr.h @@ -262,4 +262,4 @@ EVENTHANDLER_DECLARE(kld_load, kld_load_ EVENTHANDLER_DECLARE(kld_unload, kld_unload_fn); EVENTHANDLER_DECLARE(kld_unload_try, kld_unload_try_fn); -#endif /* SYS_EVENTHANDLER_H */ +#endif /* _SYS_EVENTHANDLER_H_ */ ___ svn-src-head@freebsd.org mailing list
svn commit: r257272 - head/sys/netinet
Author: tuexen Date: Mon Oct 28 20:32:37 2013 New Revision: 257272 URL: http://svnweb.freebsd.org/changeset/base/257272 Log: Fix compilation if SCTP_DONT_DO_PRIVADDR_SCOPE is defined. The issue was reported by Andrew Galante. MFC after: 3 days Modified: head/sys/netinet/sctp_pcb.c Modified: head/sys/netinet/sctp_pcb.c == --- head/sys/netinet/sctp_pcb.c Mon Oct 28 20:32:05 2013(r257271) +++ head/sys/netinet/sctp_pcb.c Mon Oct 28 20:32:37 2013(r257272) @@ -3740,7 +3740,7 @@ sctp_add_remote_addr(struct sctp_tcb *st sin-sin_len = sizeof(struct sockaddr_in); if (set_scope) { #ifdef SCTP_DONT_DO_PRIVADDR_SCOPE - stcb-ipv4_local_scope = 1; + stcb-asoc.scope.ipv4_local_scope = 1; #else if (IN4_ISPRIVATE_ADDRESS(sin-sin_addr)) { stcb-asoc.scope.ipv4_local_scope = 1; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257273 - head/sys/sys
Author: pluknet Date: Mon Oct 28 20:38:17 2013 New Revision: 257273 URL: http://svnweb.freebsd.org/changeset/base/257273 Log: G/c unused mountrootfsname. It was replaced with rootdevnames in r52778. Modified: head/sys/sys/mount.h Modified: head/sys/sys/mount.h == --- head/sys/sys/mount.hMon Oct 28 20:32:37 2013(r257272) +++ head/sys/sys/mount.hMon Oct 28 20:38:17 2013(r257273) @@ -806,8 +806,6 @@ vfs_statfs_t__vfs_statfs; }; \ DECLARE_MODULE(fsname, fsname ## _mod, SI_SUB_VFS, SI_ORDER_MIDDLE) -extern char *mountrootfsname; - /* * exported vnode operations */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257274 - head/sys/netinet
Author: tuexen Date: Mon Oct 28 20:45:19 2013 New Revision: 257274 URL: http://svnweb.freebsd.org/changeset/base/257274 Log: Fis the value of *optlen when calling getsockopt() for SCTP_REMOTE_UDP_ENCAPS_PORT. This issue was reported by Andrew Galante. MFC after: 3 days Modified: head/sys/netinet/sctp_usrreq.c Modified: head/sys/netinet/sctp_usrreq.c == --- head/sys/netinet/sctp_usrreq.c Mon Oct 28 20:38:17 2013 (r257273) +++ head/sys/netinet/sctp_usrreq.c Mon Oct 28 20:45:19 2013 (r257274) @@ -3281,7 +3281,7 @@ flags_out: } } if (error == 0) { - *optsize = sizeof(struct sctp_paddrparams); + *optsize = sizeof(struct sctp_udpencaps); } break; } ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r256512 - head/usr.bin/netstat
Hi Gleb, On Tue, Oct 15, 2013 at 09:55:08AM +, Gleb Smirnoff wrote: Author: glebius Date: Tue Oct 15 09:55:07 2013 New Revision: 256512 URL: http://svnweb.freebsd.org/changeset/base/256512 Log: Rewrite netstat/if.c to use getifaddrs(3) and getifmaddrs(3) instead of libkvm digging in kernel memory. This is possible since r231506 made getifaddrs(3) to supply if_data for each ifaddr. The pros of this change is that now netstat(1) doesn't know about kernel struct ifnet and struct ifaddr. And these structs are about to change significantly in head soon. New netstat binary will work well with 10.0 and any future kernel. The cons is that now it isn't possible to obtain interface statistics from a vmcore. Is there a kgdb macro or something like that that could be used for debugging purpose? -- Jeremie Le Hen Scientists say the world is made up of Protons, Neutrons and Electrons. They forgot to mention Morons. ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257275 - in head/sys/dev/xen: netback netfront
Author: glebius Date: Mon Oct 28 21:08:04 2013 New Revision: 257275 URL: http://svnweb.freebsd.org/changeset/base/257275 Log: Include if_var.h. Modified: head/sys/dev/xen/netback/netback.c head/sys/dev/xen/netfront/netfront.c Modified: head/sys/dev/xen/netback/netback.c == --- head/sys/dev/xen/netback/netback.c Mon Oct 28 20:45:19 2013 (r257274) +++ head/sys/dev/xen/netback/netback.c Mon Oct 28 21:08:04 2013 (r257275) @@ -57,6 +57,7 @@ __FBSDID($FreeBSD$); #include sys/sysctl.h #include net/if.h +#include net/if_var.h #include net/if_arp.h #include net/ethernet.h #include net/if_dl.h Modified: head/sys/dev/xen/netfront/netfront.c == --- head/sys/dev/xen/netfront/netfront.cMon Oct 28 20:45:19 2013 (r257274) +++ head/sys/dev/xen/netfront/netfront.cMon Oct 28 21:08:04 2013 (r257275) @@ -43,6 +43,7 @@ __FBSDID($FreeBSD$); #include sys/sx.h #include net/if.h +#include net/if_var.h #include net/if_arp.h #include net/ethernet.h #include net/if_dl.h @@ -51,7 +52,6 @@ __FBSDID($FreeBSD$); #include net/bpf.h #include net/if_types.h -#include net/if.h #include netinet/in_systm.h #include netinet/in.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257276 - head/sys/dev/xen/netfront
Author: glebius Date: Mon Oct 28 21:09:59 2013 New Revision: 257276 URL: http://svnweb.freebsd.org/changeset/base/257276 Log: Remove dead function show_device(). It isn't buildable if DEBUG is defined, due to unknown field xn_ifno. The field wasn't known since beginning of history of this file. Modified: head/sys/dev/xen/netfront/netfront.c Modified: head/sys/dev/xen/netfront/netfront.c == --- head/sys/dev/xen/netfront/netfront.cMon Oct 28 21:08:04 2013 (r257275) +++ head/sys/dev/xen/netfront/netfront.cMon Oct 28 21:09:59 2013 (r257276) @@ -165,7 +165,6 @@ static int xn_configure_features(struct static void xn_watchdog(struct ifnet *); #endif -static void show_device(struct netfront_info *sc); #ifdef notyet static void netfront_closing(device_t dev); #endif @@ -644,8 +643,6 @@ setup_device(device_t dev, struct netfro goto fail; } - show_device(info); - return (0); fail: @@ -1969,25 +1966,6 @@ network_connect(struct netfront_info *np return (0); } -static void -show_device(struct netfront_info *sc) -{ -#ifdef DEBUG - if (sc) { - IPRINTK(vif handle=%u %s(%s) evtchn=%u irq=%u tx=%p rx=%p\n, - sc-xn_ifno, - be_state_name[sc-xn_backend_state], - sc-xn_user_state ? open : closed, - sc-xn_evtchn, - sc-xn_irq, - sc-xn_tx_if, - sc-xn_rx_if); - } else { - IPRINTK(vif NULL\n); - } -#endif -} - static void xn_query_features(struct netfront_info *np) { ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257277 - head/sys/amd64/conf
Author: glebius Date: Mon Oct 28 21:11:28 2013 New Revision: 257277 URL: http://svnweb.freebsd.org/changeset/base/257277 Log: Include XEN and HyperV into amd64 LINT. Modified: head/sys/amd64/conf/NOTES Modified: head/sys/amd64/conf/NOTES == --- head/sys/amd64/conf/NOTES Mon Oct 28 21:09:59 2013(r257276) +++ head/sys/amd64/conf/NOTES Mon Oct 28 21:11:28 2013(r257277) @@ -473,6 +473,12 @@ device virtio_blk # VirtIO Block device device virtio_scsi # VirtIO SCSI device device virtio_balloon # VirtIO Memory Balloon device +device hyperv # HyperV drivers + +# Xen HVM Guest Optimizations +optionsXENHVM # Xen HVM kernel infrastructure +device xenpci # Xen HVM Hypervisor services driver + # # ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257278 - head/sys/arm/arm
Author: zbb Date: Mon Oct 28 21:31:12 2013 New Revision: 257278 URL: http://svnweb.freebsd.org/changeset/base/257278 Log: Remove hard-coded mappings related to Armada XP support Armada XP initialization flow requires SoC registers to be mapped very early in order to configure Snoop Filter for SMP. Additional mapping in locore.S is redundant as proper mapping is made in pmap_devmap_bootstrap() prior to calling cpu_setup() which configures the Snoop Filter. For secondaru CPUs it is better to pass VA of the SoC registers defined in MV_BASE and PA consistent with the value in the Device Tree. Tested by:kevlo Modified: head/sys/arm/arm/locore.S head/sys/arm/arm/mp_machdep.c Modified: head/sys/arm/arm/locore.S == --- head/sys/arm/arm/locore.S Mon Oct 28 21:11:28 2013(r257277) +++ head/sys/arm/arm/locore.S Mon Oct 28 21:31:12 2013(r257278) @@ -266,10 +266,6 @@ mmu_init_table: /* map VA 0xc000..0xc3ff to PA */ MMU_INIT(KERNBASE, PHYSADDR, 64, L1_TYPE_S|L1_SHARED|L1_S_C|L1_S_AP(AP_KRW)) MMU_INIT(0x4800, 0x4800, 1, L1_TYPE_S|L1_SHARED|L1_S_C|L1_S_AP(AP_KRW)) -#if defined(CPU_MV_PJ4B) - /* map VA 0xf100..0xf110 to PA 0xd000 */ - MMU_INIT(0xf100, 0xd000, 1, L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW)) -#endif /* CPU_MV_PJ4B */ #endif /* SMP */ .word 0 /* end of table */ #endif Modified: head/sys/arm/arm/mp_machdep.c == --- head/sys/arm/arm/mp_machdep.c Mon Oct 28 21:11:28 2013 (r257277) +++ head/sys/arm/arm/mp_machdep.c Mon Oct 28 21:31:12 2013 (r257278) @@ -52,6 +52,10 @@ __FBSDID($FreeBSD$); #ifdef VFP #include machine/vfp.h #endif +#ifdef CPU_MV_PJ4B +#include arm/mv/mvwin.h +#include dev/fdt/fdt_common.h +#endif #include opt_smp.h @@ -131,8 +135,8 @@ cpu_mp_start(void) #if defined(CPU_MV_PJ4B) /* Add ARMADAXP registers required for snoop filter initialization */ - ((int *)(temp_pagetable_va))[0xf100 L1_S_SHIFT] = - L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW)|0xd000; + ((int *)(temp_pagetable_va))[MV_BASE L1_S_SHIFT] = + L1_TYPE_S|L1_SHARED|L1_S_B|L1_S_AP(AP_KRW)|fdt_immr_pa; #endif temp_pagetable = (void*)(vtophys(temp_pagetable_va)); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257279 - head/sys/arm/mv
Author: zbb Date: Mon Oct 28 21:34:32 2013 New Revision: 257279 URL: http://svnweb.freebsd.org/changeset/base/257279 Log: Fix-up DTB for Armada XP registers' base according to the actual settings Depending on u-boot's flavor some boards have their SoC registers base address configured to 0xD000 and other to 0xF100. U-boot is passing currently set value via CP15 register. In order to create proper mapping for SoC registers and allow further successful initialization it is necessary to replace fdt_immr_pa with the real value and eventually fix-up device tree blob. Tested by:kevlo Modified: head/sys/arm/mv/common.c head/sys/arm/mv/mv_machdep.c Modified: head/sys/arm/mv/common.c == --- head/sys/arm/mv/common.cMon Oct 28 21:31:12 2013(r257278) +++ head/sys/arm/mv/common.cMon Oct 28 21:34:32 2013(r257279) @@ -2091,9 +2091,79 @@ fdt_fixup_busfreq(phandle_t root) OF_setprop(sb, bus-frequency, (void *)freq, sizeof(freq)); } +static void +fdt_fixup_ranges(phandle_t root) +{ + phandle_t node; + pcell_t par_addr_cells, addr_cells, size_cells; + pcell_t ranges[3], reg[2], *rangesptr; + int len, tuple_size, tuples_count; + uint32_t base; + + /* Fix-up SoC ranges according to real fdt_immr_pa */ + if ((node = fdt_find_compatible(root, simple-bus, 1)) != 0) { + if (fdt_addrsize_cells(node, addr_cells, size_cells) == 0 + (par_addr_cells = fdt_parent_addr_cells(node) = 2)) { + tuple_size = sizeof(pcell_t) * (par_addr_cells + + addr_cells + size_cells); + len = OF_getprop(node, ranges, ranges, + sizeof(ranges)); + tuples_count = len / tuple_size; + /* Unexpected settings are not supported */ + if (tuples_count != 1) + goto fixup_failed; + + rangesptr = ranges[0]; + rangesptr += par_addr_cells; + base = fdt_data_get((void *)rangesptr, addr_cells); + *rangesptr = cpu_to_fdt32(fdt_immr_pa); + if (OF_setprop(node, ranges, (void *)ranges[0], + sizeof(ranges)) 0) + goto fixup_failed; + } + } + + /* Fix-up PCIe reg according to real PCIe registers' PA */ + if ((node = fdt_find_compatible(root, mrvl,pcie, 1)) != 0) { + if (fdt_addrsize_cells(OF_parent(node), par_addr_cells, + size_cells) == 0) { + tuple_size = sizeof(pcell_t) * (par_addr_cells + + size_cells); + len = OF_getprop(node, reg, reg, sizeof(reg)); + tuples_count = len / tuple_size; + /* Unexpected settings are not supported */ + if (tuples_count != 1) + goto fixup_failed; + + base = fdt_data_get((void *)reg[0], par_addr_cells); + base = ~0xFF00; + base |= fdt_immr_pa; + reg[0] = cpu_to_fdt32(base); + if (OF_setprop(node, reg, (void *)reg[0], + sizeof(reg)) 0) + goto fixup_failed; + } + } + /* Fix-up succeeded. May return and continue */ + return; + +fixup_failed: + while (1) { + /* +* In case of any error while fixing ranges just hang. +* 1. No message can be displayed yet since console +* is not initialized. +* 2. Going further will cause failure on bus_space_map() +* relying on the wrong ranges or data abort when +* accessing PCIe registers. +*/ + } +} + struct fdt_fixup_entry fdt_fixup_table[] = { { mrvl,DB-88F6281, fdt_fixup_busfreq }, { mrvl,DB-78460, fdt_fixup_busfreq }, + { mrvl,DB-78460, fdt_fixup_ranges }, { NULL, NULL } }; Modified: head/sys/arm/mv/mv_machdep.c == --- head/sys/arm/mv/mv_machdep.cMon Oct 28 21:31:12 2013 (r257278) +++ head/sys/arm/mv/mv_machdep.cMon Oct 28 21:34:32 2013 (r257279) @@ -324,6 +324,19 @@ platform_devmap_init(void) i = 0; pmap_devmap_bootstrap_table = fdt_devmap[0]; +#ifdef SOC_MV_ARMADAXP + vm_paddr_t cur_immr_pa; + + /* +* Acquire SoC registers' base passed by u-boot and fill devmap +* accordingly. DTB is going to be modified basing on this data +* later. +
svn commit: r257280 - head/sys/arm/mv/armadaxp
Author: zbb Date: Mon Oct 28 21:37:45 2013 New Revision: 257280 URL: http://svnweb.freebsd.org/changeset/base/257280 Log: Change Armada XP kernel load address to the u-boot's end address Loading kernel to 0xf0 has no practical reason. Starting it from the u-boot's highest possible end address (2MB counting from 0x0) makes more sense. Tested by:kevlo Modified: head/sys/arm/mv/armadaxp/std.armadaxp Modified: head/sys/arm/mv/armadaxp/std.armadaxp == --- head/sys/arm/mv/armadaxp/std.armadaxp Mon Oct 28 21:34:32 2013 (r257279) +++ head/sys/arm/mv/armadaxp/std.armadaxp Mon Oct 28 21:37:45 2013 (r257280) @@ -1,16 +1,16 @@ # $FreeBSD$ -# kernel gets loaded at 0x00f0 by the loader, but runs at virtual address -# 0xc0f0. RAM starts at 0. We put the pagetable at a reasonable place +# kernel gets loaded at 0x0020 by the loader, but runs at virtual address +# 0xc020. RAM starts at 0. We put the pagetable at a reasonable place # in memory, but may need to bounce it higher if there's a problem with this. # We could paper over this by loading the kernel at 0xc000 virtual, but # that leads to other complications, so we'll just reclaim the lower region of # ram after we're loaded. Put the page tables for startup at 1MB. -makeoptionsKERNPHYSADDR=0x00f0 -makeoptionsKERNVIRTADDR=0xc0f0 +makeoptionsKERNPHYSADDR=0x0020 +makeoptionsKERNVIRTADDR=0xc020 -optionsKERNPHYSADDR=0x00f0 -optionsKERNVIRTADDR=0xc0f0 +optionsKERNPHYSADDR=0x0020 +optionsKERNVIRTADDR=0xc020 optionsPHYSADDR=0x optionsSTARTUP_PAGETABLE_ADDR=0x0010 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257282 - head/sys/arm/include
Author: zbb Date: Mon Oct 28 21:41:44 2013 New Revision: 257282 URL: http://svnweb.freebsd.org/changeset/base/257282 Log: Switch off explicit broadcasting of the TLB flush operations for PJ4B CPU Since CPU_MV_PJ4B describes ARMv7 compliant CPU there is no need for sending an IPI each time when TLB is flushed in any way. Tested by:kevlo Modified: head/sys/arm/include/cpufunc.h Modified: head/sys/arm/include/cpufunc.h == --- head/sys/arm/include/cpufunc.h Mon Oct 28 21:39:54 2013 (r257281) +++ head/sys/arm/include/cpufunc.h Mon Oct 28 21:41:44 2013 (r257282) @@ -188,7 +188,7 @@ extern u_int cputype; #else void tlb_broadcast(int); -#ifdef CPU_CORTEXA +#if defined(CPU_CORTEXA) || defined(CPU_MV_PJ4B) #define TLB_BROADCAST /* No need to explicitely send an IPI */ #else #define TLB_BROADCAST tlb_broadcast(7) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257281 - in head/sys/arm: arm include
Author: zbb Date: Mon Oct 28 21:39:54 2013 New Revision: 257281 URL: http://svnweb.freebsd.org/changeset/base/257281 Log: Remove not working and deprecated PJ4Bv6 support Sheeva PJ4Bv6 - based chips were only prototypes for V7 class Armada SoC family. Current in-tree support for PJ4Bv6 will not work and also there should be no platforms in active use that would incorporate that CPU revision. Modified: head/sys/arm/arm/cpufunc.c head/sys/arm/arm/cpufunc_asm_pj4b.S head/sys/arm/arm/identcpu.c head/sys/arm/include/armreg.h head/sys/arm/include/cpufunc.h Modified: head/sys/arm/arm/cpufunc.c == --- head/sys/arm/arm/cpufunc.c Mon Oct 28 21:37:45 2013(r257280) +++ head/sys/arm/arm/cpufunc.c Mon Oct 28 21:39:54 2013(r257281) @@ -541,65 +541,6 @@ struct cpu_functions pj4bv7_cpufuncs = { pj4bv7_setup/* cpu setup*/ }; - -struct cpu_functions pj4bv6_cpufuncs = { - /* CPU functions */ - - cpufunc_id, /* id */ - arm11_drain_writebuf, /* cpwait */ - - /* MMU functions */ - - cpufunc_control,/* control */ - cpufunc_domains,/* Domain */ - pj4b_setttb,/* Setttb */ - cpufunc_faultstatus,/* Faultstatus */ - cpufunc_faultaddress, /* Faultaddress */ - - /* TLB functions */ - - arm11_tlb_flushID, /* tlb_flushID */ - arm11_tlb_flushID_SE, /* tlb_flushID_SE */ - arm11_tlb_flushI, /* tlb_flushI */ - arm11_tlb_flushI_SE,/* tlb_flushI_SE*/ - arm11_tlb_flushD, /* tlb_flushD */ - arm11_tlb_flushD_SE,/* tlb_flushD_SE*/ - - /* Cache operations */ - armv6_icache_sync_all, /* icache_sync_all */ - pj4b_icache_sync_range, /* icache_sync_range*/ - - armv6_dcache_wbinv_all, /* dcache_wbinv_all */ - pj4b_dcache_wbinv_range,/* dcache_wbinv_range */ - pj4b_dcache_inv_range, /* dcache_inv_range */ - pj4b_dcache_wb_range, /* dcache_wb_range */ - - armv6_idcache_wbinv_all,/* idcache_wbinv_all*/ - pj4b_idcache_wbinv_range, /* idcache_wbinv_all*/ - - (void *)cpufunc_nullop, /* l2cache_wbinv_all*/ - (void *)cpufunc_nullop, /* l2cache_wbinv_range */ - (void *)cpufunc_nullop, /* l2cache_inv_range*/ - (void *)cpufunc_nullop, /* l2cache_wb_range */ - - /* Other functions */ - - pj4b_drain_readbuf, /* flush_prefetchbuf*/ - arm11_drain_writebuf, /* drain_writebuf */ - pj4b_flush_brnchtgt_all,/* flush_brnchtgt_C */ - pj4b_flush_brnchtgt_va, /* flush_brnchtgt_E */ - - (void *)cpufunc_nullop, /* sleep*/ - - /* Soft functions */ - - cpufunc_null_fixup, /* dataabt_fixup*/ - cpufunc_null_fixup, /* prefetchabt_fixup*/ - - arm11_context_switch, /* context_switch */ - - pj4bv6_setup/* cpu setup*/ -}; #endif /* CPU_MV_PJ4B */ #ifdef CPU_SA110 @@ -1497,27 +1438,14 @@ set_cpufuncs() #endif /* CPU_CORTEXA */ #if defined(CPU_MV_PJ4B) - if (cputype == CPU_ID_MV88SV581X_V6 || - cputype == CPU_ID_MV88SV581X_V7 || + if (cputype == CPU_ID_MV88SV581X_V7 || cputype == CPU_ID_MV88SV584X_V7 || - cputype == CPU_ID_ARM_88SV581X_V6 || cputype == CPU_ID_ARM_88SV581X_V7) { - if (cpu_pfr(0) ARM_PFR0_THUMBEE_MASK) - cpufuncs = pj4bv7_cpufuncs; - else - cpufuncs = pj4bv6_cpufuncs; - - get_cachetype_cp15(); - pmap_pte_init_mmu_v6(); - goto out; - } else if (cputype == CPU_ID_ARM_88SV584X_V6 || - cputype == CPU_ID_MV88SV584X_V6) { - cpufuncs = pj4bv6_cpufuncs; + cpufuncs = pj4bv7_cpufuncs; get_cachetype_cp15(); pmap_pte_init_mmu_v6(); goto out; } - #endif /* CPU_MV_PJ4B */ #ifdef CPU_SA110 if (cputype == CPU_ID_SA110) { @@ -2447,44 +2375,6 @@ arm11x6_setup(char *args) #ifdef CPU_MV_PJ4B void -pj4bv6_setup(char *args) -{ - int cpuctrl; - - pj4b_config(); - - cpuctrl = CPU_CONTROL_MMU_ENABLE; -#ifndef ARM32_DISABLE_ALIGNMENT_FAULTS - cpuctrl |= CPU_CONTROL_AFLT_ENABLE; -#endif - cpuctrl |= CPU_CONTROL_DC_ENABLE; - cpuctrl |= (0xf 3); -#ifdef
Re: svn commit: r257133 - head/sys/dev/iwn
Hi! Yup! So, the difference is in the rate being selected. It looks like the remote end is just plainly not ACKing the 11n management frame being sent; but it totally ACKs the 11b CCK frame being sent. So, thanks for pointing that out. I'll go and err, fix this mistake. The driver should be doing what the stack says. Bernhard figured out a couple years ago that doing 11n management frames to 11n devices is not guaranteed to work, so we fixed that. I will go and figure out why this is now broken for iwn. Thanks! Would you mind filing a PR with what we've gathered? -adrian On 28 October 2013 12:27, Stefan Farfeleder stef...@freebsd.org wrote: On Mon, Oct 28, 2013 at 12:07:17PM -0700, Adrian Chadd wrote: Yeah: Oct 28 19:43:43 mole kernel: iwn5000_tx_done: qid 3 idx 4 retries 7 nkill 0 rate a902 duration 686 status 83 status 0x83 is LONG_LIMIT, which meant it tried to transmit and it failed to get an ACK each time. The rate control says: 0x02: the rate in question bit 8: MCS bit 11: HT40 bits 14+15: transmit antennas A+B .. and it's an association/management frame, which is odd as they're not supposed to be sent as 11n HT40 frames like this. can you do the same experiment but with the patch reverted? I'd like to see what the selected rate is. Ok, here's the output with r257155 and r257133 reverted: http://pastebin.com/CJzsTANv Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257284 - in head/sys: dev/ath dev/etherswitch dev/etherswitch/arswitch mips/atheros net80211
Author: glebius Date: Mon Oct 28 22:26:03 2013 New Revision: 257284 URL: http://svnweb.freebsd.org/changeset/base/257284 Log: - Provide necessary includes, that before came via if.h pollution. - Remove unnecessary ones. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: head/sys/dev/ath/if_ath_ahb.c head/sys/dev/etherswitch/arswitch/arswitch.c head/sys/dev/etherswitch/arswitch/arswitch_phy.c head/sys/dev/etherswitch/arswitch/arswitch_vlans.c head/sys/dev/etherswitch/miiproxy.c head/sys/mips/atheros/if_arge.c head/sys/net80211/ieee80211_alq.c head/sys/net80211/ieee80211_superg.c Modified: head/sys/dev/ath/if_ath_ahb.c == --- head/sys/dev/ath/if_ath_ahb.c Mon Oct 28 22:13:50 2013 (r257283) +++ head/sys/dev/ath/if_ath_ahb.c Mon Oct 28 22:26:03 2013 (r257284) @@ -39,6 +39,7 @@ __FBSDID($FreeBSD$); #include sys/param.h #include sys/systm.h +#include sys/malloc.h #include sys/module.h #include sys/kernel.h #include sys/lock.h @@ -55,6 +56,7 @@ __FBSDID($FreeBSD$); #include net/if.h #include net/if_media.h #include net/if_arp.h +#include net/ethernet.h #include net80211/ieee80211_var.h Modified: head/sys/dev/etherswitch/arswitch/arswitch.c == --- head/sys/dev/etherswitch/arswitch/arswitch.cMon Oct 28 22:13:50 2013(r257283) +++ head/sys/dev/etherswitch/arswitch/arswitch.cMon Oct 28 22:26:03 2013(r257284) @@ -31,6 +31,7 @@ #include sys/bus.h #include sys/errno.h #include sys/kernel.h +#include sys/malloc.h #include sys/module.h #include sys/socket.h #include sys/sockio.h @@ -38,6 +39,7 @@ #include sys/systm.h #include net/if.h +#include net/if_var.h #include net/if_arp.h #include net/ethernet.h #include net/if_dl.h Modified: head/sys/dev/etherswitch/arswitch/arswitch_phy.c == --- head/sys/dev/etherswitch/arswitch/arswitch_phy.cMon Oct 28 22:13:50 2013(r257283) +++ head/sys/dev/etherswitch/arswitch/arswitch_phy.cMon Oct 28 22:26:03 2013(r257284) @@ -31,18 +31,16 @@ #include sys/bus.h #include sys/errno.h #include sys/kernel.h +#include sys/lock.h #include sys/module.h +#include sys/mutex.h #include sys/socket.h #include sys/sockio.h #include sys/sysctl.h #include sys/systm.h #include net/if.h -#include net/if_arp.h -#include net/ethernet.h -#include net/if_dl.h #include net/if_media.h -#include net/if_types.h #include machine/bus.h #include dev/iicbus/iic.h Modified: head/sys/dev/etherswitch/arswitch/arswitch_vlans.c == --- head/sys/dev/etherswitch/arswitch/arswitch_vlans.c Mon Oct 28 22:13:50 2013(r257283) +++ head/sys/dev/etherswitch/arswitch/arswitch_vlans.c Mon Oct 28 22:26:03 2013(r257284) @@ -31,12 +31,13 @@ #include sys/param.h #include sys/bus.h #include sys/errno.h +#include sys/lock.h #include sys/kernel.h +#include sys/mutex.h #include sys/systm.h #include sys/socket.h #include net/if.h - #include dev/mii/mii.h #include dev/etherswitch/etherswitch.h Modified: head/sys/dev/etherswitch/miiproxy.c == --- head/sys/dev/etherswitch/miiproxy.c Mon Oct 28 22:13:50 2013 (r257283) +++ head/sys/dev/etherswitch/miiproxy.c Mon Oct 28 22:26:03 2013 (r257284) @@ -29,17 +29,14 @@ #include sys/param.h #include sys/bus.h #include sys/kernel.h +#include sys/malloc.h #include sys/module.h #include sys/socket.h #include sys/sockio.h #include sys/systm.h #include net/if.h -#include net/if_arp.h -#include net/ethernet.h -#include net/if_dl.h #include net/if_media.h -#include net/if_types.h #include dev/etherswitch/miiproxy.h #include dev/mii/mii.h Modified: head/sys/mips/atheros/if_arge.c == --- head/sys/mips/atheros/if_arge.c Mon Oct 28 22:13:50 2013 (r257283) +++ head/sys/mips/atheros/if_arge.c Mon Oct 28 22:26:03 2013 (r257284) @@ -41,8 +41,10 @@ __FBSDID($FreeBSD$); #include sys/endian.h #include sys/systm.h #include sys/sockio.h +#include sys/lock.h #include sys/mbuf.h #include sys/malloc.h +#include sys/mutex.h #include sys/kernel.h #include sys/module.h #include sys/socket.h @@ -50,10 +52,9 @@ __FBSDID($FreeBSD$); #include sys/sysctl.h #include net/if.h -#include net/if_arp.h -#include net/ethernet.h -#include net/if_dl.h +#include net/if_var.h #include net/if_media.h +#include net/ethernet.h #include net/if_types.h #include net/bpf.h Modified: head/sys/net80211/ieee80211_alq.c == --- head/sys/net80211/ieee80211_alq.c
svn commit: r257287 - head/share/man/man4
Author: brueffer Date: Mon Oct 28 22:54:28 2013 New Revision: 257287 URL: http://svnweb.freebsd.org/changeset/base/257287 Log: New sentence - new line and some mdoc cleanup. MFC after:3 days Modified: head/share/man/man4/bpf.4 Modified: head/share/man/man4/bpf.4 == --- head/share/man/man4/bpf.4 Mon Oct 28 22:49:11 2013(r257286) +++ head/share/man/man4/bpf.4 Mon Oct 28 22:54:28 2013(r257287) @@ -697,9 +697,11 @@ is used when the time stamp is set to .Dv BPF_T_MICROTIME_MONOTONIC_FAST , or .Dv BPF_T_NONE -for backward compatibility reasons. Otherwise, +for backward compatibility reasons. +Otherwise, .Vt bpf_xhdr -is used. However, +is used. +However, .Vt bpf_hdr may be deprecated in the near future. Suitable precautions @@ -962,19 +964,23 @@ subsystem .It Va net.bpf.optimize_writers: No 0 Various programs use BPF to send (but not receive) raw packets (cdpd, lldpd, dhcpd, dhcp relays, etc. are good examples of such programs). -They do not need incoming packets to be send to them. Turning this option on +They do not need incoming packets to be send to them. +Turning this option on makes new BPF users to be attached to write-only interface list until program explicitly specifies read filter via -.Cm pcap_set_filter() . +.Fn pcap_set_filter . This removes any performance degradation for high-speed interfaces. .It Va net.bpf.stats: Binary interface for retrieving general statistics. .It Va net.bpf.zerocopy_enable: No 0 -Permits zero-copy to be used with net BPF readers. Use with caution. +Permits zero-copy to be used with net BPF readers. +Use with caution. .It Va net.bpf.maxinsns: No 512 -Maximum number of instructions that BPF program can contain. Use +Maximum number of instructions that BPF program can contain. +Use .Xr tcpdump 1 --d option to determine approximate number of instruction for any filter. +.Fl d +option to determine approximate number of instruction for any filter. .It Va net.bpf.maxbufsize: No 524288 Maximum buffer size to allocate for packets buffer. .It Va net.bpf.bufsize: No 4096 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257288 - head/bin/df
Author: brueffer Date: Mon Oct 28 23:02:12 2013 New Revision: 257288 URL: http://svnweb.freebsd.org/changeset/base/257288 Log: Clean up a spurious . in SEE ALSO. MFC after:3 days Modified: head/bin/df/df.1 Modified: head/bin/df/df.1 == --- head/bin/df/df.1Mon Oct 28 22:54:28 2013(r257287) +++ head/bin/df/df.1Mon Oct 28 23:02:12 2013(r257288) @@ -198,7 +198,7 @@ If the value is outside, it will be set .Xr mount 8 , .Xr pstat 8 , .Xr quot 8 , -.Xr swapinfo 8 . +.Xr swapinfo 8 .Sh STANDARDS With the exception of most options, the ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257289 - head/sys/dev/cm
Author: glebius Date: Mon Oct 28 23:17:41 2013 New Revision: 257289 URL: http://svnweb.freebsd.org/changeset/base/257289 Log: Provide necessary includes that before came via if.h. Modified: head/sys/dev/cm/if_cm_isa.c Modified: head/sys/dev/cm/if_cm_isa.c == --- head/sys/dev/cm/if_cm_isa.c Mon Oct 28 23:02:12 2013(r257288) +++ head/sys/dev/cm/if_cm_isa.c Mon Oct 28 23:17:41 2013(r257289) @@ -36,6 +36,7 @@ __FBSDID($FreeBSD$); #include sys/systm.h #include sys/socket.h #include sys/kernel.h +#include sys/malloc.h #include sys/module.h #include sys/bus.h @@ -45,6 +46,7 @@ __FBSDID($FreeBSD$); #include machine/resource.h #include net/if.h +#include net/if_var.h #include net/if_arc.h #include dev/cm/smc90cx6reg.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257291 - head/sys/arm/include
Author: zbb Date: Mon Oct 28 23:42:44 2013 New Revision: 257291 URL: http://svnweb.freebsd.org/changeset/base/257291 Log: Fix condition that determines PMAP_NEEDS_PTE_SYNC value for ARM Use values of the correct defines to determine statement's result. ARM_ARCH_ symbols are always defined, hence only values are relevant. Reviewed by: cognet Modified: head/sys/arm/include/pmap.h Modified: head/sys/arm/include/pmap.h == --- head/sys/arm/include/pmap.h Mon Oct 28 23:34:05 2013(r257290) +++ head/sys/arm/include/pmap.h Mon Oct 28 23:42:44 2013(r257291) @@ -489,7 +489,7 @@ extern int pmap_needs_pte_sync; #if (ARM_MMU_SA1 == 1) (ARM_NMMUS == 1) #definePMAP_NEEDS_PTE_SYNC 1 #definePMAP_INCLUDE_PTE_SYNC -#elif defined(CPU_XSCALE_81342) || defined(ARM_ARCH_7) || defined(ARM_ARCH_7A) +#elif defined(CPU_XSCALE_81342) || ARM_ARCH_6 || ARM_ARCH_7A #define PMAP_NEEDS_PTE_SYNC1 #define PMAP_INCLUDE_PTE_SYNC #elif (ARM_MMU_SA1 == 0) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257293 - in head: share/examples/bhyve usr.sbin/bhyve
Author: neel Date: Tue Oct 29 00:18:11 2013 New Revision: 257293 URL: http://svnweb.freebsd.org/changeset/base/257293 Log: Add support for PCI-to-ISA LPC bridge emulation. If the LPC bus is attached to a virtual machine then we implicitly create COM1 and COM2 ISA devices. Prior to this change the only way of attaching a COM port to the virtual machine was by presenting it as a PCI device that is mapped at the legacy I/O address 0x3F8 or 0x2F8. There were some issues with the original approach: - It did not work at all with UEFI because UEFI will reprogram the PCI device BARs and remap the COM1/COM2 ports at non-legacy addresses. - OpenBSD GENERIC kernel does not create a /dev/console because it expects the uart device at the legacy 0x3F8/0x2F8 address to be an ISA device. - It was functional with a FreeBSD guest but caused the console to appear on /dev/ttyu2 which was not intuitive. The uart emulation is now independent of the bus on which it resides. Thus it is possible to have uart devices on the PCI bus in addition to the legacy COM1/COM2 devices behind the LPC bus. The command line option to attach ISA COM1/COM2 ports to a virtual machine is -s bus,lpc -l com1,stdio. The command line option to create a PCI-attached uart device is: -s bus,uart[,stdio] The command line option to create PCI-attached COM1/COM2 device is: -S bus,uart[,stdio]. This style of creating COM ports is deprecated. Discussed with: grehan Reviewed by: grehan Submitted by: Tycho Nightingale (tycho.nighting...@pluribusnetworks.com) Mshare/examples/bhyve/vmrun.sh AM usr.sbin/bhyve/legacy_irq.c AM usr.sbin/bhyve/legacy_irq.h Musr.sbin/bhyve/Makefile AM usr.sbin/bhyve/uart_emul.c Musr.sbin/bhyve/bhyverun.c AM usr.sbin/bhyve/uart_emul.h Musr.sbin/bhyve/pci_uart.c Musr.sbin/bhyve/pci_emul.c Musr.sbin/bhyve/inout.c Musr.sbin/bhyve/pci_emul.h Musr.sbin/bhyve/inout.h AM usr.sbin/bhyve/pci_lpc.c AM usr.sbin/bhyve/pci_lpc.h Added: head/usr.sbin/bhyve/legacy_irq.c (contents, props changed) head/usr.sbin/bhyve/legacy_irq.h (contents, props changed) head/usr.sbin/bhyve/pci_lpc.c (contents, props changed) head/usr.sbin/bhyve/pci_lpc.h (contents, props changed) head/usr.sbin/bhyve/uart_emul.c (contents, props changed) head/usr.sbin/bhyve/uart_emul.h (contents, props changed) Modified: head/share/examples/bhyve/vmrun.sh head/usr.sbin/bhyve/Makefile head/usr.sbin/bhyve/bhyverun.c head/usr.sbin/bhyve/inout.c head/usr.sbin/bhyve/inout.h head/usr.sbin/bhyve/pci_emul.c head/usr.sbin/bhyve/pci_emul.h head/usr.sbin/bhyve/pci_uart.c Modified: head/share/examples/bhyve/vmrun.sh == --- head/share/examples/bhyve/vmrun.sh Mon Oct 28 23:47:52 2013 (r257292) +++ head/share/examples/bhyve/vmrun.sh Tue Oct 29 00:18:11 2013 (r257293) @@ -162,7 +162,7 @@ while [ 1 ]; do exit 1 fi BOOTDISK=${isofile} - installer_opt=-s 3:0,virtio-blk,${BOOTDISK} + installer_opt=-s 31:0,virtio-blk,${BOOTDISK} else BOOTDISK=${virtio_diskdev} installer_opt= @@ -176,10 +176,11 @@ while [ 1 ]; do ${FBSDRUN} -c ${cpus} -m ${memsize} ${apic_opt} -AI -H -P \ -g ${gdbport} \ -s 0:0,hostbridge \ - -s 1:0,virtio-net,${tapdev} \ - -s 2:0,virtio-blk,${virtio_diskdev} \ + -s 1:0,lpc \ + -s 2:0,virtio-net,${tapdev} \ + -s 3:0,virtio-blk,${virtio_diskdev} \ + -l com1,stdio \ ${installer_opt}\ - -S 31,uart,stdio\ ${vmname} if [ $? -ne 0 ]; then break Modified: head/usr.sbin/bhyve/Makefile == --- head/usr.sbin/bhyve/MakefileMon Oct 28 23:47:52 2013 (r257292) +++ head/usr.sbin/bhyve/MakefileTue Oct 29 00:18:11 2013 (r257293) @@ -7,10 +7,10 @@ PROG= bhyve DEBUG_FLAGS= -g -O0 SRCS= acpi.c atpic.c bhyverun.c block_if.c consport.c dbgport.c elcr.c -SRCS+= inout.c ioapic.c mem.c mevent.c mptbl.c pci_ahci.c -SRCS+= pci_emul.c pci_hostbridge.c pci_passthru.c pci_virtio_block.c +SRCS+= inout.c ioapic.c legacy_irq.c mem.c mevent.c mptbl.c pci_ahci.c +SRCS+= pci_emul.c pci_hostbridge.c pci_lpc.c pci_passthru.c pci_virtio_block.c SRCS+= pci_virtio_net.c
svn commit: r257295 - head/sys/dev/adb
Author: nwhitehorn Date: Tue Oct 29 00:53:17 2013 New Revision: 257295 URL: http://svnweb.freebsd.org/changeset/base/257295 Log: Return NOKEY instead of 0 if there are no more key presses queued. This worked by accident if and only if akbd was part of a kbdmux (which it always was in practice). MFC after:1 week Modified: head/sys/dev/adb/adb_kbd.c Modified: head/sys/dev/adb/adb_kbd.c == --- head/sys/dev/adb/adb_kbd.c Tue Oct 29 00:52:02 2013(r257294) +++ head/sys/dev/adb/adb_kbd.c Tue Oct 29 00:53:17 2013(r257295) @@ -621,7 +621,7 @@ akbd_read_char(keyboard_t *kbd, int wait if (!sc-buffers) { mtx_unlock(sc-sc_mutex); - return (0); + return (NOKEY); } adb_code = sc-buffer[0]; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257297 - in head/sys/amd64/vmm: . intel
Author: neel Date: Tue Oct 29 02:25:18 2013 New Revision: 257297 URL: http://svnweb.freebsd.org/changeset/base/257297 Log: Remove unnecessary includes of machine/pmap.h Requested by: alc@ Modified: head/sys/amd64/vmm/intel/vmcs.c head/sys/amd64/vmm/intel/vmx.c head/sys/amd64/vmm/intel/vmx_genassym.c head/sys/amd64/vmm/intel/vtd.c head/sys/amd64/vmm/vmm.c head/sys/amd64/vmm/vmm_dev.c head/sys/amd64/vmm/vmm_instruction_emul.c Modified: head/sys/amd64/vmm/intel/vmcs.c == --- head/sys/amd64/vmm/intel/vmcs.c Tue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/intel/vmcs.c Tue Oct 29 02:25:18 2013 (r257297) @@ -39,8 +39,6 @@ __FBSDID($FreeBSD$); #include vm/pmap.h #include machine/segments.h -#include machine/pmap.h - #include machine/vmm.h #include vmm_host.h #include vmcs.h Modified: head/sys/amd64/vmm/intel/vmx.c == --- head/sys/amd64/vmm/intel/vmx.c Tue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/intel/vmx.c Tue Oct 29 02:25:18 2013 (r257297) @@ -44,7 +44,6 @@ __FBSDID($FreeBSD$); #include machine/psl.h #include machine/cpufunc.h #include machine/md_var.h -#include machine/pmap.h #include machine/segments.h #include machine/specialreg.h #include machine/vmparam.h Modified: head/sys/amd64/vmm/intel/vmx_genassym.c == --- head/sys/amd64/vmm/intel/vmx_genassym.c Tue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/intel/vmx_genassym.c Tue Oct 29 02:25:18 2013 (r257297) @@ -38,8 +38,6 @@ __FBSDID($FreeBSD$); #include vm/vm.h #include vm/pmap.h -#include machine/pmap.h - #include machine/vmm.h #include vmx.h #include vmx_cpufunc.h Modified: head/sys/amd64/vmm/intel/vtd.c == --- head/sys/amd64/vmm/intel/vtd.c Tue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/intel/vtd.c Tue Oct 29 02:25:18 2013 (r257297) @@ -39,7 +39,6 @@ __FBSDID($FreeBSD$); #include dev/pci/pcireg.h -#include machine/pmap.h #include machine/vmparam.h #include contrib/dev/acpica/include/acpi.h Modified: head/sys/amd64/vmm/vmm.c == --- head/sys/amd64/vmm/vmm.cTue Oct 29 00:56:21 2013(r257296) +++ head/sys/amd64/vmm/vmm.cTue Oct 29 02:25:18 2013(r257297) @@ -56,7 +56,6 @@ __FBSDID($FreeBSD$); #include machine/pcb.h #include machine/smp.h #include x86/apicreg.h -#include machine/pmap.h #include machine/vmparam.h #include machine/vmm.h Modified: head/sys/amd64/vmm/vmm_dev.c == --- head/sys/amd64/vmm/vmm_dev.cTue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/vmm_dev.cTue Oct 29 02:25:18 2013 (r257297) @@ -46,7 +46,6 @@ __FBSDID($FreeBSD$); #include vm/pmap.h #include vm/vm_map.h -#include machine/pmap.h #include machine/vmparam.h #include machine/vmm.h Modified: head/sys/amd64/vmm/vmm_instruction_emul.c == --- head/sys/amd64/vmm/vmm_instruction_emul.c Tue Oct 29 00:56:21 2013 (r257296) +++ head/sys/amd64/vmm/vmm_instruction_emul.c Tue Oct 29 02:25:18 2013 (r257297) @@ -38,7 +38,6 @@ __FBSDID($FreeBSD$); #include vm/vm.h #include vm/pmap.h -#include machine/pmap.h #include machine/vmparam.h #include machine/vmm.h #else /* !_KERNEL */ ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257270 - head/sys/dev/ath
Thanks! -adrian On 28 October 2013 13:26, Olivier Houchard cog...@freebsd.org wrote: Author: cognet Date: Mon Oct 28 20:26:34 2013 New Revision: 257270 URL: http://svnweb.freebsd.org/changeset/base/257270 Log: Include sys/ktr.h, since we need it if ATH_DEBUG is defined. Modified: head/sys/dev/ath/if_ath_tx.c Modified: head/sys/dev/ath/if_ath_tx.c == --- head/sys/dev/ath/if_ath_tx.cMon Oct 28 20:15:59 2013 (r257269) +++ head/sys/dev/ath/if_ath_tx.cMon Oct 28 20:26:34 2013 (r257270) @@ -59,6 +59,7 @@ __FBSDID($FreeBSD$); #include sys/kthread.h #include sys/taskqueue.h #include sys/priv.h +#include sys/ktr.h #include machine/bus.h ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257298 - head/lib/libproc
Author: markj Date: Tue Oct 29 03:12:31 2013 New Revision: 257298 URL: http://svnweb.freebsd.org/changeset/base/257298 Log: Revert r257248 and fix the problem in a way that doesn't violate style(9). Suggested by: jmg Modified: head/lib/libproc/_libproc.h head/lib/libproc/proc_util.c Modified: head/lib/libproc/_libproc.h == --- head/lib/libproc/_libproc.h Tue Oct 29 02:25:18 2013(r257297) +++ head/lib/libproc/_libproc.h Tue Oct 29 03:12:31 2013(r257298) @@ -52,6 +52,6 @@ struct proc_handle { #defineDPRINTF(...)warn(__VA_ARGS__) #defineDPRINTFX(...) warnx(__VA_ARGS__) #else -#defineDPRINTF(...) -#defineDPRINTFX(...) +#defineDPRINTF(...)do { } while (0) +#defineDPRINTFX(...) do { } while (0) #endif Modified: head/lib/libproc/proc_util.c == --- head/lib/libproc/proc_util.cTue Oct 29 02:25:18 2013 (r257297) +++ head/lib/libproc/proc_util.cTue Oct 29 03:12:31 2013 (r257298) @@ -145,9 +145,8 @@ proc_wstatus(struct proc_handle *phdl) if (phdl == NULL) return (-1); if (waitpid(phdl-pid, status, WUNTRACED) 0) { - if (errno != EINTR) { + if (errno != EINTR) DPRINTF(waitpid); - } return (-1); } if (WIFSTOPPED(status)) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257299 - in head/sys: arm/conf boot/fdt/dts
Author: rpaulo Date: Tue Oct 29 03:42:43 2013 New Revision: 257299 URL: http://svnweb.freebsd.org/changeset/base/257299 Log: Digi-CCWMX53: enable ffec and uart. Modified: head/sys/arm/conf/DIGI-CCWMX53 head/sys/boot/fdt/dts/digi-ccwmx53.dts Modified: head/sys/arm/conf/DIGI-CCWMX53 == --- head/sys/arm/conf/DIGI-CCWMX53 Tue Oct 29 03:12:31 2013 (r257298) +++ head/sys/arm/conf/DIGI-CCWMX53 Tue Oct 29 03:42:43 2013 (r257299) @@ -105,8 +105,12 @@ device ether # Ethernet support #devicefaith # IPv6-to-IPv4 relaying (translation) #devicefirmware# firmware assist module +# Ethernet +device ffec# Freescale Fast Ethernet Controller +device miibus # Standard mii bus + # Serial (COM) ports -#deviceuart# Multi-uart driver +device uart# Multi-uart driver optionsALT_BREAK_TO_DEBUGGER device ata Modified: head/sys/boot/fdt/dts/digi-ccwmx53.dts == --- head/sys/boot/fdt/dts/digi-ccwmx53.dts Tue Oct 29 03:12:31 2013 (r257298) +++ head/sys/boot/fdt/dts/digi-ccwmx53.dts Tue Oct 29 03:42:43 2013 (r257299) @@ -95,6 +95,10 @@ }; }; aips@6000 { + ethernet@63fec000 { + status = okay; + phy-mode = rmii; + }; i2c@63fc4000 { status = okay; }; ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257300 - head/lib/libproc
Author: markj Date: Tue Oct 29 03:52:05 2013 New Revision: 257300 URL: http://svnweb.freebsd.org/changeset/base/257300 Log: Fix an off-by-one error when checking whether a given address is within the extent of a symbol. Submitted by: Prashanth Kumar pra_ud...@yahoo.co.in Reviewed by: rpaulo MFC after:1 week Modified: head/lib/libproc/proc_sym.c Modified: head/lib/libproc/proc_sym.c == --- head/lib/libproc/proc_sym.c Tue Oct 29 03:42:43 2013(r257299) +++ head/lib/libproc/proc_sym.c Tue Oct 29 03:52:05 2013(r257300) @@ -285,7 +285,7 @@ proc_addr2sym(struct proc_handle *p, uin * by rtld. */ rsym = map-pr_vaddr + sym.st_value; - if (addr = rsym addr = (rsym + sym.st_size)) { + if (addr = rsym addr rsym + sym.st_size) { s = elf_strptr(e, dynsymstridx, sym.st_name); if (s) { if (s[0] == '_' s[1] == 'Z' s[2]) @@ -325,7 +325,7 @@ symtab: rsym = map-pr_vaddr + sym.st_value; else rsym = sym.st_value; - if (addr = rsym addr = (rsym + sym.st_size)) { + if (addr = rsym addr rsym + sym.st_size) { s = elf_strptr(e, symtabstridx, sym.st_name); if (s) { if (s[0] == '_' s[1] == 'Z' s[2]) ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257301 - head/sys/dev/iwn
Author: adrian Date: Tue Oct 29 04:03:00 2013 New Revision: 257301 URL: http://svnweb.freebsd.org/changeset/base/257301 Log: Fix the PLCP lookup code in iwn(4) to base the 11n decision on whether the rate is 11n, rather than whether the channel is 11n. This correctly allows the PLCP lookup code to return the legacy rates even on an 11n channel. PR: kern/183430 Modified: head/sys/dev/iwn/if_iwn.c Modified: head/sys/dev/iwn/if_iwn.c == --- head/sys/dev/iwn/if_iwn.c Tue Oct 29 03:52:05 2013(r257300) +++ head/sys/dev/iwn/if_iwn.c Tue Oct 29 04:03:00 2013(r257301) @@ -2210,7 +2210,7 @@ iwn_rate_to_plcp(struct iwn_softc *sc, s * If it's an MCS rate, let's set the plcp correctly * and set the relevant flags based on the node config. */ - if (IEEE80211_IS_CHAN_HT(ni-ni_chan)) { + if (rate IEEE80211_RATE_MCS) { /* * Set the initial PLCP value to be between 0-31 for * MCS 0 - MCS 31, then set the I'm an MCS rate! ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257302 - in head/contrib/binutils/bfd: . po
Author: rea (ports committer) Date: Tue Oct 29 04:25:49 2013 New Revision: 257302 URL: http://svnweb.freebsd.org/changeset/base/257302 Log: binutils/bfd: fix printf-like format strings for bfd * arguments There is a special format argument '%B' that directly handles values of type 'bfd *', they must be used instead of '%s'. Manifestations of this bug can be seen in ld(1) error messages, for example, http://lists.freebsd.org/pipermail/freebsd-current/2013-August/043580.html http://lists.freebsd.org/pipermail/freebsd-current/2013-October/045404.html Approved by: dim MFC after:2 weeks Modified: head/contrib/binutils/bfd/elf32-score.c head/contrib/binutils/bfd/elflink.c head/contrib/binutils/bfd/po/bfd.pot Modified: head/contrib/binutils/bfd/elf32-score.c == --- head/contrib/binutils/bfd/elf32-score.c Tue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/elf32-score.c Tue Oct 29 04:25:49 2013 (r257302) @@ -2546,7 +2546,7 @@ _bfd_score_elf_check_relocs (bfd *abfd, } else if (r_symndx = extsymoff + NUM_SHDR_ENTRIES (symtab_hdr)) { - (*_bfd_error_handler) (_(%s: Malformed reloc detected for section %s), abfd, name); + (*_bfd_error_handler) (_(%B: Malformed reloc detected for section %s), abfd, name); bfd_set_error (bfd_error_bad_value); return FALSE; } Modified: head/contrib/binutils/bfd/elflink.c == --- head/contrib/binutils/bfd/elflink.c Tue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/elflink.c Tue Oct 29 04:25:49 2013 (r257302) @@ -4357,8 +4357,8 @@ elf_link_add_object_symbols (bfd *abfd, if ((elf_dyn_lib_class (abfd) DYN_NO_NEEDED) != 0) { (*_bfd_error_handler) - (_(%s: invalid DSO for symbol `%s' definition), -abfd, name); + (_(%B: invalid DSO for symbol `%s' definition), + abfd, name); bfd_set_error (bfd_error_bad_value); goto error_free_vers; } Modified: head/contrib/binutils/bfd/po/bfd.pot == --- head/contrib/binutils/bfd/po/bfd.potTue Oct 29 04:03:00 2013 (r257301) +++ head/contrib/binutils/bfd/po/bfd.potTue Oct 29 04:25:49 2013 (r257302) @@ -1572,7 +1572,7 @@ msgstr #: elf32-score.c:2549 #, c-format -msgid %s: Malformed reloc detected for section %s +msgid %B: Malformed reloc detected for section %s msgstr #: elf32-score.c:2600 @@ -2440,7 +2440,7 @@ msgstr #: elflink.c:4309 #, c-format -msgid %s: invalid DSO for symbol `%s' definition +msgid %B: invalid DSO for symbol `%s' definition msgstr #: elflink.c:5535 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
Re: svn commit: r257133 - head/sys/dev/iwn
I've filed a PR. Please update to -HEAD and test. Thanks! -adrian On 28 October 2013 15:05, Adrian Chadd adr...@freebsd.org wrote: Hi! Yup! So, the difference is in the rate being selected. It looks like the remote end is just plainly not ACKing the 11n management frame being sent; but it totally ACKs the 11b CCK frame being sent. So, thanks for pointing that out. I'll go and err, fix this mistake. The driver should be doing what the stack says. Bernhard figured out a couple years ago that doing 11n management frames to 11n devices is not guaranteed to work, so we fixed that. I will go and figure out why this is now broken for iwn. Thanks! Would you mind filing a PR with what we've gathered? -adrian On 28 October 2013 12:27, Stefan Farfeleder stef...@freebsd.org wrote: On Mon, Oct 28, 2013 at 12:07:17PM -0700, Adrian Chadd wrote: Yeah: Oct 28 19:43:43 mole kernel: iwn5000_tx_done: qid 3 idx 4 retries 7 nkill 0 rate a902 duration 686 status 83 status 0x83 is LONG_LIMIT, which meant it tried to transmit and it failed to get an ACK each time. The rate control says: 0x02: the rate in question bit 8: MCS bit 11: HT40 bits 14+15: transmit antennas A+B .. and it's an association/management frame, which is odd as they're not supposed to be sent as 11n HT40 frames like this. can you do the same experiment but with the patch reverted? I'd like to see what the selected rate is. Ok, here's the output with r257155 and r257133 reverted: http://pastebin.com/CJzsTANv Stefan ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257304 - head/sys/dev/mii
Author: yongari Date: Tue Oct 29 05:14:38 2013 New Revision: 257304 URL: http://svnweb.freebsd.org/changeset/base/257304 Log: Add support for new Gigabit PHY of RealTek. I don't have a copy of data sheet so I'm not sure exact PHY model name. Vendor's web page indicates RTL8251 is latest PHY so I used the name. This PHY is used with RTL8168G, RTL8168GU and RTL8411B. Modified: head/sys/dev/mii/miidevs head/sys/dev/mii/rgephy.c Modified: head/sys/dev/mii/miidevs == --- head/sys/dev/mii/miidevsTue Oct 29 04:31:07 2013(r257303) +++ head/sys/dev/mii/miidevsTue Oct 29 05:14:38 2013(r257304) @@ -304,6 +304,7 @@ model yyREALTEK RTL8201L0x0020 RTL8201L model xxREALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface model REALTEK RTL8305SC0x0005 RTL8305SC 10/100 802.1q switch model REALTEK RTL8201E 0x0008 RTL8201E 10/100 media interface +model REALTEK RTL8251 0x RTL8251 1000BASE-T media interface model REALTEK RTL8169S 0x0011 RTL8169S/8110S/8211 1000BASE-T media interface /* Seeq Seeq PHYs */ Modified: head/sys/dev/mii/rgephy.c == --- head/sys/dev/mii/rgephy.c Tue Oct 29 04:31:07 2013(r257303) +++ head/sys/dev/mii/rgephy.c Tue Oct 29 05:14:38 2013(r257304) @@ -91,6 +91,7 @@ static void rgephy_load_dspcode(struct m static const struct mii_phydesc rgephys[] = { MII_PHY_DESC(REALTEK, RTL8169S), + MII_PHY_DESC(REALTEK, RTL8251), MII_PHY_END }; @@ -395,7 +396,8 @@ rgephy_loop(struct mii_softc *sc) { int i; - if (sc-mii_mpd_rev 2) { + if (sc-mii_mpd_model != MII_MODEL_REALTEK_RTL8251 + sc-mii_mpd_rev 2) { PHY_WRITE(sc, RGEPHY_MII_BMCR, RGEPHY_BMCR_PDOWN); DELAY(1000); } @@ -428,7 +430,8 @@ rgephy_load_dspcode(struct mii_softc *sc { int val; - if (sc-mii_mpd_rev = 2) + if (sc-mii_mpd_model == MII_MODEL_REALTEK_RTL8251 || + sc-mii_mpd_rev = 2) return; PHY_WRITE(sc, 31, 0x0001); ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257305 - in head/sys: dev/re pci
Author: yongari Date: Tue Oct 29 05:30:21 2013 New Revision: 257305 URL: http://svnweb.freebsd.org/changeset/base/257305 Log: Add preliminary support for RTL8168G, RTL8168GU and RTL8411B. RTL8168GU has two variants(GMII and MII) but it uses the same chip revision id. Driver checks PCI device id of controller and sets internal capability flag(i.e. jumbo frame and link speed down in WOL). H/W donated by: RealTek Semiconductor Corp. Modified: head/sys/dev/re/if_re.c head/sys/pci/if_rlreg.h Modified: head/sys/dev/re/if_re.c == --- head/sys/dev/re/if_re.c Tue Oct 29 05:14:38 2013(r257304) +++ head/sys/dev/re/if_re.c Tue Oct 29 05:30:21 2013(r257305) @@ -182,7 +182,7 @@ static const struct rl_type re_devs[] = { RT_VENDORID, RT_DEVICEID_8101E, 0, RealTek 810xE PCIe 10/100baseTX }, { RT_VENDORID, RT_DEVICEID_8168, 0, - RealTek 8168/8111 B/C/CP/D/DP/E/F PCIe Gigabit Ethernet }, + RealTek 8168/8111 B/C/CP/D/DP/E/F/G PCIe Gigabit Ethernet }, { RT_VENDORID, RT_DEVICEID_8169, 0, RealTek 8169/8169S/8169SB(L)/8110S/8110SB(L) Gigabit Ethernet }, { RT_VENDORID, RT_DEVICEID_8169SC, 0, @@ -235,7 +235,10 @@ static const struct rl_hwrev re_hwrevs[] { RL_HWREV_8168E, RL_8169, 8168E/8111E, RL_JUMBO_MTU_9K}, { RL_HWREV_8168E_VL, RL_8169, 8168E/8111E-VL, RL_JUMBO_MTU_6K}, { RL_HWREV_8168F, RL_8169, 8168F/8111F, RL_JUMBO_MTU_9K}, + { RL_HWREV_8168G, RL_8169, 8168G/8111G, RL_JUMBO_MTU_9K}, + { RL_HWREV_8168GU, RL_8169, 8168GU/8111GU, RL_JUMBO_MTU_9K}, { RL_HWREV_8411, RL_8169, 8411, RL_JUMBO_MTU_9K}, + { RL_HWREV_8411B, RL_8169, 8411B, RL_JUMBO_MTU_9K}, { 0, 0, NULL, 0 } }; @@ -1460,12 +1463,25 @@ re_attach(device_t dev) break; case RL_HWREV_8168E_VL: case RL_HWREV_8168F: + case RL_HWREV_8168G: case RL_HWREV_8411: + case RL_HWREV_8411B: sc-rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | RL_FLAG_AUTOPAD | RL_FLAG_JUMBOV2 | RL_FLAG_CMDSTOP_WAIT_TXQ | RL_FLAG_WOL_MANLINK; break; + case RL_HWREV_8168GU: + if (pci_get_device(dev) == RT_DEVICEID_8101E) { + /* RTL8106EUS */ + sc-rl_flags |= RL_FLAG_FASTETHER; + } else + sc-rl_flags |= RL_FLAG_JUMBOV2 | RL_FLAG_WOL_MANLINK; + + sc-rl_flags |= RL_FLAG_PHYWAKE | RL_FLAG_PAR | + RL_FLAG_DESCV2 | RL_FLAG_MACSTAT | RL_FLAG_CMDSTOP | + RL_FLAG_AUTOPAD | RL_FLAG_CMDSTOP_WAIT_TXQ; + break; case RL_HWREV_8169_8110SB: case RL_HWREV_8169_8110SBL: case RL_HWREV_8169_8110SC: @@ -3336,7 +3352,9 @@ re_ioctl(struct ifnet *ifp, u_long comma switch (command) { case SIOCSIFMTU: if (ifr-ifr_mtu ETHERMIN || - ifr-ifr_mtu sc-rl_hwrev-rl_max_mtu) { + ifr-ifr_mtu sc-rl_hwrev-rl_max_mtu || + ((sc-rl_flags RL_FLAG_FASTETHER) != 0 + ifr-ifr_mtu RL_MTU)) { error = EINVAL; break; } Modified: head/sys/pci/if_rlreg.h == --- head/sys/pci/if_rlreg.h Tue Oct 29 05:14:38 2013(r257304) +++ head/sys/pci/if_rlreg.h Tue Oct 29 05:30:21 2013(r257305) @@ -192,6 +192,9 @@ #defineRL_HWREV_8106E 0x4480 #defineRL_HWREV_8168F 0x4800 #defineRL_HWREV_8411 0x4880 +#defineRL_HWREV_8168G 0x4C00 +#defineRL_HWREV_8168GU 0x5080 +#defineRL_HWREV_8411B 0x5C80 #defineRL_HWREV_8139 0x6000 #defineRL_HWREV_8139A 0x7000 #defineRL_HWREV_8139AG 0x7080 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org
svn commit: r257306 - in head/sys: dev/re pci
Author: yongari Date: Tue Oct 29 05:37:05 2013 New Revision: 257306 URL: http://svnweb.freebsd.org/changeset/base/257306 Log: Add preliminary support for RTL8168EP. Submitted by: Edward O'Callaghan (eocallaghan alterapraxis dot com) Modified: head/sys/dev/re/if_re.c head/sys/pci/if_rlreg.h Modified: head/sys/dev/re/if_re.c == --- head/sys/dev/re/if_re.c Tue Oct 29 05:30:21 2013(r257305) +++ head/sys/dev/re/if_re.c Tue Oct 29 05:37:05 2013(r257306) @@ -234,6 +234,7 @@ static const struct rl_hwrev re_hwrevs[] { RL_HWREV_8168DP, RL_8169, 8168DP/8111DP, RL_JUMBO_MTU_9K }, { RL_HWREV_8168E, RL_8169, 8168E/8111E, RL_JUMBO_MTU_9K}, { RL_HWREV_8168E_VL, RL_8169, 8168E/8111E-VL, RL_JUMBO_MTU_6K}, + { RL_HWREV_8168EP, RL_8169, 8168EP/8111EP, RL_JUMBO_MTU_9K}, { RL_HWREV_8168F, RL_8169, 8168F/8111F, RL_JUMBO_MTU_9K}, { RL_HWREV_8168G, RL_8169, 8168G/8111G, RL_JUMBO_MTU_9K}, { RL_HWREV_8168GU, RL_8169, 8168GU/8111GU, RL_JUMBO_MTU_9K}, @@ -1462,6 +1463,7 @@ re_attach(device_t dev) RL_FLAG_WOL_MANLINK; break; case RL_HWREV_8168E_VL: + case RL_HWREV_8168EP: case RL_HWREV_8168F: case RL_HWREV_8168G: case RL_HWREV_8411: Modified: head/sys/pci/if_rlreg.h == --- head/sys/pci/if_rlreg.h Tue Oct 29 05:30:21 2013(r257305) +++ head/sys/pci/if_rlreg.h Tue Oct 29 05:37:05 2013(r257306) @@ -193,6 +193,7 @@ #defineRL_HWREV_8168F 0x4800 #defineRL_HWREV_8411 0x4880 #defineRL_HWREV_8168G 0x4C00 +#defineRL_HWREV_8168EP 0x5000 #defineRL_HWREV_8168GU 0x5080 #defineRL_HWREV_8411B 0x5C80 #defineRL_HWREV_8139 0x6000 ___ svn-src-head@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to svn-src-head-unsubscr...@freebsd.org