svn commit: r323174 - head/sys/boot/efi/loader
Author: mw Date: Tue Sep 5 05:53:43 2017 New Revision: 323174 URL: https://svnweb.freebsd.org/changeset/base/323174 Log: Fix loader bug causing too many pages allocation when bootloader is U-Boot FreeBSD loader expects to have mmsz variable set by bootloader. U-Boot behaviour is that if buffer size is not big enough to keep whole memory map, assign the smallest correct buffer size to sz and return error. In other words U-Boot assumes that nobody will need mmsz value when buffer is not filled with memory map, which is not true, so calculated pages value was too big to allocate. Solution: Simply assign default value to mmsz. Submitted by: Patryk DudaObtained from: Semihalf Sponsored by: Semihalf Differential Revision: https://reviews.freebsd.org/D12194 Modified: head/sys/boot/efi/loader/bootinfo.c Modified: head/sys/boot/efi/loader/bootinfo.c == --- head/sys/boot/efi/loader/bootinfo.c Tue Sep 5 05:50:01 2017 (r323173) +++ head/sys/boot/efi/loader/bootinfo.c Tue Sep 5 05:53:43 2017 (r323174) @@ -268,6 +268,13 @@ bi_load_efi_data(struct preloaded_file *kfp) efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf; /* +* Assgin size of EFI_MEMORY_DESCRIPTOR to keep compatible with +* u-boot which doesn't fill this value when buffer for memory +* descriptors is too small (eg. 0 to obtain memory map size) +*/ + mmsz = sizeof(EFI_MEMORY_DESCRIPTOR); + + /* * It is possible that the first call to ExitBootServices may change * the map key. Fetch a new map key and retry ExitBootServices in that * case. ___ 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: r323063 - head/sys/boot/efi/boot1
Seems to cause armv6 crossbuild to fail. But did armv6 use efi anyway? jsli@jsli-e5:/tmp/src # uname -a FreeBSD jsli-e5 12.0-CURRENT FreeBSD 12.0-CURRENT #59 r323150: Mon Sep 4 11:30:09 CST 2017 jsli@jsli-e5:/usr/obj/usr/src/sys/GENERIC-NODEBUG amd64 jsli@jsli-e5:/tmp/src # svnversion 323170 jsli@jsli-e5:/tmp/src # time nice +20 env MAKEOBJDIRPREFIX=/tmp/obj make -sj12 TARGET_ARCH=armv6 KERNCONF=RPI2 -DNO_CLEAN buildworld buildkernel ... ... ... /tmp/src/sys/boot/efi/boot1/boot1.c:474:32: error: format specifies type 'wchar_t *' (aka 'unsigned int *') but the argume nt has type 'CHAR16 *' (aka 'unsigned short *') [-Werror,-Wformat] printf(" Load Path: %S\n", text); ~~ ^~~~ /tmp/src/sys/boot/efi/boot1/boot1.c:485:35: error: format specifies type 'wchar_t *' (aka 'unsigned int *') but the argume nt has type 'CHAR16 *' (aka 'unsigned short *') [-Werror,-Wformat] printf(" Load Device: %S\n", text); ~~ ^~~~ 2 errors generated. --- boot1.o --- *** [boot1.o] Error code 1 make[6]: stopped in /tmp/src/sys/boot/efi/boot1 1 error make[6]: stopped in /tmp/src/sys/boot/efi/boot1 --- all_subdir_sys/boot/efi/boot1 --- *** [all_subdir_sys/boot/efi/boot1] Error code 2 make[5]: stopped in /tmp/src/sys/boot/efi 1 error make[5]: stopped in /tmp/src/sys/boot/efi --- all_subdir_sys/boot/efi --- *** [all_subdir_sys/boot/efi] Error code 2 make[4]: stopped in /tmp/src/sys/boot 1 error make[4]: stopped in /tmp/src/sys/boot -Jia-Shiun On Fri, Sep 1, 2017 at 1:32 AM, Warner Loshwrote: > Author: imp > Date: Thu Aug 31 17:32:14 2017 > New Revision: 323063 > URL: https://svnweb.freebsd.org/changeset/base/323063 > > Log: > boot1.efi: print more info about where boot1.efi is loaded from > > Print the device that boot1.efi was loaded from. Print the path as > well (since it isn't included in DeviceHandle). Move block where we do > this earlier so all the block handle code is now together. > > Sponsored by: Netflix > > Modified: > head/sys/boot/efi/boot1/boot1.c > > Modified: head/sys/boot/efi/boot1/boot1.c > > == > --- head/sys/boot/efi/boot1/boot1.c Thu Aug 31 17:32:09 2017 > (r323062) > +++ head/sys/boot/efi/boot1/boot1.c Thu Aug 31 17:32:14 2017 > (r323063) > @@ -344,6 +344,7 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) > EFI_CONSOLE_CONTROL_PROTOCOL *ConsoleControl = NULL; > SIMPLE_TEXT_OUTPUT_INTERFACE *conout = NULL; > UINTN i, max_dim, best_mode, cols, rows, hsize, nhandles; > + CHAR16 *text; > > /* Basic initialization*/ > ST = Xsystab; > @@ -387,6 +388,27 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) > } > putchar('\n'); > > + /* Determine the devpath of our image so we can prefer it. */ > + status = BS->HandleProtocol(IH, , (VOID**)); > + imgpath = NULL; > + if (status == EFI_SUCCESS) { > + text = efi_devpath_name(img->FilePath); > + printf(" Load Path: %S\n", text); > + efi_free_devpath_name(text); > + > + status = BS->HandleProtocol(img->DeviceHandle, > , > + (void **)); > + if (status != EFI_SUCCESS) { > + DPRINTF("Failed to get image DevicePath (%lu)\n", > + EFI_ERROR_CODE(status)); > + } else { > + text = efi_devpath_name(imgpath); > + printf(" Load Device: %S\n", text); > + efi_free_devpath_name(text); > + } > + > + } > + > /* Get all the device handles */ > hsize = (UINTN)NUM_HANDLES_INIT * sizeof(EFI_HANDLE); > if ((status = BS->AllocatePool(EfiLoaderData, hsize, (void > **))) > @@ -421,24 +443,6 @@ efi_main(EFI_HANDLE Ximage, EFI_SYSTEM_TABLE *Xsystab) > nhandles = hsize / sizeof(*handles); > printf(" Probing %zu block devices...", nhandles); > DPRINTF("\n"); > - > - /* Determine the devpath of our image so we can prefer it. */ > - status = BS->HandleProtocol(IH, , (VOID**)); > - imgpath = NULL; > - if (status == EFI_SUCCESS) { > - status = BS->HandleProtocol(img->DeviceHandle, > , > - (void **)); > - if (status != EFI_SUCCESS) > - DPRINTF("Failed to get image DevicePath (%lu)\n", > - EFI_ERROR_CODE(status)); > -#ifdef EFI_DEBUG > - { > - CHAR16 *text = efi_devpath_name(imgpath); > - DPRINTF("boot1 imagepath: %S\n", text); > - efi_free_devpath_name(text); > - } > -#endif > - } > > for (i = 0; i < nhandles; i++) >
svn commit: r323173 - in head/sys: arm64/conf conf
Author: mw Date: Tue Sep 5 05:50:01 2017 New Revision: 323173 URL: https://svnweb.freebsd.org/changeset/base/323173 Log: Add Marvell RTC driver to arm64 GENERIC config Marvell Armada 80x0/70x0 SoC family uses same RTC IP as Armada 38x. This patch adds necessary files and enable driver in GENERIC config. Submitted by: Rafal KozikObtained from: Semihalf Sponsored by: Semihalf Differential Revision: https://reviews.freebsd.org/D12200 Modified: head/sys/arm64/conf/GENERIC head/sys/conf/files.arm64 Modified: head/sys/arm64/conf/GENERIC == --- head/sys/arm64/conf/GENERIC Tue Sep 5 05:45:57 2017(r323172) +++ head/sys/arm64/conf/GENERIC Tue Sep 5 05:50:01 2017(r323173) @@ -188,6 +188,7 @@ device aw_nmi # Allwinner NMI support # Real-time clock support device aw_rtc # Allwinner Real-time Clock +device mv_rtc # Marvell Real-time Clock # Watchdog controllers device aw_wdog # Allwinner Watchdog Modified: head/sys/conf/files.arm64 == --- head/sys/conf/files.arm64 Tue Sep 5 05:45:57 2017(r323172) +++ head/sys/conf/files.arm64 Tue Sep 5 05:50:01 2017(r323173) @@ -73,6 +73,7 @@ arm/broadcom/bcm2835/bcm2835_vcio.c optional soc_brcm arm/broadcom/bcm2835/bcm2835_wdog.coptional soc_brcm_bcm2837 fdt arm/broadcom/bcm2835/bcm2836.c optional soc_brcm_bcm2837 fdt arm/broadcom/bcm2835/bcm283x_dwc_fdt.c optional dwcotg fdt soc_brcm_bcm2837 +arm/mv/armada38x/armada38x_rtc.c optional mv_rtc fdt arm64/acpica/acpi_machdep.coptionalacpi arm64/acpica/OsdEnvironment.c optionalacpi arm64/acpica/acpi_wakeup.c optionalacpi ___ 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: r323172 - head/sys/arm/mv/armada38x
Author: mw Date: Tue Sep 5 05:45:57 2017 New Revision: 323172 URL: https://svnweb.freebsd.org/changeset/base/323172 Log: Add Armada 80x0/70x0 compatible to 38x RTC driver Marvell Armada 80x0/70x0 SoC family uses same RTC IP as Armada 38x. This patch adds Armada 8k compatible to Marvell RTC driver. Submitted by: Rafal KozikObtained from: Semihalf Sponsored by: Semihalf Differential Revision: https://reviews.freebsd.org/D12186 Modified: head/sys/arm/mv/armada38x/armada38x_rtc.c Modified: head/sys/arm/mv/armada38x/armada38x_rtc.c == --- head/sys/arm/mv/armada38x/armada38x_rtc.c Tue Sep 5 05:42:37 2017 (r323171) +++ head/sys/arm/mv/armada38x/armada38x_rtc.c Tue Sep 5 05:45:57 2017 (r323172) @@ -126,6 +126,12 @@ static driver_t mv_rtc_driver = { sizeof(struct mv_rtc_softc), }; +static struct ofw_compat_data mv_rtc_compat[] = { + {"marvell,armada-380-rtc", true}, + {"marvell,armada-8k-rtc", true}, + {NULL, false}, +}; + static devclass_t mv_rtc_devclass; DRIVER_MODULE(a38x_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); @@ -174,7 +180,7 @@ mv_rtc_probe(device_t dev) if (!ofw_bus_status_okay(dev)) return (ENXIO); - if (!ofw_bus_is_compatible(dev, "marvell,armada-380-rtc")) + if (!ofw_bus_search_compatible(dev, mv_rtc_compat)->ocd_data) return (ENXIO); device_set_desc(dev, "Marvell Integrated RTC"); ___ 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: r323171 - in head/sys/arm: conf mv/armada38x
Author: mw Date: Tue Sep 5 05:42:37 2017 New Revision: 323171 URL: https://svnweb.freebsd.org/changeset/base/323171 Log: Change name of Marvell Armada38x RTC driver Two modules with the same name cannot be loaded, so Marvell specific drivers cannot have the same name as generic drivers. Files with the same name, even in different folder overlaps their .o files. Change armada38x/rtc.c to armada38x/armada38x_rtc.c fix it. Preparation for adding this driver to GENERIC config for ARMv7 Marvell platforms. Submitted by: Rafal KozikObtained from: Semihalf Sponsored by: Semihalf Differential Revision: https://reviews.freebsd.org/D12185 Added: head/sys/arm/mv/armada38x/armada38x_rtc.c - copied, changed from r323170, head/sys/arm/mv/armada38x/rtc.c Deleted: head/sys/arm/mv/armada38x/rtc.c Modified: head/sys/arm/conf/ARMADA38X head/sys/arm/mv/armada38x/files.armada38x Modified: head/sys/arm/conf/ARMADA38X == --- head/sys/arm/conf/ARMADA38X Tue Sep 5 05:28:52 2017(r323170) +++ head/sys/arm/conf/ARMADA38X Tue Sep 5 05:42:37 2017(r323171) @@ -48,6 +48,9 @@ deviceneta # PCI device pci +# RTC +device mv_rtc + # Interrupt controllers device gic optionsINTRNG Copied and modified: head/sys/arm/mv/armada38x/armada38x_rtc.c (from r323170, head/sys/arm/mv/armada38x/rtc.c) == --- head/sys/arm/mv/armada38x/rtc.c Tue Sep 5 05:28:52 2017 (r323170, copy source) +++ head/sys/arm/mv/armada38x/armada38x_rtc.c Tue Sep 5 05:42:37 2017 (r323171) @@ -128,7 +128,7 @@ static driver_t mv_rtc_driver = { static devclass_t mv_rtc_devclass; -DRIVER_MODULE(mv_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); +DRIVER_MODULE(a38x_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); static void mv_rtc_reset(device_t dev) Modified: head/sys/arm/mv/armada38x/files.armada38x == --- head/sys/arm/mv/armada38x/files.armada38x Tue Sep 5 05:28:52 2017 (r323170) +++ head/sys/arm/mv/armada38x/files.armada38x Tue Sep 5 05:42:37 2017 (r323171) @@ -7,6 +7,6 @@ arm/mv/armada/wdt.c optional fdt arm/mv/armada38x/armada38x.c standard arm/mv/armada38x/armada38x_mp.coptional smp arm/mv/armada38x/pmsu.cstandard -arm/mv/armada38x/rtc.c standard +arm/mv/armada38x/armada38x_rtc.c optional mv_rtc fdt arm/mv/armada38x/armada38x_pl310.c optional pl310 dev/sdhci/sdhci_fdt.c optional sdhci ___ 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: r323170 - in head/sys: net sys
Author: sephe Date: Tue Sep 5 05:28:52 2017 New Revision: 323170 URL: https://svnweb.freebsd.org/changeset/base/323170 Log: if: Add ioctls to get RSS key and hash type/function. It will be needed by hn(4) to configure its RSS key and hash type/function in the transparent VF mode in order to match VF's RSS settings. The description of the transparent VF mode and the RSS hash value issue are here: https://svnweb.freebsd.org/base?view=revision=322299 https://svnweb.freebsd.org/base?view=revision=322485 These are generic enough to promise two independent IOCs instead of abusing SIOCGDRVSPEC. Setting RSS key and hash type/function is a different story, which probably requires more discussion. Comment about UDP_{IPV4,IPV6,IPV6_EX} were only in the patch in the review request; these hash types are standardized now. Reviewed by: gallatin MFC after:1 week Sponsored by: Microsoft Differential Revision:https://reviews.freebsd.org/D12174 Modified: head/sys/net/if.c head/sys/net/if.h head/sys/sys/sockio.h Modified: head/sys/net/if.c == --- head/sys/net/if.c Tue Sep 5 01:40:53 2017(r323169) +++ head/sys/net/if.c Tue Sep 5 05:28:52 2017(r323170) @@ -2661,6 +2661,8 @@ ifhwioctl(u_long cmd, struct ifnet *ifp, caddr_t data, case SIOCGIFMEDIA: case SIOCGIFXMEDIA: case SIOCGIFGENERIC: + case SIOCGIFRSSKEY: + case SIOCGIFRSSHASH: if (ifp->if_ioctl == NULL) return (EOPNOTSUPP); error = (*ifp->if_ioctl)(ifp, cmd, data); Modified: head/sys/net/if.h == --- head/sys/net/if.h Tue Sep 5 01:40:53 2017(r323169) +++ head/sys/net/if.h Tue Sep 5 05:28:52 2017(r323170) @@ -526,6 +526,42 @@ struct ifi2creq { uint8_t data[8];/* read buffer */ }; +/* + * RSS hash. + */ + +#defineRSS_FUNC_NONE 0 /* RSS disabled */ +#defineRSS_FUNC_PRIVATE1 /* non-standard */ +#defineRSS_FUNC_TOEPLITZ 2 + +#defineRSS_TYPE_IPV4 0x0001 +#defineRSS_TYPE_TCP_IPV4 0x0002 +#defineRSS_TYPE_IPV6 0x0004 +#defineRSS_TYPE_IPV6_EX0x0008 +#defineRSS_TYPE_TCP_IPV6 0x0010 +#defineRSS_TYPE_TCP_IPV6_EX0x0020 +#defineRSS_TYPE_UDP_IPV4 0x0040 +#defineRSS_TYPE_UDP_IPV6 0x0080 +#defineRSS_TYPE_UDP_IPV6_EX0x0100 + +#defineRSS_KEYLEN 128 + +struct ifrsskey { + charifrk_name[IFNAMSIZ];/* if name, e.g. "en0" */ + uint8_t ifrk_func; /* RSS_FUNC_ */ + uint8_t ifrk_spare0; + uint16_tifrk_keylen; + uint8_t ifrk_key[RSS_KEYLEN]; +}; + +struct ifrsshash { + charifrh_name[IFNAMSIZ];/* if name, e.g. "en0" */ + uint8_t ifrh_func; /* RSS_FUNC_ */ + uint8_t ifrh_spare0; + uint16_tifrh_spare1; + uint32_tifrh_types; /* RSS_TYPE_ */ +}; + #endif /* __BSD_VISIBLE */ #ifdef _KERNEL Modified: head/sys/sys/sockio.h == --- head/sys/sys/sockio.h Tue Sep 5 01:40:53 2017(r323169) +++ head/sys/sys/sockio.h Tue Sep 5 05:28:52 2017(r323170) @@ -134,4 +134,8 @@ #defineSIOCGIFGMEMB_IOWR('i', 138, struct ifgroupreq) /* get members */ #defineSIOCGIFXMEDIA _IOWR('i', 139, struct ifmediareq) /* get net xmedia */ +#defineSIOCGIFRSSKEY _IOWR('i', 150, struct ifrsskey)/* get RSS key */ +#defineSIOCGIFRSSHASH _IOWR('i', 151, struct ifrsshash)/* get the current RSS + type/func settings */ + #endif /* !_SYS_SOCKIO_H_ */ ___ 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: r312296 - in head: lib/libc/sys sys/kern sys/netinet sys/netinet6 sys/sys tools/regression/sockets/udp_pingpong tools/regression/sockets/unix_cmsg
Sure, I'll check that out. Thanks for heads up. -Max On Sun, Sep 3, 2017 at 8:18 PM, Alan Somerswrote: > On Mon, Jan 16, 2017 at 10:46 AM, Maxim Sobolev > wrote: > > Author: sobomax > > Date: Mon Jan 16 17:46:38 2017 > > New Revision: 312296 > > URL: https://svnweb.freebsd.org/changeset/base/312296 > > > > Log: > > Add a new socket option SO_TS_CLOCK to pick from several different > clock > > sources to return timestamps when SO_TIMESTAMP is enabled. Two > additional > > clock sources are: > > > > o nanosecond resolution realtime clock (equivalent of CLOCK_REALTIME); > > o nanosecond resolution monotonic clock (equivalent of > CLOCK_MONOTONIC). > > > > In addition to this, this option provides unified interface to get > bintime > > (equivalent of using SO_BINTIME), except it also supported with IPv6 > where > > SO_BINTIME has never been supported. The long term plan is to > depreciate > > SO_BINTIME and move everything to using SO_TS_CLOCK. > > > > Idea for this enhancement has been briefly discussed on the Net session > > during dev summit in Ottawa last June and the general input was > positive. > > > > This change is believed to benefit network benchmarks/profiling as well > > as other scenarios where precise time of arrival measurement is > necessary. > > > > There are two regression test cases as part of this commit: one > extends unix > > domain test code (unix_cmsg) to test new SCM_XXX types and another one > > implementis totally new test case which exchanges UDP packets between > two > > processes using both conventional methods (i.e. calling > clock_gettime(2) > > before recv(2) and after send(2)), as well as using > setsockopt()+recv() in > > receive path. The resulting delays are checked for sanity for all > supported > > clock types. > > > > Reviewed by:adrian, gnn > > Differential Revision: https://reviews.freebsd.org/D9171 > > While the new SCM_TIMESTAMP code works fine on both amd64 and i386, it > doesn't work on amd64 under 32-bit emulation. That is, programs that > use SCM_TIMESTAMP built for i386 will fail when run on an amd64 > machine. I don't know whether this commit introduced that bug; on > stable-10 SCM_TIMESTAMP doesn't appear to work at all on i386. But > sobomax, since you're obviously familiar with this code, would you > mind taking a look? > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=222039 > > -Alan > > ___ 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: r323166 - head/cddl/contrib/opensolaris/lib/libdtrace/common
Author: markj Date: Tue Sep 5 00:11:06 2017 New Revision: 323166 URL: https://svnweb.freebsd.org/changeset/base/323166 Log: Use O_CLOEXEC when opening persistent handles in libdtrace. PR: 199810 Submitted by: j...@iki.fi MFC after:1 week Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c Modified: head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c == --- head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cMon Sep 4 22:37:28 2017(r323165) +++ head/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.cTue Sep 5 00:11:06 2017(r323166) @@ -963,7 +963,7 @@ dt_provmod_open(dt_provmod_t **provmod, dt_fdlist_t *d (void) snprintf(path, sizeof (path), "/dev/dtrace/%s", p1); - if ((fd = open(path, O_RDONLY)) == -1) + if ((fd = open(path, O_RDONLY | O_CLOEXEC)) == -1) continue; /* failed to open driver; just skip it */ if (((prov = malloc(sizeof (dt_provmod_t))) == NULL) || @@ -1100,7 +1100,7 @@ dt_vopen(int version, int flags, int *errp, */ dt_provmod_open(, ); - dtfd = open("/dev/dtrace/dtrace", O_RDWR); + dtfd = open("/dev/dtrace/dtrace", O_RDWR | O_CLOEXEC); err = errno; /* save errno from opening dtfd */ #if defined(__FreeBSD__) /* @@ -1116,7 +1116,7 @@ dt_vopen(int version, int flags, int *errp, #ifdef illumos ftfd = open("/dev/dtrace/provider/fasttrap", O_RDWR); #else - ftfd = open("/dev/dtrace/fasttrap", O_RDWR); + ftfd = open("/dev/dtrace/fasttrap", O_RDWR | O_CLOEXEC); #endif fterr = ftfd == -1 ? errno : 0; /* save errno from open ftfd */ @@ -1145,9 +1145,6 @@ dt_vopen(int version, int flags, int *errp, } return (set_open_errno(dtp, errp, err)); } - - (void) fcntl(dtfd, F_SETFD, FD_CLOEXEC); - (void) fcntl(ftfd, F_SETFD, FD_CLOEXEC); alloc: if ((dtp = malloc(sizeof (dtrace_hdl_t))) == 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"
svn commit: r323165 - in head/release: amd64 i386 powerpc sparc64
Author: emaste Date: Mon Sep 4 22:37:28 2017 New Revision: 323165 URL: https://svnweb.freebsd.org/changeset/base/323165 Log: mkisoimages.sh: remove obsolete x$var convention Ancient shells had trouble with empty variables but this has not been relevant for FreeBSD for a very long time (decades?). Modified: head/release/amd64/mkisoimages.sh head/release/i386/mkisoimages.sh head/release/powerpc/mkisoimages.sh head/release/sparc64/mkisoimages.sh Modified: head/release/amd64/mkisoimages.sh == --- head/release/amd64/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/amd64/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" Modified: head/release/i386/mkisoimages.sh == --- head/release/i386/mkisoimages.shMon Sep 4 21:58:35 2017 (r323164) +++ head/release/i386/mkisoimages.shMon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # This is highly x86-centric and will be used directly below. bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot" shift Modified: head/release/powerpc/mkisoimages.sh == --- head/release/powerpc/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/powerpc/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -23,7 +23,7 @@ # extra-bits-dir, if provided, contains additional files to be merged # into base-bits-dir as part of making the image. -if [ "x$1" = "x-b" ]; then +if [ "$1" = "-b" ]; then # Apple boot code uudecode -o /tmp/hfs-boot-block.bz2 "`dirname "$0"`/hfs-boot.bz2.uu" bzip2 -d /tmp/hfs-boot-block.bz2 Modified: head/release/sparc64/mkisoimages.sh == --- head/release/sparc64/mkisoimages.sh Mon Sep 4 21:58:35 2017 (r323164) +++ head/release/sparc64/mkisoimages.sh Mon Sep 4 22:37:28 2017 (r323165) @@ -40,7 +40,7 @@ echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > "$BASEBIT makefs -t cd9660 -o rockridge -o label="$LABEL" -o publisher="$publisher" "$NAME.tmp" "$@" rm -f "$BASEBITSDIR/etc/fstab" -if [ "x$BOPT" != "x-b" ]; then +if [ "$BOPT" != "-b" ]; then mv "$NAME.tmp" "$NAME" exit 0 fi ___ 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: r323161 - head/usr.sbin/binmiscctl
On Mon, Sep 4, 2017 at 3:57 PM, Justin Hibbitswrote: > Author: jhibbits > Date: Mon Sep 4 20:57:38 2017 > New Revision: 323161 > URL: https://svnweb.freebsd.org/changeset/base/323161 > > Log: > Correct the binmiscctl(8) man page for powerpc64 > > Magic for powerpc64 erroneously specified ELFCLASS32 instead of ELFCLASS64. > > Submitted by: luca.pizzamiglio _AT_ gmail DOT com > MFC after:3 days PR: 215999 > > Modified: > head/usr.sbin/binmiscctl/binmiscctl.8 > > Modified: head/usr.sbin/binmiscctl/binmiscctl.8 > == > --- head/usr.sbin/binmiscctl/binmiscctl.8 Mon Sep 4 20:41:34 2017 > (r323160) > +++ head/usr.sbin/binmiscctl/binmiscctl.8 Mon Sep 4 20:57:38 2017 > (r323161) > @@ -250,7 +250,7 @@ Add QEMU bsd-user program as an image activator for Po > .Bd -literal -offset indent > # binmiscctl add powerpc64 \e >--interpreter "/usr/local/bin/qemu-ppc64-static" \e > - --magic "\ex7f\ex45\ex4c\ex46\ex01\ex02\ex01\ex00\ex00\ex00\e > + --magic "\ex7f\ex45\ex4c\ex46\ex02\ex02\ex01\ex00\ex00\ex00\e > \ex00\ex00\ex00\ex00\ex00\ex00\ex00\ex02\ex00\ex15" \e >--mask "\exff\exff\exff\exff\exff\exff\exff\ex00\exff\exff\e > \exff\exff\exff\exff\exff\exff\exff\exfe\exff\exff" \e > ___ 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: r323161 - head/usr.sbin/binmiscctl
Author: jhibbits Date: Mon Sep 4 20:57:38 2017 New Revision: 323161 URL: https://svnweb.freebsd.org/changeset/base/323161 Log: Correct the binmiscctl(8) man page for powerpc64 Magic for powerpc64 erroneously specified ELFCLASS32 instead of ELFCLASS64. Submitted by: luca.pizzamiglio _AT_ gmail DOT com MFC after:3 days Modified: head/usr.sbin/binmiscctl/binmiscctl.8 Modified: head/usr.sbin/binmiscctl/binmiscctl.8 == --- head/usr.sbin/binmiscctl/binmiscctl.8 Mon Sep 4 20:41:34 2017 (r323160) +++ head/usr.sbin/binmiscctl/binmiscctl.8 Mon Sep 4 20:57:38 2017 (r323161) @@ -250,7 +250,7 @@ Add QEMU bsd-user program as an image activator for Po .Bd -literal -offset indent # binmiscctl add powerpc64 \e --interpreter "/usr/local/bin/qemu-ppc64-static" \e - --magic "\ex7f\ex45\ex4c\ex46\ex01\ex02\ex01\ex00\ex00\ex00\e + --magic "\ex7f\ex45\ex4c\ex46\ex02\ex02\ex01\ex00\ex00\ex00\e \ex00\ex00\ex00\ex00\ex00\ex00\ex00\ex02\ex00\ex15" \e --mask "\exff\exff\exff\exff\exff\exff\exff\ex00\exff\exff\e \exff\exff\exff\exff\exff\exff\exff\exfe\exff\exff" \e ___ 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: r323160 - head/share/misc
Author: bapt Date: Mon Sep 4 20:41:34 2017 New Revision: 323160 URL: https://svnweb.freebsd.org/changeset/base/323160 Log: Update pci_vendors to 2017-09-01 MFC after:2 days Modified: head/share/misc/pci_vendors Modified: head/share/misc/pci_vendors == --- head/share/misc/pci_vendors Mon Sep 4 20:27:12 2017(r323159) +++ head/share/misc/pci_vendors Mon Sep 4 20:41:34 2017(r323160) @@ -3,8 +3,8 @@ # # List of PCI ID's # -# Version: 2017.07.27 -# Date:2017-07-27 03:15:02 +# Version: 2017.09.01 +# Date:2017-09-01 03:15:02 # # Maintained by Albert Pool, Martin Mares, and other volunteers from # the PCI ID Project at http://pci-ids.ucw.cz/. @@ -41,7 +41,8 @@ 0680 Ultra ATA/133 IDE RAID CONTROLLER CARD # Wrong ID used in subsystem ID of the TELES.S0/PCI 2.x ISDN adapter 00a7 Teles AG (Wrong ID) -0100 Ncipher Corp Ltd +# nee nCipher +0100 Thales e-Security 0123 General Dynamics # 018a is not LevelOne but there is a board misprogrammed 018a LevelOne @@ -327,6 +328,7 @@ 1033 8336 SAS1068 0056 SAS1064ET PCI-Express Fusion-MPT SAS 1014 03bb ServeRAID BR10il SAS/SATA Controller v2 + 8086 34dc AXX4SASMOD RAID Controller 0057 M1064E MegaRAID SAS 8086 346c Embedded Software RAID Technology II (ESTRII) 0058 SAS1068E PCI-Express Fusion-MPT SAS @@ -369,7 +371,16 @@ 1028 1f38 PERC H710 Mini (for monolithics) 15d9 0690 LSI MegaRAID ROMB 8086 3510 RMS25PB080 RAID Controller + 8086 3511 RMS25PB040 RAID Controller + 8086 3512 RMT3PB080 RAID Controller 8086 3513 RMS25CB080 RAID Controller + 8086 3514 RMS25CB040 RAID Controller + 8086 351c RMS25PB080N RAID Controller + 8086 351d RMS25CB080N RAID Controller + 8086 9265 RS25DB080 RAID Controller + 8086 9268 RS25AB080 RAID Controller + 8086 9285 RS25NB008 RAID Controller + 8086 9288 RS25SB008 RAID Controller 005c SAS1064A PCI-X Fusion-MPT SAS 005d MegaRAID SAS-3 3108 [Invader] 1000 9361 MegaRAID SAS 9361-8i @@ -389,6 +400,12 @@ 17aa 1052 ThinkServer RAID 720i 17aa 1053 ThinkServer RAID 720ix 1d49 0600 ThinkSystem RAID 730-8i 1GB Cache PCIe 12Gb Adapter + 8086 351e RMS3CC080 RAID Controller + 8086 351f RMS3CC040 RAID Controller + 8086 9360 RS3DC080 RAID Controller + 8086 9362 RS3DC040 RAID Controller + 8086 9380 RS3SC008 RAID Controller + 8086 9381 RS3MC044 RAID Controller 005e SAS1066 PCI-X Fusion-MPT SAS 005f MegaRAID SAS-3 3008 [Fury] 1028 1f44 PERC H330 Adapter @@ -444,6 +461,7 @@ 1028 1f20 PERC H200 Embedded 1028 1f22 Internal Tape Adapter 8086 350f RMS2LL040 RAID Controller + 8086 3700 SSD 910 Series 0073 MegaRAID SAS 2008 [Falcon] 1000 9240 MegaRAID SAS 9240-8i 1000 9241 MegaRAID SAS 9240-4i @@ -499,12 +517,18 @@ 1043 8480 PIKE-2108 16PD 1734 1176 RAID Ctrl SAS 6G 5/6 512MB (D2616) 1734 1177 RAID Ctrl SAS 6G 0/1 (D2607) - 8086 9256 MegaRAID SAS 9260DE-8i + 8086 350b RMS2MH080 RAID Controller + 8086 9256 MegaRAID SAS 9260DE-8i RS2BL080DE 8086 9260 RAID Controller RS2BL040 8086 9261 RAID Controller RS2BL080 - 8086 9264 Warm Beach (Caster Lite) + 8086 9264 RAID Controller RT3WB080 Warm Beach (Caster Lite) 8086 9267 RAID Controller RS2VB040 8086 9268 RAID Controller RS2VB080 + 8086 9275 RAID Controller RS2PI008DE + 8086 9276 RAID Controller RS2WG160 + 8086 9280 RAID Controller RS2PI008 + 8086 9282 RAID Controller RS2MB044 + 8086 9290 RAID Controller RS2SG244 007c MegaRAID SAS 1078DE 1014 0395 ServeRAID-AR10is SAS/SATA Controller 007e SSS6200 PCI-Express Flash SSD @@ -535,6 +559,14 @@ 1000 3040 9207-8e SAS2.1 HBA 1000 3050 SAS9217-8i 1590 0044 H220i + 8086 3000 RS25GB008 RAID Controller + 8086 3060 RS25FB044 RAID Controller + 8086 3516 RMS25JB080 RAID Controller + 8086 3517 RMS25JB040 RAID Controller + 8086 3518 RMS25KB080 RAID Controller + 8086 3519 RMS25KB040 RAID Controller + 8086 351a RMS25LB040 RAID Controller + 8086 351b RMS25LB080
svn commit: r323157 - in head: sbin/fsck_ffs sbin/newfs sys/ufs/ffs
Author: mckusick Date: Mon Sep 4 20:19:36 2017 New Revision: 323157 URL: https://svnweb.freebsd.org/changeset/base/323157 Log: The new fsck recovery information to enable it to find backup superblocks created in revision 322297 only works on disks with sector sizes up to 4K. This update allows the recovery information to be created by newfs and used by fsck on disks with sector sizes up to 64K. Note that FFS currently limits filesystem to be mounted from disks with up to 8K sectors. Expanding this limitation will be the subject of another commit. Reported by: Peter Holm Reviewed with: kib Modified: head/sbin/fsck_ffs/setup.c head/sbin/newfs/mkfs.c head/sys/ufs/ffs/fs.h Modified: head/sbin/fsck_ffs/setup.c == --- head/sbin/fsck_ffs/setup.c Mon Sep 4 20:10:34 2017(r323156) +++ head/sbin/fsck_ffs/setup.c Mon Sep 4 20:19:36 2017(r323157) @@ -36,6 +36,7 @@ static const char sccsid[] = "@(#)setup.c 8.10 (Berkel __FBSDID("$FreeBSD$"); #include +#include #include #define FSTYPENAMES #include @@ -465,7 +466,9 @@ sblock_init(void) static int calcsb(char *dev, int devfd, struct fs *fs) { - struct fsrecovery fsr; + struct fsrecovery *fsr; + char *fsrbuf; + u_int secsize; /* * We need fragments-per-group and the partition-size. @@ -475,32 +478,62 @@ calcsb(char *dev, int devfd, struct fs *fs) * overwritten by a boot block, we fail. But usually they are * there and we can use them. */ - if (blread(devfd, (char *), - (SBLOCK_UFS2 - sizeof(fsr)) / dev_bsize, sizeof(fsr)) || - fsr.fsr_magic != FS_UFS2_MAGIC) + if (ioctl(devfd, DIOCGSECTORSIZE, ) == -1) return (0); + fsrbuf = Malloc(secsize); + if (fsrbuf == NULL) + errx(EEXIT, "calcsb: cannot allocate recovery buffer"); + if (blread(devfd, fsrbuf, + (SBLOCK_UFS2 - secsize) / dev_bsize, secsize) != 0) + return (0); + fsr = (struct fsrecovery *)[secsize - sizeof *fsr]; + if (fsr->fsr_magic != FS_UFS2_MAGIC) + return (0); memset(fs, 0, sizeof(struct fs)); - fs->fs_fpg = fsr.fsr_fpg; - fs->fs_fsbtodb = fsr.fsr_fsbtodb; - fs->fs_sblkno = fsr.fsr_sblkno; - fs->fs_magic = fsr.fsr_magic; - fs->fs_ncg = fsr.fsr_ncg; + fs->fs_fpg = fsr->fsr_fpg; + fs->fs_fsbtodb = fsr->fsr_fsbtodb; + fs->fs_sblkno = fsr->fsr_sblkno; + fs->fs_magic = fsr->fsr_magic; + fs->fs_ncg = fsr->fsr_ncg; + free(fsrbuf); return (1); } /* * Check to see if recovery information exists. + * Return 1 if it exists or cannot be created. + * Return 0 if it does not exist and can be created. */ static int chkrecovery(int devfd) { - struct fsrecovery fsr; + struct fsrecovery *fsr; + char *fsrbuf; + u_int secsize; - if (blread(devfd, (char *), - (SBLOCK_UFS2 - sizeof(fsr)) / dev_bsize, sizeof(fsr)) || - fsr.fsr_magic != FS_UFS2_MAGIC) - return (0); - return (1); + /* +* Could not determine if backup material exists, so do not +* offer to create it. +*/ + if (ioctl(devfd, DIOCGSECTORSIZE, ) == -1 || + (fsrbuf = Malloc(secsize)) == NULL || + blread(devfd, fsrbuf, (SBLOCK_UFS2 - secsize) / dev_bsize, + secsize) != 0) + return (1); + /* +* Recovery material has already been created, so do not +* need to create it again. +*/ + fsr = (struct fsrecovery *)[secsize - sizeof *fsr]; + if (fsr->fsr_magic == FS_UFS2_MAGIC) { + free(fsrbuf); + return (1); + } + /* +* Recovery material has not been created and can be if desired. +*/ + free(fsrbuf); + return (0); } /* @@ -511,17 +544,24 @@ chkrecovery(int devfd) static void saverecovery(int readfd, int writefd) { - struct fsrecovery fsr; + struct fsrecovery *fsr; + char *fsrbuf; + u_int secsize; if (sblock.fs_magic != FS_UFS2_MAGIC || - blread(readfd, (char *), - (SBLOCK_UFS2 - sizeof(fsr)) / dev_bsize, sizeof(fsr))) + ioctl(readfd, DIOCGSECTORSIZE, ) == -1 || + (fsrbuf = Malloc(secsize)) == NULL || + blread(readfd, fsrbuf, (SBLOCK_UFS2 - secsize) / dev_bsize, + secsize) != 0) { + printf("RECOVERY DATA COULD NOT BE CREATED\n"); return; - fsr.fsr_magic = sblock.fs_magic; - fsr.fsr_fpg = sblock.fs_fpg; - fsr.fsr_fsbtodb = sblock.fs_fsbtodb; - fsr.fsr_sblkno = sblock.fs_sblkno; - fsr.fsr_ncg = sblock.fs_ncg; - blwrite(writefd, (char *), (SBLOCK_UFS2 - sizeof(fsr)) / dev_bsize, - sizeof(fsr)); + } + fsr =
svn commit: r323156 - head/sys/mips/conf
Author: lidl Date: Mon Sep 4 20:10:34 2017 New Revision: 323156 URL: https://svnweb.freebsd.org/changeset/base/323156 Log: Fix whitespace on "options" to be , no functional change Modified: head/sys/mips/conf/ERL Modified: head/sys/mips/conf/ERL == --- head/sys/mips/conf/ERL Mon Sep 4 18:59:44 2017(r323155) +++ head/sys/mips/conf/ERL Mon Sep 4 20:10:34 2017(r323156) @@ -39,7 +39,7 @@ makeoptions DEBUG=-g#Build kernel with gdb(1) debug #options OCTEON_VENDOR_LANNER# Support for Lanner boards. #options OCTEON_VENDOR_RADISYS # Support for Radisys boards. optionsOCTEON_VENDOR_UBIQUITI # Support for Ubiquiti boards. -#options OCTEON_VENDOR_GEFES # Support for GE LANIC boards +#options OCTEON_VENDOR_GEFES # Support for GE LANIC boards #options OCTEON_BOARD_CAPK_0100ND# Support for CAPK-0100nd. # Compile for a specified Octeon model. If not specified, support for @@ -89,7 +89,7 @@ options MAC # TrustedBSD MAC Framework #options KDTRACE_FRAME # Ensure frames are compiled in #options KDTRACE_HOOKS # Kernel DTrace hooks optionsINCLUDE_CONFIG_FILE # Include this file in kernel -optionsTMPFS # Temporary file system +optionsTMPFS # Temporary file system # Debugging for use in -current #options KDB # Enable kernel debugger support. ___ 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: r323155 - head/lib/libefivar
Author: rlibby Date: Mon Sep 4 18:59:44 2017 New Revision: 323155 URL: https://svnweb.freebsd.org/changeset/base/323155 Log: libefivar: -fno-strict-aliasing Avoid dealing with some code that uses type-punned pointers. See D12210 and D12211 for more background. Reviewed by: imp Approved by: markj (mentor) Sponsored by: Dell EMC Isilon Differential Revision:https://reviews.freebsd.org/D12219 Modified: head/lib/libefivar/Makefile Modified: head/lib/libefivar/Makefile == --- head/lib/libefivar/Makefile Mon Sep 4 10:08:42 2017(r323154) +++ head/lib/libefivar/Makefile Mon Sep 4 18:59:44 2017(r323155) @@ -64,4 +64,4 @@ WARNS?= 9 .include -CFLAGS+= -Wno-cast-align -Wno-unused-parameter +CFLAGS+= -fno-strict-aliasing -Wno-cast-align -Wno-unused-parameter ___ 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: r323154 - head/sys/x86/acpica
Author: royger Date: Mon Sep 4 10:08:42 2017 New Revision: 323154 URL: https://svnweb.freebsd.org/changeset/base/323154 Log: acpi/srat: zero the SRAT cpu array Fix from fallout introduced in r322348 that moved the cpus array to a dynamic allocation without zeroing the area. Reported by: mjg MFC with: r322348 Reviewed by: mjg Differential revision:https://reviews.freebsd.org/D12220 Modified: head/sys/x86/acpica/srat.c Modified: head/sys/x86/acpica/srat.c == --- head/sys/x86/acpica/srat.c Mon Sep 4 08:41:51 2017(r323153) +++ head/sys/x86/acpica/srat.c Mon Sep 4 10:08:42 2017(r323154) @@ -449,6 +449,7 @@ parse_srat(void) * the default memory attribute (WB), and the DMAP when available. */ cpus = (struct cpu_info *)pmap_mapbios(addr, size); + bzero(cpus, size); /* * Make a pass over the table to populate the cpus[] and ___ 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"