Date: Wed, 23 Oct 2013 14:58:49 GMT From: Brooks Davis <brooks@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1187302 for review Message-ID: <201310231458.r9NEwn23028000@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1187302?ac=10 Change 1187302 by brooks@brooks_zenith on 2013/10/23 14:58:19 IFC @ 1187272 Other than needing to re-merge the pte.h fix, and a few more changes to BERI_SIM.hints I've merged everthing that's ready to merge. Affected files ... .. //depot/projects/ctsrd/beribsd/src/Makefile.inc1#17 integrate .. //depot/projects/ctsrd/beribsd/src/include/pthread.h#3 integrate .. //depot/projects/ctsrd/beribsd/src/share/man/man9/Makefile#10 integrate .. //depot/projects/ctsrd/beribsd/src/share/man/man9/getenv.9#1 branch .. //depot/projects/ctsrd/beribsd/src/sys/arm/arm/stack_machdep.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/boot/i386/libi386/smbios.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#15 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/ffec/if_ffec.c#2 integrate .. //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/openfirm.c#5 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/openfirm.h#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/kern/kern_poll.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#11 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#8 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#9 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#9 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cache.c#5 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cpu.c#6 integrate .. //depot/projects/ctsrd/beribsd/src/sys/mips/mips/trap.c#12 integrate .. //depot/projects/ctsrd/beribsd/src/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_ahci.c#3 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/portsnap/portsnap/portsnap.8#6 integrate .. //depot/projects/ctsrd/beribsd/src/usr.sbin/portsnap/portsnap/portsnap.sh#6 integrate Differences ... ==== //depot/projects/ctsrd/beribsd/src/Makefile.inc1#17 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: head/Makefile.inc1 256915 2013-10-22 15:53:29Z brooks $ +# $FreeBSD: head/Makefile.inc1 256921 2013-10-22 18:36:39Z cperciva $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -128,8 +128,11 @@ .endif .if !defined(VERSION) -VERSION!= uname -srp -VERSION+= ${OSRELDATE} +REVISION!= make -C ${.CURDIR}/release -V REVISION +BRANCH!= make -C ${.CURDIR}/release -V BRANCH +SRCRELDATE!= awk '/^\#define[[:space:]]*__FreeBSD_version/ { print $$3 }' \ + ${.CURDIR}/sys/sys/param.h +VERSION= FreeBSD ${REVISION}-${BRANCH} ${TARGET_ARCH} ${SRCRELDATE} .endif KNOWN_ARCHES?= amd64 arm armeb/arm armv6/arm i386 i386/pc98 ia64 mips mipsel/mips mips64el/mips mips64/mips mipsn32el/mips mipsn32/mips powerpc powerpc64/powerpc sparc64 ==== //depot/projects/ctsrd/beribsd/src/include/pthread.h#3 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/include/pthread.h 217039 2011-01-06 03:30:16Z davidxu $ + * $FreeBSD: head/include/pthread.h 256925 2013-10-22 19:53:52Z tijl $ */ #ifndef _PTHREAD_H_ #define _PTHREAD_H_ @@ -175,6 +175,7 @@ { #define pthread_cleanup_pop(execute) \ + (void)0; \ } \ __pthread_cleanup_pop_imp(execute); \ } ==== //depot/projects/ctsrd/beribsd/src/share/man/man9/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 256124 2013-10-07 20:30:05Z jhb $ +# $FreeBSD: head/share/man/man9/Makefile 256927 2013-10-22 20:10:38Z jhb $ MAN= accept_filter.9 \ accf_data.9 \ @@ -118,6 +118,7 @@ g_consumer.9 \ g_data.9 \ get_cyclecount.9 \ + getenv.9 \ getnewvnode.9 \ g_event.9 \ g_geom.9 \ @@ -677,6 +678,14 @@ g_consumer.9 g_new_consumer.9 MLINKS+=g_data.9 g_read_data.9 \ g_data.9 g_write_data.9 +MLINKS+=getenv.9 freeenv.9 \ + getenv.9 getenv_int.9 \ + getenv.9 getenv_long.9 \ + getenv.9 getenv_string.9 \ + getenv.9 getenv_quad.9 \ + getenv.9 getenv_uint.9 \ + getenv.9 getenv_ulong.9 \ + getenv.9 testenv.9 MLINKS+=g_event.9 g_cancel_event.9 \ g_event.9 g_post_event.9 \ g_event.9 g_waitfor_event.9 ==== //depot/projects/ctsrd/beribsd/src/sys/arm/arm/stack_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/arm/stack_machdep.c 250810 2013-05-19 16:25:09Z andrew $"); +__FBSDID("$FreeBSD: head/sys/arm/arm/stack_machdep.c 256941 2013-10-22 21:47:34Z cognet $"); #include <sys/systm.h> #include <sys/param.h> @@ -43,13 +43,16 @@ * APCS where it lays out the stack incorrectly. Because of this we disable * this when building for ARM EABI or when building with clang. */ + +extern vm_offset_t kernel_vm_end; + static void stack_capture(struct stack *st, u_int32_t *frame) { #if !defined(__ARM_EABI__) && !defined(__clang__) vm_offset_t callpc; - while (INKERNEL(frame)) { + while (INKERNEL(frame) && (vm_offset_t)frame < kernel_vm_end) { callpc = frame[FR_SCP]; if (stack_put(st, callpc) == -1) break; ==== //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/if_npe.c 243882 2012-12-05 08:04:20Z glebius $"); +__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/if_npe.c 256943 2013-10-22 21:51:07Z cognet $"); /* * Intel XScale NPE Ethernet driver. @@ -507,7 +507,6 @@ dma->name, error); return error; } - /* XXX COHERENT for now */ if (bus_dmamem_alloc(dma->buf_tag, (void **)&dma->hwbuf, BUS_DMA_NOWAIT | BUS_DMA_ZERO | BUS_DMA_COHERENT, &dma->buf_map) != 0) { @@ -1073,6 +1072,7 @@ m->m_pkthdr.len = m->m_len = 1536; /* backload payload and align ip hdr */ m->m_data = m->m_ext.ext_buf + (m->m_ext.ext_size - (1536+ETHER_ALIGN)); + bus_dmamap_unload(dma->mtag, npe->ix_map); error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m, segs, &nseg, 0); if (error != 0) { @@ -1085,6 +1085,8 @@ /* NB: buffer length is shifted in word */ hw->ix_ne[0].len = htobe32(segs[0].ds_len << 16); hw->ix_ne[0].next = 0; + bus_dmamap_sync(dma->buf_tag, dma->buf_map, + BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); npe->ix_m = m; /* Flush the memory in the mbuf */ bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_PREREAD); @@ -1110,6 +1112,8 @@ struct npebuf *npe = P2V(NPE_QM_Q_ADDR(entry), dma); struct mbuf *m; + bus_dmamap_sync(dma->buf_tag, dma->buf_map, + BUS_DMASYNC_POSTREAD); DPRINTF(sc, "%s: entry 0x%x neaddr 0x%x ne_len 0x%x\n", __func__, entry, npe->ix_neaddr, npe->ix_hw->ix_ne[0].len); /* @@ -1130,7 +1134,6 @@ bus_dmamap_sync(dma->mtag, npe->ix_map, BUS_DMASYNC_POSTREAD); - /* XXX flush hw buffer; works now 'cuz coherent */ /* set m_len etc. per rx frame size */ mrx->m_len = be32toh(hw->ix_ne[0].len) & 0xffff; mrx->m_pkthdr.len = mrx->m_len; @@ -1313,6 +1316,7 @@ return; } npe = sc->tx_free; + bus_dmamap_unload(dma->mtag, npe->ix_map); error = bus_dmamap_load_mbuf_sg(dma->mtag, npe->ix_map, m, segs, &nseg, 0); if (error == EFBIG) { @@ -1355,7 +1359,8 @@ next += sizeof(hw->ix_ne[0]); } hw->ix_ne[i-1].next = 0; /* zero last in chain */ - /* XXX flush descriptor instead of using uncached memory */ + bus_dmamap_sync(dma->buf_tag, dma->buf_map, + BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE); DPRINTF(sc, "%s: qwrite(%u, 0x%x) ne_data %x ne_len 0x%x\n", __func__, sc->tx_qid, npe->ix_neaddr, ==== //depot/projects/ctsrd/beribsd/src/sys/arm/xscale/ixp425/ixp425_mem.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 186352 2008-12-20 03:26:09Z sam $"); +__FBSDID("$FreeBSD: head/sys/arm/xscale/ixp425/ixp425_mem.c 256942 2013-10-22 21:49:58Z cognet $"); #include <sys/param.h> #include <sys/systm.h> @@ -76,7 +76,7 @@ size = sdram_other[MCU_SDR_CONFIG_MCONF(sdr_config)]; if (size == 0) { - printf("** SDR_CONFIG retuns unknown value, using 32M\n"); + printf("** SDR_CONFIG returns unknown value, using 32M\n"); size = 32 * 1024 * 1024; } ==== //depot/projects/ctsrd/beribsd/src/sys/boot/i386/libi386/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/boot/i386/libi386/Makefile 239066 2012-08-05 14:37:48Z ae $ +# $FreeBSD: head/sys/boot/i386/libi386/Makefile 256940 2013-10-22 21:32:28Z jkim $ # LIB= i386 INTERNALLIB= @@ -36,6 +36,9 @@ .if defined(BOOT_LITTLE_ENDIAN_UUID) # Use little-endian UUID format as defined in SMBIOS 2.6. CFLAGS+= -DSMBIOS_LITTLE_ENDIAN_UUID +.elif defined(BOOT_NETWORK_ENDIAN_UUID) +# Use network-endian UUID format for backward compatibility. +CFLAGS+= -DSMBIOS_NETWORK_ENDIAN_UUID .endif .endif ==== //depot/projects/ctsrd/beribsd/src/sys/boot/i386/libi386/smbios.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/smbios.c 190814 2009-04-07 17:58:15Z jkim $"); +__FBSDID("$FreeBSD: head/sys/boot/i386/libi386/smbios.c 256940 2013-10-22 21:32:28Z jkim $"); #include <stand.h> #include <bootstrap.h> @@ -122,7 +122,7 @@ smbios_setuuid(const char *name, const caddr_t addr, const int ver) { char uuid[37]; - int i, ones, zeros; + int byteorder, i, ones, zeros; UUID_TYPE n; uint32_t f1; uint16_t f2, f3; @@ -152,14 +152,18 @@ * Note: We use network byte order for backward compatibility * unless SMBIOS version is 2.6+ or little-endian is forced. */ -#ifndef SMBIOS_LITTLE_ENDIAN_UUID - if (ver < 0x0206) { +#if defined(SMBIOS_LITTLE_ENDIAN_UUID) + byteorder = LITTLE_ENDIAN; +#elif defined(SMBIOS_NETWORK_ENDIAN_UUID) + byteorder = BIG_ENDIAN; +#else + byteorder = ver < 0x0206 ? BIG_ENDIAN : LITTLE_ENDIAN; +#endif + if (byteorder != LITTLE_ENDIAN) { f1 = ntohl(SMBIOS_GET32(addr, 0)); f2 = ntohs(SMBIOS_GET16(addr, 4)); f3 = ntohs(SMBIOS_GET16(addr, 6)); - } else -#endif - { + } else { f1 = le32toh(SMBIOS_GET32(addr, 0)); f2 = le16toh(SMBIOS_GET16(addr, 4)); f3 = le16toh(SMBIOS_GET16(addr, 6)); ==== //depot/projects/ctsrd/beribsd/src/sys/conf/options.mips#15 (text+ko) ==== @@ -26,7 +26,7 @@ # SUCH DAMAGE. # # JNPR: options.mips,v 1.2 2006/09/15 12:52:34 -# $FreeBSD: head/sys/conf/options.mips 256170 2013-10-09 00:21:21Z adrian $ +# $FreeBSD: head/sys/conf/options.mips 256937 2013-10-22 21:16:57Z brooks $ CPU_MIPS4KC opt_global.h CPU_MIPS24KC opt_global.h @@ -86,7 +86,7 @@ OCTEON_BOARD_CAPK_0100ND opt_cvmx.h # -# Options specific to the BERI and CHERI CPUs. +# Options specific to the BERI platform. # BERI_LARGE_TLB opt_global.h ==== //depot/projects/ctsrd/beribsd/src/sys/dev/ffec/if_ffec.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/ffec/if_ffec.c 256806 2013-10-20 21:07:38Z ian $"); +__FBSDID("$FreeBSD: head/sys/dev/ffec/if_ffec.c 256919 2013-10-22 18:14:06Z ian $"); /* * Driver for Freescale Fast Ethernet Controller, found on imx-series SoCs among @@ -883,7 +883,7 @@ * assigned bit set, and the broadcast/multicast bit clear. */ palr = RD4(sc, FEC_PALR_REG); - paur = RD4(sc, FEC_PAUR_REG); + paur = RD4(sc, FEC_PAUR_REG) & FEC_PAUR_PADDR2_MASK; if ((palr | paur) != 0) { hwaddr[0] = palr >> 24; hwaddr[1] = palr >> 16; @@ -891,7 +891,6 @@ hwaddr[3] = palr >> 0; hwaddr[4] = paur >> 24; hwaddr[5] = paur >> 16; - return; } else { rnd = arc4random() & 0x00ffffff; hwaddr[0] = 'b'; ==== //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/openfirm.c#5 (text+ko) ==== @@ -56,7 +56,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/dev/ofw/openfirm.c 255596 2013-09-15 14:19:17Z nwhitehorn $"); +__FBSDID("$FreeBSD: head/sys/dev/ofw/openfirm.c 256938 2013-10-22 21:20:05Z nwhitehorn $"); #include "opt_platform.h" @@ -64,6 +64,7 @@ #include <sys/kernel.h> #include <sys/malloc.h> #include <sys/systm.h> +#include <sys/endian.h> #include <machine/stdarg.h> @@ -280,6 +281,21 @@ return (OFW_GETPROP(ofw_obj, package, propname, buf, buflen)); } +ssize_t +OF_getencprop(phandle_t node, const char *propname, pcell_t *buf, size_t len) +{ + ssize_t retval; + int i; + + KASSERT(len % 4 == 0, ("Need a multiple of 4 bytes")); + + retval = OF_getprop(node, propname, buf, len); + for (i = 0; i < len/4; i++) + buf[i] = be32toh(buf[i]); + + return (retval); +} + /* * Recursively search the node and its parent for the given property, working * downward from the node to the device tree root. Returns the value of the @@ -296,6 +312,17 @@ return (-1); } +ssize_t +OF_searchencprop(phandle_t node, const char *propname, void *buf, size_t len) +{ + ssize_t rv; + + for (; node != 0; node = OF_parent(node)) + if ((rv = OF_getencprop(node, propname, buf, len)) != -1) + return (rv); + return (-1); +} + /* * Store the value of a property of a package into newly allocated memory * (using the M_OFWPROP malloc pool and M_WAITOK). elsz is the size of a @@ -320,6 +347,26 @@ return (len / elsz); } +ssize_t +OF_getencprop_alloc(phandle_t package, const char *name, int elsz, void **buf) +{ + ssize_t retval; + pcell_t *cell; + int i; + + KASSERT(elsz % 4 == 0, ("Need a multiple of 4 bytes")); + + retval = OF_getprop_alloc(package, name, elsz, buf); + if (retval == -1) + return (retval); + + cell = *buf; + for (i = 0; i < retval*elsz/4; i++) + cell[i] = be32toh(cell[i]); + + return (retval); +} + /* Get the next property of a package. */ int OF_nextprop(phandle_t package, const char *previous, char *buf, size_t size) ==== //depot/projects/ctsrd/beribsd/src/sys/dev/ofw/openfirm.h#5 (text+ko) ==== @@ -54,7 +54,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: head/sys/dev/ofw/openfirm.h 255596 2013-09-15 14:19:17Z nwhitehorn $ + * $FreeBSD: head/sys/dev/ofw/openfirm.h 256938 2013-10-22 21:20:05Z nwhitehorn $ */ #ifndef _DEV_OPENFIRM_H_ @@ -105,11 +105,17 @@ ssize_t OF_getproplen(phandle_t node, const char *propname); ssize_t OF_getprop(phandle_t node, const char *propname, void *buf, size_t len); +ssize_t OF_getencprop(phandle_t node, const char *prop, pcell_t *buf, + size_t len); /* Same as getprop, but maintains endianness */ int OF_hasprop(phandle_t node, const char *propname); ssize_t OF_searchprop(phandle_t node, const char *propname, void *buf, size_t len); +ssize_t OF_searchencprop(phandle_t node, const char *propname, + void *buf, size_t len); ssize_t OF_getprop_alloc(phandle_t node, const char *propname, int elsz, void **buf); +ssize_t OF_getencprop_alloc(phandle_t node, const char *propname, + int elsz, void **buf); int OF_nextprop(phandle_t node, const char *propname, char *buf, size_t len); int OF_setprop(phandle_t node, const char *name, const void *buf, ==== //depot/projects/ctsrd/beribsd/src/sys/kern/kern_poll.c#6 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/kern/kern_poll.c 254031 2013-08-07 07:22:56Z kevlo $"); +__FBSDID("$FreeBSD: head/sys/kern/kern_poll.c 256945 2013-10-22 22:03:01Z brooks $"); #include "opt_device_polling.h" ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/beri_pic.c#11 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/mips/beri/beri_pic.c 256911 2013-10-22 15:29:59Z brooks $"); +__FBSDID("$FreeBSD: head/sys/mips/beri/beri_pic.c 256936 2013-10-22 21:13:02Z brooks $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/ctsrd/beribsd/src/sys/mips/beri/std.beri#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/sys/mips/beri/std.beri 239671 2012-08-25 08:31:21Z rwatson $ +# $FreeBSD: head/sys/mips/beri/std.beri 256935 2013-10-22 21:08:25Z brooks $ files "../beri/files.beri" cpu CPU_MIPS4KC ==== //depot/projects/ctsrd/beribsd/src/sys/mips/conf/BERI_DE4_BASE#9 (text+ko) ==== @@ -4,7 +4,7 @@ # configuration. This kernel configration must be further specialized to # to include a root filesystem specification. # -# $FreeBSD: head/sys/mips/conf/BERI_DE4_BASE 256912 2013-10-22 15:45:31Z brooks $ +# $FreeBSD: head/sys/mips/conf/BERI_DE4_BASE 256931 2013-10-22 20:50:41Z brooks $ # include "BERI_TEMPLATE" ==== //depot/projects/ctsrd/beribsd/src/sys/mips/include/cpufunc.h#9 (text+ko) ==== @@ -53,7 +53,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * JNPR: cpufunc.h,v 1.5 2007/08/09 11:23:32 katta - * $FreeBSD: head/sys/mips/include/cpufunc.h 249776 2013-04-22 19:02:37Z brooks $ + * $FreeBSD: head/sys/mips/include/cpufunc.h 256935 2013-10-22 21:08:25Z brooks $ */ #ifndef _MACHINE_CPUFUNC_H_ ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cache.c#5 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/mips/mips/cache.c 232896 2012-03-12 21:25:32Z jmallett $"); +__FBSDID("$FreeBSD: head/sys/mips/mips/cache.c 256937 2013-10-22 21:16:57Z brooks $"); #include <sys/types.h> #include <sys/systm.h> ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/cpu.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/mips/mips/cpu.c 232896 2012-03-12 21:25:32Z jmallett $"); +__FBSDID("$FreeBSD: head/sys/mips/mips/cpu.c 256937 2013-10-22 21:16:57Z brooks $"); #include <sys/param.h> #include <sys/kernel.h> ==== //depot/projects/ctsrd/beribsd/src/sys/mips/mips/trap.c#12 (text+ko) ==== @@ -39,7 +39,7 @@ * JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 girish */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 250138 2013-05-01 06:57:46Z imp $"); +__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 256939 2013-10-22 21:27:22Z brooks $"); #include "opt_compat.h" #include "opt_ddb.h" ==== //depot/projects/ctsrd/beribsd/src/sys/netinet/tcp_input.c#10 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 256186 2013-10-09 12:00:38Z glebius $"); +__FBSDID("$FreeBSD: head/sys/netinet/tcp_input.c 256920 2013-10-22 18:24:34Z andre $"); #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" @@ -508,10 +508,13 @@ * the ack that opens up a 0-sized window and * - delayed acks are enabled or * - this is a half-synchronized T/TCP connection. + * - the segment size is not larger than the MSS and LRO wasn't used + * for this segment. */ -#define DELAY_ACK(tp) \ +#define DELAY_ACK(tp, tlen) \ ((!tcp_timer_active(tp, TT_DELACK) && \ (tp->t_flags & TF_RXWIN0SENT) == 0) && \ + (tlen <= tp->t_maxopd) && \ (V_tcp_delack_enabled || (tp->t_flags & TF_NEEDSYN))) /* @@ -1863,7 +1866,7 @@ } /* NB: sorwakeup_locked() does an implicit unlock. */ sorwakeup_locked(so); - if (DELAY_ACK(tp)) { + if (DELAY_ACK(tp, tlen)) { tp->t_flags |= TF_DELACK; } else { tp->t_flags |= TF_ACKNOW; @@ -1954,7 +1957,7 @@ * If there's data, delay ACK; if there's also a FIN * ACKNOW will be turned on later. */ - if (DELAY_ACK(tp) && tlen != 0) + if (DELAY_ACK(tp, tlen) && tlen != 0) tcp_timer_activate(tp, TT_DELACK, tcp_delacktime); else @@ -2926,7 +2929,7 @@ if (th->th_seq == tp->rcv_nxt && LIST_EMPTY(&tp->t_segq) && TCPS_HAVEESTABLISHED(tp->t_state)) { - if (DELAY_ACK(tp)) + if (DELAY_ACK(tp, tlen)) tp->t_flags |= TF_DELACK; else tp->t_flags |= TF_ACKNOW; ==== //depot/projects/ctsrd/beribsd/src/usr.sbin/bhyve/pci_ahci.c#3 (text+ko) ==== @@ -23,11 +23,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/usr.sbin/bhyve/pci_ahci.c 256709 2013-10-17 21:56:39Z grehan $ + * $FreeBSD: head/usr.sbin/bhyve/pci_ahci.c 256926 2013-10-22 19:55:04Z grehan $ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/usr.sbin/bhyve/pci_ahci.c 256709 2013-10-17 21:56:39Z grehan $"); +__FBSDID("$FreeBSD: head/usr.sbin/bhyve/pci_ahci.c 256926 2013-10-22 19:55:04Z grehan $"); #include <sys/param.h> #include <sys/linker_set.h> @@ -663,8 +663,7 @@ uint8_t buf[8]; uint64_t sectors; - sectors = blockif_size(p->bctx) / blockif_sectsz(p->bctx); - sectors >>= 2; + sectors = blockif_size(p->bctx) / 2048; be32enc(buf, sectors - 1); be32enc(buf + 4, 2048); cfis[4] = (cfis[4] & ~7) | ATA_I_CMD | ATA_I_IN; @@ -908,9 +907,9 @@ /* * Build up the iovec based on the prdt */ - for (i = 0; i < hdr->prdtl; i++) { + for (i = 0; i < iovcnt; i++) { breq->br_iov[i].iov_base = paddr_guest2host(ahci_ctx(sc), - prdt->dba, prdt->dbc + 1); + prdt->dba, prdt->dbc + 1); breq->br_iov[i].iov_len = prdt->dbc + 1; aior->done += (prdt->dbc + 1); prdt++; ==== //depot/projects/ctsrd/beribsd/src/usr.sbin/portsnap/portsnap/portsnap.8#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: head/usr.sbin/portsnap/portsnap/portsnap.8 250604 2013-05-13 18:13:50Z joel $ +.\" $FreeBSD: head/usr.sbin/portsnap/portsnap/portsnap.8 256923 2013-10-22 18:55:52Z gavin $ .\" -.Dd October 14, 2012 +.Dd October 22, 2013 .Dt PORTSNAP 8 .Os FreeBSD .Sh NAME @@ -161,6 +161,18 @@ commands. Again, note that in the parts of the ports tree which are being updated, any local changes or additions will be removed. +.It auto +Run +.Cm fetch +or +.Cm cron +depending on whether stdin is a terminal; then run +.Cm update +or +.Cm extract +depending on whether +.Ar portsdir +exists. .El .Sh TIPS .Bl -bullet ==== //depot/projects/ctsrd/beribsd/src/usr.sbin/portsnap/portsnap/portsnap.sh#6 (text+ko) ==== @@ -25,7 +25,7 @@ # IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE # POSSIBILITY OF SUCH DAMAGE. -# $FreeBSD: head/usr.sbin/portsnap/portsnap/portsnap.sh 253224 2013-07-11 22:19:18Z cperciva $ +# $FreeBSD: head/usr.sbin/portsnap/portsnap/portsnap.sh 256923 2013-10-22 18:55:52Z gavin $ #### Usage function -- called from command-line handling code. @@ -61,6 +61,8 @@ files and directories. update -- Update ports tree to match current snapshot, replacing files and directories which have changed. + auto -- Fetch updates, and either extract a new ports tree or + update an existing tree. EOF exit 0 } @@ -147,12 +149,15 @@ if [ ! -z "${SERVERNAME}" ]; then usage; fi shift; SERVERNAME="$1" ;; - cron | extract | fetch | update | alfred) + cron | extract | fetch | update | auto) COMMANDS="${COMMANDS} $1" ;; up) COMMANDS="${COMMANDS} update" ;; + alfred) + COMMANDS="${COMMANDS} auto" + ;; *) if [ $# -gt 1 ]; then usage; fi if echo ${COMMANDS} | grep -vq extract; then @@ -1104,10 +1109,10 @@ update_run || exit 1 } -# Alfred command. Run 'fetch' or 'cron' depending on +# Auto command. Run 'fetch' or 'cron' depending on # whether stdin is a terminal; then run 'update' or # 'extract' depending on whether ${PORTSDIR} exists. -cmd_alfred() { +cmd_auto() { if [ "${INTERACTIVE}" = "YES" ]; then cmd_fetch else
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231458.r9NEwn23028000>