svn commit: r307955 - in head/sys/boot/i386: gptboot gptzfsboot
Author: imp Date: Wed Oct 26 05:26:59 2016 New Revision: 307955 URL: https://svnweb.freebsd.org/changeset/base/307955 Log: LIBSTAND goes last, so put it last here too. Modified: head/sys/boot/i386/gptboot/Makefile head/sys/boot/i386/gptzfsboot/Makefile Modified: head/sys/boot/i386/gptboot/Makefile == --- head/sys/boot/i386/gptboot/Makefile Wed Oct 26 05:26:58 2016 (r307954) +++ head/sys/boot/i386/gptboot/Makefile Wed Oct 26 05:26:59 2016 (r307955) @@ -75,7 +75,7 @@ gptboot.bin: gptboot.out ${OBJCOPY} -S -O binary gptboot.out ${.TARGET} gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o cons.o util.o ${OPENCRYPTO_XTS} - ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} ${LIBGELIBOOT} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSTAND} gptboot.o: ${.CURDIR}/../../common/ufsread.c Modified: head/sys/boot/i386/gptzfsboot/Makefile == --- head/sys/boot/i386/gptzfsboot/Makefile Wed Oct 26 05:26:58 2016 (r307954) +++ head/sys/boot/i386/gptzfsboot/Makefile Wed Oct 26 05:26:59 2016 (r307955) @@ -78,7 +78,7 @@ gptzfsboot.bin: gptzfsboot.out gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o \ skein.o skein_block.o ${OPENCRYPTO_XTS} - ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} ${LIBGELIBOOT} + ${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSTAND} zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307954 - head/sys/boot/i386
Author: imp Date: Wed Oct 26 05:26:58 2016 New Revision: 307954 URL: https://svnweb.freebsd.org/changeset/base/307954 Log: Back out the move to the loader script from -N. This should fix the crypto-using boot problems. Modified: head/sys/boot/i386/Makefile.inc Modified: head/sys/boot/i386/Makefile.inc == --- head/sys/boot/i386/Makefile.inc Wed Oct 26 05:06:23 2016 (r307953) +++ head/sys/boot/i386/Makefile.inc Wed Oct 26 05:26:58 2016 (r307954) @@ -30,7 +30,9 @@ BTXCRT= ${BTXDIR}/lib/crt0.o # compact binary with no padding between text, data, bss LDSCRIPT= ${SRCTOP}/sys/boot/i386/boot.ldscript -LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary -LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections +# LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-T,${LDSCRIPT},-S,--oformat,binary +# LD_FLAGS_BIN=-static -T ${LDSCRIPT} --gc-sections +LDFLAGS_BIN=-e start -Ttext ${ORG} -Wl,-N,-S,--oformat,binary +LD_FLAGS_BIN=-static -N --gc-sections .include "../Makefile.inc" ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307953 - head/sys/dev/hyperv/vmbus
Author: sephe Date: Wed Oct 26 05:06:23 2016 New Revision: 307953 URL: https://svnweb.freebsd.org/changeset/base/307953 Log: hyperv/vmbus: Implement vmbus_chan_printf. And use it for vmbus channel logging, which can log the channel owner's name properly, instead of vmbus0. Submitted by: QianYue You MFC after:1 week Sponsored by: Microsoft Modified: head/sys/dev/hyperv/vmbus/vmbus_chan.c Modified: head/sys/dev/hyperv/vmbus/vmbus_chan.c == --- head/sys/dev/hyperv/vmbus/vmbus_chan.c Wed Oct 26 04:26:17 2016 (r307952) +++ head/sys/dev/hyperv/vmbus/vmbus_chan.c Wed Oct 26 05:06:23 2016 (r307953) @@ -30,6 +30,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include #include @@ -39,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include @@ -90,6 +92,9 @@ static void vmbus_chan_msgproc_chresci struct vmbus_softc *, const struct vmbus_message *); +static int vmbus_chan_printf(const struct vmbus_channel *, + const char *, ...) __printflike(2, 3); + /* * Vmbus channel message processing. */ @@ -304,7 +309,7 @@ vmbus_chan_open(struct vmbus_channel *ch PAGE_SIZE, 0, txbr_size + rxbr_size, >ch_bufring_dma, BUS_DMA_WAITOK); if (chan->ch_bufring == NULL) { - device_printf(chan->ch_dev, "bufring allocation failed\n"); + vmbus_chan_printf(chan, "bufring allocation failed\n"); return (ENOMEM); } @@ -336,7 +341,7 @@ vmbus_chan_open_br(struct vmbus_channel uint8_t *br; if (udlen > VMBUS_CHANMSG_CHOPEN_UDATA_SIZE) { - device_printf(sc->vmbus_dev, + vmbus_chan_printf(chan, "invalid udata len %d for chan%u\n", udlen, chan->ch_id); return EINVAL; } @@ -386,7 +391,7 @@ vmbus_chan_open_br(struct vmbus_channel error = vmbus_chan_gpadl_connect(chan, cbr->cbr_paddr, txbr_size + rxbr_size, >ch_bufring_gpadl); if (error) { - device_printf(sc->vmbus_dev, + vmbus_chan_printf(chan, "failed to connect bufring GPADL to chan%u\n", chan->ch_id); goto failed; } @@ -402,7 +407,7 @@ vmbus_chan_open_br(struct vmbus_channel */ mh = vmbus_msghc_get(sc, sizeof(*req)); if (mh == NULL) { - device_printf(sc->vmbus_dev, + vmbus_chan_printf(chan, "can not get msg hypercall for chopen(chan%u)\n", chan->ch_id); error = ENXIO; @@ -421,7 +426,7 @@ vmbus_chan_open_br(struct vmbus_channel error = vmbus_msghc_exec(sc, mh); if (error) { - device_printf(sc->vmbus_dev, + vmbus_chan_printf(chan, "chopen(chan%u) msg hypercall exec failed: %d\n", chan->ch_id, error); vmbus_msghc_put(sc, mh); @@ -436,13 +441,12 @@ vmbus_chan_open_br(struct vmbus_channel if (status == 0) { if (bootverbose) { - device_printf(sc->vmbus_dev, "chan%u opened\n", - chan->ch_id); + vmbus_chan_printf(chan, "chan%u opened\n", chan->ch_id); } return 0; } - device_printf(sc->vmbus_dev, "failed to open chan%u\n", chan->ch_id); + vmbus_chan_printf(chan, "failed to open chan%u\n", chan->ch_id); error = ENXIO; failed: @@ -485,7 +489,7 @@ vmbus_chan_gpadl_connect(struct vmbus_ch * We don't support multiple GPA ranges. */ if (range_len > UINT16_MAX) { - device_printf(sc->vmbus_dev, "GPA too large, %d pages\n", + vmbus_chan_printf(chan, "GPA too large, %d pages\n", page_count); return EOPNOTSUPP; } @@ -514,8 +518,8 @@ vmbus_chan_gpadl_connect(struct vmbus_ch chm_range.gpa_page[cnt]); mh = vmbus_msghc_get(sc, reqsz); if (mh == NULL) { - device_printf(sc->vmbus_dev, - "can not get msg hypercall for gpadl->chan%u\n", + vmbus_chan_printf(chan, + "can not get msg hypercall for gpadl_conn(chan%u)\n", chan->ch_id); return EIO; } @@ -533,8 +537,8 @@ vmbus_chan_gpadl_connect(struct vmbus_ch error = vmbus_msghc_exec(sc, mh); if (error) { - device_printf(sc->vmbus_dev, - "gpadl->chan%u msg hypercall exec failed: %d\n", + vmbus_chan_printf(chan, + "gpadl_conn(chan%u) msg hypercall exec failed: %d\n", chan->ch_id,
svn commit: r307952 - head/sys/dev/hyperv/vmbus
Author: sephe Date: Wed Oct 26 04:26:17 2016 New Revision: 307952 URL: https://svnweb.freebsd.org/changeset/base/307952 Log: hyperv/vmbus: Add missing white space. Submitted by: QianYue You MFC after:1 week Sponsored by: Microsoft Modified: head/sys/dev/hyperv/vmbus/vmbus.c Modified: head/sys/dev/hyperv/vmbus/vmbus.c == --- head/sys/dev/hyperv/vmbus/vmbus.c Tue Oct 25 19:04:44 2016 (r307951) +++ head/sys/dev/hyperv/vmbus/vmbus.c Wed Oct 26 04:26:17 2016 (r307952) @@ -863,7 +863,7 @@ vmbus_intr_setup(struct vmbus_softc *sc) device_printf(sc->vmbus_dev, "cannot find free IDT vector\n"); return ENXIO; } - if(bootverbose) { + if (bootverbose) { device_printf(sc->vmbus_dev, "vmbus IDT vector %d\n", sc->vmbus_idtvec); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307861 - in head: contrib/libarchive contrib/libarchive/cat/test contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/tar/t
Cool. Thanks! Also, does this need an SA like the previous libarchive updates? Thanks, Shawn On Tue, Oct 25, 2016 at 11:56:40PM +0200, Martin Matuska wrote: > Hi Shawn, > > I forgot to mention it in the commit message: MFC to stable/11 and > stable/10 is 1 week. > > Cheers, > mm > > > On 25.10.2016 17:16, Shawn Webb wrote: > > On Mon, Oct 24, 2016 at 02:08:06PM +, Martin Matuska wrote: > >> Author: mm > >> Date: Mon Oct 24 14:08:05 2016 > >> New Revision: 307861 > >> URL: https://svnweb.freebsd.org/changeset/base/307861 > >> > >> Log: > >> MFV r307859: > >> Update libarchive to 3.2.2 > > Hey Martin, > > > > Thanks for doing this upgrade! Any plans to MFC? > > > > Thanks, > > > > -- Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE signature.asc Description: PGP signature
Re: svn commit: r307861 - in head: contrib/libarchive contrib/libarchive/cat/test contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/tar/t
Hi Shawn, I forgot to mention it in the commit message: MFC to stable/11 and stable/10 is 1 week. Cheers, mm On 25.10.2016 17:16, Shawn Webb wrote: > On Mon, Oct 24, 2016 at 02:08:06PM +, Martin Matuska wrote: >> Author: mm >> Date: Mon Oct 24 14:08:05 2016 >> New Revision: 307861 >> URL: https://svnweb.freebsd.org/changeset/base/307861 >> >> Log: >> MFV r307859: >> Update libarchive to 3.2.2 > Hey Martin, > > Thanks for doing this upgrade! Any plans to MFC? > > Thanks, > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307936 - head/sys/amd64/amd64
On 10/25/16, Tijl Coosemanswrote: > On Tue, 25 Oct 2016 17:13:46 + (UTC) Gleb Smirnoff > wrote: >> Author: glebius >> Date: Tue Oct 25 17:13:46 2016 >> New Revision: 307936 >> URL: https://svnweb.freebsd.org/changeset/base/307936 >> >> Log: >> The argument validation in r296956 was not enough to close all possible >> overflows in sysarch(2). >> >> Submitted by: Kun Yang >> Patch by: kib >> Security: SA-16:15 >> >> Modified: >> head/sys/amd64/amd64/sys_machdep.c > > This patch and r296956 need to be applied to i386 too, don't they? And what's about this for i386: commit 3f32edbd77088eb3437503cca9fc4881d8e382e6 Author: tijl Date: Sun Sep 25 18:29:02 2016 + MFamd64: r266901 Allocate a zeroed LDT. Failing to do this might result in the LDT appearing to run out of free descriptors because of random junk in the descriptor's 'sd_type' field. http://lists.freebsd.org/pipermail/freebsd-amd64/2014-May/016088.html PR: 212639 Submitted by: wheelcomp...@gmail.com MFC after: 2 weeks > ___ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org" > ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307936 - head/sys/amd64/amd64
On Tue, 25 Oct 2016 17:13:46 + (UTC) Gleb Smirnoffwrote: > Author: glebius > Date: Tue Oct 25 17:13:46 2016 > New Revision: 307936 > URL: https://svnweb.freebsd.org/changeset/base/307936 > > Log: > The argument validation in r296956 was not enough to close all possible > overflows in sysarch(2). > > Submitted by: Kun Yang > Patch by: kib > Security: SA-16:15 > > Modified: > head/sys/amd64/amd64/sys_machdep.c This patch and r296956 need to be applied to i386 too, don't they? ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307950 - head/sys/boot
Author: imp Date: Tue Oct 25 19:04:42 2016 New Revision: 307950 URL: https://svnweb.freebsd.org/changeset/base/307950 Log: Add it to the right place Added: head/sys/boot/Makefile.ficl - copied, changed from r307949, head/Makefile.ficl Copied and modified: head/sys/boot/Makefile.ficl (from r307949, head/Makefile.ficl) == ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307951 - in head: . sys/boot/efi/libefi
Author: imp Date: Tue Oct 25 19:04:44 2016 New Revision: 307951 URL: https://svnweb.freebsd.org/changeset/base/307951 Log: Fix two backwards tests. CID: 1365227, 1365228 Deleted: head/Makefile.ficl Modified: head/sys/boot/efi/libefi/env.c Modified: head/sys/boot/efi/libefi/env.c == --- head/sys/boot/efi/libefi/env.c Tue Oct 25 19:04:42 2016 (r307950) +++ head/sys/boot/efi/libefi/env.c Tue Oct 25 19:04:44 2016 (r307951) @@ -114,7 +114,7 @@ ficlEfiSetenv(FICL_VM *pVM) #ifndef TESTMAIN guid = (char*)ficlMalloc(guids); - if (guid != NULL) + if (guid == NULL) vmThrowErr(pVM, "Error: out of memory"); memcpy(guid, guidp, guids); uuid_from_string(guid, , ); @@ -131,7 +131,7 @@ ficlEfiSetenv(FICL_VM *pVM) name[names] = (CHAR16)0; value = (char*)ficlMalloc(values + 1); - if (value != NULL) + if (value == NULL) vmThrowErr(pVM, "Error: out of memory"); memcpy(value, valuep, values); @@ -166,7 +166,7 @@ ficlEfiGetenv(FICL_VM *pVM) #ifndef TESTMAIN name = (char*) ficlMalloc(names+1); - if (!name) + if (name == NULL) vmThrowErr(pVM, "Error: out of memory"); strncpy(name, namep, names); name[names] = '\0'; @@ -201,7 +201,7 @@ ficlEfiUnsetenv(FICL_VM *pVM) #ifndef TESTMAIN name = (char*) ficlMalloc(names+1); - if (!name) + if (name == NULL) vmThrowErr(pVM, "Error: out of memory"); strncpy(name, namep, names); name[names] = '\0'; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307949 - head
Author: imp Date: Tue Oct 25 18:57:25 2016 New Revision: 307949 URL: https://svnweb.freebsd.org/changeset/base/307949 Log: Add missing file Added: head/Makefile.ficl (contents, props changed) Added: head/Makefile.ficl == --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/Makefile.ficl Tue Oct 25 18:57:25 2016(r307949) @@ -0,0 +1,43 @@ +# $FreeBSD$ + +# Common flags to build FICL related files + +FICLDIR?= ${SRCTOP}/sys/boot/ficl + +.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32) +FICL_CPUARCH= i386 +.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" +FICL_CPUARCH= mips64 +.else +FICL_CPUARCH= ${MACHINE_CPUARCH} +.endif + +.PATH: ${FICLDIR} ${FICLDIR}/${FICL_CPUARCH} + +.if ${MACHINE_CPUARCH} == "amd64" +.if defined(FICL32) +CFLAGS+= -m32 -I. +.else +CFLAGS+= -fPIC +.endif +.endif + +.if ${MACHINE_ARCH} == "powerpc64" +CFLAGS+= -m32 -mcpu=powerpc -I. +.endif + +CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \ + -I${FICLDIR}/../common + +.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32) +.if !exists(machine) +${SRCS:M*.c:R:S/$/.o/g}: machine + +beforedepend ${OBJS}: machine +.endif + +machine: .NOMETA + ln -sf ${.CURDIR}/../../i386/include machine + +CLEANFILES+= machine +.endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307948 - head/lib/libsysdecode
Author: jhb Date: Tue Oct 25 18:45:14 2016 New Revision: 307948 URL: https://svnweb.freebsd.org/changeset/base/307948 Log: Use binary and (&) instead of logical to extract the mask of a capability. CID: 1365227 Submitted by: cem Modified: head/lib/libsysdecode/flags.c Modified: head/lib/libsysdecode/flags.c == --- head/lib/libsysdecode/flags.c Tue Oct 25 18:43:36 2016 (r307947) +++ head/lib/libsysdecode/flags.c Tue Oct 25 18:45:14 2016 (r307948) @@ -959,7 +959,7 @@ sysdecode_umtx_rwlock_flags(FILE *fp, u_ } /* XXX: This should be in */ -#defineCAPMASK(right) ((right) && (((uint64_t)1 << 57) - 1)) +#defineCAPMASK(right) ((right) & (((uint64_t)1 << 57) - 1)) void sysdecode_cap_rights(FILE *fp, cap_rights_t *rightsp) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307947 - head/tests/sys/geom/class/uzip
Author: br Date: Tue Oct 25 18:43:36 2016 New Revision: 307947 URL: https://svnweb.freebsd.org/changeset/base/307947 Log: Change fs image name so it will not be regenerated (we have both big and little-endian images in tree). Also we don't known the endianness of the platform the image was generated on. Sponsored by: DARPA, AFRL Sponsored by: HEIF5 Modified: head/tests/sys/geom/class/uzip/Makefile Modified: head/tests/sys/geom/class/uzip/Makefile == --- head/tests/sys/geom/class/uzip/Makefile Tue Oct 25 18:36:15 2016 (r307946) +++ head/tests/sys/geom/class/uzip/Makefile Tue Oct 25 18:43:36 2016 (r307947) @@ -8,7 +8,7 @@ PACKAGE=tests TESTSDIR= ${TESTSBASE}/sys/geom/class/${.CURDIR:T} -IMAGE= 1_endian_little.img +IMAGE= 1_endian_unknown_autogenerated.img ZIMAGE=${IMAGE}.uzip UZIMAGE= ${ZIMAGE}.uue @@ -26,7 +26,7 @@ ${UZIMAGE}: ${IMAGE} ${ZIMAGE} uuencode ${ZIMAGE} ${ZIMAGE} >>${.TARGET} ${PACKAGE}FILES+= conf.sh 1_endian_big.img.uzip.uue \ - ${UZIMAGE} + 1_endian_little.img.uzip.uue FILESGROUPS+= etalon etalon+= etalon/etalon.txt ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307946 - head/sys/dev/usb/net
Author: cem Date: Tue Oct 25 18:36:15 2016 New Revision: 307946 URL: https://svnweb.freebsd.org/changeset/base/307946 Log: uhso(4): Fix a null pointer dereference The directly following m_defrag() call can wait, so there is no reason this call can't as well. Reported by: Coverity CID: 1353551 Sponsored by: Dell EMC Isilon Modified: head/sys/dev/usb/net/uhso.c Modified: head/sys/dev/usb/net/uhso.c == --- head/sys/dev/usb/net/uhso.c Tue Oct 25 18:17:03 2016(r307945) +++ head/sys/dev/usb/net/uhso.c Tue Oct 25 18:36:15 2016(r307946) @@ -1752,7 +1752,7 @@ uhso_if_rxflush(void *arg) * Allocate a new mbuf for this IP packet and * copy the IP-packet into it. */ - m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + m = m_getcl(M_WAITOK, MT_DATA, M_PKTHDR); memcpy(mtod(m, uint8_t *), mtod(m0, uint8_t *), iplen); m->m_pkthdr.len = m->m_len = iplen; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307944 - in head/sys/arm/ti: . am335x
Author: andrew Date: Tue Oct 25 18:01:19 2016 New Revision: 307944 URL: https://svnweb.freebsd.org/changeset/base/307944 Log: Add MULTIDELAY support to the am335x dmtimer. This will be useful for testing Cortex-A8 support in GENERIC. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/ti/am335x/am335x_dmtimer.c head/sys/arm/ti/ti_machdep.c Modified: head/sys/arm/ti/am335x/am335x_dmtimer.c == --- head/sys/arm/ti/am335x/am335x_dmtimer.c Tue Oct 25 17:57:31 2016 (r307943) +++ head/sys/arm/ti/am335x/am335x_dmtimer.c Tue Oct 25 18:01:19 2016 (r307944) @@ -38,6 +38,10 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef MULTIDELAY +#include /* For arm_set_delay */ +#endif + #include #include #include @@ -67,6 +71,8 @@ struct am335x_dmtimer_softc { static struct am335x_dmtimer_softc *am335x_dmtimer_et_sc = NULL; static struct am335x_dmtimer_softc *am335x_dmtimer_tc_sc = NULL; +static void am335x_dmtimer_delay(int, void *); + /* * We use dmtimer2 for eventtimer and dmtimer3 for timecounter. */ @@ -235,6 +241,10 @@ am335x_dmtimer_tc_init(struct am335x_dmt am335x_dmtimer_tc_sc = sc; tc_init(>func.tc); +#ifdef MULTIDELAY + arm_set_delay(am335x_dmtimer_delay, sc); +#endif + return (0); } @@ -328,23 +338,13 @@ static devclass_t am335x_dmtimer_devclas DRIVER_MODULE(am335x_dmtimer, simplebus, am335x_dmtimer_driver, am335x_dmtimer_devclass, 0, 0); MODULE_DEPEND(am335x_dmtimer, am335x_prcm, 1, 1, 1); -void -DELAY(int usec) +static void +am335x_dmtimer_delay(int usec, void *arg) { - struct am335x_dmtimer_softc *sc; + struct am335x_dmtimer_softc *sc = arg; int32_t counts; uint32_t first, last; - sc = am335x_dmtimer_tc_sc; - - if (sc == NULL) { - for (; usec > 0; usec--) - for (counts = 200; counts > 0; counts--) - /* Prevent gcc from optimizing out the loop */ - cpufunc_nullop(); - return; - } - /* Get the number of times to count */ counts = (usec + 1) * (sc->sysclk_freq / 100); @@ -361,3 +361,19 @@ DELAY(int usec) } } +#ifndef MULTIDELAY +void +DELAY(int usec) +{ + int32_t counts; + + if (am335x_dmtimer_tc_sc == NULL) { + for (; usec > 0; usec--) + for (counts = 200; counts > 0; counts--) + /* Prevent gcc from optimizing out the loop */ + cpufunc_nullop(); + return; + } else + am335x_dmtimer_delay(usec, am335x_dmtimer_tc_sc); +} +#endif Modified: head/sys/arm/ti/ti_machdep.c == --- head/sys/arm/ti/ti_machdep.cTue Oct 25 17:57:31 2016 (r307943) +++ head/sys/arm/ti/ti_machdep.cTue Oct 25 18:01:19 2016 (r307944) @@ -124,5 +124,5 @@ static platform_method_t am335x_methods[ PLATFORMMETHOD_END, }; -FDT_PLATFORM_DEF(am335x, "am335x", 0, "ti,am335x", 0); +FDT_PLATFORM_DEF(am335x, "am335x", 0, "ti,am335x", 200); #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307943 - head/sys/arm/include
Author: andrew Date: Tue Oct 25 17:57:31 2016 New Revision: 307943 URL: https://svnweb.freebsd.org/changeset/base/307943 Log: Remove the need for the delay to be zero when MULTIDELAY is undefined, it may be useful to only enable this in some configs. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/include/platformvar.h Modified: head/sys/arm/include/platformvar.h == --- head/sys/arm/include/platformvar.h Tue Oct 25 17:31:57 2016 (r307942) +++ head/sys/arm/include/platformvar.h Tue Oct 25 17:57:31 2016 (r307943) @@ -93,7 +93,7 @@ extern platform_method_t fdt_platform_me #ifdef MULTIDELAY #defineFDT_PLATFORM_CTASSERT(delay)CTASSERT(delay > 0) #else -#defineFDT_PLATFORM_CTASSERT(delay)CTASSERT(delay == 0) +#defineFDT_PLATFORM_CTASSERT(delay) #endif #define FDT_PLATFORM_DEF2(NAME, VAR_NAME, NAME_STR, size, compatible, \ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307942 - in head/sys/boot: common efi/libefi ficl ficl32 i386/libi386 i386/loader
Author: imp Date: Tue Oct 25 17:31:57 2016 New Revision: 307942 URL: https://svnweb.freebsd.org/changeset/base/307942 Log: Really make WITHOUT_FORTH (MK_FORTH==no) work. The recent inclusion of FICL definitions not in ficl/ficl32 files broke this generally. This makes that stuff conditional on BOOT_FORTH. Also, move definitions related to the architecture (FICL_CPUARCH and friends) into Makefile.ficl that all parts of the tree that include files with ficl need to include (but only if MK_FORTH == yes). In addition, had to fix library ordering issue with LIBSTAND to keep it last. Without boot forth, there's no references to memset to bring in memset.o from libstand.a to satisfy libgeliboot.a's use of it. Listing libstand last solves this issue (and it's the proper place for libstand to boot). Modified: head/sys/boot/common/Makefile.inc head/sys/boot/common/pnp.c head/sys/boot/efi/libefi/Makefile head/sys/boot/ficl/Makefile head/sys/boot/ficl32/Makefile head/sys/boot/i386/libi386/biospci.c head/sys/boot/i386/loader/Makefile Modified: head/sys/boot/common/Makefile.inc == --- head/sys/boot/common/Makefile.inc Tue Oct 25 17:16:58 2016 (r307941) +++ head/sys/boot/common/Makefile.inc Tue Oct 25 17:31:57 2016 (r307942) @@ -60,6 +60,7 @@ SRCS+=pnp.c # Forth interpreter .if defined(BOOT_FORTH) SRCS+= interp_forth.c +.include "${SRCTOP}/sys/boot/Makefile.ficl" .endif .if defined(BOOT_PROMPT_123) Modified: head/sys/boot/common/pnp.c == --- head/sys/boot/common/pnp.c Tue Oct 25 17:16:58 2016(r307941) +++ head/sys/boot/common/pnp.c Tue Oct 25 17:31:57 2016(r307942) @@ -17,7 +17,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef BOOT_FORTH #include "ficl.h" +#endif static struct pnpinfo_stql pnp_devices; static int pnp_devices_initted = 0; @@ -186,6 +188,7 @@ pnp_eisaformat(u_int8_t *data) return(idbuf); } +#ifdef BOOT_FORTH void ficlPnpdevices(FICL_VM *pVM) { @@ -230,3 +233,4 @@ static void ficlCompilePnp(FICL_SYSTEM * } FICL_COMPILE_SET(ficlCompilePnp); +#endif Modified: head/sys/boot/efi/libefi/Makefile == --- head/sys/boot/efi/libefi/Makefile Tue Oct 25 17:16:58 2016 (r307941) +++ head/sys/boot/efi/libefi/Makefile Tue Oct 25 17:31:57 2016 (r307942) @@ -2,6 +2,10 @@ .include +.if ${MK_FORTH} != "no" +.include "${.CURDIR}/../../Makefile.ficl" +.endif + LIB= efi INTERNALLIB= WARNS?=2 @@ -16,8 +20,6 @@ SRCS+=time_event.c .endif .if ${MK_FORTH} != "no" SRCS+= env.c -CFLAGS+= -I${.CURDIR}/../../ficl -CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} .endif # We implement a slightly non-standard %S in that it always takes a Modified: head/sys/boot/ficl/Makefile == --- head/sys/boot/ficl/Makefile Tue Oct 25 17:16:58 2016(r307941) +++ head/sys/boot/ficl/Makefile Tue Oct 25 17:31:57 2016(r307942) @@ -1,15 +1,8 @@ # $FreeBSD$ # -FICLDIR?= ${.CURDIR} +.include "${.CURDIR}/../Makefile.ficl" -.if defined(FICL32) -.PATH: ${FICLDIR}/${MACHINE_CPUARCH:S/amd64/i386/} -.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" -.PATH: ${FICLDIR}/mips64 -.else -.PATH: ${FICLDIR}/${MACHINE_CPUARCH} -.endif BASE_SRCS= dict.c ficl.c fileaccess.c float.c loader.c math64.c \ prefix.c search.c stack.c tools.c vm.c words.c @@ -41,42 +34,6 @@ SOFTWORDS= softcore.fr jhlocal.fr marker # Optional OO extension softwords #SOFTWORDS+= oo.fr classes.fr -.if ${MACHINE_CPUARCH} == "amd64" -.if defined(FICL32) -CFLAGS+= -m32 -I. -.else -CFLAGS+= -fPIC -.endif -.endif - -.if ${MACHINE_ARCH} == "powerpc64" -CFLAGS+= -m32 -mcpu=powerpc -I. -.endif - -.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32) -FICL_CPUARCH= i386 -.elif ${MACHINE_ARCH} == "mips64" || ${MACHINE_ARCH} == "mips64el" -FICL_CPUARCH= mips64 -.else -FICL_CPUARCH= ${MACHINE_CPUARCH} -.endif - -CFLAGS+= -I${FICLDIR} -I${FICLDIR}/${FICL_CPUARCH} \ - -I${FICLDIR}/../common - softcore.c: ${SOFTWORDS} softcore.awk (cd ${FICLDIR}/softwords; cat ${SOFTWORDS} \ | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET} - -.if ${MACHINE_CPUARCH} == "amd64" && defined(FICL32) -.if !exists(machine) -${SRCS:M*.c:R:S/$/.o/g}: machine - -beforedepend ${OBJS}: machine -.endif - -machine: .NOMETA - ln -sf ${.CURDIR}/../../i386/include machine - -CLEANFILES+= machine -.endif Modified: head/sys/boot/ficl32/Makefile == --- head/sys/boot/ficl32/Makefile Tue Oct 25 17:16:58 2016
svn commit: r307937 - head/usr.sbin/bhyve
Author: glebius Date: Tue Oct 25 17:13:58 2016 New Revision: 307937 URL: https://svnweb.freebsd.org/changeset/base/307937 Log: Fix unchecked array reference in the VGA device emulation code. Submitted by: Ilja Van SprundelPatch by: tychon Security: SA-16:32 Modified: head/usr.sbin/bhyve/vga.c Modified: head/usr.sbin/bhyve/vga.c == --- head/usr.sbin/bhyve/vga.c Tue Oct 25 17:13:46 2016(r307936) +++ head/usr.sbin/bhyve/vga.c Tue Oct 25 17:13:58 2016(r307937) @@ -161,10 +161,10 @@ struct vga_softc { */ struct { uint8_t dac_state; - int dac_rd_index; - int dac_rd_subindex; - int dac_wr_index; - int dac_wr_subindex; + uint8_t dac_rd_index; + uint8_t dac_rd_subindex; + uint8_t dac_wr_index; + uint8_t dac_wr_subindex; uint8_t dac_palette[3 * 256]; uint32_tdac_palette_rgb[256]; } vga_dac; ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307936 - head/sys/amd64/amd64
Author: glebius Date: Tue Oct 25 17:13:46 2016 New Revision: 307936 URL: https://svnweb.freebsd.org/changeset/base/307936 Log: The argument validation in r296956 was not enough to close all possible overflows in sysarch(2). Submitted by: Kun Yang Patch by: kib Security: SA-16:15 Modified: head/sys/amd64/amd64/sys_machdep.c Modified: head/sys/amd64/amd64/sys_machdep.c == --- head/sys/amd64/amd64/sys_machdep.c Tue Oct 25 17:11:20 2016 (r307935) +++ head/sys/amd64/amd64/sys_machdep.c Tue Oct 25 17:13:46 2016 (r307936) @@ -608,6 +608,8 @@ amd64_set_ldt(td, uap, descs) largest_ld = uap->start + uap->num; if (largest_ld > max_ldt_segment) largest_ld = max_ldt_segment; + if (largest_ld < uap->start) + return (EINVAL); i = largest_ld - uap->start; mtx_lock(_lock); bzero(&((struct user_segment_descriptor *)(pldt->ldt_base)) @@ -620,7 +622,8 @@ amd64_set_ldt(td, uap, descs) /* verify range of descriptors to modify */ largest_ld = uap->start + uap->num; if (uap->start >= max_ldt_segment || - largest_ld > max_ldt_segment) + largest_ld > max_ldt_segment || + largest_ld < uap->start) return (EINVAL); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307927 - in head/usr.sbin/makefs: . cd9660 ffs
Author: marcel Date: Tue Oct 25 16:29:15 2016 New Revision: 307927 URL: https://svnweb.freebsd.org/changeset/base/307927 Log: Be more precise when including headers so that we're less likely to depend on namespace pollution and as such become more portable. This means including headers like or , but also making sure we include system/host headers before local headers. While here: define ENOATTR as ENOMSG in mtree.c. There is no ENOATTR on Linux. With this, makefs is ready for compilation on macOS and Linux. Modified: head/usr.sbin/makefs/cd9660.c head/usr.sbin/makefs/cd9660/cd9660_archimedes.c head/usr.sbin/makefs/cd9660/iso9660_rrip.c head/usr.sbin/makefs/ffs/ffs_bswap.c head/usr.sbin/makefs/ffs/ffs_subr.c head/usr.sbin/makefs/mtree.c head/usr.sbin/makefs/walk.c Modified: head/usr.sbin/makefs/cd9660.c == --- head/usr.sbin/makefs/cd9660.c Tue Oct 25 16:28:30 2016 (r307926) +++ head/usr.sbin/makefs/cd9660.c Tue Oct 25 16:29:15 2016 (r307927) @@ -98,10 +98,11 @@ #include __FBSDID("$FreeBSD$"); -#include -#include #include #include +#include +#include +#include #include "makefs.h" #include "cd9660.h" Modified: head/usr.sbin/makefs/cd9660/cd9660_archimedes.c == --- head/usr.sbin/makefs/cd9660/cd9660_archimedes.c Tue Oct 25 16:28:30 2016(r307926) +++ head/usr.sbin/makefs/cd9660/cd9660_archimedes.c Tue Oct 25 16:29:15 2016(r307927) @@ -40,9 +40,11 @@ #include __FBSDID("$FreeBSD$"); +#include #include #include #include +#include #include #include "makefs.h" Modified: head/usr.sbin/makefs/cd9660/iso9660_rrip.c == --- head/usr.sbin/makefs/cd9660/iso9660_rrip.c Tue Oct 25 16:28:30 2016 (r307926) +++ head/usr.sbin/makefs/cd9660/iso9660_rrip.c Tue Oct 25 16:29:15 2016 (r307927) @@ -35,14 +35,16 @@ * defined in iso9660_rrip.h */ -#include "makefs.h" -#include "cd9660.h" -#include "iso9660_rrip.h" +#include +__FBSDID("$FreeBSD$"); + #include +#include #include -#include -__FBSDID("$FreeBSD$"); +#include "makefs.h" +#include "cd9660.h" +#include "iso9660_rrip.h" static void cd9660_rrip_initialize_inode(cd9660node *); static int cd9660_susp_handle_continuation(cd9660node *); Modified: head/usr.sbin/makefs/ffs/ffs_bswap.c == --- head/usr.sbin/makefs/ffs/ffs_bswap.cTue Oct 25 16:28:30 2016 (r307926) +++ head/usr.sbin/makefs/ffs/ffs_bswap.cTue Oct 25 16:29:15 2016 (r307927) @@ -38,18 +38,19 @@ __FBSDID("$FreeBSD$"); #include #endif -#include -#include "ffs/ufs_bswap.h" -#include - #if !defined(_KERNEL) #include +#include #include #include #include #define panic(x) printf("%s\n", (x)), abort() #endif +#include +#include "ffs/ufs_bswap.h" +#include + #definefs_old_postblofffs_spare5[0] #definefs_old_rotbloff fs_spare5[1] #definefs_old_postbl_start fs_maxbsize Modified: head/usr.sbin/makefs/ffs/ffs_subr.c == --- head/usr.sbin/makefs/ffs/ffs_subr.c Tue Oct 25 16:28:30 2016 (r307926) +++ head/usr.sbin/makefs/ffs/ffs_subr.c Tue Oct 25 16:29:15 2016 (r307927) @@ -35,6 +35,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include Modified: head/usr.sbin/makefs/mtree.c == --- head/usr.sbin/makefs/mtree.cTue Oct 25 16:28:30 2016 (r307926) +++ head/usr.sbin/makefs/mtree.cTue Oct 25 16:29:15 2016 (r307927) @@ -44,10 +44,15 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include "makefs.h" +#ifndef ENOATTR +#defineENOATTR ENOMSG +#endif + #defineIS_DOT(nm) ((nm)[0] == '.' && (nm)[1] == '\0') #defineIS_DOTDOT(nm) ((nm)[0] == '.' && (nm)[1] == '.' && (nm)[2] == '\0') Modified: head/usr.sbin/makefs/walk.c == --- head/usr.sbin/makefs/walk.c Tue Oct 25 16:28:30 2016(r307926) +++ head/usr.sbin/makefs/walk.c Tue Oct 25 16:29:15 2016(r307927) @@ -40,6 +40,7 @@ __FBSDID("$FreeBSD$"); #include +#include #include #include ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307928 - head/sys/arm/include
Author: andrew Date: Tue Oct 25 16:33:05 2016 New Revision: 307928 URL: https://svnweb.freebsd.org/changeset/base/307928 Log: Remove armadaxp_idcache_wbinv_all, it's a static function in the ELF trampoline and not used outside this. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/include/cpufunc.h Modified: head/sys/arm/include/cpufunc.h == --- head/sys/arm/include/cpufunc.h Tue Oct 25 16:29:15 2016 (r307927) +++ head/sys/arm/include/cpufunc.h Tue Oct 25 16:33:05 2016 (r307928) @@ -284,8 +284,6 @@ voidarmv7_cpu_sleep (int); void armv7_setup (void); void armv7_drain_writebuf(void); -void armadaxp_idcache_wbinv_all (void); - void cortexa_setup (void); #endif #if defined(CPU_MV_PJ4B) ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307926 - head/sys/dev/bfe
Author: glebius Date: Tue Oct 25 16:28:30 2016 New Revision: 307926 URL: https://svnweb.freebsd.org/changeset/base/307926 Log: Check m_getcl() return value. CID: 611376 Modified: head/sys/dev/bfe/if_bfe.c Modified: head/sys/dev/bfe/if_bfe.c == --- head/sys/dev/bfe/if_bfe.c Tue Oct 25 16:25:06 2016(r307925) +++ head/sys/dev/bfe/if_bfe.c Tue Oct 25 16:28:30 2016(r307926) @@ -793,6 +793,8 @@ bfe_list_newbuf(struct bfe_softc *sc, in int nsegs; m = m_getcl(M_NOWAIT, MT_DATA, M_PKTHDR); + if (m == NULL) + return (ENOBUFS); m->m_len = m->m_pkthdr.len = MCLBYTES; if (bus_dmamap_load_mbuf_sg(sc->bfe_rxmbuf_tag, sc->bfe_rx_sparemap, ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307925 - in head/sys/arm: arm include
Author: andrew Date: Tue Oct 25 16:25:06 2016 New Revision: 307925 URL: https://svnweb.freebsd.org/changeset/base/307925 Log: Remove arm11x6_setttb and armv7_setttb as they are unused. While here remove unneeded code from the ARMv7 cpu assembly code. Sponsored by: ABT Systems Ltd Modified: head/sys/arm/arm/cpufunc_asm_arm11x6.S head/sys/arm/arm/cpufunc_asm_armv7.S head/sys/arm/include/cpufunc.h Modified: head/sys/arm/arm/cpufunc_asm_arm11x6.S == --- head/sys/arm/arm/cpufunc_asm_arm11x6.S Tue Oct 25 16:22:43 2016 (r307924) +++ head/sys/arm/arm/cpufunc_asm_arm11x6.S Tue Oct 25 16:25:06 2016 (r307925) @@ -64,14 +64,6 @@ __FBSDID("$FreeBSD$"); .cpu arm1176jz-s -ENTRY(arm11x6_setttb) - mov r1, #0 - mcr p15, 0, r0, c2, c0, 0 /* load new TTB */ - mcr p15, 0, r1, c8, c7, 0 /* invalidate I+D TLBs */ - mcr p15, 0, r1, c7, c10, 4 /* drain write buffer */ - RET -END(arm11x6_setttb) - /* * Preload the cache before issuing the WFI by conditionally disabling the * mcr intstructions the first time around the loop. Ensure the function is Modified: head/sys/arm/arm/cpufunc_asm_armv7.S == --- head/sys/arm/arm/cpufunc_asm_armv7.STue Oct 25 16:22:43 2016 (r307924) +++ head/sys/arm/arm/cpufunc_asm_armv7.STue Oct 25 16:25:06 2016 (r307925) @@ -37,56 +37,16 @@ __FBSDID("$FreeBSD$"); .cpu cortex-a8 +#ifdef ELF_TRAMPOLINE .Lcoherency_level: .word _C_LABEL(arm_cache_loc) .Lcache_type: .word _C_LABEL(arm_cache_type) -.Larmv7_dcache_line_size: - .word _C_LABEL(arm_dcache_min_line_size) -.Larmv7_icache_line_size: - .word _C_LABEL(arm_icache_min_line_size) -.Larmv7_idcache_line_size: - .word _C_LABEL(arm_idcache_min_line_size) .Lway_mask: .word 0x3ff .Lmax_index: .word 0x7fff -.Lpage_mask: - .word 0xfff - -#define PT_NOS (1 << 5) -#define PT_S (1 << 1) -#define PT_INNER_NC0 -#define PT_INNER_WT(1 << 0) -#define PT_INNER_WB((1 << 0) | (1 << 6)) -#define PT_INNER_WBWA (1 << 6) -#define PT_OUTER_NC0 -#define PT_OUTER_WT(2 << 3) -#define PT_OUTER_WB(3 << 3) -#define PT_OUTER_WBWA (1 << 3) -#ifdef SMP -#define PT_ATTR(PT_S|PT_INNER_WBWA|PT_OUTER_WBWA|PT_NOS) -#else -#define PT_ATTR(PT_INNER_WBWA|PT_OUTER_WBWA) -#endif - -ENTRY(armv7_setttb) - dsb - orr r0, r0, #PT_ATTR - mcr CP15_TTBR0(r0) - isb -#ifdef SMP - mcr CP15_TLBIALLIS -#else - mcr CP15_TLBIALL -#endif - dsb - isb - RET -END(armv7_setttb) - -#ifdef ELF_TRAMPOLINE /* Based on algorithm from ARM Architecture Reference Manual */ ENTRY(armv7_dcache_wbinv_all) stmdb sp!, {r4, r5, r6, r7, r8, r9} Modified: head/sys/arm/include/cpufunc.h == --- head/sys/arm/include/cpufunc.h Tue Oct 25 16:22:43 2016 (r307924) +++ head/sys/arm/include/cpufunc.h Tue Oct 25 16:25:06 2016 (r307925) @@ -279,7 +279,6 @@ voidarmv6_idcache_wbinv_all (void); #endif #if defined(CPU_CORTEXA8) || defined(CPU_CORTEXA_MP) || \ defined(CPU_MV_PJ4B) || defined(CPU_KRAIT) -void armv7_setttb(u_int); void armv7_idcache_wbinv_all (void); void armv7_cpu_sleep (int); void armv7_setup (void); @@ -297,7 +296,6 @@ voidpj4bv7_setup(void); #if defined(CPU_ARM1176) void arm11_drain_writebuf(void); -voidarm11x6_setttb (u_int); voidarm11x6_setup (void); voidarm11x6_sleep (int); /* no ref. for errata */ #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307923 - in head/usr.sbin/makefs: . cd9660 ffs
Author: marcel Date: Tue Oct 25 16:21:38 2016 New Revision: 307923 URL: https://svnweb.freebsd.org/changeset/base/307923 Log: Allow building makefs(8) from another Makefile (such as one in a seperate directory hierarchy used to build tools). This boils down to replacing the use of ${.CURDIR} with either ${SRCDIR} or ${SRCTOP}. SRCDIR is defined as the directory in which the Makefile lives that bmake(1) is currently reading. Use SRCTOP when reaching outside of makefs's directory. Modified: head/usr.sbin/makefs/Makefile head/usr.sbin/makefs/cd9660/Makefile.inc head/usr.sbin/makefs/ffs/Makefile.inc Modified: head/usr.sbin/makefs/Makefile == --- head/usr.sbin/makefs/Makefile Tue Oct 25 16:14:11 2016 (r307922) +++ head/usr.sbin/makefs/Makefile Tue Oct 25 16:21:38 2016 (r307923) @@ -1,10 +1,12 @@ # $FreeBSD$ +SRCDIR:=${.PARSEDIR:tA} + .include PROG= makefs -CFLAGS+=-I${.CURDIR} +CFLAGS+=-I${SRCDIR} SRCS= cd9660.c ffs.c \ makefs.c \ @@ -14,24 +16,24 @@ MAN=makefs.8 WARNS?=2 -.include "${.CURDIR}/cd9660/Makefile.inc" -.include "${.CURDIR}/ffs/Makefile.inc" +.include "${SRCDIR}/cd9660/Makefile.inc" +.include "${SRCDIR}/ffs/Makefile.inc" CFLAGS+=-DHAVE_STRUCT_STAT_ST_FLAGS=1 CFLAGS+=-DHAVE_STRUCT_STAT_ST_GEN=1 -.PATH: ${.CURDIR}/../../contrib/mtree -CFLAGS+=-I${.CURDIR}/../../contrib/mtree +.PATH: ${SRCTOP}/contrib/mtree +CFLAGS+=-I${SRCTOP}/contrib/mtree SRCS+= getid.c misc.c spec.c -.PATH: ${.CURDIR}/../../contrib/mknod -CFLAGS+=-I${.CURDIR}/../../contrib/mknod +.PATH: ${SRCTOP}/contrib/mknod +CFLAGS+=-I${SRCTOP}/contrib/mknod SRCS+= pack_dev.c -.PATH: ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${SRCTOP}/sys/ufs/ffs SRCS+= ffs_tables.c -CFLAGS+= -I${.CURDIR}/../../lib/libnetbsd +CFLAGS+= -I${SRCTOP}/lib/libnetbsd LIBADD=netbsd util sbuf .if ${MK_TESTS} != "no" Modified: head/usr.sbin/makefs/cd9660/Makefile.inc == --- head/usr.sbin/makefs/cd9660/Makefile.incTue Oct 25 16:14:11 2016 (r307922) +++ head/usr.sbin/makefs/cd9660/Makefile.incTue Oct 25 16:21:38 2016 (r307923) @@ -1,9 +1,9 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/cd9660 ${.CURDIR}/../../sys/fs/cd9660/ +.PATH: ${SRCDIR}/cd9660 ${SRCTOP}/sys/fs/cd9660/ -CFLAGS+=-I${.CURDIR}/../../sys/fs/cd9660/ +CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ SRCS+= cd9660_strings.c cd9660_debug.c cd9660_eltorito.c \ cd9660_write.c cd9660_conversion.c iso9660_rrip.c cd9660_archimedes.c Modified: head/usr.sbin/makefs/ffs/Makefile.inc == --- head/usr.sbin/makefs/ffs/Makefile.inc Tue Oct 25 16:14:11 2016 (r307922) +++ head/usr.sbin/makefs/ffs/Makefile.inc Tue Oct 25 16:21:38 2016 (r307923) @@ -1,9 +1,9 @@ # $FreeBSD$ # -.PATH: ${.CURDIR}/ffs ${.CURDIR}/../../sys/ufs/ffs +.PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs -CFLAGS+= -I${.CURDIR}/../../sys/ufs/ffs +CFLAGS+= -I${SRCTOP}/sys/ufs/ffs SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c SRCS+= buf.c mkfs.c ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307917 - head/usr.sbin/bhyve
Author: bapt Date: Tue Oct 25 15:20:06 2016 New Revision: 307917 URL: https://svnweb.freebsd.org/changeset/base/307917 Log: accept4 actually expect SOCK_NONBLOCK and not O_NONBLOCK Reported by: jhb Pointyhat to: bapt Modified: head/usr.sbin/bhyve/dbgport.c Modified: head/usr.sbin/bhyve/dbgport.c == --- head/usr.sbin/bhyve/dbgport.c Tue Oct 25 14:58:49 2016 (r307916) +++ head/usr.sbin/bhyve/dbgport.c Tue Oct 25 15:20:06 2016 (r307917) @@ -73,7 +73,7 @@ again: printf("Waiting for connection from gdb\r\n"); printonce = 1; } - conn_fd = accept4(listen_fd, NULL, NULL, O_NONBLOCK); + conn_fd = accept4(listen_fd, NULL, NULL, SOCK_NONBLOCK); if (conn_fd < 0 && errno != EINTR) perror("accept"); } ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307918 - head/sys/arm/allwinner/clk
Author: manu Date: Tue Oct 25 15:21:08 2016 New Revision: 307918 URL: https://svnweb.freebsd.org/changeset/base/307918 Log: allwinner A10 Pll1 allow changing freq PLL1 is used by the cpu core, allowing changing freq is needed for cpufreq. The factors table contains all the frequencies in the operating point table present in the DTS. MFC after:1 week Modified: head/sys/arm/allwinner/clk/aw_pll.c Modified: head/sys/arm/allwinner/clk/aw_pll.c == --- head/sys/arm/allwinner/clk/aw_pll.c Tue Oct 25 15:20:06 2016 (r307917) +++ head/sys/arm/allwinner/clk/aw_pll.c Tue Oct 25 15:21:08 2016 (r307918) @@ -192,6 +192,16 @@ struct aw_pll_factor { #definePLLFACTOR(_n, _k, _m, _p, _freq)\ { .n = (_n), .k = (_k), .m = (_m), .p = (_p), .freq = (_freq) } +static struct aw_pll_factor aw_a10_pll1_factors[] = { + PLLFACTOR(6, 0, 0, 0, 14400), + PLLFACTOR(12, 0, 0, 0, 31200), + PLLFACTOR(21, 0, 0, 0, 52800), + PLLFACTOR(29, 0, 0, 0, 72000), + PLLFACTOR(18, 1, 0, 0, 86400), + PLLFACTOR(19, 1, 0, 0, 91200), + PLLFACTOR(20, 1, 0, 0, 96000), +}; + static struct aw_pll_factor aw_a23_pll1_factors[] = { PLLFACTOR(9, 0, 0, 2, 6000), PLLFACTOR(10, 0, 0, 2, 6600), @@ -300,6 +310,47 @@ struct aw_pll_funcs { #defineDEVICE_UNLOCK(sc) CLKDEV_DEVICE_UNLOCK((sc)->clkdev) static int +a10_pll1_init(device_t dev, bus_addr_t reg, struct clknode_init_def *def) +{ + /* Allow changing PLL frequency while enabled */ + def->flags = CLK_NODE_GLITCH_FREE; + + return (0); +} + +static int +a10_pll1_set_freq(struct aw_pll_sc *sc, uint64_t fin, uint64_t *fout, +int flags) +{ + struct aw_pll_factor *f; + uint32_t val; + int n; + + f = NULL; + for (n = 0; n < nitems(aw_a10_pll1_factors); n++) { + if (aw_a10_pll1_factors[n].freq == *fout) { + f = _a10_pll1_factors[n]; + break; + } + } + if (f == NULL) + return (EINVAL); + + DEVICE_LOCK(sc); + PLL_READ(sc, ); + val &= ~(A10_PLL1_FACTOR_N|A10_PLL1_FACTOR_K|A10_PLL1_FACTOR_M| + A10_PLL1_OUT_EXT_DIVP); + val |= (f->p << A10_PLL1_OUT_EXT_DIVP_SHIFT); + val |= (f->n << A10_PLL1_FACTOR_N_SHIFT); + val |= (f->k << A10_PLL1_FACTOR_K_SHIFT); + val |= (f->m << A10_PLL1_FACTOR_M_SHIFT); + PLL_WRITE(sc, val); + DEVICE_UNLOCK(sc); + + return (0); +} + +static int a10_pll1_recalc(struct aw_pll_sc *sc, uint64_t *freq) { uint32_t val, m, n, k, p; @@ -948,7 +999,7 @@ a83t_pllcpux_set_freq(struct aw_pll_sc * } static struct aw_pll_funcs aw_pll_func[] = { - PLL(AWPLL_A10_PLL1, a10_pll1_recalc, NULL, NULL), + PLL(AWPLL_A10_PLL1, a10_pll1_recalc, a10_pll1_set_freq, a10_pll1_init), PLL(AWPLL_A10_PLL2, a10_pll2_recalc, a10_pll2_set_freq, NULL), PLL(AWPLL_A10_PLL3, a10_pll3_recalc, a10_pll3_set_freq, a10_pll3_init), PLL(AWPLL_A10_PLL5, a10_pll5_recalc, NULL, NULL), ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
Re: svn commit: r307861 - in head: contrib/libarchive contrib/libarchive/cat/test contrib/libarchive/cpio/test contrib/libarchive/libarchive contrib/libarchive/libarchive/test contrib/libarchive/tar/t
On Mon, Oct 24, 2016 at 02:08:06PM +, Martin Matuska wrote: > Author: mm > Date: Mon Oct 24 14:08:05 2016 > New Revision: 307861 > URL: https://svnweb.freebsd.org/changeset/base/307861 > > Log: > MFV r307859: > Update libarchive to 3.2.2 Hey Martin, Thanks for doing this upgrade! Any plans to MFC? Thanks, -- Shawn Webb Cofounder and Security Engineer HardenedBSD GPG Key ID: 0x6A84658F52456EEE GPG Key Fingerprint: 2ABA B6BD EF6A F486 BE89 3D9E 6A84 658F 5245 6EEE signature.asc Description: PGP signature
svn commit: r307911 - head/sys/boot/efi/loader
Author: imp Date: Tue Oct 25 14:42:09 2016 New Revision: 307911 URL: https://svnweb.freebsd.org/changeset/base/307911 Log: Add better comment... Modified: head/sys/boot/efi/loader/main.c Modified: head/sys/boot/efi/loader/main.c == --- head/sys/boot/efi/loader/main.c Tue Oct 25 14:18:27 2016 (r307910) +++ head/sys/boot/efi/loader/main.c Tue Oct 25 14:42:09 2016 (r307911) @@ -56,7 +56,17 @@ extern char bootprog_date[]; extern char bootprog_maker[]; #ifdef BOOT_FORTH -/* Force a reference to bring in EFI support from the library */ +/* + * Normally, efi.o from libefi.a would be brought in due to a function we call + * there that's defined there. However, none of its functions are callable from + * here since it just adds words to the FORTH environment or implement those + * words. So, add a reference to a symbol in efi.o to force it to be be brought + * in so the init function there gets added to the "compile" linker set happens + * correctly. + * + * This assumes there's no global analysys that notices dummy1 isn't used + * anywhere and tries to eliminate it. + */ extern int efi_variable_support; int *dummy1 = _variable_support; #endif ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307910 - in head/sys: arm64/arm64 dev/psci
Author: andrew Date: Tue Oct 25 14:18:27 2016 New Revision: 307910 URL: https://svnweb.freebsd.org/changeset/base/307910 Log: Create a new PSCI error code and use it to signal that starting the CPU is impossible as the PSCI firmware is missing. Sponsored by: ABT Systmes Ltd Modified: head/sys/arm64/arm64/mp_machdep.c head/sys/dev/psci/psci.c head/sys/dev/psci/psci.h Modified: head/sys/arm64/arm64/mp_machdep.c == --- head/sys/arm64/arm64/mp_machdep.c Tue Oct 25 14:04:35 2016 (r307909) +++ head/sys/arm64/arm64/mp_machdep.c Tue Oct 25 14:18:27 2016 (r307910) @@ -461,9 +461,13 @@ cpu_init_fdt(u_int id, phandle_t node, u err = psci_cpu_on(target_cpu, pa, cpuid); if (err != PSCI_RETVAL_SUCCESS) { - /* Panic here if INVARIANTS are enabled */ - KASSERT(0, ("Failed to start CPU %u (%lx)\n", id, - target_cpu)); + /* +* Panic here if INVARIANTS are enabled and PSCI failed to +* start the requested CPU. If psci_cpu_on returns PSCI_MISSING +* to indicate we are unable to use it to start the given CPU. +*/ + KASSERT(err == PSCI_MISSING, + ("Failed to start CPU %u (%lx)\n", id, target_cpu)); pcpu_destroy(pcpup); kmem_free(kernel_arena, (vm_offset_t)dpcpu[cpuid - 1], Modified: head/sys/dev/psci/psci.c == --- head/sys/dev/psci/psci.cTue Oct 25 14:04:35 2016(r307909) +++ head/sys/dev/psci/psci.cTue Oct 25 14:18:27 2016(r307910) @@ -189,12 +189,12 @@ psci_cpu_on(unsigned long cpu, unsigned node = ofw_bus_find_compatible(OF_peer(0), "arm,psci-0.2"); if (node == 0) /* TODO: Handle psci 0.1 */ - return (PSCI_RETVAL_INTERNAL_FAILURE); + return (PSCI_MISSING); fnid = PSCI_FNID_CPU_ON; callfn = psci_get_callfn(node); if (callfn == NULL) - return (PSCI_RETVAL_INTERNAL_FAILURE); + return (PSCI_MISSING); } else { callfn = psci_softc->psci_call; fnid = psci_softc->psci_fnids[PSCI_FN_CPU_ON]; Modified: head/sys/dev/psci/psci.h == --- head/sys/dev/psci/psci.hTue Oct 25 14:04:35 2016(r307909) +++ head/sys/dev/psci/psci.hTue Oct 25 14:18:27 2016(r307910) @@ -54,6 +54,10 @@ int psci_smc_despatch(register_t, regist #definePSCI_RETVAL_INTERNAL_FAILURE-6 #definePSCI_RETVAL_NOT_PRESENT -7 #definePSCI_RETVAL_DISABLED-8 +/* + * Used to signal PSCI is not available, e.g. to start a CPU. + */ +#definePSCI_MISSING1 /* * PSCI function codes (as per PSCI v0.2). ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307909 - in head/sys: arm64/arm64 conf
Author: andrew Date: Tue Oct 25 14:04:35 2016 New Revision: 307909 URL: https://svnweb.freebsd.org/changeset/base/307909 Log: Import the Cortex String memcpy and memmove into the kernel. On ThunderX these show a 9-10% reduction in user and system time for a buildworld -j48. Obtained from:ABT Systems Ltd MFC after:1 week Sponsored by: The FreeBSD Foundation Added: head/sys/arm64/arm64/memcpy.S - copied, changed from r307901, head/contrib/cortex-strings/src/aarch64/memcpy.S head/sys/arm64/arm64/memmove.S - copied, changed from r307901, head/contrib/cortex-strings/src/aarch64/memmove.S Deleted: head/sys/arm64/arm64/bcopy.c Modified: head/sys/conf/files.arm64 Copied and modified: head/sys/arm64/arm64/memcpy.S (from r307901, head/contrib/cortex-strings/src/aarch64/memcpy.S) == --- head/contrib/cortex-strings/src/aarch64/memcpy.STue Oct 25 05:45:47 2016(r307901, copy source) +++ head/sys/arm64/arm64/memcpy.S Tue Oct 25 14:04:35 2016 (r307909) @@ -52,6 +52,9 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + /* Assumptions: * * ARMv8-a, AArch64, unaligned accesses. @@ -83,14 +86,6 @@ #define L(l) .L ## l - .macro def_fn f p2align=0 - .text - .p2align \p2align - .global \f - .type \f, %function -\f: - .endm - /* Copies are split into 3 main cases: small copies of up to 16 bytes, medium copies of 17..96 bytes which are fully unrolled. Large copies of more than 96 bytes align the destination and use an unrolled loop @@ -100,7 +95,7 @@ well as non-overlapping copies. */ -def_fn memcpy p2align=6 +ENTRY(memcpy) prfmPLDL1KEEP, [src] add srcend, src, count add dstend, dstin, count @@ -221,5 +216,4 @@ L(copy_long): stp B_l, B_h, [dstend, -32] stp C_l, C_h, [dstend, -16] ret - - .size memcpy, . - memcpy +END(memcpy) Copied and modified: head/sys/arm64/arm64/memmove.S (from r307901, head/contrib/cortex-strings/src/aarch64/memmove.S) == --- head/contrib/cortex-strings/src/aarch64/memmove.S Tue Oct 25 05:45:47 2016(r307901, copy source) +++ head/sys/arm64/arm64/memmove.S Tue Oct 25 14:04:35 2016 (r307909) @@ -52,19 +52,14 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + /* Assumptions: * * ARMv8-a, AArch64, unaligned accesses */ - .macro def_fn f p2align=0 - .text - .p2align \p2align - .global \f - .type \f, %function -\f: - .endm - /* Parameters and result. */ #define dstin x0 #define srcx1 @@ -89,7 +84,12 @@ unrolled loop processes 64 bytes per iteration. */ -def_fn memmove, 6 +ENTRY(bcopy) + /* Switch the input pointers when called as bcopy */ + mov x3, x1 + mov x1, x0 + mov x0, x3 +EENTRY(memmove) sub tmp1, dstin, src cmp count, 96 ccmptmp1, count, 2, hi @@ -146,5 +146,5 @@ def_fn memmove, 6 stp B_l, B_h, [dstin, 16] stp C_l, C_h, [dstin] 3: ret - - .size memmove, . - memmove +EEND(memmove) +END(bcopy) Modified: head/sys/conf/files.arm64 == --- head/sys/conf/files.arm64 Tue Oct 25 14:01:13 2016(r307908) +++ head/sys/conf/files.arm64 Tue Oct 25 14:04:35 2016(r307909) @@ -72,7 +72,6 @@ arm64/acpica/OsdEnvironment.c optionala arm64/acpica/acpi_wakeup.c optionalacpi arm64/acpica/pci_cfgreg.c optionalacpipci arm64/arm64/autoconf.c standard -arm64/arm64/bcopy.cstandard arm64/arm64/bus_machdep.c standard arm64/arm64/bus_space_asm.Sstandard arm64/arm64/busdma_bounce.cstandard @@ -98,6 +97,8 @@ arm64/arm64/in_cksum.coptionalinet | arm64/arm64/locore.S standardno-obj arm64/arm64/machdep.c standard arm64/arm64/mem.c standard +arm64/arm64/memcpy.S standard +arm64/arm64/memmove.S standard arm64/arm64/minidump_machdep.c standard arm64/arm64/mp_machdep.c optionalsmp arm64/arm64/nexus.cstandard @@ -178,7 +179,6 @@ libkern/ffsll.c standard libkern/fls.c standard libkern/flsl.c standard libkern/flsll.cstandard -libkern/memmove.c standard libkern/memset.c standard cddl/contrib/opensolaris/common/atomic/aarch64/opensolaris_atomic.S optional zfs | dtrace compile-with "${CDDL_C}" cddl/dev/dtrace/aarch64/dtrace_asm.S optional dtrace compile-with
svn commit: r307908 - in head/sys/boot/efi: libefi loader
Author: andrew Date: Tue Oct 25 14:01:13 2016 New Revision: 307908 URL: https://svnweb.freebsd.org/changeset/base/307908 Log: Fix the build on both arm64 and when WITHOUT_FORTH is defined. * On arm64 we need to use the ${MACHINE_CPUARCH} subdirectory. * env.c is only needed when using forth so only build it there. Sponsored by: ABT Systems Ltd Modified: head/sys/boot/efi/libefi/Makefile head/sys/boot/efi/loader/main.c Modified: head/sys/boot/efi/libefi/Makefile == --- head/sys/boot/efi/libefi/Makefile Tue Oct 25 13:45:59 2016 (r307907) +++ head/sys/boot/efi/libefi/Makefile Tue Oct 25 14:01:13 2016 (r307908) @@ -1,10 +1,12 @@ # $FreeBSD$ +.include + LIB= efi INTERNALLIB= WARNS?=2 -SRCS= delay.c devpath.c efi_console.c efinet.c efipart.c env.c errno.c \ +SRCS= delay.c devpath.c efi_console.c efinet.c efipart.c errno.c \ handles.c libefi.c .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" @@ -12,6 +14,11 @@ SRCS+= time.c .elif ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "arm" SRCS+= time_event.c .endif +.if ${MK_FORTH} != "no" +SRCS+= env.c +CFLAGS+= -I${.CURDIR}/../../ficl +CFLAGS+= -I${.CURDIR}/../../ficl/${MACHINE_CPUARCH} +.endif # We implement a slightly non-standard %S in that it always takes a # CHAR16 that's common in UEFI-land instead of a wchar_t. This only @@ -26,7 +33,6 @@ CFLAGS+= -msoft-float -mgeneral-regs-onl .if ${MACHINE_ARCH} == "amd64" CFLAGS+= -fPIC -mno-red-zone .endif -CFLAGS+= -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/${MACHINE} CFLAGS+= -I${.CURDIR}/../include CFLAGS+= -I${.CURDIR}/../include/${MACHINE} CFLAGS+= -I${.CURDIR}/../../../../lib/libstand Modified: head/sys/boot/efi/loader/main.c == --- head/sys/boot/efi/loader/main.c Tue Oct 25 13:45:59 2016 (r307907) +++ head/sys/boot/efi/loader/main.c Tue Oct 25 14:01:13 2016 (r307908) @@ -55,9 +55,11 @@ extern char bootprog_rev[]; extern char bootprog_date[]; extern char bootprog_maker[]; +#ifdef BOOT_FORTH /* Force a reference to bring in EFI support from the library */ extern int efi_variable_support; int *dummy1 = _variable_support; +#endif struct arch_switch archsw; /* MI/MD interface boundary */ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307904 - head/sys/amd64/vmm/amd
Author: avg Date: Tue Oct 25 10:59:21 2016 New Revision: 307904 URL: https://svnweb.freebsd.org/changeset/base/307904 Log: fix up r307903, use correct max address definition MFC after:1 week X-MFC with: r307903 Modified: head/sys/amd64/vmm/amd/svm.c Modified: head/sys/amd64/vmm/amd/svm.c == --- head/sys/amd64/vmm/amd/svm.cTue Oct 25 10:34:14 2016 (r307903) +++ head/sys/amd64/vmm/amd/svm.cTue Oct 25 10:59:21 2016 (r307904) @@ -47,6 +47,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include "vmm_lapic.h" #include "vmm_stat.h" @@ -518,7 +519,7 @@ svm_vminit(struct vm *vm, pmap_t pmap) int i; svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO, - 0, BUS_SPACE_MAXADDR, PAGE_SIZE, 0); + 0, VM_MAX_ADDRESS, PAGE_SIZE, 0); svm_sc->vm = vm; svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4); ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307903 - head/sys/amd64/vmm/amd
Author: avg Date: Tue Oct 25 10:34:14 2016 New Revision: 307903 URL: https://svnweb.freebsd.org/changeset/base/307903 Log: vmm/svm: iopm_bitmap and msr_bitmap must be contiguous in physical memory To achieve that the whole svm_softc is allocated with contigmalloc now. It would be more effient to de-embed those arrays and allocate only them with contigmalloc. Previously, if malloc(9) used non-contiguous pages for the arrays, then random bits in physical pages next to the first page would be used to determine permissions for I/O port and MSR accesses. That could result in a guest dangerously modifying the host hardware configuration. One example is that sometimes NMI watchdog driver in a Linux guest would be able to configure a performance counter on a host system. The counter would generate an interrupt and if hwpmc(4) driver is loaded on the host, then the interrupt would be delivered as an NMI. Discussed with: jhb Reviewed by: grehan MFC after:2 weeks Differential Revision: https://reviews.freebsd.org/D8321 Modified: head/sys/amd64/vmm/amd/svm.c Modified: head/sys/amd64/vmm/amd/svm.c == --- head/sys/amd64/vmm/amd/svm.cTue Oct 25 07:48:19 2016 (r307902) +++ head/sys/amd64/vmm/amd/svm.cTue Oct 25 10:34:14 2016 (r307903) @@ -517,7 +517,8 @@ svm_vminit(struct vm *vm, pmap_t pmap) vm_paddr_t msrpm_pa, iopm_pa, pml4_pa; int i; - svm_sc = malloc(sizeof (struct svm_softc), M_SVM, M_WAITOK | M_ZERO); + svm_sc = contigmalloc(sizeof (*svm_sc), M_SVM, M_WAITOK | M_ZERO, + 0, BUS_SPACE_MAXADDR, PAGE_SIZE, 0); svm_sc->vm = vm; svm_sc->nptp = (vm_offset_t)vtophys(pmap->pm_pml4); @@ -2042,7 +2043,7 @@ svm_vmcleanup(void *arg) { struct svm_softc *sc = arg; - free(sc, M_SVM); + contigfree(sc, sizeof (*sc), M_SVM); } static register_t * ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
svn commit: r307902 - head/sys/dev/usb
Author: trasz Date: Tue Oct 25 07:48:19 2016 New Revision: 307902 URL: https://svnweb.freebsd.org/changeset/base/307902 Log: Make the USB attach strings in dmesg include product name. Note to self: MFC this to 9 and 8. Reviewed by: hselasky@, imp@ MFC after:1 month Differential Revision:https://reviews.freebsd.org/D8259 Modified: head/sys/dev/usb/usb_device.c Modified: head/sys/dev/usb/usb_device.c == --- head/sys/dev/usb/usb_device.c Tue Oct 25 05:45:47 2016 (r307901) +++ head/sys/dev/usb/usb_device.c Tue Oct 25 07:48:19 2016 (r307902) @@ -1938,8 +1938,8 @@ config_done: udev->ugen_symlink = usb_alloc_symlink(udev->ugen_name); /* Announce device */ - printf("%s: <%s> at %s\n", udev->ugen_name, - usb_get_manufacturer(udev), + printf("%s: <%s %s> at %s\n", udev->ugen_name, + usb_get_manufacturer(udev), usb_get_product(udev), device_get_nameunit(udev->bus->bdev)); #endif @@ -2148,8 +2148,9 @@ usb_free_device(struct usb_device *udev, #if USB_HAVE_UGEN if (!rebooting) { - printf("%s: <%s> at %s (disconnected)\n", udev->ugen_name, - usb_get_manufacturer(udev), device_get_nameunit(bus->bdev)); + printf("%s: <%s %s> at %s (disconnected)\n", udev->ugen_name, + usb_get_manufacturer(udev), usb_get_product(udev), + device_get_nameunit(bus->bdev)); } /* Destroy UGEN symlink, if any */ ___ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"