From owner-p4-projects@FreeBSD.ORG Sun Oct 3 09:42:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 731B41065679; Sun, 3 Oct 2010 09:42:09 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 208001065674 for ; Sun, 3 Oct 2010 09:42:09 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 0C5728FC1D for ; Sun, 3 Oct 2010 09:42:09 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o939g8qS038031 for ; Sun, 3 Oct 2010 09:42:08 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o939g87U038028 for perforce@freebsd.org; Sun, 3 Oct 2010 09:42:08 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 3 Oct 2010 09:42:08 GMT Message-Id: <201010030942.o939g87U038028@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2010 09:42:09 -0000 http://p4web.freebsd.org/@@184381?ac=10 Change 184381 by hselasky@hselasky_laptop001 on 2010/10/03 09:41:31 USB network (NCM driver): - correct the ethernet payload remainder which must be post-offseted by -14 bytes instead of 0 bytes. This is not very clearly defined in the NCM specification. - add development feature about limiting the maximum datagram count in each NCM payload. - zero-pad alignment data - add TX-interval tuning sysctl Affected files ... .. //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#29 edit .. //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#7 edit .. //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdce.c#29 (text+ko) ==== @@ -110,10 +110,13 @@ #ifdef USB_DEBUG static int cdce_debug = 0; +static int cdce_tx_interval = 0; SYSCTL_NODE(_hw_usb, OID_AUTO, cdce, CTLFLAG_RW, 0, "USB CDC-Ethernet"); SYSCTL_INT(_hw_usb_cdce, OID_AUTO, debug, CTLFLAG_RW, &cdce_debug, 0, "Debug level"); +SYSCTL_INT(_hw_usb_cdce, OID_AUTO, interval, CTLFLAG_RW, &cdce_tx_interval, 0, + "NCM transmit interval in ms"); #endif static const struct usb_config cdce_config[CDCE_N_TRANSFER] = { @@ -192,7 +195,7 @@ .if_index = 0, .frames = CDCE_NCM_TX_FRAMES_MAX, .bufsize = (CDCE_NCM_TX_FRAMES_MAX * CDCE_NCM_TX_MAXLEN), - .flags = {.pipe_bof = 1,.force_short_xfer = 1,}, + .flags = {.pipe_bof = 1,}, .callback = cdce_ncm_bulk_write_callback, .timeout = 10000, /* 10 seconds */ .usb_mode = USB_MODE_DUAL, /* both modes */ @@ -294,9 +297,22 @@ { struct usb_ncm_parameters temp; struct usb_device_request req; - uDWord value; + struct usb_ncm_func_descriptor *ufd; + uint8_t value[8]; int err; + ufd = usbd_find_descriptor(sc->sc_ue.ue_udev, NULL, + sc->sc_ifaces_index[1], UDESC_CS_INTERFACE, 0 - 1, + UCDC_NCM_FUNC_DESC_SUBTYPE, 0 - 1); + + /* verify length of NCM functional descriptor */ + if (ufd != NULL) { + if (ufd->bLength < sizeof(*ufd)) + ufd = NULL; + else + DPRINTFN(1, "Found NCM functional descriptor.\n"); + } + req.bmRequestType = UT_READ_CLASS_INTERFACE; req.bRequest = UCDC_NCM_GET_NTB_PARAMETERS; USETW(req.wValue, 0); @@ -317,17 +333,19 @@ sc->sc_ncm.tx_remainder = UGETW(temp.wNdpOutPayloadRemainder); sc->sc_ncm.tx_modulus = UGETW(temp.wNdpOutDivisor); sc->sc_ncm.tx_struct_align = UGETW(temp.wNdpOutAlignment); + sc->sc_ncm.tx_nframe = UGETW(temp.wNtbOutMaxDatagrams); } else { sc->sc_ncm.rx_max = UGETDW(temp.dwNtbOutMaxSize); sc->sc_ncm.tx_max = UGETDW(temp.dwNtbInMaxSize); sc->sc_ncm.tx_remainder = UGETW(temp.wNdpInPayloadRemainder); sc->sc_ncm.tx_modulus = UGETW(temp.wNdpInDivisor); sc->sc_ncm.tx_struct_align = UGETW(temp.wNdpInAlignment); + sc->sc_ncm.tx_nframe = UGETW(temp.wNtbOutMaxDatagrams); } /* Verify maximum receive length */ - if (err || (sc->sc_ncm.rx_max < 32) || + if ((sc->sc_ncm.rx_max < 32) || (sc->sc_ncm.rx_max > CDCE_NCM_RX_MAXLEN)) { DPRINTFN(1, "Using default maximum receive length\n"); sc->sc_ncm.rx_max = CDCE_NCM_RX_MAXLEN; @@ -335,7 +353,7 @@ /* Verify maximum transmit length */ - if (err || (sc->sc_ncm.tx_max < 32) || + if ((sc->sc_ncm.tx_max < 32) || (sc->sc_ncm.tx_max > CDCE_NCM_TX_MAXLEN)) { DPRINTFN(1, "Using default maximum transmit length\n"); sc->sc_ncm.tx_max = CDCE_NCM_TX_MAXLEN; @@ -347,7 +365,7 @@ * - not greater than the maximum transmit length * - not less than four bytes */ - if (err || (sc->sc_ncm.tx_struct_align < 4) || + if ((sc->sc_ncm.tx_struct_align < 4) || (sc->sc_ncm.tx_struct_align != ((-sc->sc_ncm.tx_struct_align) & sc->sc_ncm.tx_struct_align)) || (sc->sc_ncm.tx_struct_align >= sc->sc_ncm.tx_max)) { @@ -361,7 +379,7 @@ * - not greater than the maximum transmit length * - not less than four bytes */ - if (err || (sc->sc_ncm.tx_modulus < 4) || + if ((sc->sc_ncm.tx_modulus < 4) || (sc->sc_ncm.tx_modulus != ((-sc->sc_ncm.tx_modulus) & sc->sc_ncm.tx_modulus)) || (sc->sc_ncm.tx_modulus >= sc->sc_ncm.tx_max)) { @@ -371,11 +389,30 @@ /* Verify that the payload remainder */ - if (err || (sc->sc_ncm.tx_remainder >= sc->sc_ncm.tx_modulus)) { + if ((sc->sc_ncm.tx_remainder >= sc->sc_ncm.tx_modulus)) { DPRINTFN(1, "Using default transmit remainder: 0 bytes\n"); sc->sc_ncm.tx_remainder = 0; } + /* + * Offset the TX remainder so that IP packet payload starts at + * the tx_modulus. This is not too clear in the specification. + */ + + sc->sc_ncm.tx_remainder = + (sc->sc_ncm.tx_remainder - ETHER_HDR_LEN) & + (sc->sc_ncm.tx_modulus - 1); + + /* Verify max datagrams */ + + if ((sc->sc_ncm.tx_nframe == 0) || + (sc->sc_ncm.tx_nframe > (CDCE_NCM_SUBFRAMES_MAX - 1))) { + DPRINTFN(1, "Using default max " + "subframes: %u units\n", CDCE_NCM_SUBFRAMES_MAX - 1); + /* need to reserve one entry for zero padding */ + sc->sc_ncm.tx_nframe = (CDCE_NCM_SUBFRAMES_MAX - 1); + } + /* Additional configuration, will fail in device side mode, which is OK. */ req.bmRequestType = UT_WRITE_CLASS_INTERFACE; @@ -383,8 +420,17 @@ USETW(req.wValue, 0); req.wIndex[0] = sc->sc_ifaces_index[1]; req.wIndex[1] = 0; - USETW(req.wLength, 4); - USETDW(value, sc->sc_ncm.rx_max); + + if ((ufd != NULL) && + (ufd->bmNetworkCapabilities & UCDC_NCM_CAP_MAX_DGRAM)) { + USETW(req.wLength, 8); + USETDW(value, sc->sc_ncm.rx_max); + USETW(value + 4, (CDCE_NCM_SUBFRAMES_MAX - 1)); + USETW(value + 6, 0); + } else { + USETW(req.wLength, 4); + USETDW(value, sc->sc_ncm.rx_max); + } err = usbd_do_request_flags(sc->sc_ue.ue_udev, NULL, &req, &value, 0, NULL, 1000 /* ms */); @@ -567,7 +613,7 @@ } else { - bzero(sc->sc_ue.ue_eaddr, sizeof(sc->sc_ue.ue_eaddr)); + memset(sc->sc_ue.ue_eaddr, 0, sizeof(sc->sc_ue.ue_eaddr)); for (i = 0; i != (ETHER_ADDR_LEN * 2); i++) { @@ -983,6 +1029,18 @@ } #if CDCE_HAVE_NCM +static void +cdce_ncm_tx_zero(struct usb_page_cache *pc, + uint32_t start, uint32_t end) +{ + if (start >= CDCE_NCM_TX_MAXLEN) + return; + if (end > CDCE_NCM_TX_MAXLEN) + end = CDCE_NCM_TX_MAXLEN; + + usbd_frame_zero(pc, start, end - start); +} + static uint8_t cdce_ncm_fill_tx_frames(struct usb_xfer *xfer, uint8_t index) { @@ -993,7 +1051,8 @@ uint32_t rem; uint32_t offset; uint32_t last_offset; - uint32_t n; + uint16_t n; + uint8_t retval; usbd_xfer_set_frame_offset(xfer, index * CDCE_NCM_TX_MAXLEN, index); @@ -1003,11 +1062,17 @@ /* Store last valid offset before alignment */ last_offset = offset; - /* Align offset correctly */ - offset = sc->sc_ncm.tx_remainder - - ((0UL - offset) & (0UL - sc->sc_ncm.tx_modulus)); + /* Align offset */ + offset = CDCE_NCM_ALIGN(sc->sc_ncm.tx_remainder, + offset, sc->sc_ncm.tx_modulus); + + /* Zero pad */ + cdce_ncm_tx_zero(pc, last_offset, offset); + + /* buffer full */ + retval = 2; - for (n = 0; n != CDCE_NCM_SUBFRAMES_MAX; n++) { + for (n = 0; n != sc->sc_ncm.tx_nframe; n++) { /* check if end of transmit buffer is reached */ @@ -1020,8 +1085,11 @@ IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); - if (m == NULL) + if (m == NULL) { + /* buffer not full */ + retval = 1; break; + } if (m->m_pkthdr.len > rem) { if (n == 0) { @@ -1047,9 +1115,12 @@ /* Store last valid offset before alignment */ last_offset = offset; - /* Align offset correctly */ - offset = sc->sc_ncm.tx_remainder - - ((0UL - offset) & (0UL - sc->sc_ncm.tx_modulus)); + /* Align offset */ + offset = CDCE_NCM_ALIGN(sc->sc_ncm.tx_remainder, + offset, sc->sc_ncm.tx_modulus); + + /* Zero pad */ + cdce_ncm_tx_zero(pc, last_offset, offset); /* * If there's a BPF listener, bounce a copy @@ -1067,7 +1138,7 @@ } if (n == 0) - return (1); + return (0); rem = (sizeof(sc->sc_ncm.dpt) + (4 * n) + 4); @@ -1079,8 +1150,22 @@ USETW(sc->sc_ncm.dp[n].wFrameIndex, 0); } + offset = last_offset; + + /* Align offset */ + offset = CDCE_NCM_ALIGN(0, offset, CDCE_NCM_TX_MINLEN); + + /* Optimise, save bandwidth and force short termination */ + if (offset >= sc->sc_ncm.tx_max) + offset = sc->sc_ncm.tx_max; + else + offset ++; + + /* Zero pad */ + cdce_ncm_tx_zero(pc, last_offset, offset); + /* set frame length */ - usbd_xfer_set_frame_len(xfer, index, last_offset); + usbd_xfer_set_frame_len(xfer, index, offset); /* Fill out 16-bit header */ sc->sc_ncm.hdr.dwSignature[0] = 'N'; @@ -1088,7 +1173,7 @@ sc->sc_ncm.hdr.dwSignature[2] = 'M'; sc->sc_ncm.hdr.dwSignature[3] = 'H'; USETW(sc->sc_ncm.hdr.wHeaderLength, sizeof(sc->sc_ncm.hdr)); - USETW(sc->sc_ncm.hdr.wBlockLength, last_offset); + USETW(sc->sc_ncm.hdr.wBlockLength, offset); USETW(sc->sc_ncm.hdr.wSequence, sc->sc_ncm.tx_seq); USETW(sc->sc_ncm.hdr.wDptIndex, sizeof(sc->sc_ncm.hdr)); @@ -1106,7 +1191,7 @@ sizeof(sc->sc_ncm.dpt)); usbd_copy_in(pc, sizeof(sc->sc_ncm.hdr) + sizeof(sc->sc_ncm.dpt), &(sc->sc_ncm.dp), sizeof(sc->sc_ncm.dp)); - return (0); + return (retval); } static void @@ -1115,6 +1200,7 @@ struct cdce_softc *sc = usbd_xfer_softc(xfer); struct ifnet *ifp = uether_getifp(&sc->sc_ue); uint16_t x; + uint8_t temp; int actlen; int aframes; @@ -1128,11 +1214,19 @@ case USB_ST_SETUP: for (x = 0; x != CDCE_NCM_TX_FRAMES_MAX; x++) { - if (cdce_ncm_fill_tx_frames(xfer, x)) + temp = cdce_ncm_fill_tx_frames(xfer, x); + if (temp == 0) + break; + if (temp == 1) { + x++; break; + } } if (x != 0) { +#ifdef USB_DEBUG + usbd_xfer_set_interval(xfer, cdce_tx_interval); +#endif usbd_xfer_set_frames(xfer, x); usbd_transfer_submit(xfer); } ==== //depot/projects/usb/src/sys/dev/usb/net/if_cdcereg.h#7 (text+ko) ==== @@ -38,7 +38,8 @@ #define CDCE_FRAMES_MAX 8 /* units */ #define CDCE_IND_SIZE_MAX 32 /* bytes */ -#define CDCE_NCM_TX_MAXLEN 2048UL /* bytes */ +#define CDCE_NCM_TX_MINLEN 512 /* bytes, must be power of two */ +#define CDCE_NCM_TX_MAXLEN (1UL << 14) /* bytes */ #define CDCE_NCM_TX_FRAMES_MAX 8 /* units */ #define CDCE_NCM_RX_MAXLEN (1UL << 14) /* bytes */ @@ -46,6 +47,10 @@ #define CDCE_NCM_SUBFRAMES_MAX 32 /* units */ +#define CDCE_NCM_ALIGN(rem,off,mod) \ + ((uint32_t)(((uint32_t)(rem)) - \ + ((uint32_t)((-(uint32_t)(off)) & (-(uint32_t)(mod)))))) + #ifndef CDCE_HAVE_NCM #define CDCE_HAVE_NCM 1 #endif @@ -68,6 +73,7 @@ uint16_t tx_modulus; uint16_t tx_struct_align; uint16_t tx_seq; + uint16_t tx_nframe; }; struct cdce_softc { ==== //depot/projects/usb/src/sys/dev/usb/usb_cdc.h#16 (text+ko) ==== @@ -241,6 +241,7 @@ #define UCDC_NCM_CAP_ENCAP 0x04 #define UCDC_NCM_CAP_MAX_DATA 0x08 #define UCDC_NCM_CAP_CRCMODE 0x10 +#define UCDC_NCM_CAP_MAX_DGRAM 0x20 } __packed; /* Communications interface specific class request codes */ @@ -276,7 +277,7 @@ uWord wNdpOutDivisor; uWord wNdpOutPayloadRemainder; uWord wNdpOutAlignment; - uWord wReserved26; + uWord wNtbOutMaxDatagrams; } __packed; /* Communications interface specific class notification codes */ From owner-p4-projects@FreeBSD.ORG Sun Oct 3 09:43:17 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4A2A61065674; Sun, 3 Oct 2010 09:43:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0B708106566B for ; Sun, 3 Oct 2010 09:43:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id EAEC38FC22 for ; Sun, 3 Oct 2010 09:43:16 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o939hGWH038046 for ; Sun, 3 Oct 2010 09:43:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o939hEa3038043 for perforce@freebsd.org; Sun, 3 Oct 2010 09:43:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 3 Oct 2010 09:43:14 GMT Message-Id: <201010030943.o939hEa3038043@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184382 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2010 09:43:17 -0000 http://p4web.freebsd.org/@@184382?ac=10 Change 184382 by hselasky@hselasky_laptop001 on 2010/10/03 09:42:08 IFC @ 184379 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#16 integrate .. //depot/projects/usb/src/sys/amd64/amd64/legacy.c#6 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#34 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#29 integrate .. //depot/projects/usb/src/sys/amd64/amd64/nexus.c#10 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#40 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#28 integrate .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#14 integrate .. //depot/projects/usb/src/sys/amd64/include/cpufunc.h#9 integrate .. //depot/projects/usb/src/sys/amd64/include/vmparam.h#13 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc.c#15 integrate .. //depot/projects/usb/src/sys/arm/arm/cpufunc_asm_sheeva.S#3 integrate .. //depot/projects/usb/src/sys/arm/arm/nexus.c#7 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#28 integrate .. //depot/projects/usb/src/sys/arm/at91/at91_twi.c#10 integrate .. //depot/projects/usb/src/sys/arm/at91/if_ate.c#19 integrate .. //depot/projects/usb/src/sys/arm/conf/DOCKSTAR#1 branch .. //depot/projects/usb/src/sys/arm/include/bootinfo.h#2 delete .. //depot/projects/usb/src/sys/arm/include/cpufunc.h#10 integrate .. //depot/projects/usb/src/sys/arm/mv/timer.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/ixp425.c#13 integrate .. //depot/projects/usb/src/sys/boot/common/crc32.c#1 branch .. //depot/projects/usb/src/sys/boot/common/crc32.h#1 branch .. //depot/projects/usb/src/sys/boot/common/gpt.c#1 branch .. //depot/projects/usb/src/sys/boot/common/gpt.h#1 branch .. //depot/projects/usb/src/sys/boot/common/util.c#1 branch .. //depot/projects/usb/src/sys/boot/common/util.h#1 branch .. //depot/projects/usb/src/sys/boot/fdt/dts/dockstar.dts#1 branch .. //depot/projects/usb/src/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/usb/src/sys/boot/forth/loader.conf#28 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/i386/common/cons.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/common/cons.h#1 branch .. //depot/projects/usb/src/sys/boot/i386/common/drv.c#1 branch .. //depot/projects/usb/src/sys/boot/i386/common/drv.h#1 branch .. //depot/projects/usb/src/sys/boot/i386/common/rbx.h#1 branch .. //depot/projects/usb/src/sys/boot/i386/gptboot/Makefile#3 integrate .. //depot/projects/usb/src/sys/boot/i386/gptboot/gptboot.c#7 integrate .. //depot/projects/usb/src/sys/boot/i386/gptzfsboot/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#14 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/Makefile#4 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#10 integrate .. //depot/projects/usb/src/sys/boot/ofw/libofw/ofw_copy.c#2 integrate .. //depot/projects/usb/src/sys/boot/pc98/boot2/Makefile#6 integrate .. //depot/projects/usb/src/sys/boot/sparc64/boot1/boot1.c#2 integrate .. //depot/projects/usb/src/sys/boot/zfs/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfs.c#7 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#9 integrate .. //depot/projects/usb/src/sys/cam/ata/ata_da.c#14 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#32 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#22 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#13 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#9 integrate .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 branch .. //depot/projects/usb/src/sys/cddl/compat/opensolaris/sys/vnode.h#10 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#14 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#5 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#6 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#11 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#12 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#4 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#16 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#15 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#22 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#7 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#9 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c#3 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#27 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_ioctl.c#25 integrate .. //depot/projects/usb/src/sys/conf/Makefile.mips#3 integrate .. //depot/projects/usb/src/sys/conf/files#100 integrate .. //depot/projects/usb/src/sys/conf/files.amd64#32 integrate .. //depot/projects/usb/src/sys/conf/files.mips#11 integrate .. //depot/projects/usb/src/sys/conf/files.powerpc#31 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#16 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#20 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#19 integrate .. //depot/projects/usb/src/sys/conf/ldscript.mips.64.cfe#1 branch .. //depot/projects/usb/src/sys/conf/ldscript.mips.octeon1.64#3 integrate .. //depot/projects/usb/src/sys/conf/newvers.sh#16 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/changes.txt#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adfile.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adisasm.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/adwalk.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/dmrestag.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/common/getopt.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslanalyze.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompile.c#10 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslcompiler.h#10 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslerror.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslfiles.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllisting.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/asllookup.c#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslmain.c#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslopcodes.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslpredef.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype1.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2d.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2e.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslrestype2w.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/aslstartup.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtcompile.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/compiler/dtio.c#2 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/debugger/dbexec.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/events/evrgnini.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/executer/exmutex.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/hardware/hwpci.c#1 branch .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acglobal.h#9 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/achware.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/aclocal.h#8 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acmacros.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acnamesp.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpiosxf.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acpixf.h#11 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/actypes.h#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/acutils.h#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acenv.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acfreebsd.h#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/include/platform/acgcc.h#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsrepair2.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/namespace/nsutils.c#6 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/osunixxf.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tables/tbfadt.c#4 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/tools/acpiexec/aecommon.h#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utdebug.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmath.c#3 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmisc.c#7 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utmutex.c#5 integrate .. //depot/projects/usb/src/sys/contrib/dev/acpica/utilities/utxferror.c#1 branch .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-app-init.h#2 integrate .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-board.c#2 integrate .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper-spi.c#2 integrate .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-helper.c#2 integrate .. //depot/projects/usb/src/sys/contrib/octeon-sdk/cvmx-spi.c#2 integrate .. //depot/projects/usb/src/sys/contrib/pf/net/pf.c#17 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aesni.c#2 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aesni.h#2 integrate .. //depot/projects/usb/src/sys/crypto/aesni/aesni_wrap.c#2 integrate .. //depot/projects/usb/src/sys/dev/aac/aac.c#16 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_cam.c#12 integrate .. //depot/projects/usb/src/sys/dev/aac/aac_disk.c#5 integrate .. //depot/projects/usb/src/sys/dev/aac/aacreg.h#7 integrate .. //depot/projects/usb/src/sys/dev/aac/aacvar.h#10 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_hp.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpi_support/acpi_wmi.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/Osd/OsdHardware.c#8 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#30 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_cpu.c#17 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#13 integrate .. //depot/projects/usb/src/sys/dev/ae/if_ae.c#10 integrate .. //depot/projects/usb/src/sys/dev/ahci/ahci.c#17 integrate .. //depot/projects/usb/src/sys/dev/alc/if_alc.c#10 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-all.h#21 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-lowlevel.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-ahci.c#15 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-serverworks.c#9 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-siliconimage.c#13 integrate .. //depot/projects/usb/src/sys/dev/ata/chipsets/ata-via.c#9 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/atkbdc_isa.c#5 integrate .. //depot/projects/usb/src/sys/dev/atkbdc/psm.c#14 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#33 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#18 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#22 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#19 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#26 integrate .. //depot/projects/usb/src/sys/dev/dc/dcphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/dc/pnphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82571.h#2 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_82575.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_api.h#6 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_defines.h#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_hw.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.c#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_ich8lan.h#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_mac.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.c#4 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_nvm.h#3 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.c#8 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_phy.h#7 integrate .. //depot/projects/usb/src/sys/dev/e1000/e1000_regs.h#9 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.c#23 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_em.h#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.c#23 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_igb.h#10 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.c#5 integrate .. //depot/projects/usb/src/sys/dev/e1000/if_lem.h#3 integrate .. //depot/projects/usb/src/sys/dev/et/if_et.c#6 integrate .. //depot/projects/usb/src/sys/dev/fb/vesa.c#13 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#15 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_sbus.c#2 integrate .. //depot/projects/usb/src/sys/dev/gpio/gpio_if.m#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpiobus.c#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpiobus_if.m#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpiobusvar.h#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpioc.c#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpioiic.c#1 branch .. //depot/projects/usb/src/sys/dev/gpio/gpioled.c#1 branch .. //depot/projects/usb/src/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/usb/src/sys/dev/hifn/hifn7751var.h#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_core.c#9 integrate .. //depot/projects/usb/src/sys/dev/iicbus/iicbus.c#11 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsi.c#7 integrate .. //depot/projects/usb/src/sys/dev/iscsi/initiator/iscsivar.h#4 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwn.c#22 integrate .. //depot/projects/usb/src/sys/dev/iwn/if_iwnvar.h#9 integrate .. //depot/projects/usb/src/sys/dev/led/led.c#7 integrate .. //depot/projects/usb/src/sys/dev/malo/if_malo_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/acphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/amphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/atphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/axphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/bmtphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#16 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphyreg.h#6 integrate .. //depot/projects/usb/src/sys/dev/mii/ciphy.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/e1000phy.c#14 integrate .. //depot/projects/usb/src/sys/dev/mii/exphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/gentbi.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/icsphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/inphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/ip1000phy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/jmphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/lxtphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.h#2 integrate .. //depot/projects/usb/src/sys/dev/mii/mii_physubr.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/mlphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/nsgphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/nsphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/nsphyter.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/pnaphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/qsphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/rgephy.c#8 integrate .. //depot/projects/usb/src/sys/dev/mii/rlphy.c#7 integrate .. //depot/projects/usb/src/sys/dev/mii/rlswitch.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/ruephy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/smcphy.c#2 integrate .. //depot/projects/usb/src/sys/dev/mii/tdkphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/tlphy.c#6 integrate .. //depot/projects/usb/src/sys/dev/mii/tlphyreg.h#2 integrate .. //depot/projects/usb/src/sys/dev/mii/truephy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/ukphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mii/xmphy.c#4 integrate .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_cnfg.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_hbd.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_history.txt#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_init.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_ioc.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_ra.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_raid.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_sas.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_targ.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_tool.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpi/mpi2_type.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps.c#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_ioctl.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_pci.c#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_sas.c#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_table.c#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_table.h#1 branch .. //depot/projects/usb/src/sys/dev/mps/mps_user.c#1 branch .. //depot/projects/usb/src/sys/dev/mps/mpsvar.h#1 branch .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#12 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.h#14 integrate .. //depot/projects/usb/src/sys/dev/msk/if_msk.c#23 integrate .. //depot/projects/usb/src/sys/dev/mvs/mvs.c#4 integrate .. //depot/projects/usb/src/sys/dev/mwl/if_mwl_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_fdt.c#2 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_if.m#5 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_iicbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/ofw/ofw_standard.c#8 integrate .. //depot/projects/usb/src/sys/dev/ofw/openfirm.c#10 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#18 integrate .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvram.c#6 integrate .. //depot/projects/usb/src/sys/dev/powermac_nvram/powermac_nvramvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/ppbus/ppbconf.c#11 integrate .. //depot/projects/usb/src/sys/dev/ral/rt2560.c#18 integrate .. //depot/projects/usb/src/sys/dev/sf/if_sf.c#4 integrate .. //depot/projects/usb/src/sys/dev/siba/siba.c#4 integrate .. //depot/projects/usb/src/sys/dev/siis/siis.c#15 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sis.c#9 integrate .. //depot/projects/usb/src/sys/dev/sis/if_sisreg.h#4 integrate .. //depot/projects/usb/src/sys/dev/spibus/spibus.c#6 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#11 integrate .. //depot/projects/usb/src/sys/dev/syscons/scvgarndr.c#6 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ehci.c#60 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/ohci.c#39 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/uhci.c#35 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/xhci.h#24 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#8 integrate .. //depot/projects/usb/src/sys/dev/usb/controller/xhcireg.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ukbd.c#53 integrate .. //depot/projects/usb/src/sys/dev/usb/input/ums.c#33 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axe.c#27 integrate .. //depot/projects/usb/src/sys/dev/usb/net/if_axereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/usb/net/uhso.c#10 integrate .. //depot/projects/usb/src/sys/dev/usb/serial/ubser.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/storage/umass.c#56 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_busdma.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_controller.h#28 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_device.c#80 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_generic.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_hub.c#59 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#187 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.h#19 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdevs#141 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi.h#21 integrate .. //depot/projects/usb/src/sys/dev/usb/usbdi_util.h#8 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_rum.c#34 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_uath.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_upgt.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_ural.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_urtw.c#19 integrate .. //depot/projects/usb/src/sys/dev/usb/wlan/if_zyd.c#33 edit .. //depot/projects/usb/src/sys/fs/devfs/devfs.h#6 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_devs.c#18 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_dir.c#1 branch .. //depot/projects/usb/src/sys/fs/devfs/devfs_int.h#8 integrate .. //depot/projects/usb/src/sys/fs/devfs/devfs_vnops.c#27 integrate .. //depot/projects/usb/src/sys/fs/nfs/nfsdport.h#3 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clbio.c#13 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clrpcops.c#10 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfs_clvnops.c#18 integrate .. //depot/projects/usb/src/sys/fs/nfsclient/nfsnode.h#4 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdport.c#12 integrate .. //depot/projects/usb/src/sys/fs/nfsserver/nfs_nfsdstate.c#14 integrate .. //depot/projects/usb/src/sys/fs/nwfs/nwfs_vfsops.c#8 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_vfsops.c#10 integrate .. //depot/projects/usb/src/sys/fs/tmpfs/tmpfs_vnops.c#17 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/usb/src/sys/gdb/gdb_cons.c#3 integrate .. //depot/projects/usb/src/sys/geom/concat/g_concat.c#7 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.c#12 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli.h#6 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_ctl.c#6 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_integrity.c#2 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_key.c#4 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_privacy.c#2 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#15 integrate .. //depot/projects/usb/src/sys/geom/mirror/g_mirror_ctl.c#5 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#27 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#22 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_mbr.c#11 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_pc98.c#12 integrate .. //depot/projects/usb/src/sys/geom/sched/subr_disk.c#2 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_move.c#5 integrate .. //depot/projects/usb/src/sys/geom/vinum/geom_vinum_rename.c#6 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#38 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#33 integrate .. //depot/projects/usb/src/sys/i386/i386/busdma_machdep.c#18 integrate .. //depot/projects/usb/src/sys/i386/i386/legacy.c#6 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#30 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#24 integrate .. //depot/projects/usb/src/sys/i386/i386/nexus.c#9 integrate .. //depot/projects/usb/src/sys/i386/i386/support.s#10 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#16 integrate .. //depot/projects/usb/src/sys/i386/include/cpufunc.h#13 integrate .. //depot/projects/usb/src/sys/ia64/ia64/busdma_machdep.c#14 integrate .. //depot/projects/usb/src/sys/ia64/ia64/nexus.c#10 integrate .. //depot/projects/usb/src/sys/ia64/include/_stdint.h#2 integrate .. //depot/projects/usb/src/sys/ia64/include/bus.h#6 integrate .. //depot/projects/usb/src/sys/isa/isa_common.c#8 integrate .. //depot/projects/usb/src/sys/kern/Makefile#6 integrate .. //depot/projects/usb/src/sys/kern/bus_if.m#9 integrate .. //depot/projects/usb/src/sys/kern/imgact_shell.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_clock.c#13 integrate .. //depot/projects/usb/src/sys/kern/kern_clocksource.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_et.c#2 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#22 integrate .. //depot/projects/usb/src/sys/kern/kern_jail.c#39 integrate .. //depot/projects/usb/src/sys/kern/kern_linker.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#17 integrate .. //depot/projects/usb/src/sys/kern/kern_ntptime.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_shutdown.c#18 integrate .. //depot/projects/usb/src/sys/kern/kern_sig.c#29 integrate .. //depot/projects/usb/src/sys/kern/kern_sysctl.c#23 integrate .. //depot/projects/usb/src/sys/kern/kern_tc.c#8 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#15 integrate .. //depot/projects/usb/src/sys/kern/link_elf.c#16 integrate .. //depot/projects/usb/src/sys/kern/link_elf_obj.c#19 integrate .. //depot/projects/usb/src/sys/kern/p1003_1b.c#5 integrate .. //depot/projects/usb/src/sys/kern/sched_4bsd.c#17 integrate .. //depot/projects/usb/src/sys/kern/sched_ule.c#28 integrate .. //depot/projects/usb/src/sys/kern/subr_acl_nfs4.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_bus.c#41 integrate .. //depot/projects/usb/src/sys/kern/subr_disk.c#7 integrate .. //depot/projects/usb/src/sys/kern/subr_kdb.c#9 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#12 integrate .. //depot/projects/usb/src/sys/kern/subr_sbuf.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#18 integrate .. //depot/projects/usb/src/sys/kern/subr_stack.c#8 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#16 integrate .. //depot/projects/usb/src/sys/kern/subr_witness.c#26 integrate .. //depot/projects/usb/src/sys/kern/tty.c#37 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#33 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#29 integrate .. //depot/projects/usb/src/sys/kern/vfs_mount.c#37 integrate .. //depot/projects/usb/src/sys/kern/vfs_mountroot.c#1 branch .. //depot/projects/usb/src/sys/kern/vfs_subr.c#36 integrate .. //depot/projects/usb/src/sys/libkern/inet_ntop.c#1 branch .. //depot/projects/usb/src/sys/libkern/inet_pton.c#1 branch .. //depot/projects/usb/src/sys/mips/adm5120/obio.c#5 integrate .. //depot/projects/usb/src/sys/mips/alchemy/obio.c#3 integrate .. //depot/projects/usb/src/sys/mips/atheros/apb.c#2 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_gpio.c#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_gpiovar.h#1 branch .. //depot/projects/usb/src/sys/mips/atheros/ar71xx_machdep.c#4 integrate .. //depot/projects/usb/src/sys/mips/atheros/ar71xxreg.h#6 integrate .. //depot/projects/usb/src/sys/mips/atheros/files.ar71xx#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/ciu.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/files.octeon1#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/obio.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/cavium-ethernet.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-common.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-headers.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mdio.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mv88e61xx.c#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-mv88e61xx.h#1 branch .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-rgmii.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-rx.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-sgmii.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-tx.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet-xaui.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/ethernet.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octe/octe.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_machdep.c#6 integrate .. //depot/projects/usb/src/sys/mips/cavium/octeon_mp.c#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/octopci.c#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/octopcireg.h#2 integrate .. //depot/projects/usb/src/sys/mips/cavium/std.octeon1#3 integrate .. //depot/projects/usb/src/sys/mips/cavium/uart_bus_octeonusart.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/uart_cpu_octeonusart.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/uart_dev_oct16550.c#4 integrate .. //depot/projects/usb/src/sys/mips/cavium/usb/octusb.c#3 integrate .. //depot/projects/usb/src/sys/mips/conf/AR71XX#6 integrate .. //depot/projects/usb/src/sys/mips/conf/AR71XX.hints#3 integrate .. //depot/projects/usb/src/sys/mips/conf/MALTA64#4 integrate .. //depot/projects/usb/src/sys/mips/conf/OCTEON1#6 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM#6 integrate .. //depot/projects/usb/src/sys/mips/conf/SWARM64#1 branch .. //depot/projects/usb/src/sys/mips/conf/SWARM64_SMP#1 branch .. //depot/projects/usb/src/sys/mips/conf/SWARM_COMMON#1 branch .. //depot/projects/usb/src/sys/mips/conf/SWARM_SMP#2 integrate .. //depot/projects/usb/src/sys/mips/idt/obio.c#5 integrate .. //depot/projects/usb/src/sys/mips/include/cpufunc.h#6 integrate .. //depot/projects/usb/src/sys/mips/include/cpuregs.h#8 integrate .. //depot/projects/usb/src/sys/mips/include/md_var.h#5 integrate .. //depot/projects/usb/src/sys/mips/include/pmap.h#13 integrate .. //depot/projects/usb/src/sys/mips/include/smp.h#8 integrate .. //depot/projects/usb/src/sys/mips/mips/busdma_machdep.c#10 integrate .. //depot/projects/usb/src/sys/mips/mips/locore.S#8 integrate .. //depot/projects/usb/src/sys/mips/mips/machdep.c#16 integrate .. //depot/projects/usb/src/sys/mips/mips/mainbus.c#5 integrate .. //depot/projects/usb/src/sys/mips/mips/mp_machdep.c#10 integrate .. //depot/projects/usb/src/sys/mips/mips/nexus.c#6 integrate .. //depot/projects/usb/src/sys/mips/mips/pmap.c#23 integrate .. //depot/projects/usb/src/sys/mips/mips/psraccess.S#5 delete .. //depot/projects/usb/src/sys/mips/mips/trap.c#11 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.c#5 integrate .. //depot/projects/usb/src/sys/mips/rmi/board.h#4 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/nlge/if_nlge.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/desc.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmilib.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/rmisec.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/sec/stats.h#2 delete .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.c#7 integrate .. //depot/projects/usb/src/sys/mips/rmi/dev/xlr/rge.h#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/fmn.c#2 integrate .. //depot/projects/usb/src/sys/mips/rmi/iodi.c#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/msgring.h#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/pic.h#6 integrate .. //depot/projects/usb/src/sys/mips/rmi/rmi_mips_exts.h#3 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/rmi/xlr_pci.c#6 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_machdep.c#7 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbbus.c#4 integrate .. //depot/projects/usb/src/sys/mips/sibyte/sb_zbpci.c#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#55 integrate .. //depot/projects/usb/src/sys/modules/acpi/acpi/Makefile#16 integrate .. //depot/projects/usb/src/sys/modules/crypto/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/gem/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/krpc/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/mps/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/opensolaris/Makefile#5 integrate .. //depot/projects/usb/src/sys/modules/scc/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/sound/sound/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/zfs/Makefile#15 integrate .. //depot/projects/usb/src/sys/net/bpf.c#30 integrate .. //depot/projects/usb/src/sys/net/if.c#51 integrate .. //depot/projects/usb/src/sys/net/if_epair.c#8 integrate .. //depot/projects/usb/src/sys/net/if_tap.c#14 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#19 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_scan_sta.c#19 integrate .. //depot/projects/usb/src/sys/netinet/igmp.c#25 integrate .. //depot/projects/usb/src/sys/netinet/in.c#47 integrate .. //depot/projects/usb/src/sys/netinet/in.h#19 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#24 integrate .. //depot/projects/usb/src/sys/netinet/ip_carp.c#24 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#38 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#34 integrate .. //depot/projects/usb/src/sys/netinet/ip_var.h#19 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched_qfq.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/dn_sched_wf2q.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_glue.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_io.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dn_private.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_dummynet.c#11 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_nat.c#9 integrate .. //depot/projects/usb/src/sys/netinet/ipfw/ip_fw_pfil.c#12 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#37 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#18 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.h#9 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.c#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#16 integrate .. //depot/projects/usb/src/sys/netinet/sctp_cc_functions.c#7 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#30 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#28 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#34 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#13 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#28 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#14 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#19 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#21 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#25 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#35 integrate .. //depot/projects/usb/src/sys/netinet/siftr.c#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp.h#9 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#34 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#25 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#15 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#34 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.h#8 integrate .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#28 integrate .. //depot/projects/usb/src/sys/netinet6/in6_rmx.c#22 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#36 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_output.c#24 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_var.h#19 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#15 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs.h#13 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_nfsiod.c#8 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_subs.c#15 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_vnops.c#36 integrate .. //depot/projects/usb/src/sys/nfsclient/nfsnode.h#11 integrate .. //depot/projects/usb/src/sys/nlm/nlm_prot_impl.c#10 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.c#11 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptosoft.c#10 integrate .. //depot/projects/usb/src/sys/opencrypto/xform.c#5 integrate .. //depot/projects/usb/src/sys/opencrypto/xform.h#3 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#29 integrate .. //depot/projects/usb/src/sys/pc98/pc98/canbus.c#2 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#20 integrate .. //depot/projects/usb/src/sys/pci/if_rl.c#16 integrate .. //depot/projects/usb/src/sys/powerpc/aim/clock.c#8 integrate .. //depot/projects/usb/src/sys/powerpc/aim/copyinout.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/aim/interrupt.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/aim/machdep.c#20 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea.c#16 integrate .. //depot/projects/usb/src/sys/powerpc/aim/mmu_oea64.c#16 integrate .. //depot/projects/usb/src/sys/powerpc/aim/nexus.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/aim/slb.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap.c#10 integrate .. //depot/projects/usb/src/sys/powerpc/aim/trap_subr64.S#2 integrate .. //depot/projects/usb/src/sys/powerpc/booke/clock.c#7 integrate .. //depot/projects/usb/src/sys/powerpc/booke/interrupt.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/booke/machdep.c#18 integrate .. //depot/projects/usb/src/sys/powerpc/booke/platform_bare.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/booke/pmap.c#22 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC#31 integrate .. //depot/projects/usb/src/sys/powerpc/conf/GENERIC64#2 integrate .. //depot/projects/usb/src/sys/powerpc/include/intr_machdep.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/md_var.h#11 integrate .. //depot/projects/usb/src/sys/powerpc/include/mmuvar.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/include/param.h#8 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcb.h#7 integrate .. //depot/projects/usb/src/sys/powerpc/include/pcpu.h#12 integrate .. //depot/projects/usb/src/sys/powerpc/include/pmap.h#13 integrate .. //depot/projects/usb/src/sys/powerpc/include/smp.h#9 integrate .. //depot/projects/usb/src/sys/powerpc/include/sr.h#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/vm.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_real.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/ofw/ofw_syscons.c#9 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/ata_kauai.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powermac/kiic.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/bus_machdep.c#6 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/busdma_machdep.c#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/exec_machdep.c#2 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/intr_machdep.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mmu_if.m#10 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/mp_machdep.c#12 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/pmap_dispatch.c#14 integrate .. //depot/projects/usb/src/sys/rpc/inet_ntop.c#2 delete .. //depot/projects/usb/src/sys/rpc/inet_pton.c#2 delete .. //depot/projects/usb/src/sys/rpc/rpc_com.h#3 integrate .. //depot/projects/usb/src/sys/rpc/rpc_generic.c#4 integrate .. //depot/projects/usb/src/sys/security/audit/audit_bsm_klib.c#14 integrate .. //depot/projects/usb/src/sys/sparc64/conf/GENERIC#31 integrate .. //depot/projects/usb/src/sys/sparc64/include/asm.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/intr_machdep.h#10 integrate .. //depot/projects/usb/src/sys/sparc64/include/md_var.h#5 integrate .. //depot/projects/usb/src/sys/sparc64/include/nexusvar.h#3 branch .. //depot/projects/usb/src/sys/sparc64/include/smp.h#11 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#11 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/bus_machdep.c#7 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#12 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/intr_machdep.c#11 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/iommu.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#24 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/mp_machdep.c#15 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#10 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/support.S#8 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/vm_machdep.c#9 integrate .. //depot/projects/usb/src/sys/sun4v/conf/GENERIC#22 integrate .. //depot/projects/usb/src/sys/sun4v/include/intr_machdep.h#4 integrate .. //depot/projects/usb/src/sys/sun4v/include/smp.h#7 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/bus_machdep.c#4 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/hviommu.c#3 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/intr_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/mp_machdep.c#9 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/nexus.c#5 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/vnex.c#5 integrate .. //depot/projects/usb/src/sys/sys/acl.h#7 integrate .. //depot/projects/usb/src/sys/sys/bio.h#5 integrate .. //depot/projects/usb/src/sys/sys/bus.h#15 integrate .. //depot/projects/usb/src/sys/sys/callout.h#6 integrate .. //depot/projects/usb/src/sys/sys/copyright.h#7 integrate .. //depot/projects/usb/src/sys/sys/disklabel.h#4 integrate .. //depot/projects/usb/src/sys/sys/elf_common.h#16 integrate .. //depot/projects/usb/src/sys/sys/gpio.h#1 branch .. //depot/projects/usb/src/sys/sys/gpt.h#6 integrate .. //depot/projects/usb/src/sys/sys/lock.h#13 integrate .. //depot/projects/usb/src/sys/sys/mount.h#25 integrate .. //depot/projects/usb/src/sys/sys/mutex.h#12 integrate .. //depot/projects/usb/src/sys/sys/param.h#56 integrate .. //depot/projects/usb/src/sys/sys/pcpu.h#17 integrate .. //depot/projects/usb/src/sys/sys/proc.h#30 integrate .. //depot/projects/usb/src/sys/sys/sbuf.h#3 integrate .. //depot/projects/usb/src/sys/sys/sched.h#9 integrate .. //depot/projects/usb/src/sys/sys/socketvar.h#14 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#25 integrate .. //depot/projects/usb/src/sys/sys/systm.h#26 integrate .. //depot/projects/usb/src/sys/sys/time.h#10 integrate .. //depot/projects/usb/src/sys/sys/timeet.h#2 integrate .. //depot/projects/usb/src/sys/sys/timetc.h#3 integrate .. //depot/projects/usb/src/sys/sys/unistd.h#5 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#20 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vfsops.c#27 integrate .. //depot/projects/usb/src/sys/ufs/ffs/fs.h#8 integrate .. //depot/projects/usb/src/sys/ufs/ffs/softdep.h#4 integrate .. //depot/projects/usb/src/sys/vm/uma_core.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm_kern.c#16 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#28 integrate .. //depot/projects/usb/src/sys/vm/vm_map.h#13 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#27 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#26 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#24 integrate .. //depot/projects/usb/src/sys/vm/vm_phys.c#9 integrate .. //depot/projects/usb/src/sys/vm/vm_reserv.c#3 integrate .. //depot/projects/usb/src/sys/x86/cpufreq/est.c#3 integrate .. //depot/projects/usb/src/sys/x86/isa/clock.c#4 integrate .. //depot/projects/usb/src/sys/x86/pci/qpi.c#2 integrate .. //depot/projects/usb/src/sys/x86/x86/local_apic.c#3 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/busdma_machdep.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.92 2010/02/22 17:03:45 gibbs Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.93 2010/09/29 21:53:11 neel Exp $"); #include #include @@ -526,7 +526,7 @@ CTR4(KTR_BUSDMA, "%s: tag %p tag flags 0x%x error %d", __func__, dmat, dmat->flags, ENOMEM); return (ENOMEM); - } else if ((uintptr_t)*vaddr & (dmat->alignment - 1)) { + } else if (vtophys(*vaddr) & (dmat->alignment - 1)) { printf("bus_dmamem_alloc failed to align memory properly.\n"); } if (flags & BUS_DMA_NOCACHE) ==== //depot/projects/usb/src/sys/amd64/amd64/legacy.c#6 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.64 2010/06/11 18:46:34 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/legacy.c,v 1.65 2010/09/10 11:19:03 avg Exp $"); /* * This code implements a system driver for legacy systems that do not @@ -60,7 +60,7 @@ static int legacy_probe(device_t); static int legacy_attach(device_t); static int legacy_print_child(device_t, device_t); -static device_t legacy_add_child(device_t bus, int order, const char *name, +static device_t legacy_add_child(device_t bus, u_int order, const char *name, int unit); static int legacy_read_ivar(device_t, device_t, int, uintptr_t *); static int legacy_write_ivar(device_t, device_t, int, uintptr_t); @@ -149,7 +149,7 @@ } static device_t -legacy_add_child(device_t bus, int order, const char *name, int unit) +legacy_add_child(device_t bus, u_int order, const char *name, int unit) { device_t child; struct legacy_device *atdev; @@ -213,7 +213,7 @@ static void cpu_identify(driver_t *driver, device_t parent); static int cpu_read_ivar(device_t dev, device_t child, int index, uintptr_t *result); -static device_t cpu_add_child(device_t bus, int order, const char *name, +static device_t cpu_add_child(device_t bus, u_int order, const char *name, int unit); static struct resource_list *cpu_get_rlist(device_t dev, device_t child); @@ -277,7 +277,7 @@ } static device_t -cpu_add_child(device_t bus, int order, const char *name, int unit) +cpu_add_child(device_t bus, u_int order, const char *name, int unit) { struct cpu_device *cd; device_t child; ==== //depot/projects/usb/src/sys/amd64/amd64/machdep.c#34 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.723 2010/08/28 08:03:29 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.724 2010/09/13 07:25:35 mav Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -585,59 +585,89 @@ } void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */ +static int cpu_ident_amdc1e = 0; /* AMD C1E supported. */ +static int idle_mwait = 1; /* Use MONITOR/MWAIT for short idle. */ +TUNABLE_INT("machdep.idle_mwait", &idle_mwait); +SYSCTL_INT(_machdep, OID_AUTO, idle_mwait, CTLFLAG_RW, &idle_mwait, + 0, "Use MONITOR/MWAIT for short idle"); +#define STATE_RUNNING 0x0 +#define STATE_MWAIT 0x1 +#define STATE_SLEEPING 0x2 + static void -cpu_idle_hlt(int busy) +cpu_idle_acpi(int busy) { - /* - * we must absolutely guarentee that hlt is the next instruction - * after sti or we introduce a timing window. - */ + int *state; + + state = (int *)PCPU_PTR(monitorbuf); + *state = STATE_SLEEPING; disable_intr(); - if (sched_runnable()) + if (sched_runnable()) enable_intr(); + else if (cpu_idle_hook) + cpu_idle_hook(); else __asm __volatile("sti; hlt"); + *state = STATE_RUNNING; } static void -cpu_idle_acpi(int busy) +cpu_idle_hlt(int busy) { + int *state; + + state = (int *)PCPU_PTR(monitorbuf); + *state = STATE_SLEEPING; + /* + * We must absolutely guarentee that hlt is the next instruction + * after sti or we introduce a timing window. + */ disable_intr(); - if (sched_runnable()) + if (sched_runnable()) enable_intr(); - else if (cpu_idle_hook) - cpu_idle_hook(); else __asm __volatile("sti; hlt"); + *state = STATE_RUNNING; } -static int cpu_ident_amdc1e = 0; +/* + * MWAIT cpu power states. Lower 4 bits are sub-states. + */ +#define MWAIT_C0 0xf0 +#define MWAIT_C1 0x00 +#define MWAIT_C2 0x10 +#define MWAIT_C3 0x20 +#define MWAIT_C4 0x30 + +static void +cpu_idle_mwait(int busy) +{ + int *state; + + state = (int *)PCPU_PTR(monitorbuf); + *state = STATE_MWAIT; + if (!sched_runnable()) { + cpu_monitor(state, 0, 0); + if (*state == STATE_MWAIT) + cpu_mwait(0, MWAIT_C1); + } + *state = STATE_RUNNING; +} -static int -cpu_probe_amdc1e(void) +static void +cpu_idle_spin(int busy) { + int *state; int i; - /* - * Forget it, if we're not using local APIC timer. - */ - if (resource_disabled("apic", 0) || - (resource_int_value("apic", 0, "clock", &i) == 0 && i == 0)) - return (0); - - /* - * Detect the presence of C1E capability mostly on latest - * dual-cores (or future) k8 family. - */ - if (cpu_vendor_id == CPU_VENDOR_AMD && - (cpu_id & 0x00000f00) == 0x00000f00 && - (cpu_id & 0x0fff0000) >= 0x00040000) { - cpu_ident_amdc1e = 1; - return (1); + state = (int *)PCPU_PTR(monitorbuf); + *state = STATE_RUNNING; + for (i = 0; i < 1000; i++) { + if (sched_runnable()) + return; + cpu_spinwait(); } - - return (0); } /* @@ -655,110 +685,83 @@ #define AMDK8_CMPHALT (AMDK8_SMIONCMPHALT | AMDK8_C1EONCMPHALT) static void -cpu_idle_amdc1e(int busy) +cpu_probe_amdc1e(void) { - disable_intr(); - if (sched_runnable()) - enable_intr(); - else { - uint64_t msr; - - msr = rdmsr(MSR_AMDK8_IPM); - if (msr & AMDK8_CMPHALT) - wrmsr(MSR_AMDK8_IPM, msr & ~AMDK8_CMPHALT); - - if (cpu_idle_hook) - cpu_idle_hook(); - else - __asm __volatile("sti; hlt"); + /* + * Detect the presence of C1E capability mostly on latest + * dual-cores (or future) k8 family. + */ + if (cpu_vendor_id == CPU_VENDOR_AMD && + (cpu_id & 0x00000f00) == 0x00000f00 && + (cpu_id & 0x0fff0000) >= 0x00040000) { + cpu_ident_amdc1e = 1; } } -static void -cpu_idle_spin(int busy) -{ - return; -} - void (*cpu_idle_fn)(int) = cpu_idle_acpi; void cpu_idle(int busy) { + uint64_t msr; + + CTR2(KTR_SPARE2, "cpu_idle(%d) at %d", + busy, curcpu); #ifdef SMP if (mp_grab_cpu_hlt()) return; #endif - cpu_idle_fn(busy); -} + /* If we are busy - try to use fast methods. */ + if (busy) { + if ((cpu_feature2 & CPUID2_MON) && idle_mwait) { + cpu_idle_mwait(busy); + goto out; + } + } -/* - * mwait cpu power states. Lower 4 bits are sub-states. - */ -#define MWAIT_C0 0xf0 -#define MWAIT_C1 0x00 -#define MWAIT_C2 0x10 -#define MWAIT_C3 0x20 -#define MWAIT_C4 0x30 + /* If we have time - switch timers into idle mode. */ + if (!busy) { + critical_enter(); + cpu_idleclock(); + } -#define MWAIT_DISABLED 0x0 -#define MWAIT_WOKEN 0x1 -#define MWAIT_WAITING 0x2 + /* Apply AMD APIC timer C1E workaround. */ + if (cpu_ident_amdc1e && cpu_disable_deep_sleep) { + msr = rdmsr(MSR_AMDK8_IPM); + if (msr & AMDK8_CMPHALT) + wrmsr(MSR_AMDK8_IPM, msr & ~AMDK8_CMPHALT); + } -static void -cpu_idle_mwait(int busy) -{ - int *mwait; + /* Call main idle method. */ + cpu_idle_fn(busy); - mwait = (int *)PCPU_PTR(monitorbuf); - *mwait = MWAIT_WAITING; - if (sched_runnable()) - return; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Oct 3 10:04:22 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFCF91065694; Sun, 3 Oct 2010 10:04:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A060A106566C for ; Sun, 3 Oct 2010 10:04:21 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe03.swip.net [212.247.154.65]) by mx1.freebsd.org (Postfix) with ESMTP id 2B2D18FC12 for ; Sun, 3 Oct 2010 10:04:20 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.1 cv=iBCGAMPDYtSF9sDXX85uHY3wcnYctfVT8vFpe3qPflY= c=1 sm=1 a=aEmVUhBRFO0A:10 a=N659UExz7-8A:10 a=M8b_wTzEtboA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:17 a=m0bHr2FCAAAA:8 a=6-eTQsuGWb6EF1eBAkEA:9 a=ln0Ndzwy3C6saoFTXseuMHdn-FkA:4 a=pILNOxqGKmIA:10 a=MnI1ikcADjEx7bvsp0jZvQ==:117 Received: from [188.126.201.140] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe03.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 29848887 for perforce@freebsd.org; Sun, 03 Oct 2010 11:54:18 +0200 From: Hans Petter Selasky To: Perforce Change Reviews Date: Sun, 3 Oct 2010 11:55:32 +0200 User-Agent: KMail/1.13.5 (FreeBSD/8.1-STABLE; KDE/4.4.5; amd64; ; ) References: <201010030942.o939g87U038028@skunkworks.freebsd.org> In-Reply-To: <201010030942.o939g87U038028@skunkworks.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="windows-1252" Content-Transfer-Encoding: 7bit Message-Id: <201010031155.32741.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 184381 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 03 Oct 2010 10:04:22 -0000 > - add development feature about limiting the > maximum datagram count in each NCM payload. FYI: These deltas derive from: http://kerneltrap.org/mailarchive/linux-usb/2010/6/8/6261923/thread Which is about the same driver like we're using in FreeBSD :-) --HPS From owner-p4-projects@FreeBSD.ORG Wed Oct 6 07:50:47 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BF201065670; Wed, 6 Oct 2010 07:50:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2252D106567A for ; Wed, 6 Oct 2010 07:50:47 +0000 (UTC) (envelope-from lz@FreeBSD.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id 10DC78FC24 for ; Wed, 6 Oct 2010 07:50:47 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id o967okYq014249 for ; Wed, 6 Oct 2010 07:50:46 GMT (envelope-from lz@FreeBSD.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id o967okBd014244 for perforce@freebsd.org; Wed, 6 Oct 2010 07:50:46 GMT (envelope-from lz@FreeBSD.org) Date: Wed, 6 Oct 2010 07:50:46 GMT Message-Id: <201010060750.o967okBd014244@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to lz@FreeBSD.org using -f From: Zheng Liu To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 184461 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Oct 2010 07:50:47 -0000 http://p4web.freebsd.org/@@184461?ac=10 Change 184461 by lz@gnehzuil-freebsd on 2010/10/06 07:49:44 Modify the comment for ext2_discard_rsv() function. Affected files ... .. //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#27 edit Differences ... ==== //depot/projects/soc2010/extfs/src/sys/fs/ext2fs/ext2_alloc.c#27 (text+ko) ==== @@ -217,8 +217,7 @@ * * It is called during the following situations: * 1. free an inode - * 2. sync inode - * 3. truncate a file + * 2. truncate a file */ void ext2_discard_rsv(struct inode *ip)