Re: CVS commit: [netbsd-9] src
On Fri, Oct 16, 2020 at 08:17:09AM +, Martin Husemann wrote: > Module Name: src > Committed By: martin > Date: Fri Oct 16 08:17:09 UTC 2020 > > Modified Files: > src/doc [netbsd-9]: CHANGES-9.1 > src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local > src/sys/sys [netbsd-9]: param.h > > Log Message: > Welcome to 9.1! Just in case anyone is wondering - this version did not survive internal QA, we will move the tag for some files and have a slightly different 9.1 - hopefully soon. This is why no official binaries are available and there was no anouncement yet. Martin
Re: CVS commit: [netbsd-9] src/doc
On Mon, Aug 17, 2020 at 11:10:39PM +0900, Izumi Tsutsui wrote: > >> +xsrc/external/mit/xorg-server/dist/fb/fb.h1.3 > >> +xsrc/external/mit/xorg-server/dist/fb/fbfill.c1.2,1.3 > > This should be only 1.2 (no 1.3 yet). > > >> +xsrc/external/mit/xorg-server/dist/fb/fbtile.c1.1-1.3 > > Maybe only 1.3 is enough (1.2 was file removal). Both adjusted, thanks! (The scripts deal not very well with vendor branches or source changes mails referenced in commit messages) Martin
Re: CVS commit: [netbsd-9] src/doc
> Module Name: src > Committed By: martin > Date: Mon Aug 17 11:31:07 UTC 2020 > > Modified Files: > src/doc [netbsd-9]: CHANGES-9.1 > > Log Message: > Tickets #1050 - #1054 > > > To generate a diff of this commit: > cvs rdiff -u -r1.1.2.95 -r1.1.2.96 src/doc/CHANGES-9.1 >> +xsrc/external/mit/xorg-server/dist/fb/fb.h 1.3 >> +xsrc/external/mit/xorg-server/dist/fb/fbfill.c 1.2,1.3 This should be only 1.2 (no 1.3 yet). >> +xsrc/external/mit/xorg-server/dist/fb/fbtile.c 1.1-1.3 Maybe only 1.3 is enough (1.2 was file removal). >> +xsrc/external/mit/xorg-server/dist/fb/wfbrename.h 1.2 >> +external/mit/xorg/server/xorg-server/fb/Makefile.fb 1.12 --- Izumi Tsutsui
Re: CVS commit: [netbsd-9] src/sys
On Mon, Mar 09, 2020 at 02:22:26PM +0100, Tobias Nygren wrote: > /usr/src/sys/arch/amd64/amd64/trap.c: In function 'trap': > /usr/src/sys/arch/amd64/amd64/trap.c:360:2: error: expected expression before > '}' token > > 1.107 christos 356: > 1.121.2.1! martin 357: > MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame), > ! 358:ENOSYS, hook_ret); > ! 359:if (hook_ret == 0) > 1.107 christos 360:} > 1.116 mrg 361:/* FALLTHROUGH */ > Yes, I fixed it a few minutes ago. Martin
Re: CVS commit: [netbsd-9] src/sys
On Sun, 8 Mar 2020 10:54:43 + Martin Husemann wrote: > Pull up following revision(s) (requested by pgoyette in ticket #762): > cvs rdiff -u -r1.121 -r1.121.2.1 src/sys/arch/amd64/amd64/trap.c Hi, Someone reported on IRC that this seems to have become mismerged: /usr/src/sys/arch/amd64/amd64/trap.c: In function 'trap': /usr/src/sys/arch/amd64/amd64/trap.c:360:2: error: expected expression before '}' token 1.107 christos 356: 1.121.2.1! martin 357:MODULE_HOOK_CALL(amd64_oosyscall_hook, (p, frame), ! 358:ENOSYS, hook_ret); ! 359:if (hook_ret == 0) 1.107 christos 360:} 1.116 mrg 361:/* FALLTHROUGH */
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 16:14:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix editor mishap, note chanes to distrib/notes/common/Makefile.inc To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.125 src/doc/CHANGES-9.0:1.1.2.126 --- src/doc/CHANGES-9.0:1.1.2.125 Wed Nov 27 14:34:31 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 16:14:52 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.125 2019/11/27 14:34:31 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.126 2019/11/27 16:14:52 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6615,7 +6615,7 @@ sys/dev/pci/esm.c1.64 add missing break. [msaitoh, ticket #493] -istrib/notes/common/main (edited manually) +distrib/notes/common/main (edited manually) Note sysinst changes. @@ -6623,3 +6623,9 @@ external/gpl2/groff/tmac/mdoc.local (ed sys/sys/param.h (edited manually) Welcome to 9.0_RC1 ! + +distrib/notes/common/Makefile.inc 1.47 + + Fix generation of non-HTML ToC. + (9.0_RC1 tag moved) +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 16:14:53 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Fix editor mishap, note chanes to distrib/notes/common/Makefile.inc To generate a diff of this commit: cvs rdiff -u -r1.1.2.125 -r1.1.2.126 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: martin Date: Wed Nov 27 16:07:30 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc Log Message: Pull up the following revision: distrib/notes/Makefile.inc 1.47 When creating the TOC file, strip all incoming double quotes, but output quotes around the third arg of the generated Ti macro invocation. This fixes the TOC in non-html output. Pointed out by kre. To generate a diff of this commit: cvs rdiff -u -r1.43.18.3 -r1.43.18.4 src/distrib/notes/Makefile.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: martin
Date: Wed Nov 27 16:07:30 UTC 2019
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
Log Message:
Pull up the following revision:
distrib/notes/Makefile.inc 1.47
When creating the TOC file, strip all incoming double quotes, but output
quotes around the third arg of the generated Ti macro invocation.
This fixes the TOC in non-html output. Pointed out by kre.
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.3 -r1.43.18.4 src/distrib/notes/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.3 src/distrib/notes/Makefile.inc:1.43.18.4
--- src/distrib/notes/Makefile.inc:1.43.18.3 Wed Nov 27 13:36:55 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 16:07:30 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.3 2019/11/27 13:36:55 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.4 2019/11/27 16:07:30 martin Exp $
#
# Ross Harvey
@@ -107,7 +107,9 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
+TOCPROC= 2>&1 >/dev/null |\
+ ${TOOL_SED} -n -e 's/"//g' \
+ -e '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 14:34:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.0_RC1 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.0 cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.1 -r1.599.2.2 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 14:34:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 src/external/gpl2/groff/tmac [netbsd-9]: mdoc.local src/sys/sys [netbsd-9]: param.h Log Message: Welcome to 9.0_RC1 To generate a diff of this commit: cvs rdiff -u -r1.1.2.124 -r1.1.2.125 src/doc/CHANGES-9.0 cvs rdiff -u -r1.5.6.1 -r1.5.6.2 src/external/gpl2/groff/tmac/mdoc.local cvs rdiff -u -r1.599.2.1 -r1.599.2.2 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.124 src/doc/CHANGES-9.0:1.1.2.125 --- src/doc/CHANGES-9.0:1.1.2.124 Wed Nov 27 14:06:12 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.124 2019/11/27 14:06:12 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.125 2019/11/27 14:34:31 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6615,3 +6615,11 @@ sys/dev/pci/esm.c1.64 add missing break. [msaitoh, ticket #493] +istrib/notes/common/main (edited manually) + + Note sysinst changes. + +external/gpl2/groff/tmac/mdoc.local (edited manually) +sys/sys/param.h (edited manually) + + Welcome to 9.0_RC1 ! Index: src/external/gpl2/groff/tmac/mdoc.local diff -u src/external/gpl2/groff/tmac/mdoc.local:1.5.6.1 src/external/gpl2/groff/tmac/mdoc.local:1.5.6.2 --- src/external/gpl2/groff/tmac/mdoc.local:1.5.6.1 Tue Jul 30 16:52:10 2019 +++ src/external/gpl2/groff/tmac/mdoc.local Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: mdoc.local,v 1.5.6.1 2019/07/30 16:52:10 martin Exp $ +.\" $NetBSD: mdoc.local,v 1.5.6.2 2019/11/27 14:34:31 martin Exp $ .\" .\" Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 " (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\" Default .Os value -.ds doc-operating-system NetBSD\~9.0_BETA +.ds doc-operating-system NetBSD\~9.0_RC1 .\" Default footer operating system value -.ds doc-default-operating-system NetBSD\~9.0_BETA +.ds doc-default-operating-system NetBSD\~9.0_RC1 .\" Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.599.2.1 src/sys/sys/param.h:1.599.2.2 --- src/sys/sys/param.h:1.599.2.1 Tue Jul 30 16:52:10 2019 +++ src/sys/sys/param.h Wed Nov 27 14:34:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.599.2.1 2019/07/30 16:52:10 martin Exp $ */ +/* $NetBSD: param.h,v 1.599.2.2 2019/11/27 14:34:31 martin Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -67,7 +67,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 9 /* NetBSD 9.0_BETA */ +#define __NetBSD_Version__ 9 /* NetBSD 9.0_RC1 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) <= __NetBSD_Version__)
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Wed Nov 27 14:28:40 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Special hint for new sysinst and possible installation fallout. To generate a diff of this commit: cvs rdiff -u -r1.551.2.3 -r1.551.2.4 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes/common
Module Name:src Committed By: martin Date: Wed Nov 27 14:28:40 UTC 2019 Modified Files: src/distrib/notes/common [netbsd-9]: main Log Message: Special hint for new sysinst and possible installation fallout. To generate a diff of this commit: cvs rdiff -u -r1.551.2.3 -r1.551.2.4 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.551.2.3 src/distrib/notes/common/main:1.551.2.4 --- src/distrib/notes/common/main:1.551.2.3 Wed Nov 27 13:36:55 2019 +++ src/distrib/notes/common/main Wed Nov 27 14:28:40 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.551.2.3 2019/11/27 13:36:55 msaitoh Exp $ +.\" $NetBSD: main,v 1.551.2.4 2019/11/27 14:28:40 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -559,6 +559,19 @@ The complete list of changes can be foun .Lk \*[RELEASE_URL]/CHANGES.prev CHANGES.prev .\} \" !\n[RELEASE_BRANCH] . +.Ss2 Installation and Partitioning Changes +The sysinst installation program has been reworked for this release. +.Pp +It now supports arbitrary big disks and offers GPT partitions as alternative +to MBR/fdisk partitions on a lot architectures. +.Pp +Unfortunately it has not been tested on all hardware supported by +.Nx . +If you have problems partitioning the target disk or installing the system, +please report bugs with as much details as possible. +See the Administrivia section below on how to report bugs or contact +other users and ask for support. +. .Ss "Features to be removed in a later release" The following features are to be removed from .Nx
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 14:06:12 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #491 - #493 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.123 src/doc/CHANGES-9.0:1.1.2.124 --- src/doc/CHANGES-9.0:1.1.2.123 Wed Nov 27 13:40:18 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 14:06:12 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.123 2019/11/27 13:40:18 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.124 2019/11/27 14:06:12 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6510,3 +6510,108 @@ distrib/notes/sparc64/prep 1.16 - Add "Oxford comma". - Improve heading a bit. [martin, ticket #489] + +distrib/utils/embedded/conf/armv7.conf 1.36,1.37,1.39 +distrib/utils/embedded/files/armv7_boot.cmd 1.15 +distrib/utils/embedded/files/armv7_boot_nonefi.cmd 1.2 +etc/etc.evbarm/Makefile.inc 1.108-1.114 +sys/arch/arm/dts/omap3-beagle-xm.dts 1.1 +sys/arch/arm/dts/omap3-beagle.dts 1.1 +sys/arch/arm/dts/omap3-n900.dts 1.1 +sys/arch/arm/fdt/smsh_fdt.c 1.2 +sys/arch/arm/ti/am3_platform.c 1.1 +sys/arch/arm/ti/am3_prcm.c 1.2-1.10 +sys/arch/arm/ti/files.ti 1.5-1.20 +sys/arch/arm/ti/if_cpsw.c 1.7,1.8 +sys/arch/arm/ti/if_cpswreg.h 1.1 +sys/arch/arm/ti/omap2_gpmcreg.h 1.1 +sys/arch/arm/ti/omap2_nand.c 1.1,1.2 +sys/arch/arm/ti/omap3_cm.c 1.1-1.4 +sys/arch/arm/ti/omap3_dss.c 1.1 +sys/arch/arm/ti/omap3_dssreg.h 1.1 +sys/arch/arm/ti/omap3_platform.c 1.1,1.2 +sys/arch/arm/ti/omap3_prm.c 1.1 +sys/arch/arm/ti/ti_com.c 1.6-1.8 +sys/arch/arm/ti/ti_cpufreq.c 1.1 +sys/arch/arm/ti/ti_cpufreq.c 1.2 +sys/arch/arm/ti/ti_div_clock.c 1.1 +sys/arch/arm/ti/ti_dpll_clock.c 1.1,1.2 +sys/arch/arm/ti/ti_edma.c 1.1 +sys/arch/arm/ti/ti_edma.h 1.1 +sys/arch/arm/ti/ti_ehci.c 1.1 +sys/arch/arm/ti/ti_fb.c1.1 +sys/arch/arm/ti/ti_gpio.c 1.1-1.3 +sys/arch/arm/ti/ti_gpmc.c 1.1 +sys/arch/arm/ti/ti_iic.c 1.1-1.4 +sys/arch/arm/ti/ti_iicreg.h 1.1-1.3 +sys/arch/arm/ti/ti_lcdc.c 1.1 +sys/arch/arm/ti/ti_lcdc.c 1.2,1.3 +sys/arch/arm/ti/ti_lcdc.h 1.1 +sys/arch/arm/ti/ti_lcdcreg.h 1.1 +sys/arch/arm/ti/ti_motg.c 1.1 +sys/arch/arm/ti/ti_mux_clock.c 1.1 +sys/arch/arm/ti/ti_omapintc.c 1.2 +sys/arch/arm/ti/ti_omaptimer.c 1.2-1.4 +sys/arch/arm/ti/ti_otg.c 1.1 +sys/arch/arm/ti/ti_otgreg.h 1.1 +sys/arch/arm/ti/ti_platform.c delete +sys/arch/arm/ti/ti_platform.h delete +sys/arch/arm/ti/ti_prcm.c 1.2,1.3 +sys/arch/arm/ti/ti_prcm.h 1.2-1.4 +sys/arch/arm/ti/ti_rng.c 1.1,1.2 +sys/arch/arm/ti/ti_rngreg.h 1.1 +sys/arch/arm/ti/ti_sdhc.c 1.1-1.3 +sys/arch/arm/ti/ti_sdhcreg.h 1.1,1.2 +sys/arch/arm/ti/ti_sysc.c 1.1 +sys/arch/arm/ti/ti_tptc.c 1.1 +sys/arch/arm/ti/ti_usb.c 1.1 +sys/arch/arm/ti/ti_usbtll.c 1.1 +sys/arch/evbarm/conf/BEAGLEBOARD delete +sys/arch/evbarm/conf/BEAGLEBOARDXM delete +sys/arch/evbarm/conf/BEAGLEBOARDXM_INSTALL delete +sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL delete +sys/arch/evbarm/conf/BEAGLEBONE delete +sys/arch/evbarm/conf/BEAGLEBONE_INSTALL delete +sys/arch/evbarm/conf/DEVKIT8000 delete +sys/arch/evbarm/conf/GENERIC 1.55-1.67 +sys/arch/evbarm/conf/IGEPV2 delete +sys/arch/evbarm/conf/N900 1.32,1.33 +sys/arch/evbarm/conf/OVERO delete +sys/arch/evbarm/conf/OVERO_INSTALL delete +sys/arch/evbarm/conf/README.evbarm 1.22-1.27 +sys/arch/evbarm/conf/TIdelete +sys/arch/evbarm/conf/files.generic 1.9 +sys/arch/evbarm/conf/files.ti delete +sys/arch/evbarm/conf/std.igepv2 delete +sys/arch/evbarm/conf/std.ti delete +sys/dev/fdt/cpufreq_dt.c 1.11-1.13 +sys/dev/fdt/fdt_clock.c1.9 +sys/dev/fdt/fdt_phy.c1.6 +sys/dev/fdt/fdtvar.h1.55,1.56 +sys/dev/fdt/files.fdt1.46 +sys/dev/fdt/files.fdt1.47 +sys/dev/fdt/pinctrl_single.c 1.1 +sys/dev/fdt/syscon.c1.4 +sys/dev/fdt/usbnopphy.c1.1 +sys/dev/i2c/at24cxx.c1.32 +sys/dev/i2c/files.i2c1.101-1.104 +sys/dev/i2c/tda19988.c1.1-1.3 +sys/dev/i2c/tps65217pmic.c 1.13,1.14 +sys/dev/i2c/tps65950.cdelete +sys/dev/i2c/twl4030.c1.1-1.3 + + arm: switch am335x and omap3 to FDT support. + [jmcneill, ticket #491] + +sys/dev/ieee1394/fwohci.c 1.144 +sys/dev/pci/eso.c1.72 +sys/dev/pci/sv.c1.57 + + Fix operand priority of bit op vs ternary operator. + [msaitoh, ticket #492] + +sys/dev/pci/esm.c1.64 + + add missing break. + [msaitoh, ticket #493] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 14:06:12 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #491 - #493 To generate a diff of this commit: cvs rdiff -u -r1.1.2.123 -r1.1.2.124 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Wed Nov 27 14:04:38 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: esm.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #493): sys/dev/pci/esm.c: revision 1.64 add missing break. To generate a diff of this commit: cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 14:04:38 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: esm.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #493):
sys/dev/pci/esm.c: revision 1.64
add missing break.
To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.63.2.1 src/sys/dev/pci/esm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/esm.c
diff -u src/sys/dev/pci/esm.c:1.63 src/sys/dev/pci/esm.c:1.63.2.1
--- src/sys/dev/pci/esm.c:1.63 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/esm.c Wed Nov 27 14:04:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $ */
/*-
* Copyright (c) 2002, 2003 Matt Fredette
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: esm.c,v 1.63.2.1 2019/11/27 14:04:38 martin Exp $");
#include
#include
@@ -1482,6 +1482,7 @@ esm_match(device_t dev, cfdata_t match,
case PCI_PRODUCT_ESSTECH_MAESTRO2E:
return 1;
}
+ break;
case PCI_VENDOR_ESSTECH2:
switch (PCI_PRODUCT(pa->pa_id)) {
CVS commit: [netbsd-9] src/sys/dev
Module Name:src Committed By: martin Date: Wed Nov 27 14:03:14 UTC 2019 Modified Files: src/sys/dev/ieee1394 [netbsd-9]: fwohci.c src/sys/dev/pci [netbsd-9]: eso.c sv.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #492): sys/dev/pci/sv.c: revision 1.57 sys/dev/pci/eso.c: revision 1.72 sys/dev/ieee1394/fwohci.c: revision 1.144 Fix operand priority of bit op vs ternary operator. To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/dev/ieee1394/fwohci.c cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/eso.c cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/sv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev
Module Name:src
Committed By: martin
Date: Wed Nov 27 14:03:14 UTC 2019
Modified Files:
src/sys/dev/ieee1394 [netbsd-9]: fwohci.c
src/sys/dev/pci [netbsd-9]: eso.c sv.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #492):
sys/dev/pci/sv.c: revision 1.57
sys/dev/pci/eso.c: revision 1.72
sys/dev/ieee1394/fwohci.c: revision 1.144
Fix operand priority of bit op vs ternary operator.
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/dev/ieee1394/fwohci.c
cvs rdiff -u -r1.71 -r1.71.2.1 src/sys/dev/pci/eso.c
cvs rdiff -u -r1.56 -r1.56.2.1 src/sys/dev/pci/sv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ieee1394/fwohci.c
diff -u src/sys/dev/ieee1394/fwohci.c:1.142 src/sys/dev/ieee1394/fwohci.c:1.142.2.1
--- src/sys/dev/ieee1394/fwohci.c:1.142 Tue May 28 08:59:34 2019
+++ src/sys/dev/ieee1394/fwohci.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $ */
+/* $NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin Exp $ */
/*-
* Copyright (c) 2003 Hidetoshi Shimokawa
@@ -37,7 +37,7 @@
*
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142 2019/05/28 08:59:34 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fwohci.c,v 1.142.2.1 2019/11/27 14:03:14 martin Exp $");
#include
#include
@@ -1746,8 +1746,8 @@ fwohci_db_init(struct fwohci_softc *sc,
dbch->ndb, BUS_DMA_WAITOK);
#else /* Ooops, debugging now... */
dbch->ndb, BUS_DMA_WAITOK |
- (dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
- BUS_DMA_COHERENT : 0);
+ ((dbch->off == OHCI_ARQOFF || dbch->off == OHCI_ARSOFF) ?
+ BUS_DMA_COHERENT : 0));
#endif
if (dbch->am == NULL) {
aprint_error_dev(fc->dev, "fwdma_malloc_multiseg failed\n");
Index: src/sys/dev/pci/eso.c
diff -u src/sys/dev/pci/eso.c:1.71 src/sys/dev/pci/eso.c:1.71.2.1
--- src/sys/dev/pci/eso.c:1.71 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/eso.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: eso.c,v 1.71.2.1 2019/11/27 14:03:14 martin Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: eso.c,v 1.71.2.1 2019/11/27 14:03:14 martin Exp $");
#include "mpu.h"
@@ -1489,7 +1489,7 @@ eso_allocmem(struct eso_softc *sc, size_
error = bus_dmamap_load(ed->ed_dmat, ed->ed_map, ed->ed_kva,
ed->ed_size, NULL, BUS_DMA_WAITOK |
- (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
Index: src/sys/dev/pci/sv.c
diff -u src/sys/dev/pci/sv.c:1.56 src/sys/dev/pci/sv.c:1.56.2.1
--- src/sys/dev/pci/sv.c:1.56 Sat Jun 8 08:02:38 2019
+++ src/sys/dev/pci/sv.c Wed Nov 27 14:03:14 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $ */
+/* $NetBSD: sv.c,v 1.56.2.1 2019/11/27 14:03:14 martin Exp $ */
/* $OpenBSD: sv.c,v 1.2 1998/07/13 01:50:15 csapuntz Exp $ */
/*
@@ -67,7 +67,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56 2019/06/08 08:02:38 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sv.c,v 1.56.2.1 2019/11/27 14:03:14 martin Exp $");
#include
#include
@@ -530,7 +530,7 @@ sv_allocmem(struct sv_softc *sc, size_t
goto unmap;
error = bus_dmamap_load(sc->sc_dmatag, p->map, p->addr, p->size, NULL,
- BUS_DMA_WAITOK | (direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE);
+ BUS_DMA_WAITOK | ((direction == AUMODE_RECORD) ? BUS_DMA_READ : BUS_DMA_WRITE));
if (error)
goto destroy;
DPRINTF(("sv_allocmem: pa=%lx va=%lx pba=%lx\n",
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Wed Nov 27 13:46:46 UTC 2019 Modified Files: src/distrib/utils/embedded/conf [netbsd-9]: armv7.conf src/distrib/utils/embedded/files [netbsd-9]: armv7_boot.cmd armv7_boot_nonefi.cmd src/etc/etc.evbarm [netbsd-9]: Makefile.inc src/sys/arch/arm/fdt [netbsd-9]: smsh_fdt.c src/sys/arch/arm/ti [netbsd-9]: am3_prcm.c files.ti if_cpsw.c ti_com.c ti_omapintc.c ti_omaptimer.c ti_prcm.c ti_prcm.h src/sys/arch/evbarm/conf [netbsd-9]: GENERIC N900 README.evbarm files.generic src/sys/dev/fdt [netbsd-9]: cpufreq_dt.c fdt_clock.c fdt_phy.c fdtvar.h files.fdt syscon.c src/sys/dev/i2c [netbsd-9]: at24cxx.c files.i2c tps65217pmic.c Added Files: src/sys/arch/arm/dts [netbsd-9]: omap3-beagle-xm.dts omap3-beagle.dts omap3-n900.dts src/sys/arch/arm/ti [netbsd-9]: am3_platform.c if_cpswreg.h omap2_gpmcreg.h omap2_nand.c omap3_cm.c omap3_dss.c omap3_dssreg.h omap3_platform.c omap3_prm.c ti_cpufreq.c ti_div_clock.c ti_dpll_clock.c ti_edma.c ti_edma.h ti_ehci.c ti_fb.c ti_gpio.c ti_gpmc.c ti_iic.c ti_iicreg.h ti_lcdc.c ti_lcdc.h ti_lcdcreg.h ti_motg.c ti_mux_clock.c ti_otg.c ti_otgreg.h ti_rng.c ti_rngreg.h ti_sdhc.c ti_sdhcreg.h ti_sysc.c ti_tptc.c ti_usb.c ti_usbtll.c src/sys/dev/fdt [netbsd-9]: pinctrl_single.c usbnopphy.c src/sys/dev/i2c [netbsd-9]: tda19988.c twl4030.c Removed Files: src/sys/arch/arm/ti [netbsd-9]: ti_platform.c ti_platform.h src/sys/arch/evbarm/conf [netbsd-9]: BEAGLEBOARD BEAGLEBOARDXM BEAGLEBOARDXM_INSTALL BEAGLEBOARD_INSTALL BEAGLEBONE BEAGLEBONE_INSTALL DEVKIT8000 IGEPV2 OVERO OVERO_INSTALL TI files.ti std.igepv2 std.ti src/sys/dev/i2c [netbsd-9]: tps65950.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #491): sys/arch/evbarm/conf/BEAGLEBOARD_INSTALL: file removal sys/arch/arm/ti/ti_dpll_clock.c: revision 1.2 sys/arch/arm/ti/ti_sysc.c: revision 1.1 sys/arch/arm/ti/ti_rng.c: revision 1.1 sys/arch/arm/ti/ti_rng.c: revision 1.2 sys/dev/i2c/tps65950.c: file removal sys/arch/evbarm/conf/std.ti: file removal sys/dev/i2c/files.i2c: revision 1.101 sys/dev/i2c/files.i2c: revision 1.102 sys/dev/i2c/at24cxx.c: revision 1.32 sys/dev/i2c/files.i2c: revision 1.103 sys/dev/i2c/twl4030.c: revision 1.1 sys/dev/i2c/files.i2c: revision 1.104 sys/dev/i2c/twl4030.c: revision 1.2 sys/dev/i2c/twl4030.c: revision 1.3 sys/arch/arm/ti/ti_com.c: revision 1.6 sys/arch/arm/ti/ti_com.c: revision 1.7 sys/arch/arm/ti/ti_com.c: revision 1.8 sys/dev/fdt/cpufreq_dt.c: revision 1.11 sys/arch/arm/ti/ti_iic.c: revision 1.1 sys/dev/fdt/cpufreq_dt.c: revision 1.12 sys/arch/arm/ti/ti_usb.c: revision 1.1 sys/arch/arm/ti/ti_iic.c: revision 1.2 sys/dev/fdt/cpufreq_dt.c: revision 1.13 sys/arch/arm/ti/ti_iic.c: revision 1.3 sys/arch/arm/ti/ti_iic.c: revision 1.4 sys/arch/evbarm/conf/files.ti: file removal sys/arch/evbarm/conf/BEAGLEBOARDXM: file removal sys/arch/arm/dts/omap3-n900.dts: revision 1.1 sys/arch/arm/ti/ti_edma.h: revision 1.1 sys/arch/evbarm/conf/OVERO_INSTALL: file removal sys/arch/arm/ti/ti_usbtll.c: revision 1.1 sys/arch/arm/ti/files.ti: revision 1.5 etc/etc.evbarm/Makefile.inc: revision 1.108 sys/arch/arm/ti/files.ti: revision 1.6 sys/dev/i2c/tps65217pmic.c: revision 1.13 etc/etc.evbarm/Makefile.inc: revision 1.109 sys/arch/arm/ti/files.ti: revision 1.7 sys/dev/i2c/tps65217pmic.c: revision 1.14 sys/arch/arm/ti/files.ti: revision 1.8 sys/arch/arm/ti/files.ti: revision 1.9 sys/dev/fdt/usbnopphy.c: revision 1.1 sys/arch/evbarm/conf/GENERIC: revision 1.55 sys/arch/evbarm/conf/GENERIC: revision 1.56 sys/arch/evbarm/conf/GENERIC: revision 1.57 sys/arch/evbarm/conf/GENERIC: revision 1.58 sys/arch/evbarm/conf/GENERIC: revision 1.59 sys/arch/evbarm/conf/BEAGLEBONE: file removal sys/arch/arm/ti/omap2_gpmcreg.h: revision 1.1 sys/arch/arm/ti/ti_otgreg.h: revision 1.1 sys/arch/arm/ti/ti_tptc.c: revision 1.1 sys/arch/evbarm/conf/IGEPV2: file removal sys/arch/arm/ti/am3_prcm.c: revision 1.10 sys/dev/i2c/tda19988.c: revision 1.1 sys/arch/evbarm/conf/OVERO: file removal sys/dev/i2c/tda19988.c: revision 1.2 sys/dev/i2c/tda19988.c: revision 1.3 sys/arch/arm/ti/omap3_dss.c: revision 1.1 sys/arch/evbarm/conf/BEAGLEBONE_INSTALL: file removal sys/arch/arm/ti/ti_omapintc.c: revision 1.2
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:40:18 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #489. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.122 src/doc/CHANGES-9.0:1.1.2.123 --- src/doc/CHANGES-9.0:1.1.2.122 Wed Nov 27 11:22:13 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 13:40:18 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.122 2019/11/27 11:22:13 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.123 2019/11/27 13:40:18 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6491,3 +6491,22 @@ sys/dev/mii/ipgphy.c1.7 Print dmesg correctly. [msaitoh, ticket #490] +distrib/notes/Makefile.inc 1.46 +distrib/notes/common/list-portmasters.pl delete +distrib/notes/common/macros 1.44 +distrib/notes/common/main 1.555-1.557 via patch +distrib/notes/common/netboot 1.38 +distrib/notes/common/postinstall 1.86 +distrib/notes/common/sysinst 1.110 +distrib/notes/sparc/prep 1.28-1.29 +distrib/notes/sparc64/prep 1.16 + + - Remove list-portmasters.pl script. + - Quote long .Ss2 title to avoid troff's limitation. + - Simplify TOC handling and remove arg limit (from uwe). + - Use Lk with explicit anchor text in some places. + - Do not allow official release builds when we can not derive the + proper date from the buildid. + - Add "Oxford comma". + - Improve heading a bit. + [martin, ticket #489]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:40:18 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #489. To generate a diff of this commit: cvs rdiff -u -r1.1.2.122 -r1.1.2.123 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src
Committed By: msaitoh
Date: Wed Nov 27 13:36:55 UTC 2019
Modified Files:
src/distrib/notes [netbsd-9]: Makefile.inc
src/distrib/notes/common [netbsd-9]: macros main netboot postinstall
sysinst
src/distrib/notes/sparc [netbsd-9]: prep
src/distrib/notes/sparc64 [netbsd-9]: prep
Removed Files:
src/distrib/notes/common [netbsd-9]: list-portmasters.pl
Log Message:
Pull up following revision(s) (requested by martin in ticket #489):
distrib/notes/Makefile.inc: revision 1.46
distrib/notes/common/postinstall: revision 1.86
distrib/notes/sparc64/prep: revision 1.16
distrib/notes/common/netboot: revision 1.38
distrib/notes/common/main: revision 1.555
distrib/notes/common/main: revision 1.556
distrib/notes/common/main: revision 1.557
distrib/notes/common/macros: revision 1.44
distrib/notes/common/sysinst: revision 1.110
distrib/notes/sparc/prep: revision 1.28
distrib/notes/sparc/prep: revision 1.29
distrib/notes/common/list-portmasters.pl: file removal
Remove list-portmasters.pl script.
We dropped that list from "main" some time ago.
Quote long .Ss2 title to avoid troff's limitation.
Troff is limited to 9 macro parameters and this title is 10 words, so
we lose the last word here when we pass arguments around. We have
more titles like that but for now I wanted to commit only one just to
flag the problem.
More cleanup:
- simplify TOC handling and remove arg limit (from uwe)
- use Lk with explicit anchor text in some places
- do not allow official release builds when we can not derive the
proper date from the buildid
Add "Oxford comma"
Improve heading a bit. While here, use quotes to group some of the
words to avoid the 9-arg limitation of .Ss
To generate a diff of this commit:
cvs rdiff -u -r1.43.18.2 -r1.43.18.3 src/distrib/notes/Makefile.inc
cvs rdiff -u -r1.6 -r0 src/distrib/notes/common/list-portmasters.pl
cvs rdiff -u -r1.43 -r1.43.6.1 src/distrib/notes/common/macros
cvs rdiff -u -r1.551.2.2 -r1.551.2.3 src/distrib/notes/common/main
cvs rdiff -u -r1.36.18.1 -r1.36.18.2 src/distrib/notes/common/netboot
cvs rdiff -u -r1.83.2.2 -r1.83.2.3 src/distrib/notes/common/postinstall
cvs rdiff -u -r1.107.6.2 -r1.107.6.3 src/distrib/notes/common/sysinst
cvs rdiff -u -r1.27 -r1.27.18.1 src/distrib/notes/sparc/prep
cvs rdiff -u -r1.15 -r1.15.50.1 src/distrib/notes/sparc64/prep
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/Makefile.inc
diff -u src/distrib/notes/Makefile.inc:1.43.18.2 src/distrib/notes/Makefile.inc:1.43.18.3
--- src/distrib/notes/Makefile.inc:1.43.18.2 Mon Nov 25 05:50:15 2019
+++ src/distrib/notes/Makefile.inc Wed Nov 27 13:36:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.43.18.2 2019/11/25 05:50:15 msaitoh Exp $
+# $NetBSD: Makefile.inc,v 1.43.18.3 2019/11/27 13:36:55 msaitoh Exp $
#
# Ross Harvey
@@ -51,8 +51,12 @@ PRESET+= -rnextminor=${nextmin}
.if defined(BUILDID) && "${BUILDID:M20*Z}" != ""
curdate!= env LANG="C" date -d "${BUILDID:C/[0-9][0-9][0-9][0-9]Z$//}" "+%b %d, %Y"
.else
+.if ${NETBSD_OFFICIAL_RELEASE:Uno} == "yes"
+.error "No release date could be derived from BUILDID"
+.else
curdate!= env LANG="C" date "+%b %d, %Y"
.endif
+.endif
PRESET+= -dcur_date="${curdate}"
POST_PLAIN= -P-b -P-u -P-o
@@ -103,8 +107,7 @@ ${TARG}.more: ${SRCS} ${TOC.more} ${DIST
# space taken by the TOC itself.
#
-TOCPROC= 2>&1 >/dev/null |\
- ${TOOL_SED} -n '/^\.Ti/{s/ \([A-Za-z]\)/ "\1/; s/ *$$/"/; p; }'
+TOCPROC= 2>&1 >/dev/null | ${TOOL_GREP} -e '^\.Ti '
${TARG}.PostScript.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_PS} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
@@ -121,8 +124,6 @@ ${TARG}.ASCII.toc: ${SRCS}
${TARG}.HTML.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
mv -f $@.tmp $@
- ${TOOL_GROFF} -dTOC=1 ${ARGS_HTML} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
- mv -f $@.tmp $@
${TARG}.more.toc: ${SRCS}
${TOOL_GROFF} -dTOC=1 ${ARGS_MORE} -mdoc ${MAIN} ${TOCPROC} > $@.tmp
Index: src/distrib/notes/common/macros
diff -u src/distrib/notes/common/macros:1.43 src/distrib/notes/common/macros:1.43.6.1
--- src/distrib/notes/common/macros:1.43 Wed Jan 24 09:04:41 2018
+++ src/distrib/notes/common/macros Wed Nov 27 13:36:55 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: macros,v 1.43 2018/01/24 09:04:41 skrll Exp $
+.\" $NetBSD: macros,v 1.43.6.1 2019/11/27 13:36:55 msaitoh Exp $
.\"
.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -312,13 +312,13 @@
.if dTOC \{
.rn Ss Ss-toc
.de Ss
-.Ss-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 0 \\n% \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
+.Ss-toc \\$@
+.tm .Ti 0 \\n% "\\$*"
..
.rn Ss2 Ss2-toc
.de Ss2
-.Ss2-toc \\$1 \\$2 \\$3 \\$4 \\$5 \\$6 \\$7 \\$8 \\$9
-\.tm .Ti 1 \\n% \\$1
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: msaitoh Date: Wed Nov 27 13:36:55 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc src/distrib/notes/common [netbsd-9]: macros main netboot postinstall sysinst src/distrib/notes/sparc [netbsd-9]: prep src/distrib/notes/sparc64 [netbsd-9]: prep Removed Files: src/distrib/notes/common [netbsd-9]: list-portmasters.pl Log Message: Pull up following revision(s) (requested by martin in ticket #489): distrib/notes/Makefile.inc: revision 1.46 distrib/notes/common/postinstall: revision 1.86 distrib/notes/sparc64/prep: revision 1.16 distrib/notes/common/netboot: revision 1.38 distrib/notes/common/main: revision 1.555 distrib/notes/common/main: revision 1.556 distrib/notes/common/main: revision 1.557 distrib/notes/common/macros: revision 1.44 distrib/notes/common/sysinst: revision 1.110 distrib/notes/sparc/prep: revision 1.28 distrib/notes/sparc/prep: revision 1.29 distrib/notes/common/list-portmasters.pl: file removal Remove list-portmasters.pl script. We dropped that list from "main" some time ago. Quote long .Ss2 title to avoid troff's limitation. Troff is limited to 9 macro parameters and this title is 10 words, so we lose the last word here when we pass arguments around. We have more titles like that but for now I wanted to commit only one just to flag the problem. More cleanup: - simplify TOC handling and remove arg limit (from uwe) - use Lk with explicit anchor text in some places - do not allow official release builds when we can not derive the proper date from the buildid Add "Oxford comma" Improve heading a bit. While here, use quotes to group some of the words to avoid the 9-arg limitation of .Ss To generate a diff of this commit: cvs rdiff -u -r1.43.18.2 -r1.43.18.3 src/distrib/notes/Makefile.inc cvs rdiff -u -r1.6 -r0 src/distrib/notes/common/list-portmasters.pl cvs rdiff -u -r1.43 -r1.43.6.1 src/distrib/notes/common/macros cvs rdiff -u -r1.551.2.2 -r1.551.2.3 src/distrib/notes/common/main cvs rdiff -u -r1.36.18.1 -r1.36.18.2 src/distrib/notes/common/netboot cvs rdiff -u -r1.83.2.2 -r1.83.2.3 src/distrib/notes/common/postinstall cvs rdiff -u -r1.107.6.2 -r1.107.6.3 src/distrib/notes/common/sysinst cvs rdiff -u -r1.27 -r1.27.18.1 src/distrib/notes/sparc/prep cvs rdiff -u -r1.15 -r1.15.50.1 src/distrib/notes/sparc64/prep Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 11:22:13 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #487, #488, and #490 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.121 src/doc/CHANGES-9.0:1.1.2.122 --- src/doc/CHANGES-9.0:1.1.2.121 Tue Nov 26 18:31:55 2019 +++ src/doc/CHANGES-9.0 Wed Nov 27 11:22:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.121 2019/11/26 18:31:55 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.122 2019/11/27 11:22:13 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6467,3 +6467,27 @@ sys/dev/pci/if_mcx.c1.7 mcx(4): fix IFF_ALLMULTI handling. [jmcneill, ticket #486] +sys/dev/pci/if_bge.c1.336,1.340-1.342 + + - Avoid undefined behavior in bge_setmulti(). + - Avoid undefined behavior when setting the MAC address in + bge_init(). + - Fix a bug that SK-9D41 can't detect fiber media. + - Use *_FLUSH() more. The main purpose is to wait following + delay() correctly. + - Add missing DELAY(80) after writing BGE_MI_MODE register. + - Modify PHY initialization code to fix a bug that SK-9D21 + doesn't detect MII PHY. + [msaitoh, ticket #487] + +sys/arch/amd64/amd64/netbsd32_machdep.c 1.126 + + Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but + rather on whether the proc uses a user-set LDT. + [maxv, ticket #488] + +sys/dev/mii/ipgphy.c1.7 + + Print dmesg correctly. + [msaitoh, ticket #490] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Nov 27 11:22:13 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #487, #488, and #490 To generate a diff of this commit: cvs rdiff -u -r1.1.2.121 -r1.1.2.122 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Wed Nov 27 11:19:46 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: ipgphy.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #490): sys/dev/mii/ipgphy.c: revision 1.7 Print dmesg correctly. To generate a diff of this commit: cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/dev/mii/ipgphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:19:46 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-9]: ipgphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #490):
sys/dev/mii/ipgphy.c: revision 1.7
Print dmesg correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.2 -r1.6.2.3 src/sys/dev/mii/ipgphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/ipgphy.c
diff -u src/sys/dev/mii/ipgphy.c:1.6.2.2 src/sys/dev/mii/ipgphy.c:1.6.2.3
--- src/sys/dev/mii/ipgphy.c:1.6.2.2 Mon Nov 25 16:44:31 2019
+++ src/sys/dev/mii/ipgphy.c Wed Nov 27 11:19:46 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipgphy.c,v 1.6.2.2 2019/11/25 16:44:31 martin Exp $ */
+/* $NetBSD: ipgphy.c,v 1.6.2.3 2019/11/27 11:19:46 martin Exp $ */
/* $OpenBSD: ipgphy.c,v 1.19 2015/07/19 06:28:12 yuo Exp $ */
/*-
@@ -33,7 +33,7 @@
* Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.6.2.2 2019/11/25 16:44:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipgphy.c,v 1.6.2.3 2019/11/27 11:19:46 martin Exp $");
#include
#include
@@ -118,7 +118,8 @@ ipgphy_attach(device_t parent, device_t
//sc->mii_capabilities &= ~BMSR_ANEG;
if (sc->mii_capabilities & BMSR_EXTSTAT)
PHY_READ(sc, MII_EXTSR, >mii_extcapabilities);
-
+
+ aprint_normal_dev(self, "");
mii_phy_add_media(sc);
aprint_normal("\n");
}
CVS commit: [netbsd-9] src/sys/arch/amd64/amd64
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:11:17 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64 [netbsd-9]: netbsd32_machdep.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #488):
sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.126
Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but rather on
whether the proc uses a user-set LDT. Same as check_sigcontext32().
To generate a diff of this commit:
cvs rdiff -u -r1.125.2.1 -r1.125.2.2 \
src/sys/arch/amd64/amd64/netbsd32_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/netbsd32_machdep.c
diff -u src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.1 src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.2
--- src/sys/arch/amd64/amd64/netbsd32_machdep.c:1.125.2.1 Thu Nov 21 14:02:33 2019
+++ src/sys/arch/amd64/amd64/netbsd32_machdep.c Wed Nov 27 11:11:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_machdep.c,v 1.125.2.1 2019/11/21 14:02:33 martin Exp $ */
+/* $NetBSD: netbsd32_machdep.c,v 1.125.2.2 2019/11/27 11:11:17 martin Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.125.2.1 2019/11/21 14:02:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_machdep.c,v 1.125.2.2 2019/11/27 11:11:17 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -905,12 +905,6 @@ startlwp32(void *arg)
userret(l);
}
-/*
- * For various reasons, the amd64 port can't do what the i386 port does,
- * and relies on catching invalid user contexts on exit from the kernel.
- * These functions perform the needed checks.
- */
-
int
check_sigcontext32(struct lwp *l, const struct netbsd32_sigcontext *scp)
{
@@ -925,21 +919,22 @@ check_sigcontext32(struct lwp *l, const
return EINVAL;
if (__predict_false(pmap->pm_ldt != NULL)) {
- /* Only when the LDT is user-set (with USER_LDT) */
+ /* Allow unfamiliar segment register values (USER_LDT). */
if (!USERMODE(scp->sc_cs))
return EINVAL;
} else {
if (!VALID_USER_CSEL32(scp->sc_cs))
return EINVAL;
if (scp->sc_fs != 0 && !VALID_USER_DSEL32(scp->sc_fs) &&
- !(VALID_USER_FSEL32(scp->sc_fs) && pcb->pcb_fs != 0))
+ !(VALID_USER_FSEL32(scp->sc_fs) && pcb->pcb_fs != 0))
return EINVAL;
if (scp->sc_gs != 0 && !VALID_USER_DSEL32(scp->sc_gs) &&
- !(VALID_USER_GSEL32(scp->sc_gs) && pcb->pcb_gs != 0))
+ !(VALID_USER_GSEL32(scp->sc_gs) && pcb->pcb_gs != 0))
return EINVAL;
if (scp->sc_es != 0 && !VALID_USER_DSEL32(scp->sc_es))
return EINVAL;
- if (!VALID_USER_DSEL32(scp->sc_ds) || !VALID_USER_DSEL32(scp->sc_ss))
+ if (!VALID_USER_DSEL32(scp->sc_ds) ||
+ !VALID_USER_DSEL32(scp->sc_ss))
return EINVAL;
}
@@ -952,36 +947,37 @@ check_sigcontext32(struct lwp *l, const
int
cpu_mcontext32_validate(struct lwp *l, const mcontext32_t *mcp)
{
+ struct pmap *pmap = l->l_proc->p_vmspace->vm_map.pmap;
const __greg32_t *gr;
struct trapframe *tf;
+ struct pcb *pcb;
gr = mcp->__gregs;
tf = l->l_md.md_regs;
+ pcb = lwp_getpcb(l);
if (((gr[_REG32_EFL] ^ tf->tf_rflags) & PSL_USERSTATIC) != 0)
return EINVAL;
-#ifdef USER_LDT
- /* Userland is allowed to have unfamiliar segment register values */
- if (!USERMODE(gr[_REG32_CS]))
- return EINVAL;
-#else
- struct pcb *pcb = lwp_getpcb(l);
-
- if (!VALID_USER_CSEL32(gr[_REG32_CS]))
- return EINVAL;
- if (gr[_REG32_FS] != 0 && !VALID_USER_DSEL32(gr[_REG32_FS]) &&
- !(VALID_USER_FSEL32(gr[_REG32_FS]) && pcb->pcb_fs != 0))
- return EINVAL;
- if (gr[_REG32_GS] != 0 && !VALID_USER_DSEL32(gr[_REG32_GS]) &&
- !(VALID_USER_GSEL32(gr[_REG32_GS]) && pcb->pcb_gs != 0))
- return EINVAL;
- if (gr[_REG32_ES] != 0 && !VALID_USER_DSEL32(gr[_REG32_ES]))
- return EINVAL;
- if (!VALID_USER_DSEL32(gr[_REG32_DS]) ||
- !VALID_USER_DSEL32(gr[_REG32_SS]))
- return EINVAL;
-#endif
+ if (__predict_false(pmap->pm_ldt != NULL)) {
+ /* Allow unfamiliar segment register values (USER_LDT). */
+ if (!USERMODE(gr[_REG32_CS]))
+ return EINVAL;
+ } else {
+ if (!VALID_USER_CSEL32(gr[_REG32_CS]))
+ return EINVAL;
+ if (gr[_REG32_FS] != 0 && !VALID_USER_DSEL32(gr[_REG32_FS]) &&
+ !(VALID_USER_FSEL32(gr[_REG32_FS]) && pcb->pcb_fs != 0))
+ return EINVAL;
+ if (gr[_REG32_GS] != 0 && !VALID_USER_DSEL32(gr[_REG32_GS]) &&
+ !(VALID_USER_GSEL32(gr[_REG32_GS]) && pcb->pcb_gs != 0))
+ return EINVAL;
+ if (gr[_REG32_ES] != 0 && !VALID_USER_DSEL32(gr[_REG32_ES]))
+ return EINVAL;
+ if (!VALID_USER_DSEL32(gr[_REG32_DS]) ||
+ !VALID_USER_DSEL32(gr[_REG32_SS]))
+ return EINVAL;
+ }
if (gr[_REG32_EIP] >= VM_MAXUSER_ADDRESS32)
return EINVAL;
CVS commit: [netbsd-9] src/sys/arch/amd64/amd64
Module Name:src Committed By: martin Date: Wed Nov 27 11:11:17 UTC 2019 Modified Files: src/sys/arch/amd64/amd64 [netbsd-9]: netbsd32_machdep.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #488): sys/arch/amd64/amd64/netbsd32_machdep.c: revision 1.126 Don't depend on #ifdef USER_LDT in cpu_mcontext32_validate(), but rather on whether the proc uses a user-set LDT. Same as check_sigcontext32(). To generate a diff of this commit: cvs rdiff -u -r1.125.2.1 -r1.125.2.2 \ src/sys/arch/amd64/amd64/netbsd32_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Wed Nov 27 11:08:24 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_bge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #487):
sys/dev/pci/if_bge.c: revision 1.340
sys/dev/pci/if_bge.c: revision 1.341
sys/dev/pci/if_bge.c: revision 1.342
sys/dev/pci/if_bge.c: revision 1.336
- Avoid undefined behavior in bge_setmulti(). found by kUBSan.
- Avoid undefined behavior when setting the MAC address in bge_init().
found by kUBSan.
Fix a bug that SK-9D41 can't detect fiber media. Check the subsystem ID
correctly. This bug was added in if_bge.c rev. 1.161.
- Use *_FLUSH() more. The main purpose is to wait following delay() correctly.
- Add missing DELAY(80) after writing BGE_MI_MODE register.
Modify PHY initialization code. This change fix a bug that SK-9D21 doesn't
detect MII PHY.
- Add error check to bge_miibus_writereg().
- Change return value of bge_miibus_readreg() when a read error occurred.
It also add error message using with aprint_debug_dev(). This error occurs
on some devices while detecting MII devices.
- Move the location of BGE_MI_MODE register's initialization to next to
bge_chipinit().
- Set BGE_MAC_MODE before calling ifmedia_init() and/or mii_attach().
- Add retry code for mii_attach() failed. Same as FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.335 -r1.335.2.1 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.335 src/sys/dev/pci/if_bge.c:1.335.2.1
--- src/sys/dev/pci/if_bge.c:1.335 Tue Jul 9 08:46:58 2019
+++ src/sys/dev/pci/if_bge.c Wed Nov 27 11:08:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $ */
+/* $NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335 2019/07/09 08:46:58 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_bge.c,v 1.335.2.1 2019/11/27 11:08:24 martin Exp $");
#include
#include
@@ -1027,10 +1027,10 @@ bge_eeprom_getbyte(struct bge_softc *sc,
* Enable use of auto EEPROM access so we can avoid
* having to use the bitbang method.
*/
- BGE_SETBIT(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
+ BGE_SETBIT_FLUSH(sc, BGE_MISC_LOCAL_CTL, BGE_MLC_AUTO_EEPROM);
/* Reset the EEPROM, load the clock period. */
- CSR_WRITE_4(sc, BGE_EE_ADDR,
+ CSR_WRITE_4_FLUSH(sc, BGE_EE_ADDR,
BGE_EEADDR_RESET | BGE_EEHALFCLK(BGE_HALFCLK_384SCL));
DELAY(20);
@@ -1113,9 +1113,11 @@ bge_miibus_readreg(device_t dev, int phy
if (i == BGE_TIMEOUT) {
aprint_error_dev(sc->bge_dev, "PHY read timed out\n");
rv = ETIMEDOUT;
- } else if ((data & BGE_MICOMM_READFAIL) != 0)
- rv = -1;
- else
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ /* XXX This error occurs on some devices while attaching. */
+ aprint_debug_dev(sc->bge_dev, "PHY read I/O error\n");
+ rv = EIO;
+ } else
*val = data & BGE_MICOMM_DATA;
if (autopoll & BGE_MIMODE_AUTOPOLL) {
@@ -1133,7 +1135,8 @@ static int
bge_miibus_writereg(device_t dev, int phy, int reg, uint16_t val)
{
struct bge_softc *sc = device_private(dev);
- uint32_t autopoll;
+ uint32_t data, autopoll;
+ int rv = 0;
int i;
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906 &&
@@ -1156,13 +1159,22 @@ bge_miibus_writereg(device_t dev, int ph
for (i = 0; i < BGE_TIMEOUT; i++) {
delay(10);
- if (!(CSR_READ_4(sc, BGE_MI_COMM) & BGE_MICOMM_BUSY)) {
+ data = CSR_READ_4(sc, BGE_MI_COMM);
+ if (!(data & BGE_MICOMM_BUSY)) {
delay(5);
- CSR_READ_4(sc, BGE_MI_COMM);
+ data = CSR_READ_4(sc, BGE_MI_COMM);
break;
}
}
+ if (i == BGE_TIMEOUT) {
+ aprint_error_dev(sc->bge_dev, "PHY write timed out\n");
+ rv = ETIMEDOUT;
+ } else if ((data & BGE_MICOMM_READFAIL) != 0) {
+ aprint_error_dev(sc->bge_dev, "PHY write I/O error\n");
+ rv = EIO;
+ }
+
if (autopoll & BGE_MIMODE_AUTOPOLL) {
BGE_STS_SETBIT(sc, BGE_STS_AUTOPOLL);
BGE_SETBIT_FLUSH(sc, BGE_MI_MODE, BGE_MIMODE_AUTOPOLL);
@@ -1176,7 +1188,7 @@ bge_miibus_writereg(device_t dev, int ph
return ETIMEDOUT;
}
- return 0;
+ return rv;
}
static void
@@ -1827,7 +1839,7 @@ bge_setmulti(struct bge_softc *sc)
/* Just want the 7 least-significant bits. */
h &= 0x7f;
- hashes[(h & 0x60) >> 5] |= 1 << (h & 0x1F);
+ hashes[(h & 0x60) >> 5] |= 1U << (h & 0x1F);
ETHER_NEXT_MULTI(step, enm);
}
ETHER_UNLOCK(ec);
@@ -2286,7 +2298,7 @@ bge_chipinit(struct bge_softc *sc)
#endif
/* Set the timer prescaler (always 66MHz) */
- CSR_WRITE_4(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
+ CSR_WRITE_4_FLUSH(sc, BGE_MISC_CFG, BGE_32BITTIME_66MHZ);
if (BGE_ASICREV(sc->bge_chipid) == BGE_ASICREV_BCM5906) {
DELAY(40); /* XXX */
@@
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 26 18:31:55 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #486 To generate a diff of this commit: cvs rdiff -u -r1.1.2.120 -r1.1.2.121 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 18:30:57 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_mcx.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #486): sys/dev/pci/if_mcx.c: revision 1.7 Fix IFF_ALLMULTI handling. To generate a diff of this commit: cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/pci/if_mcx.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 18:30:57 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_mcx.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #486):
sys/dev/pci/if_mcx.c: revision 1.7
Fix IFF_ALLMULTI handling.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.5 -r1.1.2.6 src/sys/dev/pci/if_mcx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_mcx.c
diff -u src/sys/dev/pci/if_mcx.c:1.1.2.5 src/sys/dev/pci/if_mcx.c:1.1.2.6
--- src/sys/dev/pci/if_mcx.c:1.1.2.5 Mon Nov 18 19:46:33 2019
+++ src/sys/dev/pci/if_mcx.c Tue Nov 26 18:30:57 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_mcx.c,v 1.1.2.5 2019/11/18 19:46:33 martin Exp $ */
+/* $NetBSD: if_mcx.c,v 1.1.2.6 2019/11/26 18:30:57 martin Exp $ */
/* $OpenBSD: if_mcx.c,v 1.33 2019/09/12 04:23:59 jmatthew Exp $ */
/*
@@ -6205,8 +6205,11 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
{
struct mcx_softc *sc = (struct mcx_softc *)ifp->if_softc;
struct ifreq *ifr = (struct ifreq *)data;
+ struct ethercom *ec = >sc_ec;
uint8_t addrhi[ETHER_ADDR_LEN], addrlo[ETHER_ADDR_LEN];
- int s, i, error = 0;
+ struct ether_multi *enm;
+ struct ether_multistep step;
+ int s, i, flags, error = 0;
s = splnet();
switch (cmd) {
@@ -6214,8 +6217,10 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
case SIOCADDMULTI:
if (ether_addmulti(ifreq_getaddr(cmd, ifr), >sc_ec) == ENETRESET) {
error = ether_multiaddr(>ifr_addr, addrlo, addrhi);
- if (error != 0)
+ if (error != 0) {
+splx(s);
return (error);
+ }
for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
if (sc->sc_mcast_flows[i][0] == 0) {
@@ -6238,7 +6243,7 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
error = ENETRESET;
}
-if (sc->sc_ec.ec_multicnt > 0) {
+if (memcmp(addrlo, addrhi, ETHER_ADDR_LEN)) {
SET(ifp->if_flags, IFF_ALLMULTI);
error = ENETRESET;
}
@@ -6249,8 +6254,10 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
case SIOCDELMULTI:
if (ether_delmulti(ifreq_getaddr(cmd, ifr), >sc_ec) == ENETRESET) {
error = ether_multiaddr(>ifr_addr, addrlo, addrhi);
- if (error != 0)
+ if (error != 0) {
+splx(s);
return (error);
+ }
for (i = 0; i < MCX_NUM_MCAST_FLOWS; i++) {
if (memcmp(sc->sc_mcast_flows[i], addrlo,
@@ -6269,10 +6276,23 @@ mcx_ioctl(struct ifnet *ifp, u_long cmd,
sc->sc_extra_mcast--;
if (ISSET(ifp->if_flags, IFF_ALLMULTI) &&
- (sc->sc_extra_mcast == 0) &&
- (sc->sc_ec.ec_multicnt == 0)) {
-CLR(ifp->if_flags, IFF_ALLMULTI);
-error = ENETRESET;
+ sc->sc_extra_mcast == 0) {
+flags = 0;
+ETHER_LOCK(ec);
+ETHER_FIRST_MULTI(step, ec, enm);
+while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo,
+ enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ SET(flags, IFF_ALLMULTI);
+ break;
+ }
+ ETHER_NEXT_MULTI(step, enm);
+}
+ETHER_UNLOCK(ec);
+if (!ISSET(flags, IFF_ALLMULTI)) {
+ CLR(ifp->if_flags, IFF_ALLMULTI);
+ error = ENETRESET;
+}
}
}
break;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 26 08:57:49 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #485 To generate a diff of this commit: cvs rdiff -u -r1.1.2.119 -r1.1.2.120 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.119 src/doc/CHANGES-9.0:1.1.2.120 --- src/doc/CHANGES-9.0:1.1.2.119 Tue Nov 26 08:24:43 2019 +++ src/doc/CHANGES-9.0 Tue Nov 26 08:57:49 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.119 2019/11/26 08:24:43 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.120 2019/11/26 08:57:49 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6456,3 +6456,9 @@ sys/dev/hyperv/if_hvn.c1.11 hvn(4): Fix incorrect ident when waiting for NVS command response. [nonaka, ticket #484] +share/tmac/doc2html1.68 + + PR toolchain/54715: Remove duplicate (incorrect) version of + the .Lk macro. + [kre, ticket #485] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 26 08:57:49 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #485 To generate a diff of this commit: cvs rdiff -u -r1.1.2.119 -r1.1.2.120 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/tmac
Module Name:src Committed By: martin Date: Tue Nov 26 08:56:51 UTC 2019 Modified Files: src/share/tmac [netbsd-9]: doc2html Log Message: Pull up following revision(s) (requested by kre in ticket #485): share/tmac/doc2html: revision 1.68 PR toolchain/54715 Remove duplicate (incorrect) version of the .Lk macro, so the earlier (fancier and functional) definition survives. For now simply comment it out. Sometime later this one should be removed - but the two have been present since these macros were first imported (1999) so leaving this visible (but removed) a little longer shouldn't hurt. I (believe) this one is the only duplicate of this form. With this change the Lk macro in doc2html should work as it is designed (but does not call other macros, and can only have punctuation following the URL and (optional) anchor args (2nd arg is the anchor if it isn't punctuation). Tested by martin@ To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.67.16.1 src/share/tmac/doc2html Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/share/tmac
Module Name:src Committed By: martin Date: Tue Nov 26 08:56:51 UTC 2019 Modified Files: src/share/tmac [netbsd-9]: doc2html Log Message: Pull up following revision(s) (requested by kre in ticket #485): share/tmac/doc2html: revision 1.68 PR toolchain/54715 Remove duplicate (incorrect) version of the .Lk macro, so the earlier (fancier and functional) definition survives. For now simply comment it out. Sometime later this one should be removed - but the two have been present since these macros were first imported (1999) so leaving this visible (but removed) a little longer shouldn't hurt. I (believe) this one is the only duplicate of this form. With this change the Lk macro in doc2html should work as it is designed (but does not call other macros, and can only have punctuation following the URL and (optional) anchor args (2nd arg is the anchor if it isn't punctuation). Tested by martin@ To generate a diff of this commit: cvs rdiff -u -r1.67 -r1.67.16.1 src/share/tmac/doc2html Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/tmac/doc2html diff -u src/share/tmac/doc2html:1.67 src/share/tmac/doc2html:1.67.16.1 --- src/share/tmac/doc2html:1.67 Tue Nov 22 00:36:49 2016 +++ src/share/tmac/doc2html Tue Nov 26 08:56:51 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: doc2html,v 1.67 2016/11/22 00:36:49 kamil Exp $ +.\" $NetBSD: doc2html,v 1.67.16.1 2019/11/26 08:56:51 martin Exp $ .\" .\" Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -788,12 +788,12 @@ AT UNIX\\$* . as doc-pcresult \\*[an-eol] . pc-fin .. -.de Lk -. as doc-pcresult \\$1 -. shift -. recurse \\$@ -. pc-fin -.. +.\".de Lk +.\". as doc-pcresult \\$1 +.\". shift +.\". recurse \\$@ +.\". pc-fin +.\".. .de Mt . as doc-pcresult \\$1 . shift
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 26 08:24:43 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #469, #482 - #484 To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.118 src/doc/CHANGES-9.0:1.1.2.119 --- src/doc/CHANGES-9.0:1.1.2.118 Mon Nov 25 17:03:50 2019 +++ src/doc/CHANGES-9.0 Tue Nov 26 08:24:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.118 2019/11/25 17:03:50 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.119 2019/11/26 08:24:43 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6429,3 +6429,30 @@ sys/kern/subr_cprng.c1.33 Use cprng_strong, not cprng_fast, for sysctl kern.arnd. [riastradh, ticket #481] +lib/libc/tls/Makefile.inc 1.3 +lib/libc/tls/tls.c1.10-1.13 +libexec/ld.elf_so/Makefile 1.142 +libexec/ld.elf_so/tls.c1.13,1.14 +usr.bin/ldd/Makefile.elf 1.6 + + PR/54074 and PR/54093: fix static TLS allocation properly aligned. + [nakayama, ticket #469] + +sys/dev/pci/if_age.c1.63 + + Fix multicast handling. + [msaitoh, ticket #482] + +sys/dev/pci/if_age.c1.64 +sys/dev/pci/if_alc.c1.44 +sys/dev/pci/if_ale.c1.35,1.36 +sys/dev/pci/if_cas.c1.36 + + Fix a bug that IFF_ALLMULTI is almost always set. + [msaitoh, ticket #483] + +sys/dev/hyperv/if_hvn.c1.11 + + hvn(4): Fix incorrect ident when waiting for NVS command response. + [nonaka, ticket #484] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Tue Nov 26 08:24:43 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #469, #482 - #484 To generate a diff of this commit: cvs rdiff -u -r1.1.2.118 -r1.1.2.119 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:22:51 UTC 2019
Modified Files:
src/sys/dev/hyperv [netbsd-9]: if_hvn.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #484):
sys/dev/hyperv/if_hvn.c: revision 1.11
hvn(4): Fix incorrect ident when waiting for NVS command response.
To generate a diff of this commit:
cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/hyperv/if_hvn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.4.2.4 src/sys/dev/hyperv/if_hvn.c:1.4.2.5
--- src/sys/dev/hyperv/if_hvn.c:1.4.2.4 Mon Nov 25 16:58:54 2019
+++ src/sys/dev/hyperv/if_hvn.c Tue Nov 26 08:22:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $ */
+/* $NetBSD: if_hvn.c,v 1.4.2.5 2019/11/26 08:22:51 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.5 2019/11/26 08:22:51 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1097,7 +1097,8 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
hvn_nvs_intr(sc);
splx(s);
} else
- tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1));
+ tsleep(sc->sc_nvsrsp, PRIBIO | PCATCH, "nvscmd",
+ mstohz(1));
} while (--timo > 0 && sc->sc_nvsdone != 1);
if (timo == 0 && sc->sc_nvsdone != 1) {
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src Committed By: martin Date: Tue Nov 26 08:22:51 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-9]: if_hvn.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #484): sys/dev/hyperv/if_hvn.c: revision 1.11 hvn(4): Fix incorrect ident when waiting for NVS command response. To generate a diff of this commit: cvs rdiff -u -r1.4.2.4 -r1.4.2.5 src/sys/dev/hyperv/if_hvn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:20:47 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_age.c if_alc.c if_ale.c if_cas.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #483):
sys/dev/pci/if_cas.c: revision 1.36
sys/dev/pci/if_alc.c: revision 1.44
sys/dev/pci/if_ale.c: revision 1.35
sys/dev/pci/if_ale.c: revision 1.36
sys/dev/pci/if_age.c: revision 1.64
Fix a bug that IFF_ALLMULTI is almost always set.
OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt.
Remove accidentally committed debug code. Sorry.
To generate a diff of this commit:
cvs rdiff -u -r1.60.2.3 -r1.60.2.4 src/sys/dev/pci/if_age.c
cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/pci/if_alc.c
cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/sys/dev/pci/if_ale.c
cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/pci/if_cas.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60.2.3 src/sys/dev/pci/if_age.c:1.60.2.4
--- src/sys/dev/pci/if_age.c:1.60.2.3 Tue Nov 26 08:18:40 2019
+++ src/sys/dev/pci/if_age.c Tue Nov 26 08:20:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $ */
+/* $NetBSD: if_age.c,v 1.60.2.4 2019/11/26 08:20:47 martin Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.4 2019/11/26 08:20:47 martin Exp $");
#include "vlan.h"
@@ -2275,27 +2275,37 @@ age_rxfilter(struct age_softc *sc)
*/
rxcfg |= MAC_CFG_BCAST;
- if (ifp->if_flags & IFF_PROMISC || ec->ec_multicnt > 0) {
- ifp->if_flags |= IFF_ALLMULTI;
- if (ifp->if_flags & IFF_PROMISC)
+ /* Program new filter. */
+ if ((ifp->if_flags & IFF_PROMISC) != 0)
+ goto update;
+
+ memset(mchash, 0, sizeof(mchash));
+
+ ETHER_LOCK(ec);
+ ETHER_FIRST_MULTI(step, ec, enm);
+ while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ ETHER_UNLOCK(ec);
+ goto update;
+ }
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
+ mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+ ETHER_NEXT_MULTI(step, enm);
+ }
+ ETHER_UNLOCK(ec);
+
+update:
+ if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if (ifp->if_flags & IFF_PROMISC) {
rxcfg |= MAC_CFG_PROMISC;
- else
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ } else
rxcfg |= MAC_CFG_ALLMULTI;
mchash[0] = mchash[1] = 0x;
- } else {
- /* Program new filter. */
- memset(mchash, 0, sizeof(mchash));
-
- ETHER_LOCK(ec);
- ETHER_FIRST_MULTI(step, ec, enm);
- while (enm != NULL) {
- crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
- mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
- ETHER_NEXT_MULTI(step, enm);
- }
- ETHER_UNLOCK(ec);
}
-
CSR_WRITE_4(sc, AGE_MAR0, mchash[0]);
CSR_WRITE_4(sc, AGE_MAR1, mchash[1]);
CSR_WRITE_4(sc, AGE_MAC_CFG, rxcfg);
Index: src/sys/dev/pci/if_alc.c
diff -u src/sys/dev/pci/if_alc.c:1.38.2.2 src/sys/dev/pci/if_alc.c:1.38.2.3
--- src/sys/dev/pci/if_alc.c:1.38.2.2 Wed Nov 6 09:59:38 2019
+++ src/sys/dev/pci/if_alc.c Tue Nov 26 08:20:47 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_alc.c,v 1.38.2.2 2019/11/06 09:59:38 martin Exp $ */
+/* $NetBSD: if_alc.c,v 1.38.2.3 2019/11/26 08:20:47 martin Exp $ */
/* $OpenBSD: if_alc.c,v 1.1 2009/08/08 09:31:13 kevlo Exp $ */
/*-
* Copyright (c) 2009, Pyun YongHyeon
@@ -3443,27 +3443,37 @@ alc_iff(struct alc_softc *sc)
*/
rxcfg |= MAC_CFG_BCAST;
- if (ifp->if_flags & IFF_PROMISC || ec->ec_multicnt > 0) {
- ifp->if_flags |= IFF_ALLMULTI;
- if (ifp->if_flags & IFF_PROMISC)
+ /* Program new filter. */
+ if ((ifp->if_flags & IFF_PROMISC) != 0)
+ goto update;
+
+ memset(mchash, 0, sizeof(mchash));
+
+ ETHER_LOCK(ec);
+ ETHER_FIRST_MULTI(step, ec, enm);
+ while (enm != NULL) {
+ if (memcmp(enm->enm_addrlo, enm->enm_addrhi, ETHER_ADDR_LEN)) {
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ ETHER_UNLOCK(ec);
+ goto update;
+ }
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
+ mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
+ ETHER_NEXT_MULTI(step, enm);
+ }
+ ETHER_UNLOCK(ec);
+
+update:
+ if ((ifp->if_flags & (IFF_PROMISC | IFF_ALLMULTI)) != 0) {
+ if (ifp->if_flags & IFF_PROMISC) {
rxcfg |= MAC_CFG_PROMISC;
- else
+ /* XXX Use ETHER_F_ALLMULTI in future. */
+ ifp->if_flags |= IFF_ALLMULTI;
+ } else
rxcfg |= MAC_CFG_ALLMULTI;
mchash[0] = mchash[1] = 0x;
- } else {
- /* Program new filter. */
- memset(mchash, 0, sizeof(mchash));
-
-
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 08:20:47 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_age.c if_alc.c if_ale.c if_cas.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #483): sys/dev/pci/if_cas.c: revision 1.36 sys/dev/pci/if_alc.c: revision 1.44 sys/dev/pci/if_ale.c: revision 1.35 sys/dev/pci/if_ale.c: revision 1.36 sys/dev/pci/if_age.c: revision 1.64 Fix a bug that IFF_ALLMULTI is almost always set. OpenBSD's ac_multirangecnt is not NetBSD's ec_multicnt. Remove accidentally committed debug code. Sorry. To generate a diff of this commit: cvs rdiff -u -r1.60.2.3 -r1.60.2.4 src/sys/dev/pci/if_age.c cvs rdiff -u -r1.38.2.2 -r1.38.2.3 src/sys/dev/pci/if_alc.c cvs rdiff -u -r1.33.2.1 -r1.33.2.2 src/sys/dev/pci/if_ale.c cvs rdiff -u -r1.35 -r1.35.2.1 src/sys/dev/pci/if_cas.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:18:40 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_age.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #482):
sys/dev/pci/if_age.c: revision 1.63
Fix multicast handling. All Atheros controllers use big-endian form
when computing multicast hash. Same as OpenBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.60.2.2 -r1.60.2.3 src/sys/dev/pci/if_age.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_age.c
diff -u src/sys/dev/pci/if_age.c:1.60.2.2 src/sys/dev/pci/if_age.c:1.60.2.3
--- src/sys/dev/pci/if_age.c:1.60.2.2 Wed Nov 6 09:59:39 2019
+++ src/sys/dev/pci/if_age.c Tue Nov 26 08:18:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin Exp $ */
+/* $NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $ */
/* $OpenBSD: if_age.c,v 1.1 2009/01/16 05:00:34 kevlo Exp $ */
/*-
@@ -31,7 +31,7 @@
/* Driver for Attansic Technology Corp. L1 Gigabit Ethernet. */
#include
-__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.2 2019/11/06 09:59:39 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_age.c,v 1.60.2.3 2019/11/26 08:18:40 martin Exp $");
#include "vlan.h"
@@ -2289,7 +2289,7 @@ age_rxfilter(struct age_softc *sc)
ETHER_LOCK(ec);
ETHER_FIRST_MULTI(step, ec, enm);
while (enm != NULL) {
- crc = ether_crc32_le(enm->enm_addrlo, ETHER_ADDR_LEN);
+ crc = ether_crc32_be(enm->enm_addrlo, ETHER_ADDR_LEN);
mchash[crc >> 31] |= 1 << ((crc >> 26) & 0x1f);
ETHER_NEXT_MULTI(step, enm);
}
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Nov 26 08:18:40 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_age.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #482): sys/dev/pci/if_age.c: revision 1.63 Fix multicast handling. All Atheros controllers use big-endian form when computing multicast hash. Same as OpenBSD. To generate a diff of this commit: cvs rdiff -u -r1.60.2.2 -r1.60.2.3 src/sys/dev/pci/if_age.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Tue Nov 26 08:12:27 UTC 2019
Modified Files:
src/lib/libc/tls [netbsd-9]: Makefile.inc tls.c
src/libexec/ld.elf_so [netbsd-9]: Makefile tls.c
src/usr.bin/ldd [netbsd-9]: Makefile.elf
Log Message:
Pull up following revision(s) (requested by nakayama in ticket #469):
lib/libc/tls/tls.c: revision 1.10
lib/libc/tls/tls.c: revision 1.11
lib/libc/tls/tls.c: revision 1.12
lib/libc/tls/tls.c: revision 1.13
libexec/ld.elf_so/tls.c: revision 1.13
libexec/ld.elf_so/tls.c: revision 1.14
libexec/ld.elf_so/Makefile: revision 1.142
lib/libc/tls/Makefile.inc: revision 1.3
usr.bin/ldd/Makefile.elf: revision 1.6
PR 54093: Align static TLS area to max_align_t.
Use alignof and not size_t for platforms with non-natural base
alignments.
Mirror the ld.elf_so logic for handling aligning the TLS size.
Most noticable, recompute the start of the TLS area for variant I
relative to the TCB. This makes a difference when the segment size and
base alignment don't agree.
Fix PR/54074 and PR/54093 completely.
More similar to the ld.elf_so logic, it is necessary to align with
p_align first. Also, invert the #ifdef condition for consistency.
Should fix regression for static linking binaries:
http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03
http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.46.1 src/lib/libc/tls/Makefile.inc
cvs rdiff -u -r1.9 -r1.9.2.1 src/lib/libc/tls/tls.c
cvs rdiff -u -r1.141 -r1.141.2.1 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.12 -r1.12.2.1 src/libexec/ld.elf_so/tls.c
cvs rdiff -u -r1.5 -r1.5.30.1 src/usr.bin/ldd/Makefile.elf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/tls/Makefile.inc
diff -u src/lib/libc/tls/Makefile.inc:1.2 src/lib/libc/tls/Makefile.inc:1.2.46.1
--- src/lib/libc/tls/Makefile.inc:1.2 Sat Mar 12 07:55:09 2011
+++ src/lib/libc/tls/Makefile.inc Tue Nov 26 08:12:26 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/03/12 07:55:09 matt Exp $
+# $NetBSD: Makefile.inc,v 1.2.46.1 2019/11/26 08:12:26 martin Exp $
.include
@@ -6,4 +6,4 @@
.PATH: ${.PARSEDIR} ${ARCHDIR}/tls
SRCS+= tls.c
-CPPFLAGS.tls.c+= -D_LIBC_SOURCE
+CPPFLAGS.tls.c+= -D_LIBC_SOURCE -std=gnu11
Index: src/lib/libc/tls/tls.c
diff -u src/lib/libc/tls/tls.c:1.9 src/lib/libc/tls/tls.c:1.9.2.1
--- src/lib/libc/tls/tls.c:1.9 Fri Jul 13 19:50:21 2018
+++ src/lib/libc/tls/tls.c Tue Nov 26 08:12:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.9 2018/07/13 19:50:21 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.9.2.1 2019/11/26 08:12:26 martin Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: tls.c,v 1.9 2018/07/13 19:50:21 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.9.2.1 2019/11/26 08:12:26 martin Exp $");
#include "namespace.h"
@@ -46,6 +46,7 @@ __RCSID("$NetBSD: tls.c,v 1.9 2018/07/13
#include
#include
#include
+#include
#include
#include
#include
@@ -84,15 +85,17 @@ _rtld_tls_allocate(void)
uint8_t *p;
if (initial_thread_tcb == NULL) {
-#ifdef __HAVE_TLS_VARIANT_II
- tls_size = roundup2(tls_size, sizeof(void *));
+#ifdef __HAVE_TLS_VARIANT_I
+ tls_allocation = tls_size;
+#else
+ tls_allocation = roundup2(tls_size, alignof(max_align_t));
#endif
- tls_allocation = tls_size + sizeof(*tcb);
- initial_thread_tcb = p = mmap(NULL, tls_allocation,
- PROT_READ | PROT_WRITE, MAP_ANON, -1, 0);
+ initial_thread_tcb = p = mmap(NULL,
+ tls_allocation + sizeof(*tcb), PROT_READ | PROT_WRITE,
+ MAP_ANON, -1, 0);
} else {
- p = calloc(1, tls_allocation);
+ p = calloc(1, tls_allocation + sizeof(*tcb));
}
if (p == NULL) {
static const char msg[] = "TLS allocation failed, terminating\n";
@@ -105,7 +108,8 @@ _rtld_tls_allocate(void)
p += sizeof(struct tls_tcb);
#else
/* LINTED tls_size is rounded above */
- tcb = (struct tls_tcb *)(p + tls_size);
+ tcb = (struct tls_tcb *)(p + tls_allocation);
+ p = (uint8_t *)tcb - tls_size;
tcb->tcb_self = tcb;
#endif
memcpy(p, tls_initaddr, tls_initsize);
@@ -125,10 +129,10 @@ _rtld_tls_free(struct tls_tcb *tcb)
p = (uint8_t *)tcb;
#else
/* LINTED */
- p = (uint8_t *)tcb - tls_size;
+ p = (uint8_t *)tcb - tls_allocation;
#endif
if (p == initial_thread_tcb)
- munmap(p, tls_allocation);
+ munmap(p, tls_allocation + sizeof(*tcb));
else
free(p);
}
@@ -148,7 +152,11 @@ __libc_static_tls_setup_cb(struct dl_phd
continue;
tls_initaddr = (void *)(phdr->p_vaddr + data->dlpi_addr);
tls_initsize = phdr->p_filesz;
+#ifdef __HAVE_TLS_VARIANT_I
tls_size = phdr->p_memsz;
+#else
+ tls_size = roundup2(phdr->p_memsz, phdr->p_align);
+#endif
}
return 0;
}
Index:
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Tue Nov 26 08:12:27 UTC 2019 Modified Files: src/lib/libc/tls [netbsd-9]: Makefile.inc tls.c src/libexec/ld.elf_so [netbsd-9]: Makefile tls.c src/usr.bin/ldd [netbsd-9]: Makefile.elf Log Message: Pull up following revision(s) (requested by nakayama in ticket #469): lib/libc/tls/tls.c: revision 1.10 lib/libc/tls/tls.c: revision 1.11 lib/libc/tls/tls.c: revision 1.12 lib/libc/tls/tls.c: revision 1.13 libexec/ld.elf_so/tls.c: revision 1.13 libexec/ld.elf_so/tls.c: revision 1.14 libexec/ld.elf_so/Makefile: revision 1.142 lib/libc/tls/Makefile.inc: revision 1.3 usr.bin/ldd/Makefile.elf: revision 1.6 PR 54093: Align static TLS area to max_align_t. Use alignof and not size_t for platforms with non-natural base alignments. Mirror the ld.elf_so logic for handling aligning the TLS size. Most noticable, recompute the start of the TLS area for variant I relative to the TCB. This makes a difference when the segment size and base alignment don't agree. Fix PR/54074 and PR/54093 completely. More similar to the ld.elf_so logic, it is necessary to align with p_align first. Also, invert the #ifdef condition for consistency. Should fix regression for static linking binaries: http://releng.netbsd.org/b5reports/sparc/commits-2019.11.html#2019.11.10.23.39.03 http://releng.netbsd.org/b5reports/sparc64/commits-2019.11.html#2019.11.16.04.10.33 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.46.1 src/lib/libc/tls/Makefile.inc cvs rdiff -u -r1.9 -r1.9.2.1 src/lib/libc/tls/tls.c cvs rdiff -u -r1.141 -r1.141.2.1 src/libexec/ld.elf_so/Makefile cvs rdiff -u -r1.12 -r1.12.2.1 src/libexec/ld.elf_so/tls.c cvs rdiff -u -r1.5 -r1.5.30.1 src/usr.bin/ldd/Makefile.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 20:47:25 UTC 2019 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4 [netbsd-9]: Makefile jme.4 mii.4 src/sys/arch/amd64/conf [netbsd-9]: ALL GENERIC src/sys/arch/i386/conf [netbsd-9]: ALL GENERIC src/sys/dev [netbsd-9]: DEVNAMES Added Files: src/share/man/man4 [netbsd-9]: jmphy.4 smscphy.4 Log Message: Pull up following revision(s) (requested by msaitoh in ticket #478): sys/dev/mii/smscphy.c: revision 1.1 sys/arch/amd64/conf/ALL: revision 1.127 sys/arch/amd64/conf/ALL: revision 1.128 sys/dev/mii/files.mii: revision 1.52 sys/dev/mii/files.mii: revision 1.53 sys/arch/i386/conf/ALL: revision 1.473 share/man/man4/mii.4: revision 1.29 sys/arch/i386/conf/ALL: revision 1.474 sys/arch/amd64/conf/GENERIC: revision 1.543 sys/arch/amd64/conf/GENERIC: revision 1.544 sys/dev/mii/jmphyreg.h: revision 1.1 share/man/man4/Makefile: revision 1.687 share/man/man4/smscphy.4: revision 1.1 share/man/man4/Makefile: revision 1.688 sys/dev/mii/jmphy.c: revision 1.1 sys/dev/DEVNAMES: revision 1.324 sys/dev/DEVNAMES: revision 1.325 distrib/sets/lists/man/mi: revision 1.1661 sys/arch/i386/conf/GENERIC: revision 1.1214 distrib/sets/lists/man/mi: revision 1.1662 sys/arch/i386/conf/GENERIC: revision 1.1215 share/man/man4/jmphy.4: revision 1.1 share/man/man4/jme.4: revision 1.8 Add jmphy(4) from OpenBSD. Add jmphy.4. Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup and IFM_NONE support. To generate a diff of this commit: cvs rdiff -u -r1.1649.2.4 -r1.1649.2.5 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.680.2.2 -r1.680.2.3 src/share/man/man4/Makefile cvs rdiff -u -r1.7 -r1.7.8.1 src/share/man/man4/jme.4 cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/jmphy.4 \ src/share/man/man4/smscphy.4 cvs rdiff -u -r1.27.28.1 -r1.27.28.2 src/share/man/man4/mii.4 cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.531.2.5 -r1.531.2.6 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.469.2.1 -r1.469.2.2 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1208.2.3 -r1.1208.2.4 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.321.2.1 -r1.321.2.2 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 20:47:25 UTC 2019 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4 [netbsd-9]: Makefile jme.4 mii.4 src/sys/arch/amd64/conf [netbsd-9]: ALL GENERIC src/sys/arch/i386/conf [netbsd-9]: ALL GENERIC src/sys/dev [netbsd-9]: DEVNAMES Added Files: src/share/man/man4 [netbsd-9]: jmphy.4 smscphy.4 Log Message: Pull up following revision(s) (requested by msaitoh in ticket #478): sys/dev/mii/smscphy.c: revision 1.1 sys/arch/amd64/conf/ALL: revision 1.127 sys/arch/amd64/conf/ALL: revision 1.128 sys/dev/mii/files.mii: revision 1.52 sys/dev/mii/files.mii: revision 1.53 sys/arch/i386/conf/ALL: revision 1.473 share/man/man4/mii.4: revision 1.29 sys/arch/i386/conf/ALL: revision 1.474 sys/arch/amd64/conf/GENERIC: revision 1.543 sys/arch/amd64/conf/GENERIC: revision 1.544 sys/dev/mii/jmphyreg.h: revision 1.1 share/man/man4/Makefile: revision 1.687 share/man/man4/smscphy.4: revision 1.1 share/man/man4/Makefile: revision 1.688 sys/dev/mii/jmphy.c: revision 1.1 sys/dev/DEVNAMES: revision 1.324 sys/dev/DEVNAMES: revision 1.325 distrib/sets/lists/man/mi: revision 1.1661 sys/arch/i386/conf/GENERIC: revision 1.1214 distrib/sets/lists/man/mi: revision 1.1662 sys/arch/i386/conf/GENERIC: revision 1.1215 share/man/man4/jmphy.4: revision 1.1 share/man/man4/jme.4: revision 1.8 Add jmphy(4) from OpenBSD. Add jmphy.4. Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with some cleanup and IFM_NONE support. To generate a diff of this commit: cvs rdiff -u -r1.1649.2.4 -r1.1649.2.5 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.680.2.2 -r1.680.2.3 src/share/man/man4/Makefile cvs rdiff -u -r1.7 -r1.7.8.1 src/share/man/man4/jme.4 cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/jmphy.4 \ src/share/man/man4/smscphy.4 cvs rdiff -u -r1.27.28.1 -r1.27.28.2 src/share/man/man4/mii.4 cvs rdiff -u -r1.120.2.2 -r1.120.2.3 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.531.2.5 -r1.531.2.6 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.469.2.1 -r1.469.2.2 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1208.2.3 -r1.1208.2.4 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.321.2.1 -r1.321.2.2 src/sys/dev/DEVNAMES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1649.2.4 src/distrib/sets/lists/man/mi:1.1649.2.5 --- src/distrib/sets/lists/man/mi:1.1649.2.4 Mon Nov 25 16:44:32 2019 +++ src/distrib/sets/lists/man/mi Mon Nov 25 20:47:25 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1649.2.4 2019/11/25 16:44:32 martin Exp $ +# $NetBSD: mi,v 1.1649.2.5 2019/11/25 20:47:25 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1379,6 +1379,7 @@ ./usr/share/man/cat4/iy.0 man-sys-catman .cat ./usr/share/man/cat4/jme.0 man-sys-catman .cat ./usr/share/man/cat4/jmide.0 man-sys-catman .cat +./usr/share/man/cat4/jmphy.0 man-sys-catman .cat ./usr/share/man/cat4/joy.0 man-sys-catman .cat ./usr/share/man/cat4/kame_ipsec.0 man-obsolete obsolete ./usr/share/man/cat4/kcov.0 man-sys-catman .cat @@ -1709,6 +1710,7 @@ ./usr/share/man/cat4/slip.0 man-sys-catman .cat ./usr/share/man/cat4/sm.0 man-sys-catman .cat ./usr/share/man/cat4/smsc.0 man-sys-catman .cat +./usr/share/man/cat4/smscphy.0 man-sys-catman .cat ./usr/share/man/cat4/smscmon.0 man-sys-catman .cat ./usr/share/man/cat4/smsh.0 man-sys-catman .cat ./usr/share/man/cat4/sn.0 man-sys-catman .cat @@ -4518,6 +4520,7 @@ ./usr/share/man/html4/iy.html man-sys-htmlman html ./usr/share/man/html4/jme.html man-sys-htmlman html ./usr/share/man/html4/jmide.html man-sys-htmlman html +./usr/share/man/html4/jmphy.html man-sys-htmlman html ./usr/share/man/html4/joy.html man-sys-htmlman html ./usr/share/man/html4/kame_ipsec.html man-obsolete obsolete ./usr/share/man/html4/kcov.html man-sys-htmlman html @@ -4815,6 +4818,7 @@ ./usr/share/man/html4/slip.html man-sys-htmlman html ./usr/share/man/html4/sm.html man-sys-htmlman html ./usr/share/man/html4/smsc.html man-sys-htmlman html +./usr/share/man/html4/smscphy.html man-sys-htmlman html ./usr/share/man/html4/smscmon.html man-sys-htmlman html ./usr/share/man/html4/smsh.html man-sys-htmlman html ./usr/share/man/html4/sn.html man-sys-htmlman html @@ -7497,6 +7501,7 @@ ./usr/share/man/man4/iy.4 man-sys-man .man ./usr/share/man/man4/jme.4 man-sys-man .man ./usr/share/man/man4/jmide.4 man-sys-man .man +./usr/share/man/man4/jmphy.4 man-sys-man .man ./usr/share/man/man4/joy.4 man-sys-man .man ./usr/share/man/man4/kame_ipsec.4 man-obsolete obsolete
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 25 17:03:50 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #470, #472 - #481 To generate a diff of this commit: cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.117 src/doc/CHANGES-9.0:1.1.2.118 --- src/doc/CHANGES-9.0:1.1.2.117 Mon Nov 25 05:52:54 2019 +++ src/doc/CHANGES-9.0 Mon Nov 25 17:03:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.117 2019/11/25 05:52:54 msaitoh Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.118 2019/11/25 17:03:50 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6308,3 +6308,124 @@ distrib/notes/x68k/contents 1.21 - Adapt to cdn/nycdn and our current auto-build conventions. - Automate where possible. [martin, ticket #471] + +sys/arch/arm/dts/sun50i-a64-pinebook.dts1.17 +sys/arch/arm/sunxi/sun50i_a64_ccu.c 1.16-1.20 +sys/arch/arm/sunxi/sunxi_ccu.h 1.22 +sys/arch/arm/sunxi/sunxi_ccu_fractional.c 1.5,1.6 +sys/arch/arm/sunxi/sunxi_dwhdmi.c 1.5-1.8 +sys/arch/arm/sunxi/sunxi_hdmiphy.c 1.3,1.4 +sys/arch/arm/sunxi/sunxi_hdmiphy.h 1.2 +sys/arch/arm/sunxi/sunxi_lcdc.c 1.7 +sys/arch/arm/sunxi/sunxi_mixer.c1.8-1.10 +sys/arch/arm/sunxi/sunxi_platform.c 1.38 +sys/dev/fdt/fdt_port.c 1.3,1.4 +sys/dev/ic/dw_hdmi.c1.5,1.6 +sys/dev/ic/dw_hdmi.h1.5 + +Add Pinebook HDMI support. + [jmcneill, ticket #470] + +sys/arch/arm/sunxi/sunxi_drm.c 1.9 + + Reclaim bootloader FB memory for CMA pool. + [jmcneill, ticket #472] + +sys/dev/mii/miidevs1.155-1.157,1.159,1.160 +sys/dev/mii/rlphy.c1.37 +sys/dev/mii/miidevs.h(regen) +sys/dev/mii/miidevs_data.h (regen) + + - miidevs update: + - Add Teranetics, Aquantia and Renesas. + - Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3). + - Fix typo in comment. from vezhlys. + - Rename JMICRON 0x0021 from JMC250 to JMP211 + - Rename JMICRON 0x0022 from JMC260 to JMP202 + - rlphy(4): Print model name if it's ICPLUS IP101 to avoid printing + "Realtek internal PHY". + [msaitoh, ticket #473] + +sys/dev/usb/if_upl.c1.68 + + Make it compilable with UPL_DEBUG. + [msaitoh, ticket #474] + +sys/dev/nvmm/x86/nvmm_x86_svm.c 1.54 +sys/dev/nvmm/x86/nvmm_x86_vmx.c 1.45 +tests/lib/libnvmm/h_mem_assist.c 1.18 + + Hide XSAVES-specific stuff and the masked extended states. + Several improvements. In particular, reduce CS.limit, because + Intel CPUs perform strict sanity checks, and the previous (too high) + limit caused the VM entry to fail. + [maxv, ticket #475] + +distrib/sets/lists/man/mi 1.1656 +share/man/man4/Makefile1.684 +share/man/man4/ipgphy.41.1,1.2 +share/man/man4/mii.41.28 +share/man/man4/vge.41.8,1.9 +sys/arch/amd64/conf/ALL1.124 +sys/arch/amd64/conf/GENERIC 1.537 +sys/arch/i386/conf/ALL1.471 +sys/arch/i386/conf/GENERIC 1.1211 +sys/dev/DEVNAMES1.322 +sys/dev/mii/files.mii1.51 +sys/dev/mii/ipgphy.c1.1.1.5 +sys/dev/mii/ipgphyreg.h1.1-1.3 +sys/dev/pci/if_stge.c1.71 +sys/dev/pci/if_stgereg.h 1.6 + + Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by + Tomokazu HARADA and patch provided by Andrius V. + [msaitoh, ticket #476] + +sys/dev/pci/if_vge.c1.76,1.77 + + - Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device + time out. + - When the link is up, set VGE_DIAGCTL not from user media setting + but from the current active link status. + [msaitoh, ticket #477] + +distrib/sets/lists/man/mi 1.1661,1.1662 +share/man/man4/Makefile1.687,1.688 +share/man/man4/jme.41.8 +share/man/man4/jmphy.41.1 +share/man/man4/mii.41.29 +share/man/man4/smscphy.4 1.1 +sys/arch/amd64/conf/ALL1.127,1.128 +sys/arch/amd64/conf/GENERIC 1.543,1.544 +sys/arch/i386/conf/ALL1.473,1.474 +sys/arch/i386/conf/GENERIC 1.1214,1.1215 +sys/dev/DEVNAMES1.324,1.325 +sys/dev/mii/files.mii1.52,1.53 +sys/dev/mii/jmphy.c1.1 +sys/dev/mii/jmphyreg.h1.1 +sys/dev/mii/smscphy.c1.1 + + - Add jmphy(4) from OpenBSD. + - Port SMSC LAN87xx 10/100 Ethernet PHY driver from FreeBSD with + some cleanup and IFM_NONE support. + [msaitoh, ticket #478] + +share/man/man4/micphy.41.3 +sys/dev/mii/micphy.c1.9 +sys/dev/mii/miidevs1.161 + + Add support for KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and KSZ9477. + It also supports LAN7430's internal PHY. + [msaitoh, ticket #479] + +sys/dev/hyperv/hvs.c1.3 +sys/dev/hyperv/if_hvn.c1.10 + + hvs(4), hvn(4): Set correct size for bus_dmamap_sync(9). + [nonaka, ticket #480] + +sys/kern/subr_cprng.c1.33 + + Use
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 25 17:03:50 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #470, #472 - #481 To generate a diff of this commit: cvs rdiff -u -r1.1.2.117 -r1.1.2.118 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/kern
Module Name:src
Committed By: martin
Date: Mon Nov 25 17:00:22 UTC 2019
Modified Files:
src/sys/kern [netbsd-9]: subr_cprng.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #481):
sys/kern/subr_cprng.c: revision 1.33
Use cprng_strong, not cprng_fast, for sysctl kern.arnd.
To generate a diff of this commit:
cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/kern/subr_cprng.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_cprng.c
diff -u src/sys/kern/subr_cprng.c:1.30.2.1 src/sys/kern/subr_cprng.c:1.30.2.2
--- src/sys/kern/subr_cprng.c:1.30.2.1 Tue Sep 3 07:48:00 2019
+++ src/sys/kern/subr_cprng.c Mon Nov 25 17:00:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_cprng.c,v 1.30.2.1 2019/09/03 07:48:00 martin Exp $ */
+/* $NetBSD: subr_cprng.c,v 1.30.2.2 2019/11/25 17:00:22 martin Exp $ */
/*-
* Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.30.2.1 2019/09/03 07:48:00 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.30.2.2 2019/11/25 17:00:22 martin Exp $");
#include
#include
@@ -539,6 +539,7 @@ cprng_strong_rndsink_callback(void *cont
mutex_exit(>cs_lock);
}
+static ONCE_DECL(sysctl_prng_once);
static cprng_strong_t *sysctl_prng;
static int
@@ -558,10 +559,9 @@ makeprng(void)
static int
sysctl_kern_urnd(SYSCTLFN_ARGS)
{
- static ONCE_DECL(control);
int v, rv;
- RUN_ONCE(, makeprng);
+ RUN_ONCE(_prng_once, makeprng);
rv = cprng_strong(sysctl_prng, , sizeof(v), 0);
if (rv == sizeof(v)) {
struct sysctlnode node = *rnode;
@@ -590,6 +590,7 @@ sysctl_kern_arnd(SYSCTLFN_ARGS)
int error;
void *v;
struct sysctlnode node = *rnode;
+ size_t n __diagused;
switch (*oldlenp) {
case 0:
@@ -598,8 +599,10 @@ sysctl_kern_arnd(SYSCTLFN_ARGS)
if (*oldlenp > 256) {
return E2BIG;
}
+ RUN_ONCE(_prng_once, makeprng);
v = kmem_alloc(*oldlenp, KM_SLEEP);
- cprng_fast(v, *oldlenp);
+ n = cprng_strong(sysctl_prng, v, *oldlenp, 0);
+ KASSERT(n == *oldlenp);
node.sysctl_data = v;
node.sysctl_size = *oldlenp;
error = sysctl_lookup(SYSCTLFN_CALL());
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Mon Nov 25 17:00:22 UTC 2019 Modified Files: src/sys/kern [netbsd-9]: subr_cprng.c Log Message: Pull up following revision(s) (requested by riastradh in ticket #481): sys/kern/subr_cprng.c: revision 1.33 Use cprng_strong, not cprng_fast, for sysctl kern.arnd. To generate a diff of this commit: cvs rdiff -u -r1.30.2.1 -r1.30.2.2 src/sys/kern/subr_cprng.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src Committed By: martin Date: Mon Nov 25 16:58:55 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-9]: hvs.c if_hvn.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #480): sys/dev/hyperv/hvs.c: revision 1.3 sys/dev/hyperv/if_hvn.c: revision 1.10 hvs(4), hvn(4): Set correct size for bus_dmamap_sync(9). To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/dev/hyperv/hvs.c cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/sys/dev/hyperv/if_hvn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:58:55 UTC 2019
Modified Files:
src/sys/dev/hyperv [netbsd-9]: hvs.c if_hvn.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #480):
sys/dev/hyperv/hvs.c: revision 1.3
sys/dev/hyperv/if_hvn.c: revision 1.10
hvs(4), hvn(4): Set correct size for bus_dmamap_sync(9).
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.8.1 src/sys/dev/hyperv/hvs.c
cvs rdiff -u -r1.4.2.3 -r1.4.2.4 src/sys/dev/hyperv/if_hvn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/hvs.c
diff -u src/sys/dev/hyperv/hvs.c:1.1 src/sys/dev/hyperv/hvs.c:1.1.8.1
--- src/sys/dev/hyperv/hvs.c:1.1 Fri Feb 15 08:54:01 2019
+++ src/sys/dev/hyperv/hvs.c Mon Nov 25 16:58:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvs.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $ */
+/* $NetBSD: hvs.c,v 1.1.8.1 2019/11/25 16:58:54 martin Exp $ */
/* $OpenBSD: hvs.c,v 1.17 2017/08/10 17:22:48 mikeb Exp $ */
/*-
@@ -37,7 +37,7 @@
/* #define HVS_DEBUG_IO */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.1 2019/02/15 08:54:01 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvs.c,v 1.1.8.1 2019/11/25 16:58:54 martin Exp $");
#include
#include
@@ -1095,7 +1095,8 @@ hvs_free_ccbs(struct hvs_softc *sc)
if (ccb->ccb_dmap == NULL)
continue;
- bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmap, 0, 0,
+ bus_dmamap_sync(sc->sc_dmat, ccb->ccb_dmap,
+ 0, ccb->ccb_dmap->dm_mapsize,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->sc_dmat, ccb->ccb_dmap);
bus_dmamap_destroy(sc->sc_dmat, ccb->ccb_dmap);
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.4.2.3 src/sys/dev/hyperv/if_hvn.c:1.4.2.4
--- src/sys/dev/hyperv/if_hvn.c:1.4.2.3 Sun Nov 24 08:13:07 2019
+++ src/sys/dev/hyperv/if_hvn.c Mon Nov 25 16:58:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $ */
+/* $NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.4 2019/11/25 16:58:54 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -632,7 +632,8 @@ hvn_decap(struct hvn_softc *sc, struct h
{
struct ifnet *ifp = SC2IFP(sc);
- bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+ bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+ 0, txd->txd_dmap->dm_mapsize,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
txd->txd_buf = NULL;
@@ -667,7 +668,8 @@ hvn_txeof(struct hvn_softc *sc, uint64_t
}
txd->txd_buf = NULL;
- bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+ bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+ 0, txd->txd_dmap->dm_mapsize,
BUS_DMASYNC_POSTREAD | BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
m_freem(m);
@@ -844,7 +846,8 @@ hvn_tx_ring_destroy(struct hvn_softc *sc
txd = >sc_tx_desc[i];
if (txd->txd_dmap == NULL)
continue;
- bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap, 0, 0,
+ bus_dmamap_sync(sc->sc_dmat, txd->txd_dmap,
+ 0, txd->txd_dmap->dm_mapsize,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->sc_dmat, txd->txd_dmap);
bus_dmamap_destroy(sc->sc_dmat, txd->txd_dmap);
@@ -855,7 +858,8 @@ hvn_tx_ring_destroy(struct hvn_softc *sc
txd->txd_buf = NULL;
}
if (sc->sc_tx_rmap) {
- bus_dmamap_sync(sc->sc_dmat, sc->sc_tx_rmap, 0, 0,
+ bus_dmamap_sync(sc->sc_dmat, sc->sc_tx_rmap,
+ 0, txd->txd_dmap->dm_mapsize,
BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(sc->sc_dmat, sc->sc_tx_rmap);
bus_dmamap_destroy(sc->sc_dmat, sc->sc_tx_rmap);
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:55:09 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket 479 To generate a diff of this commit: cvs rdiff -u -r1.151.2.4 -r1.151.2.5 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.4 -r1.139.2.5 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:55:09 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket 479 To generate a diff of this commit: cvs rdiff -u -r1.151.2.4 -r1.151.2.5 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.4 -r1.139.2.5 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.151.2.4 src/sys/dev/mii/miidevs.h:1.151.2.5 --- src/sys/dev/mii/miidevs.h:1.151.2.4 Mon Nov 25 16:53:55 2019 +++ src/sys/dev/mii/miidevs.h Mon Nov 25 16:55:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: miidevs.h,v 1.151.2.4 2019/11/25 16:53:55 martin Exp $ */ +/* $NetBSD: miidevs.h,v 1.151.2.5 2019/11/25 16:55:09 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.4 src/sys/dev/mii/miidevs_data.h:1.139.2.5 --- src/sys/dev/mii/miidevs_data.h:1.139.2.4 Mon Nov 25 16:53:55 2019 +++ src/sys/dev/mii/miidevs_data.h Mon Nov 25 16:55:09 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: miidevs_data.h,v 1.139.2.4 2019/11/25 16:53:55 martin Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.139.2.5 2019/11/25 16:55:09 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:53:55 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-9]: files.mii miidevs.h miidevs_data.h
Added Files:
src/sys/dev/mii [netbsd-9]: jmphy.c jmphyreg.h smscphy.c
Log Message:
Regen for ticket 479
To generate a diff of this commit:
cvs rdiff -u -r1.50.26.1 -r1.50.26.2 src/sys/dev/mii/files.mii
cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/mii/jmphy.c src/sys/dev/mii/jmphyreg.h \
src/sys/dev/mii/smscphy.c
cvs rdiff -u -r1.151.2.3 -r1.151.2.4 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.139.2.3 -r1.139.2.4 src/sys/dev/mii/miidevs_data.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/files.mii
diff -u src/sys/dev/mii/files.mii:1.50.26.1 src/sys/dev/mii/files.mii:1.50.26.2
--- src/sys/dev/mii/files.mii:1.50.26.1 Mon Nov 25 16:44:31 2019
+++ src/sys/dev/mii/files.mii Mon Nov 25 16:53:55 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.mii,v 1.50.26.1 2019/11/25 16:44:31 martin Exp $
+# $NetBSD: files.mii,v 1.50.26.2 2019/11/25 16:53:55 martin Exp $
defflag opt_mii.h MIIVERBOSE
@@ -103,6 +103,10 @@ device ipgphy: mii_phy
attach ipgphy at mii
file dev/mii/ipgphy.c ipgphy
+device jmphy: mii_phy
+attach jmphy at mii
+file dev/mii/jmphy.cjmphy
+
device sqphy: mii_phy
attach sqphy at mii
file dev/mii/sqphy.csqphy
@@ -162,3 +166,7 @@ file dev/mii/rdcphy.c rdcphy
device micphy: mii_phy, ukphy_subr
attach micphy at mii
file dev/mii/micphy.c micphy
+
+device smscphy: mii_phy
+attach smscphy at mii
+file dev/mii/smscphy.c smscphy
Index: src/sys/dev/mii/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.151.2.3 src/sys/dev/mii/miidevs.h:1.151.2.4
--- src/sys/dev/mii/miidevs.h:1.151.2.3 Mon Nov 25 16:26:31 2019
+++ src/sys/dev/mii/miidevs.h Mon Nov 25 16:53:55 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.151.2.3 2019/11/25 16:26:31 martin Exp $ */
+/* $NetBSD: miidevs.h,v 1.151.2.4 2019/11/25 16:53:55 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.3 2019/11/25 16:26:00 martin Exp
+ * NetBSD: miidevs,v 1.153.2.4 2019/11/25 16:53:29 martin Exp
*/
/*-
@@ -494,13 +494,27 @@
#define MII_MODEL_MARVELL_E 0x000c
#define MII_STR_MARVELL_E "Marvell 88E Gigabit PHY"
-/* Micrel PHYs */
+/* Micrel PHYs (Kendin and Microchip) */
+#define MII_MODEL_MICREL_KSZ8041 0x0011
+#define MII_STR_MICREL_KSZ8041 "Micrel KSZ8041TL/FTL/MLL 10/100 PHY"
+#define MII_MODEL_MICREL_KSZ8041RNLI 0x0013
+#define MII_STR_MICREL_KSZ8041RNLI "Micrel KSZ8041RNLI 10/100 PHY"
+#define MII_MODEL_MICREL_KSZ8051 0x0015
+#define MII_STR_MICREL_KSZ8051 "Micrel KSZ80[235]1 10/100 PHY"
#define MII_MODEL_MICREL_KSZ8081 0x0016
-#define MII_STR_MICREL_KSZ8081 "Micrel KSZ8081 10/100 PHY"
-#define MII_MODEL_MICREL_KSZ9021RNI 0x0021
-#define MII_STR_MICREL_KSZ9021RNI "Micrel KSZ9021RNI 10/100/1000 PHY"
+#define MII_STR_MICREL_KSZ8081 "Micrel KSZ80[89]1 10/100 PHY"
+#define MII_MODEL_MICREL_KSZ8061 0x0017
+#define MII_STR_MICREL_KSZ8061 "Micrel KSZ8061 10/100 PHY"
+#define MII_MODEL_MICREL_KSZ9021_8001_8721 0x0021
+#define MII_STR_MICREL_KSZ9021_8001_8721 "Micrel KSZ9021 Gb & KSZ8001/8721 10/100 PHY"
#define MII_MODEL_MICREL_KSZ9031 0x0022
#define MII_STR_MICREL_KSZ9031 "Micrel KSZ9031 10/100/1000 PHY"
+#define MII_MODEL_MICREL_KSZ9477 0x0023
+#define MII_STR_MICREL_KSZ9477 "Micrel KSZ9477 10/100/1000 PHY"
+#define MII_MODEL_MICREL_KSZ9131 0x0024
+#define MII_STR_MICREL_KSZ9131 "Micrel KSZ9131 10/100/1000 PHY"
+#define MII_MODEL_MICREL_KS8737 0x0032
+#define MII_STR_MICREL_KS8737 "Micrel KS8737 10/100 PHY"
/* Myson Technology PHYs */
#define MII_MODEL_xxMYSON_MTD972 0x
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.3 src/sys/dev/mii/miidevs_data.h:1.139.2.4
--- src/sys/dev/mii/miidevs_data.h:1.139.2.3 Mon Nov 25 16:26:31 2019
+++ src/sys/dev/mii/miidevs_data.h Mon Nov 25 16:53:55 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.139.2.3 2019/11/25 16:26:31 martin Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.139.2.4 2019/11/25 16:53:55 martin Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.153.2.3 2019/11/25 16:26:00 martin Exp
+ * NetBSD: miidevs,v 1.153.2.4 2019/11/25 16:53:29 martin Exp
*/
/*-
@@ -204,9 +204,16 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_5, MII_STR_MARVELL_E1000_5 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E1000_6, MII_STR_MARVELL_E1000_6 },
{ MII_OUI_MARVELL, MII_MODEL_MARVELL_E, MII_STR_MARVELL_E },
+ { MII_OUI_MICREL, MII_MODEL_MICREL_KSZ8041, MII_STR_MICREL_KSZ8041 },
+ { MII_OUI_MICREL, MII_MODEL_MICREL_KSZ8041RNLI, MII_STR_MICREL_KSZ8041RNLI },
+ { MII_OUI_MICREL, MII_MODEL_MICREL_KSZ8051, MII_STR_MICREL_KSZ8051 },
{ MII_OUI_MICREL, MII_MODEL_MICREL_KSZ8081,
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 16:53:29 UTC 2019 Modified Files: src/share/man/man4 [netbsd-9]: micphy.4 src/sys/dev/mii [netbsd-9]: micphy.c miidevs Log Message: Pull up following revision(s) (requested by msaitoh in ticket #479): sys/dev/mii/micphy.c: revision 1.9 sys/dev/mii/miidevs: revision 1.161 share/man/man4/micphy.4: revision 1.3 Add Micrel (now Microchip) KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and KSZ9477. Add support for KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and KSZ9477. It also supports LAN7430's internal PHY. First wrote by nisimura@ and added some device support by me. Not tested well. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.32.1 src/share/man/man4/micphy.4 cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/mii/micphy.c cvs rdiff -u -r1.153.2.3 -r1.153.2.4 src/sys/dev/mii/miidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:53:55 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: files.mii miidevs.h miidevs_data.h Added Files: src/sys/dev/mii [netbsd-9]: jmphy.c jmphyreg.h smscphy.c Log Message: Regen for ticket 479 To generate a diff of this commit: cvs rdiff -u -r1.50.26.1 -r1.50.26.2 src/sys/dev/mii/files.mii cvs rdiff -u -r0 -r1.1.2.2 src/sys/dev/mii/jmphy.c src/sys/dev/mii/jmphyreg.h \ src/sys/dev/mii/smscphy.c cvs rdiff -u -r1.151.2.3 -r1.151.2.4 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.3 -r1.139.2.4 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:53:29 UTC 2019
Modified Files:
src/share/man/man4 [netbsd-9]: micphy.4
src/sys/dev/mii [netbsd-9]: micphy.c miidevs
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #479):
sys/dev/mii/micphy.c: revision 1.9
sys/dev/mii/miidevs: revision 1.161
share/man/man4/micphy.4: revision 1.3
Add Micrel (now Microchip) KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and
KSZ9477.
Add support for KSZ80[0456]1, KSZ8721, KSZ9[01]31, KS8731 and KSZ9477.
It also supports LAN7430's internal PHY. First wrote by nisimura@ and added
some device support by me. Not tested well.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.2.32.1 src/share/man/man4/micphy.4
cvs rdiff -u -r1.8 -r1.8.4.1 src/sys/dev/mii/micphy.c
cvs rdiff -u -r1.153.2.3 -r1.153.2.4 src/sys/dev/mii/miidevs
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/man/man4/micphy.4
diff -u src/share/man/man4/micphy.4:1.2 src/share/man/man4/micphy.4:1.2.32.1
--- src/share/man/man4/micphy.4:1.2 Mon Mar 3 09:10:46 2014
+++ src/share/man/man4/micphy.4 Mon Nov 25 16:53:29 2019
@@ -1,4 +1,4 @@
-.\" $NetBSD: micphy.4,v 1.2 2014/03/03 09:10:46 wiz Exp $
+.\" $NetBSD: micphy.4,v 1.2.32.1 2019/11/25 16:53:29 martin Exp $
.\"
.\" Copyright (c) 2014 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -15,18 +15,20 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd March 3, 2014
+.Dd November 6, 2019
.Dt MICPHY 4
.Os
.Sh NAME
.Nm micphy
-.Nd Micrel KSZ9021 10/100/1000 PHY driver
+.Nd Micrel KSZ8xxx 10/100 and KSZ9xxx 10/100/1000 PHY driver
.Sh SYNOPSIS
.Cd "micphy* at mii? phy ?"
.Sh DESCRIPTION
The
.Nm
-driver currently supports only Micrel KSZ9021RN PHY.
+driver currently supports KSZ80[2345689]1, KSZ87[23]x, KSZ90[23]1, KSZ9131 and
+KSZ9477.
+It also supports LAN7430's internal PHY.
The driver has a fixup for
.Xr evbarm/cpsw 4
which requires Gig-E PHYs to adjust RGMII signal timing.
Index: src/sys/dev/mii/micphy.c
diff -u src/sys/dev/mii/micphy.c:1.8 src/sys/dev/mii/micphy.c:1.8.4.1
--- src/sys/dev/mii/micphy.c:1.8 Mon Mar 25 07:34:13 2019
+++ src/sys/dev/mii/micphy.c Mon Nov 25 16:53:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: micphy.c,v 1.8 2019/03/25 07:34:13 msaitoh Exp $ */
+/* $NetBSD: micphy.c,v 1.8.4.1 2019/11/25 16:53:29 martin Exp $ */
/*-
* Copyright (c) 1998, 1999, 2000 The NetBSD Foundation, Inc.
@@ -55,11 +55,11 @@
*/
/*
- * Driver for Micrel KSZ9021RN PHYs
+ * Driver for Micrel KSZ8xxx 10/100 and KSZ9xxx 10/100/1000 PHY.
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.8 2019/03/25 07:34:13 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: micphy.c,v 1.8.4.1 2019/11/25 16:53:29 martin Exp $");
#include "opt_mii.h"
@@ -87,19 +87,98 @@ CFATTACH_DECL3_NEW(micphy, sizeof(struct
DVF_DETACH_SHUTDOWN);
static int micphy_service(struct mii_softc *, struct mii_data *, int);
+static void micphy_status(struct mii_softc *);
static void micphy_fixup(struct mii_softc *, int, int, device_t);
static const struct mii_phy_funcs micphy_funcs = {
- micphy_service, ukphy_status, micphy_reset,
+ micphy_service, micphy_status, micphy_reset,
+};
+
+struct micphy_softc {
+ struct mii_softc sc_mii;
+ uint32_t sc_lstype; /* Type of link status register */
};
static const struct mii_phydesc micphys[] = {
- MII_PHY_DESC(MICREL, KSZ8081),
- MII_PHY_DESC(MICREL, KSZ9021RNI),
+ MII_PHY_DESC(MICREL, KSZ8041),
+ MII_PHY_DESC(MICREL, KSZ8051), /* +8021,8031 */
+ MII_PHY_DESC(MICREL, KSZ8061),
+ MII_PHY_DESC(MICREL, KSZ8081), /* +8051,8091 */
+ MII_PHY_DESC(MICREL, KS8737),
+ MII_PHY_DESC(MICREL, KSZ9021_8001_8721),
+ MII_PHY_DESC(MICREL, KSZ9031),
+ MII_PHY_DESC(MICREL, KSZ9131),
+ MII_PHY_DESC(MICREL, KSZ9477), /* +LAN7430internal */
MII_PHY_END,
};
-#define MII_KSZ8081_PHYCTL2 0x1f
+/*
+ * Model Rev. Media LSTYPE Devices
+ *
+ * 0x11 1001F_42 KSZ8041
+ * 0x13 1001F_42? KSZ8041RNLI
+ * 0x15 ? 1001E_20 KSZ8051
+ * 0x5 1001E_20 KSZ8021
+ * 0x6 1001E_20 KSZ8031
+ * 0x16 ? 1001E_20 KSZ8081
+ * ? 1001E_20 KSZ8091
+ * 0x17 1001E_20 KSZ8061
+ * 0x21 0x0 giga GIGA KSZ9021
+ * 0x1 giga GIGA KSZ9021RLRN
+ * 0x9 1001F_42 KSZ8721BL/SL
+ * 0x9 100none? KSZ8721CL
+ * 0xa 1001F_42 KSZ8001
+ * 0x22 giga GIGA KSZ9031
+ * 0x23 1? gigasw GIGA KSZ9477 (No master/slave bit)
+ * 5? giga GIGA LAN7430internal
+ * 0x24 giga GIGA KSZ9131
+ * 0x32 1001F_42 KS8737
+ */
+
+/* Type of link status register */
+#define MICPHYF_LSTYPE_DEFAULT 0
+#define MICPHYF_LSTYPE_1F_42 1
+#define MICPHYF_LSTYPE_1E_20 2
+#define MICPHYF_LSTYPE_GIGA 3
+
+/* Return if the
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:47:16 UTC 2019
Modified Files:
src/sys/dev/pci [netbsd-9]: if_vge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #477):
sys/dev/pci/if_vge.c: revision 1.76
sys/dev/pci/if_vge.c: revision 1.77
Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout.
If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO),
control VGE_DIAGCTL_GMII bit.
- Set duplex correctly when user setting is not IFM_AUTO.
- When the link is up, set VGE_DIAGCTL not from user media setting but from
the current active link status.
To generate a diff of this commit:
cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/pci/if_vge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_vge.c
diff -u src/sys/dev/pci/if_vge.c:1.73.2.1 src/sys/dev/pci/if_vge.c:1.73.2.2
--- src/sys/dev/pci/if_vge.c:1.73.2.1 Thu Oct 17 18:58:33 2019
+++ src/sys/dev/pci/if_vge.c Mon Nov 25 16:47:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $ */
+/* $NetBSD: if_vge.c,v 1.73.2.2 2019/11/25 16:47:16 martin Exp $ */
/*-
* Copyright (c) 2004
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73.2.1 2019/10/17 18:58:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_vge.c,v 1.73.2.2 2019/11/25 16:47:16 martin Exp $");
/*
* VIA Networking Technologies VT612x PCI gigabit ethernet NIC driver.
@@ -1916,6 +1916,7 @@ vge_miibus_statchg(struct ifnet *ifp)
struct vge_softc *sc = ifp->if_softc;
struct mii_data *mii = >sc_mii;
struct ifmedia_entry *ife = mii->mii_media.ifm_cur;
+ uint8_t dctl;
/*
* If the user manually selects a media mode, we need to turn
@@ -1927,31 +1928,37 @@ vge_miibus_statchg(struct ifnet *ifp)
* always implied, so we turn on the forced mode bit but leave
* the FDX bit cleared.
*/
+ dctl = CSR_READ_1(sc, VGE_DIAGCTL);
- switch (IFM_SUBTYPE(ife->ifm_media)) {
- case IFM_AUTO:
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- break;
- case IFM_1000_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- break;
- case IFM_100_TX:
- case IFM_10_T:
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_MACFORCE);
- if ((ife->ifm_media & IFM_FDX) != 0) {
- CSR_SETBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- } else {
- CSR_CLRBIT_1(sc, VGE_DIAGCTL, VGE_DIAGCTL_FDXFORCE);
- }
- break;
- default:
- printf("%s: unknown media type: %x\n",
- device_xname(sc->sc_dev),
- IFM_SUBTYPE(ife->ifm_media));
- break;
+ if (IFM_SUBTYPE(ife->ifm_media) == IFM_AUTO) {
+ dctl &= ~VGE_DIAGCTL_MACFORCE;
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
+ } else {
+ u_int ifmword;
+
+ /* If the link is up, use the current active media. */
+ if ((mii->mii_media_status & IFM_ACTIVE) != 0)
+ ifmword = mii->mii_media_active;
+ else
+ ifmword = ife->ifm_media;
+
+ dctl |= VGE_DIAGCTL_MACFORCE;
+ if ((ifmword & IFM_FDX) != 0)
+ dctl |= VGE_DIAGCTL_FDXFORCE;
+ else
+ dctl &= ~VGE_DIAGCTL_FDXFORCE;
+
+ if (IFM_SUBTYPE(ifmword) == IFM_1000_T) {
+ /*
+ * It means the user setting is not auto but it's
+ * 1000baseT-FDX or 1000baseT.
+ */
+ dctl |= VGE_DIAGCTL_GMII;
+ } else
+ dctl &= ~VGE_DIAGCTL_GMII;
}
+
+ CSR_WRITE_1(sc, VGE_DIAGCTL, dctl);
}
static int
CVS commit: [netbsd-9] src/sys/dev/pci
Module Name:src Committed By: martin Date: Mon Nov 25 16:47:16 UTC 2019 Modified Files: src/sys/dev/pci [netbsd-9]: if_vge.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #477): sys/dev/pci/if_vge.c: revision 1.76 sys/dev/pci/if_vge.c: revision 1.77 Fixes a bug that "ifmedia vge0 media 1000baseT-FDX" causes device timeout. If the interface's media is NOT in the "best" mode (i.e. other than IFM_AUTO), control VGE_DIAGCTL_GMII bit. - Set duplex correctly when user setting is not IFM_AUTO. - When the link is up, set VGE_DIAGCTL not from user media setting but from the current active link status. To generate a diff of this commit: cvs rdiff -u -r1.73.2.1 -r1.73.2.2 src/sys/dev/pci/if_vge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 16:44:32 UTC 2019 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4 [netbsd-9]: Makefile mii.4 vge.4 src/sys/arch/amd64/conf [netbsd-9]: ALL GENERIC src/sys/arch/i386/conf [netbsd-9]: ALL GENERIC src/sys/dev [netbsd-9]: DEVNAMES src/sys/dev/mii [netbsd-9]: files.mii src/sys/dev/pci [netbsd-9]: if_stge.c if_stgereg.h Added Files: src/share/man/man4 [netbsd-9]: ipgphy.4 src/sys/dev/mii [netbsd-9]: ipgphy.c ipgphyreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #476): sys/dev/pci/if_stgereg.h: revision 1.6 sys/arch/amd64/conf/ALL: revision 1.124 sys/dev/mii/files.mii: revision 1.51 share/man/man4/vge.4: revision 1.8 share/man/man4/vge.4: revision 1.9 distrib/sets/lists/man/mi: revision 1.1656 sys/arch/i386/conf/ALL: revision 1.471 share/man/man4/mii.4: revision 1.28 sys/dev/pci/if_stge.c: revision 1.71 sys/dev/mii/ipgphy.c: revision 1.1 sys/dev/mii/ipgphy.c: revision 1.2 share/man/man4/Makefile: revision 1.684 sys/dev/mii/ipgphy.c: revision 1.3 sys/dev/mii/ipgphyreg.h: revision 1.1 sys/dev/mii/ipgphy.c: revision 1.4 sys/dev/mii/ipgphyreg.h: revision 1.2 sys/dev/mii/ipgphy.c: revision 1.5 sys/dev/mii/ipgphyreg.h: revision 1.3 sys/dev/DEVNAMES: revision 1.322 sys/arch/i386/conf/GENERIC: revision 1.1211 sys/arch/amd64/conf/GENERIC: revision 1.537 share/man/man4/ipgphy.4: revision 1.1 share/man/man4/ipgphy.4: revision 1.2 Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by Tomokazu HARADA and patch provided by Andrius V. New sentence, new line. Fix date. Add RCS Id. KNF. No functional change. STGE_PhyCtrl is not PHY register but MAC register, so use ukphy_status() for IP1000A device. - Use auto-negotiation when forcing 1000BASE-T. - Add XXX comment for strange pause setting code. I suspect this is wrong. - On my environments, 1000BASE-T half duplex doesn't work, so we might remove IFM_1000T_HDX from this device in future. - Define IPGPHY_SCR's address. - Whitespace fix. Add missing NetBSD RCS Id. Reported by Andrius V. To generate a diff of this commit: cvs rdiff -u -r1.1649.2.3 -r1.1649.2.4 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.680.2.1 -r1.680.2.2 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/ipgphy.4 cvs rdiff -u -r1.27 -r1.27.28.1 src/share/man/man4/mii.4 cvs rdiff -u -r1.7 -r1.7.28.1 src/share/man/man4/vge.4 cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.531.2.4 -r1.531.2.5 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.469 -r1.469.2.1 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1208.2.2 -r1.1208.2.3 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.321 -r1.321.2.1 src/sys/dev/DEVNAMES cvs rdiff -u -r1.50 -r1.50.26.1 src/sys/dev/mii/files.mii cvs rdiff -u -r0 -r1.6.2.2 src/sys/dev/mii/ipgphy.c cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/mii/ipgphyreg.h cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/sys/dev/pci/if_stge.c cvs rdiff -u -r1.5 -r1.5.94.1 src/sys/dev/pci/if_stgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 16:44:32 UTC 2019 Modified Files: src/distrib/sets/lists/man [netbsd-9]: mi src/share/man/man4 [netbsd-9]: Makefile mii.4 vge.4 src/sys/arch/amd64/conf [netbsd-9]: ALL GENERIC src/sys/arch/i386/conf [netbsd-9]: ALL GENERIC src/sys/dev [netbsd-9]: DEVNAMES src/sys/dev/mii [netbsd-9]: files.mii src/sys/dev/pci [netbsd-9]: if_stge.c if_stgereg.h Added Files: src/share/man/man4 [netbsd-9]: ipgphy.4 src/sys/dev/mii [netbsd-9]: ipgphy.c ipgphyreg.h Log Message: Pull up following revision(s) (requested by msaitoh in ticket #476): sys/dev/pci/if_stgereg.h: revision 1.6 sys/arch/amd64/conf/ALL: revision 1.124 sys/dev/mii/files.mii: revision 1.51 share/man/man4/vge.4: revision 1.8 share/man/man4/vge.4: revision 1.9 distrib/sets/lists/man/mi: revision 1.1656 sys/arch/i386/conf/ALL: revision 1.471 share/man/man4/mii.4: revision 1.28 sys/dev/pci/if_stge.c: revision 1.71 sys/dev/mii/ipgphy.c: revision 1.1 sys/dev/mii/ipgphy.c: revision 1.2 share/man/man4/Makefile: revision 1.684 sys/dev/mii/ipgphy.c: revision 1.3 sys/dev/mii/ipgphyreg.h: revision 1.1 sys/dev/mii/ipgphy.c: revision 1.4 sys/dev/mii/ipgphyreg.h: revision 1.2 sys/dev/mii/ipgphy.c: revision 1.5 sys/dev/mii/ipgphyreg.h: revision 1.3 sys/dev/DEVNAMES: revision 1.322 sys/arch/i386/conf/GENERIC: revision 1.1211 sys/arch/amd64/conf/GENERIC: revision 1.537 share/man/man4/ipgphy.4: revision 1.1 share/man/man4/ipgphy.4: revision 1.2 Add support IC Plus IP1000* PHYs. PR/kern 42314 first reported by Tomokazu HARADA and patch provided by Andrius V. New sentence, new line. Fix date. Add RCS Id. KNF. No functional change. STGE_PhyCtrl is not PHY register but MAC register, so use ukphy_status() for IP1000A device. - Use auto-negotiation when forcing 1000BASE-T. - Add XXX comment for strange pause setting code. I suspect this is wrong. - On my environments, 1000BASE-T half duplex doesn't work, so we might remove IFM_1000T_HDX from this device in future. - Define IPGPHY_SCR's address. - Whitespace fix. Add missing NetBSD RCS Id. Reported by Andrius V. To generate a diff of this commit: cvs rdiff -u -r1.1649.2.3 -r1.1649.2.4 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.680.2.1 -r1.680.2.2 src/share/man/man4/Makefile cvs rdiff -u -r0 -r1.2.2.2 src/share/man/man4/ipgphy.4 cvs rdiff -u -r1.27 -r1.27.28.1 src/share/man/man4/mii.4 cvs rdiff -u -r1.7 -r1.7.28.1 src/share/man/man4/vge.4 cvs rdiff -u -r1.120.2.1 -r1.120.2.2 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.531.2.4 -r1.531.2.5 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.469 -r1.469.2.1 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1208.2.2 -r1.1208.2.3 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.321 -r1.321.2.1 src/sys/dev/DEVNAMES cvs rdiff -u -r1.50 -r1.50.26.1 src/sys/dev/mii/files.mii cvs rdiff -u -r0 -r1.6.2.2 src/sys/dev/mii/ipgphy.c cvs rdiff -u -r0 -r1.3.2.2 src/sys/dev/mii/ipgphyreg.h cvs rdiff -u -r1.70.2.2 -r1.70.2.3 src/sys/dev/pci/if_stge.c cvs rdiff -u -r1.5 -r1.5.94.1 src/sys/dev/pci/if_stgereg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1649.2.3 src/distrib/sets/lists/man/mi:1.1649.2.4 --- src/distrib/sets/lists/man/mi:1.1649.2.3 Sun Nov 10 12:58:31 2019 +++ src/distrib/sets/lists/man/mi Mon Nov 25 16:44:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1649.2.3 2019/11/10 12:58:31 martin Exp $ +# $NetBSD: mi,v 1.1649.2.4 2019/11/25 16:44:32 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1336,6 +1336,7 @@ ./usr/share/man/cat4/ip6.0 man-sys-catman .cat ./usr/share/man/cat4/ipf.0 man-ipf-catman ipfilter,.cat ./usr/share/man/cat4/ipfilter.0 man-ipf-catman ipfilter,.cat +./usr/share/man/cat4/ipgphy.0 man-sys-catman .cat ./usr/share/man/cat4/ipip.0 man-obsolete obsolete ./usr/share/man/cat4/ipkdb.0 man-obsolete obsolete ./usr/share/man/cat4/ipl.0 man-ipf-catman ipfilter,.cat @@ -4476,6 +4477,7 @@ ./usr/share/man/html4/ip6.html man-sys-htmlman html ./usr/share/man/html4/ipf.html man-ipf-htmlman ipfilter,html ./usr/share/man/html4/ipfilter.html man-ipf-htmlman ipfilter,html +./usr/share/man/html4/ipgphy.html man-sys-htmlman html ./usr/share/man/html4/ipkdb.html man-obsolete obsolete ./usr/share/man/html4/ipl.html man-ipf-htmlman ipfilter,html ./usr/share/man/html4/ipmi.html man-sys-htmlman html @@ -7452,6 +7454,7 @@ ./usr/share/man/man4/ip6.4 man-sys-man .man ./usr/share/man/man4/ipf.4 man-sys-man ipfilter,.man ./usr/share/man/man4/ipfilter.4 man-sys-man ipfilter,.man +./usr/share/man/man4/ipgphy.4
CVS commit: [netbsd-9] src
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:39:30 UTC 2019
Modified Files:
src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_svm.c nvmm_x86_vmx.c
src/tests/lib/libnvmm [netbsd-9]: h_mem_assist.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #475):
tests/lib/libnvmm/h_mem_assist.c: revision 1.18
sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.45
sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.54
Hide XSAVES-specific stuff and the masked extended states.
Several improvements. In particular, reduce CS.limit, because Intel CPUs
perform strict sanity checks, and the previous (too high) limit caused the
VM entry to fail.
To generate a diff of this commit:
cvs rdiff -u -r1.46.4.2 -r1.46.4.3 src/sys/dev/nvmm/x86/nvmm_x86_svm.c
cvs rdiff -u -r1.36.2.3 -r1.36.2.4 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
cvs rdiff -u -r1.11.4.1 -r1.11.4.2 src/tests/lib/libnvmm/h_mem_assist.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.2 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.3
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.46.4.2 Sun Nov 10 12:58:30 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c Mon Nov 25 16:39:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.2 2019/11/10 12:58:30 martin Exp $ */
+/* $NetBSD: nvmm_x86_svm.c,v 1.46.4.3 2019/11/25 16:39:30 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.2 2019/11/10 12:58:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.46.4.3 2019/11/25 16:39:30 martin Exp $");
#include
#include
@@ -828,7 +828,18 @@ svm_inkernel_handle_cpuid(struct nvmm_cp
cpudata->gprs[NVMM_X64_GPR_RDX] = svm_xcr0_mask >> 32;
break;
case 1:
- cpudata->vmcb->state.rax &= ~CPUID_PES1_XSAVES;
+ cpudata->vmcb->state.rax &=
+ (CPUID_PES1_XSAVEOPT | CPUID_PES1_XSAVEC |
+ CPUID_PES1_XGETBV);
+ cpudata->gprs[NVMM_X64_GPR_RBX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RCX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RDX] = 0;
+ break;
+ default:
+ cpudata->vmcb->state.rax = 0;
+ cpudata->gprs[NVMM_X64_GPR_RBX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RCX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RDX] = 0;
break;
}
break;
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.3 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.4
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.36.2.3 Sun Nov 10 12:58:30 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c Mon Nov 25 16:39:30 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.3 2019/11/10 12:58:30 martin Exp $ */
+/* $NetBSD: nvmm_x86_vmx.c,v 1.36.2.4 2019/11/25 16:39:30 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.3 2019/11/10 12:58:30 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.36.2.4 2019/11/25 16:39:30 martin Exp $");
#include
#include
@@ -1203,7 +1203,18 @@ vmx_inkernel_handle_cpuid(struct nvmm_cp
cpudata->gprs[NVMM_X64_GPR_RDX] = vmx_xcr0_mask >> 32;
break;
case 1:
- cpudata->gprs[NVMM_X64_GPR_RAX] &= ~CPUID_PES1_XSAVES;
+ cpudata->gprs[NVMM_X64_GPR_RAX] &=
+ (CPUID_PES1_XSAVEOPT | CPUID_PES1_XSAVEC |
+ CPUID_PES1_XGETBV);
+ cpudata->gprs[NVMM_X64_GPR_RBX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RCX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RDX] = 0;
+ break;
+ default:
+ cpudata->gprs[NVMM_X64_GPR_RAX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RBX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RCX] = 0;
+ cpudata->gprs[NVMM_X64_GPR_RDX] = 0;
break;
}
break;
Index: src/tests/lib/libnvmm/h_mem_assist.c
diff -u src/tests/lib/libnvmm/h_mem_assist.c:1.11.4.1 src/tests/lib/libnvmm/h_mem_assist.c:1.11.4.2
--- src/tests/lib/libnvmm/h_mem_assist.c:1.11.4.1 Sun Nov 10 12:58:30 2019
+++ src/tests/lib/libnvmm/h_mem_assist.c Mon Nov 25 16:39:29 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: h_mem_assist.c,v 1.11.4.1 2019/11/10 12:58:30 martin Exp $ */
+/* $NetBSD: h_mem_assist.c,v 1.11.4.2 2019/11/25 16:39:29 martin Exp $ */
/*
* Copyright (c) 2018-2019 The NetBSD Foundation, Inc.
@@ -113,7 +113,7 @@ run_machine(struct nvmm_machine *mach, s
return;
default:
- printf("Invalid!\n");
+ printf("Invalid VMEXIT: 0x%lx\n", exit->reason);
return;
}
}
@@ -177,22 +177,22 @@ extern uint8_t test_64bit_15_begin, test
extern uint8_t test_64bit_16_begin, test_64bit_16_end;
static const struct test tests64[] = {
- { "test1 - MOV", _begin, _end, 0x3004, 0 },
- { "test2 - OR", _begin, _end, 0x16FF, 0 },
- { "test3 - AND", _begin, _end, 0x1FC0, 0 },
- { "test4 - XOR", _begin, _end, 0x10CF, 0 },
- { "test5 - Address Sizes", _begin, _end, 0x1F00, 0 },
- { "test6 -
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Mon Nov 25 16:39:30 UTC 2019 Modified Files: src/sys/dev/nvmm/x86 [netbsd-9]: nvmm_x86_svm.c nvmm_x86_vmx.c src/tests/lib/libnvmm [netbsd-9]: h_mem_assist.c Log Message: Pull up following revision(s) (requested by maxv in ticket #475): tests/lib/libnvmm/h_mem_assist.c: revision 1.18 sys/dev/nvmm/x86/nvmm_x86_vmx.c: revision 1.45 sys/dev/nvmm/x86/nvmm_x86_svm.c: revision 1.54 Hide XSAVES-specific stuff and the masked extended states. Several improvements. In particular, reduce CS.limit, because Intel CPUs perform strict sanity checks, and the previous (too high) limit caused the VM entry to fail. To generate a diff of this commit: cvs rdiff -u -r1.46.4.2 -r1.46.4.3 src/sys/dev/nvmm/x86/nvmm_x86_svm.c cvs rdiff -u -r1.36.2.3 -r1.36.2.4 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c cvs rdiff -u -r1.11.4.1 -r1.11.4.2 src/tests/lib/libnvmm/h_mem_assist.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src Committed By: martin Date: Mon Nov 25 16:37:06 UTC 2019 Modified Files: src/sys/dev/usb [netbsd-9]: if_upl.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #474): sys/dev/usb/if_upl.c: revision 1.68 Make it compilable with UPL_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.64.2.2 -r1.64.2.3 src/sys/dev/usb/if_upl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:37:06 UTC 2019
Modified Files:
src/sys/dev/usb [netbsd-9]: if_upl.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #474):
sys/dev/usb/if_upl.c: revision 1.68
Make it compilable with UPL_DEBUG.
To generate a diff of this commit:
cvs rdiff -u -r1.64.2.2 -r1.64.2.3 src/sys/dev/usb/if_upl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_upl.c
diff -u src/sys/dev/usb/if_upl.c:1.64.2.2 src/sys/dev/usb/if_upl.c:1.64.2.3
--- src/sys/dev/usb/if_upl.c:1.64.2.2 Fri Sep 13 06:51:58 2019
+++ src/sys/dev/usb/if_upl.c Mon Nov 25 16:37:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_upl.c,v 1.64.2.2 2019/09/13 06:51:58 martin Exp $ */
+/* $NetBSD: if_upl.c,v 1.64.2.3 2019/11/25 16:37:06 martin Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.64.2.2 2019/09/13 06:51:58 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_upl.c,v 1.64.2.3 2019/11/25 16:37:06 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -229,8 +229,8 @@ upl_rx_loop(struct usbnet * un, struct u
{
usbnet_isowned_rx(un);
- DPRINTFN(9,("%s: %s: enter status=%d length=%d\n",
- device_xname(un->un_dev), __func__, status, total_len));
+ DPRINTFN(9,("%s: %s: enter length=%d\n",
+ device_xname(un->un_dev), __func__, total_len));
usbnet_input(un, c->unc_buf, total_len);
}
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:26:31 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket #473 To generate a diff of this commit: cvs rdiff -u -r1.151.2.2 -r1.151.2.3 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.2 -r1.139.2.3 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/miidevs.h diff -u src/sys/dev/mii/miidevs.h:1.151.2.2 src/sys/dev/mii/miidevs.h:1.151.2.3 --- src/sys/dev/mii/miidevs.h:1.151.2.2 Wed Oct 23 19:46:53 2019 +++ src/sys/dev/mii/miidevs.h Mon Nov 25 16:26:31 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.151.2.2 2019/10/23 19:46:53 martin Exp $ */ +/* $NetBSD: miidevs.h,v 1.151.2.3 2019/11/25 16:26:31 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.153.2.2 2019/10/23 19:45:56 martin Exp + * NetBSD: miidevs,v 1.153.2.3 2019/11/25 16:26:00 martin Exp */ /*- @@ -72,7 +72,9 @@ #define MII_OUI_ENABLESEMI 0x0010dd /* Enable Semiconductor */ #define MII_OUI_SUNPLUS 0x001105 /* Sunplus Technology */ #define MII_OUI_ATHEROS 0x001374 /* Atheros */ +#define MII_OUI_TERANETICS 0x0014a6 /* Teranetics */ #define MII_OUI_RALINK2 0x0017a5 /* Ralink Technology */ +#define MII_OUI_AQUANTIA 0x0017b6 /* Aquantia Corporation */ #define MII_OUI_BROADCOM3 0x001be9 /* Broadcom Corporation */ #define MII_OUI_LEVEL1 0x00207b /* Level 1 */ #define MII_OUI_VIA 0x004063 /* VIA Technologies */ @@ -81,7 +83,6 @@ #define MII_OUI_AMLOGIC 0x006051 /* Amlogic */ #define MII_OUI_DAVICOM 0x00606e /* Davicom Semiconductor */ #define MII_OUI_SMSC 0x00800f /* SMSC */ -#define MII_OUI_ICPLUS 0x0090c3 /* IC Plus Corp. */ #define MII_OUI_SEEQ 0x00a07d /* Seeq */ #define MII_OUI_ICS 0x00a0be /* Integrated Circuit Systems */ #define MII_OUI_INTEL 0x00aa00 /* Intel */ @@ -98,8 +99,9 @@ #define MII_OUI_NATSEMI 0x080017 /* National Semiconductor */ #define MII_OUI_TI 0x080028 /* Texas Instruments */ #define MII_OUI_BROADCOM4 0x18c086 /* Broadcom Corporation */ +#define MII_OUI_RENESAS 0x749050 /* Renesas */ -/* Unregisterd or wrong OUI */ +/* Unregistered or wrong OUI */ #define MII_OUI_yyREALTEK 0x04 /* Realtek */ #define MII_OUI_yyAMD 0x58 /* Advanced Micro Devices */ #define MII_OUI_xxMYSON 0x00032d /* Myson Technology */ @@ -111,6 +113,7 @@ #define MII_OUI_xxREALTEK 0x000732 /* Realtek */ #define MII_OUI_xxBROADCOM 0x000818 /* Broadcom Corporation */ #define MII_OUI_xxPMCSIERRA 0x0009c0 /* PMC-Sierra */ +#define MII_OUI_xxICPLUS 0x0009c3 /* IC Plus Corp. */ #define MII_OUI_xxMARVELL 0x000ac2 /* Marvell Semiconductor */ #define MII_OUI_xxINTEL 0x001f00 /* Intel */ #define MII_OUI_xxBROADCOM_ALT1 0x0050ef /* Broadcom Corporation */ @@ -343,14 +346,14 @@ #define MII_STR_xxDAVICOM_DM9601 "DM9601 internal 10/100 media interface" /* IC Plus Corp. PHYs */ -#define MII_MODEL_ICPLUS_IP100 0x0004 -#define MII_STR_ICPLUS_IP100 "IP100 10/100 PHY" -#define MII_MODEL_ICPLUS_IP101 0x0005 -#define MII_STR_ICPLUS_IP101 "IP101 10/100 PHY" -#define MII_MODEL_ICPLUS_IP1000A 0x0008 -#define MII_STR_ICPLUS_IP1000A "IP1000A 10/100/1000 PHY" -#define MII_MODEL_ICPLUS_IP1001 0x0019 -#define MII_STR_ICPLUS_IP1001 "IP1001 10/100/1000 PHY" +#define MII_MODEL_xxICPLUS_IP100 0x0004 +#define MII_STR_xxICPLUS_IP100 "IP100 10/100 PHY" +#define MII_MODEL_xxICPLUS_IP101 0x0005 +#define MII_STR_xxICPLUS_IP101 "IP101 10/100 PHY" +#define MII_MODEL_xxICPLUS_IP1000A 0x0008 +#define MII_STR_xxICPLUS_IP1000A "IP1000A 10/100/1000 PHY" +#define MII_MODEL_xxICPLUS_IP1001 0x0019 +#define MII_STR_xxICPLUS_IP1001 "IP1001 10/100/1000 PHY" /* Integrated Circuit Systems PHYs */ #define MII_MODEL_ICS_1889 0x0001 @@ -408,10 +411,10 @@ /* JMicron PHYs */ -#define MII_MODEL_JMICRON_JMC250 0x0021 -#define MII_STR_JMICRON_JMC250 "JMC250 10/100/1000 media interface" -#define MII_MODEL_JMICRON_JMC260 0x0022 -#define MII_STR_JMICRON_JMC260 "JMC260 10/100 media interface" +#define MII_MODEL_JMICRON_JMP211 0x0021 +#define MII_STR_JMICRON_JMP211 "JMP211 10/100/1000 media interface" +#define MII_MODEL_JMICRON_JMP202 0x0022 +#define MII_STR_JMICRON_JMP202 "JMP202 10/100 media interface" /* Level 1 PHYs */ #define MII_MODEL_xxLEVEL1_LXT970 0x Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.139.2.2 src/sys/dev/mii/miidevs_data.h:1.139.2.3 --- src/sys/dev/mii/miidevs_data.h:1.139.2.2 Wed Oct 23 19:46:53 2019 +++ src/sys/dev/mii/miidevs_data.h Mon Nov 25 16:26:31 2019 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.139.2.2 2019/10/23 19:46:53 martin Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.139.2.3 2019/11/25 16:26:31 martin Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.153.2.2 2019/10/23 19:45:56 martin Exp + *
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:26:31 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs.h miidevs_data.h Log Message: Regen for ticket #473 To generate a diff of this commit: cvs rdiff -u -r1.151.2.2 -r1.151.2.3 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.139.2.2 -r1.139.2.3 src/sys/dev/mii/miidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src Committed By: martin Date: Mon Nov 25 16:26:01 UTC 2019 Modified Files: src/sys/dev/mii [netbsd-9]: miidevs rlphy.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #473): sys/dev/mii/rlphy.c: revision 1.37 sys/dev/mii/miidevs: revision 1.155 sys/dev/mii/miidevs: revision 1.156 sys/dev/mii/miidevs: revision 1.157 sys/dev/mii/miidevs: revision 1.159 sys/dev/mii/miidevs: revision 1.160 Add Teranetics, Aquantia and Renesas. Use uppercase for vendor name. Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3) - ICPLUS -> xxICPLUS - Print model name if it's ICPLUS IP101 to avoid "Realtek internal PHY". Fix typo. from vezhlys - Rename JMICRON 0x0021 from JMC250 to JMP211 - Rename JMICRON 0x0022 from JMC260 to JMP202 To generate a diff of this commit: cvs rdiff -u -r1.153.2.2 -r1.153.2.3 src/sys/dev/mii/miidevs cvs rdiff -u -r1.36 -r1.36.4.1 src/sys/dev/mii/rlphy.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/mii
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:26:01 UTC 2019
Modified Files:
src/sys/dev/mii [netbsd-9]: miidevs rlphy.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #473):
sys/dev/mii/rlphy.c: revision 1.37
sys/dev/mii/miidevs: revision 1.155
sys/dev/mii/miidevs: revision 1.156
sys/dev/mii/miidevs: revision 1.157
sys/dev/mii/miidevs: revision 1.159
sys/dev/mii/miidevs: revision 1.160
Add Teranetics, Aquantia and Renesas.
Use uppercase for vendor name.
Change ICPLUS(0x0090c3) to xxICPLUS(0x0009c3)
- ICPLUS -> xxICPLUS
- Print model name if it's ICPLUS IP101 to avoid "Realtek internal PHY".
Fix typo. from vezhlys
- Rename JMICRON 0x0021 from JMC250 to JMP211
- Rename JMICRON 0x0022 from JMC260 to JMP202
To generate a diff of this commit:
cvs rdiff -u -r1.153.2.2 -r1.153.2.3 src/sys/dev/mii/miidevs
cvs rdiff -u -r1.36 -r1.36.4.1 src/sys/dev/mii/rlphy.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/mii/miidevs
diff -u src/sys/dev/mii/miidevs:1.153.2.2 src/sys/dev/mii/miidevs:1.153.2.3
--- src/sys/dev/mii/miidevs:1.153.2.2 Wed Oct 23 19:45:56 2019
+++ src/sys/dev/mii/miidevs Mon Nov 25 16:26:00 2019
@@ -1,4 +1,4 @@
-$NetBSD: miidevs,v 1.153.2.2 2019/10/23 19:45:56 martin Exp $
+$NetBSD: miidevs,v 1.153.2.3 2019/11/25 16:26:00 martin Exp $
/*-
* Copyright (c) 1998, 1999 The NetBSD Foundation, Inc.
@@ -65,7 +65,9 @@ oui ALTIMA 0x0010a9 Altima Communicati
oui ENABLESEMI 0x0010dd Enable Semiconductor
oui SUNPLUS 0x001105 Sunplus Technology
oui ATHEROS 0x001374 Atheros
+oui TERANETICS 0x0014a6 Teranetics
oui RALINK2 0x0017a5 Ralink Technology
+oui AQUANTIA 0x0017b6 Aquantia Corporation
oui BROADCOM3 0x001be9 Broadcom Corporation
oui LEVEL1 0x00207b Level 1
oui VIA0x004063 VIA Technologies
@@ -74,7 +76,6 @@ oui QUALSEMI 0x006051 Quality Semicond
oui AMLOGIC 0x006051 Amlogic
oui DAVICOM 0x00606e Davicom Semiconductor
oui SMSC 0x00800f SMSC
-oui ICPLUS 0x0090c3 IC Plus Corp.
oui SEEQ 0x00a07d Seeq
oui ICS0x00a0be Integrated Circuit Systems
oui INTEL 0x00aa00 Intel
@@ -91,8 +92,9 @@ oui XAQTI 0x00e0ae XaQti Corp.
oui NATSEMI 0x080017 National Semiconductor
oui TI0x080028 Texas Instruments
oui BROADCOM4 0x18c086 Broadcom Corporation
+oui RENESAS 0x749050 Renesas
-/* Unregisterd or wrong OUI */
+/* Unregistered or wrong OUI */
oui yyREALTEK 0x04 Realtek
oui yyAMD 0x58 Advanced Micro Devices
oui xxMYSON 0x00032d Myson Technology
@@ -104,6 +106,7 @@ oui xxQUALSEMI 0x00068a Quality Semico
oui xxREALTEK 0x000732 Realtek
oui xxBROADCOM 0x000818 Broadcom Corporation
oui xxPMCSIERRA 0x0009c0 PMC-Sierra
+oui xxICPLUS 0x0009c3 IC Plus Corp.
oui xxMARVELL 0x000ac2 Marvell Semiconductor
oui xxINTEL 0x001f00 Intel
oui xxBROADCOM_ALT1 0x0050ef Broadcom Corporation
@@ -242,10 +245,10 @@ model xxDAVICOM DM9161B 0x000b DM9161[B
model xxDAVICOM DM9601 0x000c DM9601 internal 10/100 media interface
/* IC Plus Corp. PHYs */
-model ICPLUS IP100 0x0004 IP100 10/100 PHY
-model ICPLUS IP101 0x0005 IP101 10/100 PHY
-model ICPLUS IP1000A 0x0008 IP1000A 10/100/1000 PHY
-model ICPLUS IP1001 0x0019 IP1001 10/100/1000 PHY
+model xxICPLUS IP100 0x0004 IP100 10/100 PHY
+model xxICPLUS IP101 0x0005 IP101 10/100 PHY
+model xxICPLUS IP1000A 0x0008 IP1000A 10/100/1000 PHY
+model xxICPLUS IP1001 0x0019 IP1001 10/100/1000 PHY
/* Integrated Circuit Systems PHYs */
model ICS 1889 0x0001 ICS1889 10/100 media interface
@@ -278,8 +281,8 @@ model ATTANSIC I82578 0x0004 Intel 8257
/* JMicron PHYs */
-model JMICRON JMC250 0x0021 JMC250 10/100/1000 media interface
-model JMICRON JMC260 0x0022 JMC260 10/100 media interface
+model JMICRON JMP211 0x0021 JMP211 10/100/1000 media interface
+model JMICRON JMP202 0x0022 JMP202 10/100 media interface
/* Level 1 PHYs */
model xxLEVEL1 LXT970 0x LXT970 10/100 media interface
Index: src/sys/dev/mii/rlphy.c
diff -u src/sys/dev/mii/rlphy.c:1.36 src/sys/dev/mii/rlphy.c:1.36.4.1
--- src/sys/dev/mii/rlphy.c:1.36 Mon Mar 25 09:20:46 2019
+++ src/sys/dev/mii/rlphy.c Mon Nov 25 16:26:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rlphy.c,v 1.36 2019/03/25 09:20:46 msaitoh Exp $ */
+/* $NetBSD: rlphy.c,v 1.36.4.1 2019/11/25 16:26:00 martin Exp $ */
/* $OpenBSD: rlphy.c,v 1.20 2005/07/31 05:27:30 pvalchev Exp $ */
/*
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.36 2019/03/25 09:20:46 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rlphy.c,v 1.36.4.1 2019/11/25 16:26:00 martin Exp $");
#include
#include
@@ -78,7 +78,7 @@ const struct mii_phy_funcs rlphy_funcs =
static const struct mii_phydesc rlphys[] = {
MII_PHY_DESC(yyREALTEK, RTL8201L),
MII_PHY_DESC(REALTEK, RTL8201E),
- MII_PHY_DESC(ICPLUS, IP101),
+ MII_PHY_DESC(xxICPLUS,
CVS commit: [netbsd-9] src/sys/arch/arm/sunxi
Module Name:src Committed By: martin Date: Mon Nov 25 16:20:41 UTC 2019 Modified Files: src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c Log Message: Pull up following revision(s) (requested by jmcneill in ticket #472): sys/arch/arm/sunxi/sunxi_drm.c: revision 1.9 Reclaim bootloader FB memory for CMA pool. To generate a diff of this commit: cvs rdiff -u -r1.7.6.1 -r1.7.6.2 src/sys/arch/arm/sunxi/sunxi_drm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/arm/sunxi
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:20:41 UTC 2019
Modified Files:
src/sys/arch/arm/sunxi [netbsd-9]: sunxi_drm.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #472):
sys/arch/arm/sunxi/sunxi_drm.c: revision 1.9
Reclaim bootloader FB memory for CMA pool.
To generate a diff of this commit:
cvs rdiff -u -r1.7.6.1 -r1.7.6.2 src/sys/arch/arm/sunxi/sunxi_drm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/sunxi_drm.c
diff -u src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.1 src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.2
--- src/sys/arch/arm/sunxi/sunxi_drm.c:1.7.6.1 Wed Nov 6 09:48:31 2019
+++ src/sys/arch/arm/sunxi/sunxi_drm.c Mon Nov 25 16:20:41 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_drm.c,v 1.7.6.1 2019/11/06 09:48:31 martin Exp $ */
+/* $NetBSD: sunxi_drm.c,v 1.7.6.2 2019/11/25 16:20:41 martin Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.1 2019/11/06 09:48:31 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_drm.c,v 1.7.6.2 2019/11/25 16:20:41 martin Exp $");
#include
#include
@@ -296,6 +296,27 @@ static struct drm_mode_config_funcs sunx
};
static int
+sunxi_drm_simplefb_lookup(bus_addr_t *paddr, bus_size_t *psize)
+{
+ static const char * compat[] = { "simple-framebuffer", NULL };
+ int chosen, child;
+
+ chosen = OF_finddevice("/chosen");
+ if (chosen == -1)
+ return ENOENT;
+
+ for (child = OF_child(chosen); child; child = OF_peer(child)) {
+ if (!fdtbus_status_okay(child))
+ continue;
+ if (!of_match_compatible(child, compat))
+ continue;
+ return fdtbus_get_reg(child, 0, paddr, psize);
+ }
+
+ return ENOENT;
+}
+
+static int
sunxi_drm_fb_probe(struct drm_fb_helper *helper, struct drm_fb_helper_surface_size *sizes)
{
struct sunxi_drm_softc * const sc = sunxi_drm_private(helper->dev);
@@ -303,6 +324,8 @@ sunxi_drm_fb_probe(struct drm_fb_helper
struct sunxi_drm_framebuffer *sfb = to_sunxi_drm_framebuffer(helper->fb);
struct drm_framebuffer *fb = helper->fb;
struct sunxi_drmfb_attach_args sfa;
+ bus_addr_t sfb_addr;
+ bus_size_t sfb_size;
size_t cma_size;
int error;
@@ -312,14 +335,31 @@ sunxi_drm_fb_probe(struct drm_fb_helper
const size_t size = roundup(height * pitch, PAGE_SIZE);
- /* Reserve enough memory for the FB console plus a 4K plane, rounded to 1MB */
- cma_size = size;
- cma_size += (SUNXI_DRM_MAX_WIDTH * SUNXI_DRM_MAX_HEIGHT * 4);
+ if (sunxi_drm_simplefb_lookup(_addr, _size) != 0)
+ sfb_size = 0;
+
+ /* Reserve enough memory for a 4K plane, rounded to 1MB */
+ cma_size = (SUNXI_DRM_MAX_WIDTH * SUNXI_DRM_MAX_HEIGHT * 4);
+ if (sfb_size == 0) {
+ /* Add memory for FB console if we cannot reclaim bootloader memory */
+ cma_size += size;
+ }
cma_size = roundup(cma_size, 1024 * 1024);
sc->sc_ddev->cma_pool = sunxi_drm_alloc_cma_pool(sc->sc_ddev, cma_size);
- if (sc->sc_ddev->cma_pool != NULL)
- aprint_normal_dev(sc->sc_dev, "reserved %u MB DRAM for CMA\n",
- (u_int)(cma_size / (1024 * 1024)));
+ if (sc->sc_ddev->cma_pool != NULL) {
+ if (sfb_size != 0) {
+ error = vmem_add(sc->sc_ddev->cma_pool, sfb_addr,
+ sfb_size, VM_SLEEP);
+ if (error != 0)
+sfb_size = 0;
+ }
+ aprint_normal_dev(sc->sc_dev, "reserved %u MB DRAM for CMA",
+ (u_int)((cma_size + sfb_size) / (1024 * 1024)));
+ if (sfb_size != 0)
+ aprint_normal(" (%u MB reclaimed from bootloader)",
+ (u_int)(sfb_size / (1024 * 1024)));
+ aprint_normal("\n");
+ }
sfb->obj = drm_gem_cma_create(ddev, size);
if (sfb->obj == NULL) {
CVS commit: [netbsd-9] src/sys
Module Name:src
Committed By: martin
Date: Mon Nov 25 16:18:41 UTC 2019
Modified Files:
src/sys/arch/arm/dts [netbsd-9]: sun50i-a64-pinebook.dts
src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c sunxi_ccu.h
sunxi_ccu_fractional.c sunxi_dwhdmi.c sunxi_hdmiphy.c
sunxi_hdmiphy.h sunxi_lcdc.c sunxi_mixer.c sunxi_platform.c
src/sys/dev/fdt [netbsd-9]: fdt_port.c
src/sys/dev/ic [netbsd-9]: dw_hdmi.c dw_hdmi.h
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #470):
sys/arch/arm/sunxi/sunxi_hdmiphy.c: revision 1.4
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.16
sys/dev/ic/dw_hdmi.c: revision 1.5
sys/arch/arm/sunxi/sunxi_hdmiphy.h: revision 1.2
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.17
sys/dev/ic/dw_hdmi.c: revision 1.6
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.18
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.19
sys/dev/ic/dw_hdmi.h: revision 1.5
sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.8
sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.9
sys/arch/arm/sunxi/sunxi_ccu.h: revision 1.22
sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.5
sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.6
sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.7
sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.8
sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.20
sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.10
sys/arch/arm/dts/sun50i-a64-pinebook.dts: revision 1.17
sys/arch/arm/sunxi/sunxi_platform.c: revision 1.38
sys/dev/fdt/fdt_port.c: revision 1.3
sys/dev/fdt/fdt_port.c: revision 1.4
sys/arch/arm/sunxi/sunxi_ccu_fractional.c: revision 1.5
sys/arch/arm/sunxi/sunxi_lcdc.c: revision 1.7
sys/arch/arm/sunxi/sunxi_ccu_fractional.c: revision 1.6
sys/arch/arm/sunxi/sunxi_hdmiphy.c: revision 1.3
Fix CLK_BUS_HDMI bit
Enable TMDS clock
Store the flags passed to SUNXI_CCU_FRACTIONAL macro.
Previously the macro dropped the flags argument entirely, and did not
initialize the structure with it.
Allow bus glue to setup DDC clocks
Add TCON0 clock
HDMI PHY and TX share the same clocks. Do not enable clocks until both
reset resources have been deasserted. Explicitly set DDC clock dividers.
Honour SUNXI_CCU_FRACTIONAL_SET_ENABLE in fractional mode
Use fdtbus_get_reg to read "reg" property
Need to initialize the PHY before HPD sense and DDC will work
Set pixel clock on mode set
Set TCON1 parent to PLL_VIDEO1(1X)
Do not assume that an fb's pitch is width * 4 bytes.
Use actual hw mode, not proposed mode.
Set pre-divider M to 0 in fractional mode, as noted in user manual. Spotted by
jak.
Support non-zero fb start pixels.
Set video PLLs to 297MHz
Do not assume the cursor pitch is the same as the primary fb
Enable HDMI and HDMI audio
Try to avoid changing hardware settings when the "nomodeset" kernel arg
is present.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c
cvs rdiff -u -r1.21 -r1.21.4.1 src/sys/arch/arm/sunxi/sunxi_ccu.h
cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/arm/sunxi/sunxi_ccu_fractional.c
cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c
cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/arm/sunxi/sunxi_hdmiphy.c
cvs rdiff -u -r1.1 -r1.1.6.1 src/sys/arch/arm/sunxi/sunxi_hdmiphy.h
cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/sunxi/sunxi_lcdc.c
cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/arm/sunxi/sunxi_mixer.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/arch/arm/sunxi/sunxi_platform.c
cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/fdt/fdt_port.c
cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/sys/dev/ic/dw_hdmi.c \
src/sys/dev/ic/dw_hdmi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16.2.1
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.16 Thu Jun 6 23:19:45 2019
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Mon Nov 25 16:18:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.16 2019/06/06 23:19:45 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.16.2.1 2019/11/25 16:18:40 martin Exp $ */
/*-
* Copyright (c) 2017-2019 Jared McNeill
@@ -54,6 +54,17 @@
sound_spdif {
status = "disabled";
};
+
+ hdmi-connector {
+ compatible = "hdmi-connector";
+ type = "c";
+
+ port {
+ hdmi_con_in: endpoint {
+remote-endpoint = <_out_con>;
+ };
+ };
+ };
};
{
@@ -151,3 +162,28 @@
};
};
};
+
+_dldo1 {
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ regulator-name =
CVS commit: [netbsd-9] src/sys
Module Name:src Committed By: martin Date: Mon Nov 25 16:18:41 UTC 2019 Modified Files: src/sys/arch/arm/dts [netbsd-9]: sun50i-a64-pinebook.dts src/sys/arch/arm/sunxi [netbsd-9]: sun50i_a64_ccu.c sunxi_ccu.h sunxi_ccu_fractional.c sunxi_dwhdmi.c sunxi_hdmiphy.c sunxi_hdmiphy.h sunxi_lcdc.c sunxi_mixer.c sunxi_platform.c src/sys/dev/fdt [netbsd-9]: fdt_port.c src/sys/dev/ic [netbsd-9]: dw_hdmi.c dw_hdmi.h Log Message: Pull up following revision(s) (requested by jmcneill in ticket #470): sys/arch/arm/sunxi/sunxi_hdmiphy.c: revision 1.4 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.16 sys/dev/ic/dw_hdmi.c: revision 1.5 sys/arch/arm/sunxi/sunxi_hdmiphy.h: revision 1.2 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.17 sys/dev/ic/dw_hdmi.c: revision 1.6 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.18 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.19 sys/dev/ic/dw_hdmi.h: revision 1.5 sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.8 sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.9 sys/arch/arm/sunxi/sunxi_ccu.h: revision 1.22 sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.5 sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.6 sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.7 sys/arch/arm/sunxi/sunxi_dwhdmi.c: revision 1.8 sys/arch/arm/sunxi/sun50i_a64_ccu.c: revision 1.20 sys/arch/arm/sunxi/sunxi_mixer.c: revision 1.10 sys/arch/arm/dts/sun50i-a64-pinebook.dts: revision 1.17 sys/arch/arm/sunxi/sunxi_platform.c: revision 1.38 sys/dev/fdt/fdt_port.c: revision 1.3 sys/dev/fdt/fdt_port.c: revision 1.4 sys/arch/arm/sunxi/sunxi_ccu_fractional.c: revision 1.5 sys/arch/arm/sunxi/sunxi_lcdc.c: revision 1.7 sys/arch/arm/sunxi/sunxi_ccu_fractional.c: revision 1.6 sys/arch/arm/sunxi/sunxi_hdmiphy.c: revision 1.3 Fix CLK_BUS_HDMI bit Enable TMDS clock Store the flags passed to SUNXI_CCU_FRACTIONAL macro. Previously the macro dropped the flags argument entirely, and did not initialize the structure with it. Allow bus glue to setup DDC clocks Add TCON0 clock HDMI PHY and TX share the same clocks. Do not enable clocks until both reset resources have been deasserted. Explicitly set DDC clock dividers. Honour SUNXI_CCU_FRACTIONAL_SET_ENABLE in fractional mode Use fdtbus_get_reg to read "reg" property Need to initialize the PHY before HPD sense and DDC will work Set pixel clock on mode set Set TCON1 parent to PLL_VIDEO1(1X) Do not assume that an fb's pitch is width * 4 bytes. Use actual hw mode, not proposed mode. Set pre-divider M to 0 in fractional mode, as noted in user manual. Spotted by jak. Support non-zero fb start pixels. Set video PLLs to 297MHz Do not assume the cursor pitch is the same as the primary fb Enable HDMI and HDMI audio Try to avoid changing hardware settings when the "nomodeset" kernel arg is present. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.16.2.1 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts cvs rdiff -u -r1.13.2.2 -r1.13.2.3 src/sys/arch/arm/sunxi/sun50i_a64_ccu.c cvs rdiff -u -r1.21 -r1.21.4.1 src/sys/arch/arm/sunxi/sunxi_ccu.h cvs rdiff -u -r1.4 -r1.4.4.1 src/sys/arch/arm/sunxi/sunxi_ccu_fractional.c cvs rdiff -u -r1.3.6.1 -r1.3.6.2 src/sys/arch/arm/sunxi/sunxi_dwhdmi.c cvs rdiff -u -r1.2 -r1.2.6.1 src/sys/arch/arm/sunxi/sunxi_hdmiphy.c cvs rdiff -u -r1.1 -r1.1.6.1 src/sys/arch/arm/sunxi/sunxi_hdmiphy.h cvs rdiff -u -r1.6 -r1.6.2.1 src/sys/arch/arm/sunxi/sunxi_lcdc.c cvs rdiff -u -r1.7 -r1.7.6.1 src/sys/arch/arm/sunxi/sunxi_mixer.c cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/arch/arm/sunxi/sunxi_platform.c cvs rdiff -u -r1.2 -r1.2.4.1 src/sys/dev/fdt/fdt_port.c cvs rdiff -u -r1.1.6.1 -r1.1.6.2 src/sys/dev/ic/dw_hdmi.c \ src/sys/dev/ic/dw_hdmi.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Mon Nov 25 05:52:54 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #466 and #471. To generate a diff of this commit: cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.116 src/doc/CHANGES-9.0:1.1.2.117 --- src/doc/CHANGES-9.0:1.1.2.116 Sun Nov 24 08:34:28 2019 +++ src/doc/CHANGES-9.0 Mon Nov 25 05:52:54 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.116 2019/11/24 08:34:28 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.117 2019/11/25 05:52:54 msaitoh Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6247,3 +6247,64 @@ doc/3RDPARTY 1.1655 (patch) Import tzdata2019c. [kre, ticket #468] +sys/arch/evbarm/beagle/beagle_machdep.c 1.80 + + Fix compile error when DIAGNOSTIC is not used. + [martin, ticket #466] + +distrib/notes/Makefile.inc 1.45 +distrib/notes/acorn32/contents 1.6 +distrib/notes/alpha/contents 1.20 +distrib/notes/amd64/contents 1.9 +distrib/notes/amiga/contents 1.24 +distrib/notes/arc/contents 1.6 +distrib/notes/arc/prep1.5 +distrib/notes/atari/contents 1.24 +distrib/notes/bebox/contents 1.6 +distrib/notes/cats/contents 1.6 +distrib/notes/cats/prep1.14 +distrib/notes/common/contents 1.180 +distrib/notes/common/main 1.554 +distrib/notes/common/postinstall 1.85 +distrib/notes/common/sysinst 1.109 +distrib/notes/common/upgrade 1.31 +distrib/notes/emips/contents 1.6 +distrib/notes/evbarm/contents 1.6 +distrib/notes/evbppc/contents 1.7 +distrib/notes/ews4800mips/contents 1.6 +distrib/notes/hp300/contents 1.21 +distrib/notes/hpcarm/contents 1.7 +distrib/notes/hpcmips/contents 1.14 +distrib/notes/hpcsh/contents 1.7 +distrib/notes/hppa/contents 1.6 +distrib/notes/i386/contents 1.33 +distrib/notes/landisk/contents 1.7 +distrib/notes/mac68k/contents 1.24 +distrib/notes/macppc/contents 1.18 +distrib/notes/macppc/prep.OPENFIRMWARE 1.21 +distrib/notes/mmeye/contents 1.7 +distrib/notes/mvme68k/contents 1.17 +distrib/notes/news68k/contents 1.10 +distrib/notes/newsmips/contents 1.6 +distrib/notes/next68k/contents 1.11 +distrib/notes/ofppc/contents 1.7 +distrib/notes/pmax/contents 1.21 +distrib/notes/prep/contents 1.6 +distrib/notes/rs6000/contents 1.6 +distrib/notes/sandpoint/contents 1.6 +distrib/notes/sandpoint/xfer 1.4 +distrib/notes/sgimips/contents 1.6 +distrib/notes/shark/contents 1.6 +distrib/notes/sparc/contents 1.25 +distrib/notes/sparc64/contents 1.9 +distrib/notes/sparc64/upgrade 1.7 +distrib/notes/sun2/contents 1.6 +distrib/notes/sun3/contents 1.20 +distrib/notes/vax/contents 1.15 +distrib/notes/x68k/contents 1.21 + + Modernize release notes: + - Use https where possible. + - Adapt to cdn/nycdn and our current auto-build conventions. + - Automate where possible. + [martin, ticket #471]
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: msaitoh Date: Mon Nov 25 05:52:54 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Ticket #466 and #471. To generate a diff of this commit: cvs rdiff -u -r1.1.2.116 -r1.1.2.117 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: msaitoh Date: Mon Nov 25 05:50:21 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc src/distrib/notes/acorn32 [netbsd-9]: contents src/distrib/notes/alpha [netbsd-9]: contents src/distrib/notes/amd64 [netbsd-9]: contents src/distrib/notes/amiga [netbsd-9]: contents src/distrib/notes/arc [netbsd-9]: contents prep src/distrib/notes/atari [netbsd-9]: contents src/distrib/notes/bebox [netbsd-9]: contents src/distrib/notes/cats [netbsd-9]: contents prep src/distrib/notes/common [netbsd-9]: contents main postinstall sysinst upgrade src/distrib/notes/emips [netbsd-9]: contents src/distrib/notes/evbarm [netbsd-9]: contents src/distrib/notes/evbppc [netbsd-9]: contents src/distrib/notes/ews4800mips [netbsd-9]: contents src/distrib/notes/hp300 [netbsd-9]: contents src/distrib/notes/hpcarm [netbsd-9]: contents src/distrib/notes/hpcmips [netbsd-9]: contents src/distrib/notes/hpcsh [netbsd-9]: contents src/distrib/notes/hppa [netbsd-9]: contents src/distrib/notes/i386 [netbsd-9]: contents src/distrib/notes/landisk [netbsd-9]: contents src/distrib/notes/mac68k [netbsd-9]: contents src/distrib/notes/macppc [netbsd-9]: contents prep.OPENFIRMWARE src/distrib/notes/mmeye [netbsd-9]: contents src/distrib/notes/mvme68k [netbsd-9]: contents src/distrib/notes/news68k [netbsd-9]: contents src/distrib/notes/newsmips [netbsd-9]: contents src/distrib/notes/next68k [netbsd-9]: contents src/distrib/notes/ofppc [netbsd-9]: contents src/distrib/notes/pmax [netbsd-9]: contents src/distrib/notes/prep [netbsd-9]: contents src/distrib/notes/rs6000 [netbsd-9]: contents src/distrib/notes/sandpoint [netbsd-9]: contents xfer src/distrib/notes/sgimips [netbsd-9]: contents src/distrib/notes/shark [netbsd-9]: contents src/distrib/notes/sparc [netbsd-9]: contents src/distrib/notes/sparc64 [netbsd-9]: contents upgrade src/distrib/notes/sun2 [netbsd-9]: contents src/distrib/notes/sun3 [netbsd-9]: contents src/distrib/notes/vax [netbsd-9]: contents src/distrib/notes/x68k [netbsd-9]: contents Log Message: Pull up following revision(s) (requested by martin in ticket #471): distrib/notes/sandpoint/xfer: revision 1.4 distrib/notes/newsmips/contents: revision 1.6 distrib/notes/Makefile.inc: revision 1.45 distrib/notes/landisk/contents: revision 1.7 distrib/notes/sparc/contents: revision 1.25 distrib/notes/arc/contents: revision 1.6 distrib/notes/sun2/contents: revision 1.6 distrib/notes/common/sysinst: revision 1.109 distrib/notes/common/postinstall: revision 1.85 distrib/notes/vax/contents: revision 1.15 distrib/notes/mac68k/contents: revision 1.24 distrib/notes/alpha/contents: revision 1.20 distrib/notes/cats/contents: revision 1.6 distrib/notes/sparc64/contents: revision 1.9 distrib/notes/mvme68k/contents: revision 1.17 distrib/notes/i386/contents: revision 1.33 distrib/notes/common/main: revision 1.554 distrib/notes/rs6000/contents: revision 1.6 distrib/notes/hpcmips/contents: revision 1.14 distrib/notes/evbppc/contents: revision 1.7 distrib/notes/hpcarm/contents: revision 1.7 distrib/notes/emips/contents: revision 1.6 distrib/notes/sun3/contents: revision 1.20 distrib/notes/macppc/contents: revision 1.18 distrib/notes/amd64/contents: revision 1.9 distrib/notes/x68k/contents: revision 1.21 distrib/notes/sgimips/contents: revision 1.6 distrib/notes/sandpoint/contents: revision 1.6 distrib/notes/mmeye/contents: revision 1.7 distrib/notes/arc/prep: revision 1.5 distrib/notes/pmax/contents: revision 1.21 distrib/notes/shark/contents: revision 1.6 distrib/notes/news68k/contents: revision 1.10 distrib/notes/cats/prep: revision 1.14 distrib/notes/hp300/contents: revision 1.21 distrib/notes/common/upgrade: revision 1.31 distrib/notes/next68k/contents: revision 1.11 distrib/notes/amiga/contents: revision 1.24 distrib/notes/common/contents: revision 1.180 distrib/notes/evbarm/contents: revision 1.6 distrib/notes/sparc64/upgrade: revision 1.7 distrib/notes/hppa/contents: revision 1.6 distrib/notes/acorn32/contents: revision 1.6 distrib/notes/ofppc/contents: revision 1.7 distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.21 distrib/notes/atari/contents: revision 1.24 distrib/notes/bebox/contents: revision 1.6 distrib/notes/prep/contents: revision 1.6 distrib/notes/hpcsh/contents:
CVS commit: [netbsd-9] src/distrib/notes
Module Name:src Committed By: msaitoh Date: Mon Nov 25 05:50:21 UTC 2019 Modified Files: src/distrib/notes [netbsd-9]: Makefile.inc src/distrib/notes/acorn32 [netbsd-9]: contents src/distrib/notes/alpha [netbsd-9]: contents src/distrib/notes/amd64 [netbsd-9]: contents src/distrib/notes/amiga [netbsd-9]: contents src/distrib/notes/arc [netbsd-9]: contents prep src/distrib/notes/atari [netbsd-9]: contents src/distrib/notes/bebox [netbsd-9]: contents src/distrib/notes/cats [netbsd-9]: contents prep src/distrib/notes/common [netbsd-9]: contents main postinstall sysinst upgrade src/distrib/notes/emips [netbsd-9]: contents src/distrib/notes/evbarm [netbsd-9]: contents src/distrib/notes/evbppc [netbsd-9]: contents src/distrib/notes/ews4800mips [netbsd-9]: contents src/distrib/notes/hp300 [netbsd-9]: contents src/distrib/notes/hpcarm [netbsd-9]: contents src/distrib/notes/hpcmips [netbsd-9]: contents src/distrib/notes/hpcsh [netbsd-9]: contents src/distrib/notes/hppa [netbsd-9]: contents src/distrib/notes/i386 [netbsd-9]: contents src/distrib/notes/landisk [netbsd-9]: contents src/distrib/notes/mac68k [netbsd-9]: contents src/distrib/notes/macppc [netbsd-9]: contents prep.OPENFIRMWARE src/distrib/notes/mmeye [netbsd-9]: contents src/distrib/notes/mvme68k [netbsd-9]: contents src/distrib/notes/news68k [netbsd-9]: contents src/distrib/notes/newsmips [netbsd-9]: contents src/distrib/notes/next68k [netbsd-9]: contents src/distrib/notes/ofppc [netbsd-9]: contents src/distrib/notes/pmax [netbsd-9]: contents src/distrib/notes/prep [netbsd-9]: contents src/distrib/notes/rs6000 [netbsd-9]: contents src/distrib/notes/sandpoint [netbsd-9]: contents xfer src/distrib/notes/sgimips [netbsd-9]: contents src/distrib/notes/shark [netbsd-9]: contents src/distrib/notes/sparc [netbsd-9]: contents src/distrib/notes/sparc64 [netbsd-9]: contents upgrade src/distrib/notes/sun2 [netbsd-9]: contents src/distrib/notes/sun3 [netbsd-9]: contents src/distrib/notes/vax [netbsd-9]: contents src/distrib/notes/x68k [netbsd-9]: contents Log Message: Pull up following revision(s) (requested by martin in ticket #471): distrib/notes/sandpoint/xfer: revision 1.4 distrib/notes/newsmips/contents: revision 1.6 distrib/notes/Makefile.inc: revision 1.45 distrib/notes/landisk/contents: revision 1.7 distrib/notes/sparc/contents: revision 1.25 distrib/notes/arc/contents: revision 1.6 distrib/notes/sun2/contents: revision 1.6 distrib/notes/common/sysinst: revision 1.109 distrib/notes/common/postinstall: revision 1.85 distrib/notes/vax/contents: revision 1.15 distrib/notes/mac68k/contents: revision 1.24 distrib/notes/alpha/contents: revision 1.20 distrib/notes/cats/contents: revision 1.6 distrib/notes/sparc64/contents: revision 1.9 distrib/notes/mvme68k/contents: revision 1.17 distrib/notes/i386/contents: revision 1.33 distrib/notes/common/main: revision 1.554 distrib/notes/rs6000/contents: revision 1.6 distrib/notes/hpcmips/contents: revision 1.14 distrib/notes/evbppc/contents: revision 1.7 distrib/notes/hpcarm/contents: revision 1.7 distrib/notes/emips/contents: revision 1.6 distrib/notes/sun3/contents: revision 1.20 distrib/notes/macppc/contents: revision 1.18 distrib/notes/amd64/contents: revision 1.9 distrib/notes/x68k/contents: revision 1.21 distrib/notes/sgimips/contents: revision 1.6 distrib/notes/sandpoint/contents: revision 1.6 distrib/notes/mmeye/contents: revision 1.7 distrib/notes/arc/prep: revision 1.5 distrib/notes/pmax/contents: revision 1.21 distrib/notes/shark/contents: revision 1.6 distrib/notes/news68k/contents: revision 1.10 distrib/notes/cats/prep: revision 1.14 distrib/notes/hp300/contents: revision 1.21 distrib/notes/common/upgrade: revision 1.31 distrib/notes/next68k/contents: revision 1.11 distrib/notes/amiga/contents: revision 1.24 distrib/notes/common/contents: revision 1.180 distrib/notes/evbarm/contents: revision 1.6 distrib/notes/sparc64/upgrade: revision 1.7 distrib/notes/hppa/contents: revision 1.6 distrib/notes/acorn32/contents: revision 1.6 distrib/notes/ofppc/contents: revision 1.7 distrib/notes/macppc/prep.OPENFIRMWARE: revision 1.21 distrib/notes/atari/contents: revision 1.24 distrib/notes/bebox/contents: revision 1.6 distrib/notes/prep/contents: revision 1.6 distrib/notes/hpcsh/contents:
CVS commit: [netbsd-9] src/sys/arch/evbarm/beagle
Module Name:src
Committed By: msaitoh
Date: Mon Nov 25 05:47:13 UTC 2019
Modified Files:
src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #466):
sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.80
"rv" is only used on some boards and only with options DIAGNOSTIC.
So move the declaration into the proper #ifdef block.
To generate a diff of this commit:
cvs rdiff -u -r1.78.2.1 -r1.78.2.2 \
src/sys/arch/evbarm/beagle/beagle_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.2
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1 Fri Nov 22 15:28:18 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Mon Nov 25 05:47:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.78.2.2 2019/11/25 05:47:13 msaitoh Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78.2.2 2019/11/25 05:47:13 msaitoh Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,7 +1075,6 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
- int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1170,6 +1169,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port2-gpio", -1);
#endif
#if defined(OMAP_5430)
+ int rv __diagused;
bus_space_tag_t iot = _bs_tag;
bus_space_handle_t ioh;
omap2_gpio_ctl(80, GPIO_PIN_OUTPUT);
CVS commit: [netbsd-9] src/sys/arch/evbarm/beagle
Module Name:src Committed By: msaitoh Date: Mon Nov 25 05:47:13 UTC 2019 Modified Files: src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c Log Message: Pull up following revision(s) (requested by martin in ticket #466): sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.80 "rv" is only used on some boards and only with options DIAGNOSTIC. So move the declaration into the proper #ifdef block. To generate a diff of this commit: cvs rdiff -u -r1.78.2.1 -r1.78.2.2 \ src/sys/arch/evbarm/beagle/beagle_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Nov 24 08:34:29 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #464, #465, #467, #468 To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Sun Nov 24 08:34:29 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #464, #465, #467, #468 To generate a diff of this commit: cvs rdiff -u -r1.1.2.115 -r1.1.2.116 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.115 src/doc/CHANGES-9.0:1.1.2.116 --- src/doc/CHANGES-9.0:1.1.2.115 Fri Nov 22 15:30:39 2019 +++ src/doc/CHANGES-9.0 Sun Nov 24 08:34:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.115 2019/11/22 15:30:39 bouyer Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.116 2019/11/24 08:34:28 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6199,3 +6199,51 @@ sys/arch/xen/xen/xenevt.c 1.54 Make these files compilable w/o options DIAGNOSTIC [martin, ticket #463] +sys/dev/hyperv/hvkbd.c1.5,1.6 +sys/dev/hyperv/if_hvn.c1.8,1.9 +sys/dev/hyperv/vmbus.c1.5 + + vmbus(4), hvn(4), hvkbd(4): fix wait time for tsleep(9). + hvn(4), hvkbd(4): only poll when cold. + [nonaka, ticket #464] + +sys/kern/sys_ptrace_common.c 1.73 + + Fix regression introduced to ptrace_regs() in rev 1.27: + Size of registers should be determined from tracer, NOT tracee. + [rin, ticket #465] + +bin/sh/expand.c 1.133 + + Fix quoting in character class names in patterns (e.g. [[:\alpha:]]). + [kre, ticket #467] + +external/public-domain/tz/dist/Makefile up to 1.1.1.25 +external/public-domain/tz/dist/NEWS up to 1.1.1.28 +external/public-domain/tz/dist/TZDATA_VERSION up to 1.18 +external/public-domain/tz/dist/africa up to 1.1.1.21 +external/public-domain/tz/dist/antarctica up to 1.1.1.12 +external/public-domain/tz/dist/asia up to 1.1.1.24 +external/public-domain/tz/dist/australasia up to 1.1.1.18 +external/public-domain/tz/dist/backzone up to 1.1.1.17 +external/public-domain/tz/dist/checktab.awk up to 1.1.1.10 +external/public-domain/tz/dist/europe up to 1.1.1.25 +external/public-domain/tz/dist/factory up to 1.1.1.4 +external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.12 +external/public-domain/tz/dist/leapseconds up to 1.1.1.14 +external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.9 +external/public-domain/tz/dist/northamerica up to 1.1.1.24 +external/public-domain/tz/dist/pacificnew up to 1.1.1.3 +external/public-domain/tz/dist/southamerica up to 1.1.1.16 +external/public-domain/tz/dist/systemv up to 1.1.1.3 +external/public-domain/tz/dist/theory.html up to 1.1.1.9 +external/public-domain/tz/dist/version up to 1.1.1.15 +external/public-domain/tz/dist/zishrink.awk up to 1.1.1.6 +external/public-domain/tz/dist/zone.tab up to 1.1.1.17 +external/public-domain/tz/dist/zone1970.tab up to 1.1.1.19 +external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.3 +doc/3RDPARTY 1.1655 (patch) + + Import tzdata2019c. + [kre, ticket #468] +
CVS commit: [netbsd-9] src
Module Name:src Committed By: martin Date: Sun Nov 24 08:30:28 UTC 2019 Modified Files: src/doc [netbsd-9]: 3RDPARTY src/external/public-domain/tz/dist [netbsd-9]: Makefile NEWS TZDATA_VERSION africa antarctica asia australasia backzone checktab.awk europe factory leap-seconds.list leapseconds leapseconds.awk northamerica pacificnew southamerica systemv theory.html version zishrink.awk zone.tab zone1970.tab zoneinfo2tdf.pl Log Message: Pull up the following revisions, requested by kre in ticket #468: external/public-domain/tz/dist/Makefile up to 1.1.1.25 external/public-domain/tz/dist/NEWS up to 1.1.1.28 external/public-domain/tz/dist/TZDATA_VERSION up to 1.18 external/public-domain/tz/dist/africa up to 1.1.1.21 external/public-domain/tz/dist/antarctica up to 1.1.1.12 external/public-domain/tz/dist/asia up to 1.1.1.24 external/public-domain/tz/dist/australasia up to 1.1.1.18 external/public-domain/tz/dist/backzone up to 1.1.1.17 external/public-domain/tz/dist/checktab.awk up to 1.1.1.10 external/public-domain/tz/dist/europe up to 1.1.1.25 external/public-domain/tz/dist/factory up to 1.1.1.4 external/public-domain/tz/dist/leap-seconds.list up to 1.1.1.12 external/public-domain/tz/dist/leapseconds up to 1.1.1.14 external/public-domain/tz/dist/leapseconds.awk up to 1.1.1.9 external/public-domain/tz/dist/northamerica up to 1.1.1.24 external/public-domain/tz/dist/pacificnew up to 1.1.1.3 external/public-domain/tz/dist/southamerica up to 1.1.1.16 external/public-domain/tz/dist/systemv up to 1.1.1.3 external/public-domain/tz/dist/theory.html up to 1.1.1.9 external/public-domain/tz/dist/version up to 1.1.1.15 external/public-domain/tz/dist/zishrink.awk up to 1.1.1.6 external/public-domain/tz/dist/zone.tab up to 1.1.1.17 external/public-domain/tz/dist/zone1970.tab up to 1.1.1.19 external/public-domain/tz/dist/zoneinfo2tdf.pl up to 1.1.1.3 doc/3RDPARTY1.1655 (patch) Import tzdata2019c from ftp://ftp.iana.org/tz/releases/tzdata2019c.tar.gz Summary of changes in tzdata2019c (2019-09-11 08:59:48 -0700): Fiji observes DST from 2019-11-10 to 2020-01-12 Norfolk Island starts observing Australian-style DST Plus historic corrections to time in Turkey (1940-85) South Korea (1948-51) Detroit (US) (1967-8), Perry County (Indiana, US) (pre 1970) Edmonton (CA) (1967, 1969) Vancouver (CA) (1946), Vienna (AT) (1946), Kaliningrad (1945-6). Louisville (US) (1946-50). Brussles (BE) (1892). Hong Kong Winter Time (1941) now listed as being "DST". Summary of changes in tzdata2019b (2019-07-01 00:09:53 -0700): Brazil no longer observes DST Predictions for Morocco extended to 2087. Panestine (March 2019) time zone change date corrected (and guesses for future transitions revised). Historic updates: Honk Kong (1941 - 1947), Italy (1866). To generate a diff of this commit: cvs rdiff -u -r1.1640.2.7 -r1.1640.2.8 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.24 -r1.1.1.24.2.1 \ src/external/public-domain/tz/dist/Makefile \ src/external/public-domain/tz/dist/europe cvs rdiff -u -r1.1.1.27 -r1.1.1.27.2.1 \ src/external/public-domain/tz/dist/NEWS cvs rdiff -u -r1.17 -r1.17.2.1 \ src/external/public-domain/tz/dist/TZDATA_VERSION cvs rdiff -u -r1.1.1.20 -r1.1.1.20.2.1 \ src/external/public-domain/tz/dist/africa cvs rdiff -u -r1.1.1.11 -r1.1.1.11.2.1 \ src/external/public-domain/tz/dist/antarctica \ src/external/public-domain/tz/dist/leap-seconds.list cvs rdiff -u -r1.1.1.23 -r1.1.1.23.2.1 \ src/external/public-domain/tz/dist/asia \ src/external/public-domain/tz/dist/northamerica cvs rdiff -u -r1.1.1.17 -r1.1.1.17.2.1 \ src/external/public-domain/tz/dist/australasia cvs rdiff -u -r1.1.1.16 -r1.1.1.16.2.1 \ src/external/public-domain/tz/dist/backzone \ src/external/public-domain/tz/dist/zone.tab cvs rdiff -u -r1.1.1.9 -r1.1.1.9.4.1 \ src/external/public-domain/tz/dist/checktab.awk cvs rdiff -u -r1.1.1.3 -r1.1.1.3.2.1 \ src/external/public-domain/tz/dist/factory cvs rdiff -u -r1.1.1.13 -r1.1.1.13.2.1 \ src/external/public-domain/tz/dist/leapseconds cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ src/external/public-domain/tz/dist/leapseconds.awk \ src/external/public-domain/tz/dist/theory.html cvs rdiff -u -r1.1.1.2 -r1.1.1.2.2.1 \ src/external/public-domain/tz/dist/pacificnew \ src/external/public-domain/tz/dist/systemv \ src/external/public-domain/tz/dist/zoneinfo2tdf.pl cvs rdiff -u -r1.1.1.15
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Nov 24 08:24:06 UTC 2019
Modified Files:
src/bin/sh [netbsd-9]: expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #467):
bin/sh/expand.c: revision 1.133
Open code the validity test & copy of the character class name in
a bracket expression in a pattern (ie: [[:THISNAME:]]). Previously
the code used strspn() to look for invalid chars in the name, and
then memcpy(), now we do the test and copy a character at a time.
This might, or might not, be faster, but it now correctly handles
\ quoted characters in the name (' and " quoting were already
dealt with, \ was too in an earlier version, but when the \ handling
changes were made, this piece of code broke).
Not exactly a vital bug fix (who writes [[:\alpha:]] or similar?)
but it should work correctly regardless of how obscure the usage is.
Problem noted by Harald van Dijk
XXX pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.132.2.1 src/bin/sh/expand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/bin/sh/expand.c
diff -u src/bin/sh/expand.c:1.132 src/bin/sh/expand.c:1.132.2.1
--- src/bin/sh/expand.c:1.132 Wed Apr 10 08:13:11 2019
+++ src/bin/sh/expand.c Sun Nov 24 08:24:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: expand.c,v 1.132 2019/04/10 08:13:11 kre Exp $ */
+/* $NetBSD: expand.c,v 1.132.2.1 2019/11/24 08:24:06 martin Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)expand.c 8.5 (Berkeley) 5/15/95";
#else
-__RCSID("$NetBSD: expand.c,v 1.132 2019/04/10 08:13:11 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.132.2.1 2019/11/24 08:24:06 martin Exp $");
#endif
#endif /* not lint */
@@ -1792,24 +1792,44 @@ match_charclass(const char *p, wchar_t c
char name[20];
char *nameend;
wctype_t cclass;
+ char *q;
*end = NULL;
p++;
+ q = [0];
nameend = strstr(p, ":]");
if (nameend == NULL || nameend == p) /* not a valid class */
return 0;
- if (!is_alpha(*p) || strspn(p, /* '_' is a local extension */
- "0123456789" "_"
- "abcdefghijklmnopqrstuvwxyz"
- "ABCDEFGHIJKLMNOPQRSTUVWXYZ") != (size_t)(nameend - p))
+ if (*p == CTLESC) {
+ if (*++p == CTLESC)
+ return 0;
+ if (p == nameend)
+ return 0;
+ }
+ if (!is_alpha(*p))
return 0;
+ while (p < nameend) {
+ if (*p == CTLESC) {
+ p++;
+ if (p == nameend)
+return 0;
+ }
+ if (!is_in_name(*p)) /* '_' is a local extension */
+ return 0;
+ if (q < [sizeof name])
+ *q++ = *p++;
+ else
+ p++;
+ }
*end = nameend + 2; /* committed to it being a char class */
- if ((size_t)(nameend - p) >= sizeof(name)) /* but too long */
- return 0;/* so no match */
- memcpy(name, p, nameend - p);
- name[nameend - p] = '\0';
+
+ if (q < [sizeof name]) /* a usable name found */
+ *q++ = '\0';
+ else/* too long, valid, but no match */
+ return 0;
+
cclass = wctype(name);
/* An unknown class matches nothing but is valid nevertheless. */
if (cclass == 0)
CVS commit: [netbsd-9] src/bin/sh
Module Name:src
Committed By: martin
Date: Sun Nov 24 08:24:06 UTC 2019
Modified Files:
src/bin/sh [netbsd-9]: expand.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #467):
bin/sh/expand.c: revision 1.133
Open code the validity test & copy of the character class name in
a bracket expression in a pattern (ie: [[:THISNAME:]]). Previously
the code used strspn() to look for invalid chars in the name, and
then memcpy(), now we do the test and copy a character at a time.
This might, or might not, be faster, but it now correctly handles
\ quoted characters in the name (' and " quoting were already
dealt with, \ was too in an earlier version, but when the \ handling
changes were made, this piece of code broke).
Not exactly a vital bug fix (who writes [[:\alpha:]] or similar?)
but it should work correctly regardless of how obscure the usage is.
Problem noted by Harald van Dijk
XXX pullup -9
To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.132.2.1 src/bin/sh/expand.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/kern
Module Name:src Committed By: martin Date: Sun Nov 24 08:16:53 UTC 2019 Modified Files: src/sys/kern [netbsd-9]: sys_ptrace_common.c Log Message: Pull up following revision(s) (requested by rin in ticket #465): sys/kern/sys_ptrace_common.c: revision 1.73 Fix regression introduced to ptrace_regs() in rev 1.27: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/sys_ptrace_common.c#rev1.27 Size of registers should be determined from tracer, NOT tracee. Now, 64-bit tracer can manipulate registers of 32-bit tracee again. gdb for amd64 works for i386 binaries to some extent. XXX pullup to netbsd-9 and -8. To generate a diff of this commit: cvs rdiff -u -r1.58.2.11 -r1.58.2.12 src/sys/kern/sys_ptrace_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/kern
Module Name:src
Committed By: martin
Date: Sun Nov 24 08:16:53 UTC 2019
Modified Files:
src/sys/kern [netbsd-9]: sys_ptrace_common.c
Log Message:
Pull up following revision(s) (requested by rin in ticket #465):
sys/kern/sys_ptrace_common.c: revision 1.73
Fix regression introduced to ptrace_regs() in rev 1.27:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/kern/sys_ptrace_common.c#rev1.27
Size of registers should be determined from tracer, NOT tracee.
Now, 64-bit tracer can manipulate registers of 32-bit tracee again.
gdb for amd64 works for i386 binaries to some extent.
XXX
pullup to netbsd-9 and -8.
To generate a diff of this commit:
cvs rdiff -u -r1.58.2.11 -r1.58.2.12 src/sys/kern/sys_ptrace_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/sys_ptrace_common.c
diff -u src/sys/kern/sys_ptrace_common.c:1.58.2.11 src/sys/kern/sys_ptrace_common.c:1.58.2.12
--- src/sys/kern/sys_ptrace_common.c:1.58.2.11 Tue Nov 19 13:22:01 2019
+++ src/sys/kern/sys_ptrace_common.c Sun Nov 24 08:16:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_ptrace_common.c,v 1.58.2.11 2019/11/19 13:22:01 martin Exp $ */
+/* $NetBSD: sys_ptrace_common.c,v 1.58.2.12 2019/11/24 08:16:52 martin Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -118,7 +118,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.11 2019/11/19 13:22:01 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sys_ptrace_common.c,v 1.58.2.12 2019/11/24 08:16:52 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_ptrace.h"
@@ -831,9 +831,12 @@ ptrace_regs(struct lwp *l, struct lwp **
void *addr, size_t data)
{
int error;
- struct proc *t = (*lt)->l_proc;
+ struct proc *p, *t;
struct vmspace *vm;
+ p = l->l_proc; /* tracer */
+ t = (*lt)->l_proc; /* traced */
+
if ((error = ptrace_update_lwp(t, lt, data)) != 0)
return error;
@@ -849,7 +852,7 @@ ptrace_regs(struct lwp *l, struct lwp **
case_PT_SETREGS
if (!process_validregs(*lt))
return EINVAL;
- size = PROC_REGSZ(t);
+ size = PROC_REGSZ(p);
func = ptm->ptm_doregs;
break;
#endif
@@ -858,7 +861,7 @@ ptrace_regs(struct lwp *l, struct lwp **
case_PT_SETFPREGS
if (!process_validfpregs(*lt))
return EINVAL;
- size = PROC_FPREGSZ(t);
+ size = PROC_FPREGSZ(p);
func = ptm->ptm_dofpregs;
break;
#endif
@@ -867,7 +870,7 @@ ptrace_regs(struct lwp *l, struct lwp **
case_PT_SETDBREGS
if (!process_validdbregs(*lt))
return EINVAL;
- size = PROC_DBREGSZ(t);
+ size = PROC_DBREGSZ(p);
func = ptm->ptm_dodbregs;
break;
#endif
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src Committed By: martin Date: Sun Nov 24 08:13:07 UTC 2019 Modified Files: src/sys/dev/hyperv [netbsd-9]: hvkbd.c if_hvn.c vmbus.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #464): sys/dev/hyperv/if_hvn.c: revision 1.8 sys/dev/hyperv/if_hvn.c: revision 1.9 sys/dev/hyperv/hvkbd.c: revision 1.5 sys/dev/hyperv/hvkbd.c: revision 1.6 sys/dev/hyperv/vmbus.c: revision 1.5 vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9). hvn(4), hvkbd(4): Only need to poll when cold. To generate a diff of this commit: cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/sys/dev/hyperv/hvkbd.c cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/dev/hyperv/if_hvn.c cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/hyperv/vmbus.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/hyperv
Module Name:src
Committed By: martin
Date: Sun Nov 24 08:13:07 UTC 2019
Modified Files:
src/sys/dev/hyperv [netbsd-9]: hvkbd.c if_hvn.c vmbus.c
Log Message:
Pull up following revision(s) (requested by nonaka in ticket #464):
sys/dev/hyperv/if_hvn.c: revision 1.8
sys/dev/hyperv/if_hvn.c: revision 1.9
sys/dev/hyperv/hvkbd.c: revision 1.5
sys/dev/hyperv/hvkbd.c: revision 1.6
sys/dev/hyperv/vmbus.c: revision 1.5
vmbus(4), hvn(4), hvkbd(4): Fixed wait time for tsleep(9).
hvn(4), hvkbd(4): Only need to poll when cold.
To generate a diff of this commit:
cvs rdiff -u -r1.2.2.1 -r1.2.2.2 src/sys/dev/hyperv/hvkbd.c
cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/sys/dev/hyperv/if_hvn.c
cvs rdiff -u -r1.4 -r1.4.2.1 src/sys/dev/hyperv/vmbus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/hyperv/hvkbd.c
diff -u src/sys/dev/hyperv/hvkbd.c:1.2.2.1 src/sys/dev/hyperv/hvkbd.c:1.2.2.2
--- src/sys/dev/hyperv/hvkbd.c:1.2.2.1 Sat Nov 16 16:51:45 2019
+++ src/sys/dev/hyperv/hvkbd.c Sun Nov 24 08:13:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: hvkbd.c,v 1.2.2.1 2019/11/16 16:51:45 martin Exp $ */
+/* $NetBSD: hvkbd.c,v 1.2.2.2 2019/11/24 08:13:07 martin Exp $ */
/*-
* Copyright (c) 2017 Microsoft Corp.
@@ -36,7 +36,7 @@
#endif /* _KERNEL_OPT */
#include
-__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.2.2.1 2019/11/16 16:51:45 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: hvkbd.c,v 1.2.2.2 2019/11/24 08:13:07 martin Exp $");
#include
#include
@@ -359,13 +359,13 @@ hvkbd_connect(struct hvkbd_softc *sc)
}
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
- tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", 1);
- s = spltty();
- hvkbd_intr(sc);
- splx(s);
+ s = spltty();
+ hvkbd_intr(sc);
+ splx(s);
+ } else
+ tsleep(sc, PRIBIO | PCATCH, "hvkbdcon", mstohz(1));
} while (--timo > 0 && sc->sc_connected == 0);
if (timo == 0 && sc->sc_connected == 0) {
Index: src/sys/dev/hyperv/if_hvn.c
diff -u src/sys/dev/hyperv/if_hvn.c:1.4.2.2 src/sys/dev/hyperv/if_hvn.c:1.4.2.3
--- src/sys/dev/hyperv/if_hvn.c:1.4.2.2 Mon Nov 18 19:46:33 2019
+++ src/sys/dev/hyperv/if_hvn.c Sun Nov 24 08:13:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $ */
+/* $NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $ */
/* $OpenBSD: if_hvn.c,v 1.39 2018/03/11 14:31:34 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.2 2019/11/18 19:46:33 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_hvn.c,v 1.4.2.3 2019/11/24 08:13:07 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1069,7 +1069,7 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
if (cold)
delay(1000);
else
-tsleep(cmd, PRIBIO, "nvsout", 1);
+tsleep(cmd, PRIBIO, "nvsout", mstohz(1));
} else if (rv) {
DPRINTF("%s: NVSP operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->nvs_type, rv);
@@ -1087,13 +1087,13 @@ hvn_nvs_cmd(struct hvn_softc *sc, void *
return 0;
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
- tsleep(sc, PRIBIO | PCATCH, "nvscmd", 1);
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
+ tsleep(sc, PRIBIO | PCATCH, "nvscmd", mstohz(1));
} while (--timo > 0 && sc->sc_nvsdone != 1);
if (timo == 0 && sc->sc_nvsdone != 1) {
@@ -1391,7 +1391,7 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
if (cold)
delay(1000);
else
-tsleep(rc, PRIBIO, "rndisout", 1);
+tsleep(rc, PRIBIO, "rndisout", mstohz(1));
} else if (rv) {
DPRINTF("%s: RNDIS operation %u send error %d\n",
device_xname(sc->sc_dev), hdr->rm_type, rv);
@@ -1410,13 +1410,13 @@ hvn_rndis_cmd(struct hvn_softc *sc, stru
BUS_DMASYNC_POSTWRITE);
do {
- if (cold)
+ if (cold) {
delay(1000);
- else
- tsleep(rc, PRIBIO | PCATCH, "rndiscmd", 1);
- s = splnet();
- hvn_nvs_intr(sc);
- splx(s);
+ s = splnet();
+ hvn_nvs_intr(sc);
+ splx(s);
+ } else
+ tsleep(rc, PRIBIO | PCATCH, "rndiscmd", mstohz(1));
} while (--timo > 0 && rc->rc_done != 1);
bus_dmamap_sync(sc->sc_dmat, rc->rc_dmap, 0, PAGE_SIZE,
Index: src/sys/dev/hyperv/vmbus.c
diff -u src/sys/dev/hyperv/vmbus.c:1.4 src/sys/dev/hyperv/vmbus.c:1.4.2.1
--- src/sys/dev/hyperv/vmbus.c:1.4 Tue Jul 9 10:07:11 2019
+++ src/sys/dev/hyperv/vmbus.c Sun Nov 24 08:13:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $ */
+/* $NetBSD: vmbus.c,v 1.4.2.1 2019/11/24 08:13:07 martin Exp $ */
/* $OpenBSD: hyperv.c,v 1.43 2017/06/27 13:56:15 mikeb Exp $ */
/*-
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.4 2019/07/09 10:07:11 nakayama Exp $");
+__KERNEL_RCSID(0, "$NetBSD: vmbus.c,v 1.4.2.1 2019/11/24 08:13:07 martin Exp $");
#include
#include
@@ -604,7 +604,7 @@
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:30:39 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: tickets 462, 463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.114 src/doc/CHANGES-9.0:1.1.2.115 --- src/doc/CHANGES-9.0:1.1.2.114 Fri Nov 22 08:05:10 2019 +++ src/doc/CHANGES-9.0 Fri Nov 22 15:30:39 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.114 2019/11/22 08:05:10 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.115 2019/11/22 15:30:39 bouyer Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -6185,3 +6185,17 @@ doc/3RDPARTY (manually adjusted) Import dhcpcd-8.1.2. [roy, ticket #461] +etc/Makefile.params1.21 +share/mk/bsd.README1.397 + + Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is + important information when trying to reproduce a build. + [martin, ticket #462] + +sys/arch/arm/omap/obio_mputmr.c 1.9 +sys/arch/evbarm/beagle/beagle_machdep.c 1.79 +sys/arch/xen/xen/xenevt.c 1.54 + + Make these files compilable w/o options DIAGNOSTIC + [martin, ticket #463] +
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:30:39 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: tickets 462, 463 To generate a diff of this commit: cvs rdiff -u -r1.1.2.114 -r1.1.2.115 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Fri Nov 22 15:28:18 UTC 2019
Modified Files:
src/sys/arch/arm/omap [netbsd-9]: obio_mputmr.c
src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c
src/sys/arch/xen/xen [netbsd-9]: xenevt.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #463):
sys/arch/xen/xen/xenevt.c: revision 1.54
sys/arch/arm/omap/obio_mputmr.c: revision 1.9
sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.79
Make this files compilable w/o options DIAGNOSTIC
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/arm/omap/obio_mputmr.c
cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c
cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/xen/xen/xenevt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/omap/obio_mputmr.c
diff -u src/sys/arch/arm/omap/obio_mputmr.c:1.8 src/sys/arch/arm/omap/obio_mputmr.c:1.8.38.1
--- src/sys/arch/arm/omap/obio_mputmr.c:1.8 Sun Jun 16 17:47:54 2013
+++ src/sys/arch/arm/omap/obio_mputmr.c Fri Nov 22 15:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $ */
+/* $NetBSD: obio_mputmr.c,v 1.8.38.1 2019/11/22 15:28:18 bouyer Exp $ */
/*
* Based on omap_mputmr.c
@@ -101,7 +101,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8 2013/06/16 17:47:54 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: obio_mputmr.c,v 1.8.38.1 2019/11/22 15:28:18 bouyer Exp $");
#include "opt_omap.h"
#include "opt_cpuoptions.h"
@@ -302,9 +302,9 @@ gpt_enable(
#if defined(OMAP_2430) || defined(OMAP_2420)
bus_space_handle_t ioh;
- uint32_t r;
+ uint32_t r, err __diagused;
- int err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
+ err = bus_space_map(obio->obio_iot, OMAP2_CM_BASE,
OMAP2_CM_SIZE, 0, );
KASSERT(err == 0);
Index: src/sys/arch/evbarm/beagle/beagle_machdep.c
diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78.2.1
--- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.78 Tue Jul 16 14:41:44 2019
+++ src/sys/arch/evbarm/beagle/beagle_machdep.c Fri Nov 22 15:28:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $ */
+/* $NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78 2019/07/16 14:41:44 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: beagle_machdep.c,v 1.78.2.1 2019/11/22 15:28:18 bouyer Exp $");
#include "opt_arm_debug.h"
#include "opt_console.h"
@@ -1075,6 +1075,7 @@ void
beagle_device_register(device_t self, void *aux)
{
prop_dictionary_t dict = device_properties(self);
+ int rv __diagused;
if (device_is_a(self, "armperiph")
&& device_is_a(device_parent(self), "mainbus")) {
@@ -1180,7 +1181,7 @@ beagle_device_register(device_t self, vo
prop_dictionary_set_int16(dict, "port0-gpio", 80);
prop_dictionary_set_bool(dict, "port0-gpioval", true);
#endif
- int rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
+ rv = bus_space_map(iot, OMAP5_CM_CTL_WKUP_REF_CLK0_OUT_REF_CLK1_OUT, 4, 0, );
KASSERT(rv == 0);
uint32_t v = bus_space_read_4(iot, ioh, 0);
v &= 0x;
Index: src/sys/arch/xen/xen/xenevt.c
diff -u src/sys/arch/xen/xen/xenevt.c:1.53 src/sys/arch/xen/xen/xenevt.c:1.53.4.1
--- src/sys/arch/xen/xen/xenevt.c:1.53 Tue Dec 25 06:50:12 2018
+++ src/sys/arch/xen/xen/xenevt.c Fri Nov 22 15:28:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $ */
+/* $NetBSD: xenevt.c,v 1.53.4.1 2019/11/22 15:28:17 bouyer Exp $ */
/*
* Copyright (c) 2005 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53 2018/12/25 06:50:12 cherry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xenevt.c,v 1.53.4.1 2019/11/22 15:28:17 bouyer Exp $");
#include "opt_xen.h"
#include
@@ -161,7 +161,7 @@ static evtchn_port_t xenevt_alloc_event(
void
xenevtattach(int n)
{
- struct intrhand *ih;
+ struct intrhand *ih __diagused;
int level = IPL_HIGH;
bool mpsafe = (level != IPL_VM);
CVS commit: [netbsd-9] src/sys/arch
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:28:18 UTC 2019 Modified Files: src/sys/arch/arm/omap [netbsd-9]: obio_mputmr.c src/sys/arch/evbarm/beagle [netbsd-9]: beagle_machdep.c src/sys/arch/xen/xen [netbsd-9]: xenevt.c Log Message: Pull up following revision(s) (requested by martin in ticket #463): sys/arch/xen/xen/xenevt.c: revision 1.54 sys/arch/arm/omap/obio_mputmr.c: revision 1.9 sys/arch/evbarm/beagle/beagle_machdep.c: revision 1.79 Make this files compilable w/o options DIAGNOSTIC To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.8.38.1 src/sys/arch/arm/omap/obio_mputmr.c cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/arch/evbarm/beagle/beagle_machdep.c cvs rdiff -u -r1.53 -r1.53.4.1 src/sys/arch/xen/xen/xenevt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:26:28 UTC 2019 Modified Files: src/etc [netbsd-9]: Makefile.params src/share/mk [netbsd-9]: bsd.README Log Message: Pull up following revision(s) (requested by martin in ticket #462): share/mk/bsd.README: revision 1.397 etc/Makefile.params: revision 1.21 Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/etc/Makefile.params cvs rdiff -u -r1.393 -r1.393.2.1 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/Makefile.params diff -u src/etc/Makefile.params:1.20 src/etc/Makefile.params:1.20.2.1 --- src/etc/Makefile.params:1.20 Tue Jul 10 13:22:22 2018 +++ src/etc/Makefile.params Fri Nov 22 15:26:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.params,v 1.20 2018/07/10 13:22:22 martin Exp $ +# $NetBSD: Makefile.params,v 1.20.2.1 2019/11/22 15:26:28 bouyer Exp $ # # Makefile fragment for printing build parameters. # @@ -40,7 +40,7 @@ RELEASEVARS= DISTRIBVER EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \ HAVE_LLVM HAVE_PCC INSTALLWORLDDIR \ MACHINE MACHINE_ARCH \ - NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ + NETBSD_OFFICIAL_RELEASE NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ TOOLCHAIN_MISSING \ USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \ USE_PAM USE_SKEY USE_YP \ Index: src/share/mk/bsd.README diff -u src/share/mk/bsd.README:1.393 src/share/mk/bsd.README:1.393.2.1 --- src/share/mk/bsd.README:1.393 Wed Jul 24 09:28:29 2019 +++ src/share/mk/bsd.README Fri Nov 22 15:26:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.README,v 1.393 2019/07/24 09:28:29 roy Exp $ +# $NetBSD: bsd.README,v 1.393.2.1 2019/11/22 15:26:28 bouyer Exp $ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 This is the README file for the make "include" files for the NetBSD @@ -152,6 +152,16 @@ MKCTF If "no", do not build and install during build. Default: no +NETBSD_OFFICIAL_RELEASE + If defined and set to "yes", the build targets an official + NetBSD release which is going to be available from + ftp.NetBSD.org / cdn.NetBSD.org. This modifies a few + default paths in the installer and also creates different + links in the install documentation. + The auto-build cluster uses this variable to distinguish + "daily" builds from real releases. + Default: undefined (no) + NOCTF Don't generate and manipulate CTF data of ELF binaries during build. It is set internally for standalone programs.
CVS commit: [netbsd-9] src
Module Name:src Committed By: bouyer Date: Fri Nov 22 15:26:28 UTC 2019 Modified Files: src/etc [netbsd-9]: Makefile.params src/share/mk [netbsd-9]: bsd.README Log Message: Pull up following revision(s) (requested by martin in ticket #462): share/mk/bsd.README: revision 1.397 etc/Makefile.params: revision 1.21 Document NETBSD_OFFICIAL_RELEASE and add it to /etc/release - it is important information when trying to reproduce a build. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.20.2.1 src/etc/Makefile.params cvs rdiff -u -r1.393 -r1.393.2.1 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: [netbsd-9] src
On Fri, Nov 22, 2019 at 07:44:58AM +0100, Martin Husemann wrote: > On Fri, Nov 22, 2019 at 06:17:43AM +0100, Kamil Rytarowski wrote: > > Can we use __diagused? > > Yes, please - can you please commit to -current and request pullup? > Should be the same issue on HEAD (just not being noticed in default > compiles). Actually there is more fallout like this - I'll deal with it in one go. Martin
