CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Thu Apr 22 05:00:36 UTC 2021 Modified Files: src/external/gpl3/gcc: README.gcc10 Log Message: arm64* now works. (thanks skrll.) evbarmv5 and evbarmv7hfeb works. (thanks martin.) To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/external/gpl3/gcc/README.gcc10 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/README.gcc10 diff -u src/external/gpl3/gcc/README.gcc10:1.14 src/external/gpl3/gcc/README.gcc10:1.15 --- src/external/gpl3/gcc/README.gcc10:1.14 Mon Apr 19 08:40:15 2021 +++ src/external/gpl3/gcc/README.gcc10 Thu Apr 22 05:00:35 2021 @@ -1,4 +1,4 @@ -$NetBSD: README.gcc10,v 1.14 2021/04/19 08:40:15 mrg Exp $ +$NetBSD: README.gcc10,v 1.15 2021/04/22 05:00:35 mrg Exp $ new stuff: @@ -32,12 +32,12 @@ switched: has port switched? y (yes), n architecture tools kernels libgcc native-gcc make release runs atf switched - --- -- -- --- -aarch64 y n[3] y y n ? y ? -aarch64eb y n[3] y y n ? ? ? +aarch64 y y y y y y y n +aarch64eb y y y y y y ? ? alpha y y y y y y y y earmv4 y y y y y y ? n earmv4eb y b y y y ? ? ? -earmv5 y b y y y ? ? ? +earmv5 y b y y y y y n earmv5eb y b y y y ? ? ? earmv5hf y b y y y ? ? ? earmv5hfeb y b y y y ? ? ? @@ -48,7 +48,7 @@ earmv6hfeb y b y y y ? ? ? earmv7 y b y y y ? ? ? earmv7eb y b y y y ? ? ? earmv7hf y y y y y y y n -earmv7hfeb y b y y y ? ? ? +earmv7hfeb y b y y y y y n hppa y y y y y y y y i386 y y y y y y n[8] ? ia64 y y y y y ? N/A y @@ -74,7 +74,6 @@ coldfire ? N/A ? ? ? N/A N/A architecture tools kernels libgcc native-gcc make release runs atf [1] - ramdisk.fs is too large, needs fixing. -[3] - missing __aarch64_swp1_acq in kernels. [6] - vax vs c++ exceptions issue, same as it ever was [7] - fails just as poorly in gxemul/landisk as GCC 9 [8] - i386 seems to have a signal delivery issue. pthread tests hang and then
CVS commit: src/share/man/man8/man8.x86
Module Name:src Committed By: rin Date: Thu Apr 22 01:36:25 UTC 2021 Modified Files: src/share/man/man8/man8.x86: boot.8 Log Message: Capitalize /EFI and /EFI/NetBSD as usual. Both are case-insensitive although. Maybe not worth bumping dates... To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man8/man8.x86/boot.8 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/man8/man8.x86/boot.8 diff -u src/share/man/man8/man8.x86/boot.8:1.23 src/share/man/man8/man8.x86/boot.8:1.24 --- src/share/man/man8/man8.x86/boot.8:1.23 Mon Aug 10 01:10:26 2020 +++ src/share/man/man8/man8.x86/boot.8 Thu Apr 22 01:36:25 2021 @@ -1,4 +1,4 @@ -.\" $NetBSD: boot.8,v 1.23 2020/08/10 01:10:26 uwe Exp $ +.\" $NetBSD: boot.8,v 1.24 2021/04/22 01:36:25 rin Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -797,7 +797,7 @@ bootstraps for and .Nx Ns /amd64 , which should be copied to the -.Pa /efi/boot +.Pa /EFI/boot directory in a .Tn FAT formatted partition of type @@ -812,7 +812,7 @@ section). .Nx .Tn UEFI bootstrap reads its configuration from the -.Pa /efi/netBSD/boot.cfg +.Pa /EFI/NetBSD/boot.cfg file in the .Tn EFI partition.
CVS commit: src/sys/arch/powerpc/booke/dev
Module Name:src Committed By: rin Date: Thu Apr 22 01:33:18 UTC 2021 Modified Files: src/sys/arch/powerpc/booke/dev: pq3etsec.c Log Message: Fix rnd(9) support; events were not sampled actually in the previous. Remove #if-0'ed and wrap long line for clarity. To generate a diff of this commit: cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/booke/dev/pq3etsec.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/powerpc/booke/dev/pq3etsec.c diff -u src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.52 src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.53 --- src/sys/arch/powerpc/booke/dev/pq3etsec.c:1.52 Sun Jan 24 05:16:56 2021 +++ src/sys/arch/powerpc/booke/dev/pq3etsec.c Thu Apr 22 01:33:18 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pq3etsec.c,v 1.52 2021/01/24 05:16:56 rin Exp $ */ +/* $NetBSD: pq3etsec.c,v 1.53 2021/04/22 01:33:18 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.52 2021/01/24 05:16:56 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3etsec.c,v 1.53 2021/04/22 01:33:18 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -1640,14 +1640,14 @@ pq3etsec_rxq_consume( rxq->rxq_consumer = consumer; rxq->rxq_inuse -= rxconsumed; KASSERT(rxq->rxq_inuse == 0); - return; + break; } pq3etsec_rxq_desc_postsync(sc, rxq, consumer, 1); const uint16_t rxbd_flags = consumer->rxbd_flags; if (rxbd_flags & RXBD_E) { rxq->rxq_consumer = consumer; rxq->rxq_inuse -= rxconsumed; - return; + break; } KASSERT(rxq->rxq_mconsumer != NULL); #ifdef ETSEC_DEBUG @@ -2178,6 +2178,7 @@ pq3etsec_txq_consume( struct ifnet * const ifp = &sc->sc_if; volatile struct txbd *consumer = txq->txq_consumer; size_t txfree = 0; + bool ret; #if 0 printf("%s: entry: free=%zu\n", __func__, txq->txq_free); @@ -2189,13 +2190,11 @@ pq3etsec_txq_consume( txq->txq_consumer = consumer; txq->txq_free += txfree; txq->txq_lastintr -= uimin(txq->txq_lastintr, txfree); -#if 0 - printf("%s: empty: freed %zu descriptors going form %zu to %zu\n", - __func__, txfree, txq->txq_free - txfree, txq->txq_free); -#endif KASSERT(txq->txq_lastintr == 0); - KASSERT(txq->txq_free == txq->txq_last - txq->txq_first - 1); - return true; + KASSERT(txq->txq_free == + txq->txq_last - txq->txq_first - 1); + ret = true; + break; } pq3etsec_txq_desc_postsync(sc, txq, consumer, 1); const uint16_t txbd_flags = consumer->txbd_flags; @@ -2203,11 +2202,8 @@ pq3etsec_txq_consume( txq->txq_consumer = consumer; txq->txq_free += txfree; txq->txq_lastintr -= uimin(txq->txq_lastintr, txfree); -#if 0 - printf("%s: freed %zu descriptors\n", - __func__, txfree); -#endif - return pq3etsec_txq_fillable_p(sc, txq); + ret = pq3etsec_txq_fillable_p(sc, txq); + break; } /* @@ -2274,6 +2270,7 @@ pq3etsec_txq_consume( if (txfree != 0) rnd_add_uint32(&sc->rnd_source, txfree); + return ret; } static void
CVS commit: src/external/gpl3/binutils.old/dist/bfd
Module Name:src Committed By: rin Date: Thu Apr 22 01:14:18 UTC 2021 Modified Files: src/external/gpl3/binutils.old/dist/bfd: elf32-ppc.c elf64-ppc.c Log Message: Apply this fix also for binutils.old. http://www.nerv.org/netbsd/?q=id:20210422T010948Z.f87d2246188cfedb66a0d5a012c107b6a2b9f395 > Fix regression where ld(1) is trapped into infinite loop when > linking binary whose text does not fit within R_PPC_REL24. > > Reported upstream as Bug 27755: > https://sourceware.org/bugzilla/show_bug.cgi?id=27755 > > This problem was introduced to binutils-2-31-1 for our tree. > netbsd-9 is affected, while netbsd-8 is not. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c diff -u src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c:1.7 src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c:1.8 --- src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c:1.7 Fri Apr 3 17:51:04 2020 +++ src/external/gpl3/binutils.old/dist/bfd/elf32-ppc.c Thu Apr 22 01:14:18 2021 @@ -5392,7 +5392,7 @@ ppc_elf_inline_plt (struct bfd_link_info return FALSE; relend = relstart + sec->reloc_count; - for (rel = relstart; rel < relend; ) + for (rel = relstart; rel < relend; rel++) { enum elf_ppc_reloc_type r_type; unsigned long r_symndx; Index: src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c diff -u src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c:1.8 src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c:1.9 --- src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c:1.8 Fri Apr 3 17:51:04 2020 +++ src/external/gpl3/binutils.old/dist/bfd/elf64-ppc.c Thu Apr 22 01:14:18 2021 @@ -8391,7 +8391,7 @@ ppc64_elf_inline_plt (struct bfd_link_in return FALSE; relend = relstart + sec->reloc_count; - for (rel = relstart; rel < relend; ) + for (rel = relstart; rel < relend; rel++) { enum elf_ppc64_reloc_type r_type; unsigned long r_symndx;
CVS commit: src/external/gpl3/binutils/dist/bfd
Module Name:src Committed By: rin Date: Thu Apr 22 01:09:48 UTC 2021 Modified Files: src/external/gpl3/binutils/dist/bfd: elf32-ppc.c elf64-ppc.c Log Message: Fix regression where ld(1) is trapped into infinite loop when linking binary whose text does not fit within R_PPC_REL24. Reported upstream as Bug 27755: https://sourceware.org/bugzilla/show_bug.cgi?id=27755 This problem was introduced to binutils-2-31-1 for our tree. netbsd-9 is affected, while netbsd-8 is not. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/binutils/dist/bfd/elf32-ppc.c \ src/external/gpl3/binutils/dist/bfd/elf64-ppc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/binutils/dist/bfd/elf32-ppc.c diff -u src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.15 src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.16 --- src/external/gpl3/binutils/dist/bfd/elf32-ppc.c:1.15 Fri Apr 3 23:48:46 2020 +++ src/external/gpl3/binutils/dist/bfd/elf32-ppc.c Thu Apr 22 01:09:48 2021 @@ -4235,7 +4235,7 @@ ppc_elf_inline_plt (struct bfd_link_info return FALSE; relend = relstart + sec->reloc_count; - for (rel = relstart; rel < relend; ) + for (rel = relstart; rel < relend; rel++) { enum elf_ppc_reloc_type r_type; unsigned long r_symndx; Index: src/external/gpl3/binutils/dist/bfd/elf64-ppc.c diff -u src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.15 src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.16 --- src/external/gpl3/binutils/dist/bfd/elf64-ppc.c:1.15 Fri Apr 3 23:48:46 2020 +++ src/external/gpl3/binutils/dist/bfd/elf64-ppc.c Thu Apr 22 01:09:48 2021 @@ -7507,7 +7507,7 @@ ppc64_elf_inline_plt (struct bfd_link_in return FALSE; relend = relstart + sec->reloc_count; - for (rel = relstart; rel < relend; ) + for (rel = relstart; rel < relend; rel++) { enum elf_ppc64_reloc_type r_type; unsigned long r_symndx;
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Wed Apr 21 18:13:02 UTC 2021 Modified Files: src/doc [netbsd-9]: CHANGES-9.2 Log Message: Tickets #1247 - #1249 To generate a diff of this commit: cvs rdiff -u -r1.1.2.66 -r1.1.2.67 src/doc/CHANGES-9.2 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.2 diff -u src/doc/CHANGES-9.2:1.1.2.66 src/doc/CHANGES-9.2:1.1.2.67 --- src/doc/CHANGES-9.2:1.1.2.66 Fri Apr 16 17:04:59 2021 +++ src/doc/CHANGES-9.2 Wed Apr 21 18:13:02 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.2,v 1.1.2.66 2021/04/16 17:04:59 martin Exp $ +# $NetBSD: CHANGES-9.2,v 1.1.2.67 2021/04/21 18:13:02 martin Exp $ A complete list of changes from the NetBSD 9.1 release to the NetBSD 9.2 release: @@ -2939,3 +2939,20 @@ crypto/external/bsd/openssl/lib/libcrypt Restore sparcv9 optimization for 32bit builds on sparc64. [mrg, ticket #1246] +sys/arch/zaurus/dev/w100lcd.c 1.3 + + Make LCD BrightnessUp/BrightnessDown work on C7x0/860. + [tsutsui, ticket #1247] + +sys/arch/hp300/dev/diofb.c 1.5 +sys/arch/hp300/dev/topcat.c 1.5 + + topcat(4) framebuffer: + - fix panic on monochrome framebuffers. + - fix incorrect framebuffer width of 98542/98544 framebuffers on HP332. + [tsutsui, ticket #1248] + +sys/arch/sparc/conf/GENERIC (apply patch) + + PR 56077: remove options DIAGNOSTIC. + [tsutsui, ticket #1249]
CVS commit: [netbsd-9] src/sys/arch/sparc/conf
Module Name:src Committed By: martin Date: Wed Apr 21 18:11:06 UTC 2021 Modified Files: src/sys/arch/sparc/conf [netbsd-9]: GENERIC Log Message: Apply patch, requested by tsutsui in ticket #1249: sys/arch/sparc/conf/GENERIC (apply patch) PR 56077: remove DIAGNOSTIC from sparc kernel. To generate a diff of this commit: cvs rdiff -u -r1.267 -r1.267.2.1 src/sys/arch/sparc/conf/GENERIC 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/sparc/conf/GENERIC diff -u src/sys/arch/sparc/conf/GENERIC:1.267 src/sys/arch/sparc/conf/GENERIC:1.267.2.1 --- src/sys/arch/sparc/conf/GENERIC:1.267 Wed May 8 13:40:16 2019 +++ src/sys/arch/sparc/conf/GENERIC Wed Apr 21 18:11:06 2021 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.267 2019/05/08 13:40:16 isaki Exp $ +# $NetBSD: GENERIC,v 1.267.2.1 2021/04/21 18:11:06 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/sparc/conf/std.sparc" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.267 $" +#ident "GENERIC-$Revision: 1.267.2.1 $" maxusers 32 @@ -125,7 +125,7 @@ options DDB_HISTORY_SIZE=100 # enable h ## Adds code to the kernel that does internal consistency checks, and will ## cause the kernel to panic if corruption of internal data structures ## is detected. -options DIAGNOSTIC # extra kernel sanity checking +#options DIAGNOSTIC # extra kernel sanity checking ## Enable (possibly expensive) debugging code that may also display messages ## on the system console
CVS commit: [netbsd-9] src/sys/arch/hp300/dev
Module Name:src Committed By: martin Date: Wed Apr 21 17:59:48 UTC 2021 Modified Files: src/sys/arch/hp300/dev [netbsd-9]: diofb.c topcat.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1248): sys/arch/hp300/dev/topcat.c: revision 1.5 sys/arch/hp300/dev/diofb.c: revision 1.5 Fix two problems on old topcat(4) framebuffers found on HP332/340. - Fix panic on monochrome framebuffers. They don't have palette registers. The problem was reported from Anders Gustafsson and also Andrew Gillham back in 2013: https://mail-index.netbsd.org/port-hp300/2013/09/27/msg86.html https://mail-index.netbsd.org/port-hp300/2013/09/28/msg87.html - Fix incorrect framebuffer width of 98542/98544 framebuffers on HP332. Reported from Andrew Gillham (98542) as above and Chris Hanson (98543): https://mail-index.netbsd.org/port-hp300/2013/09/27/msg83.html https://mail-index.netbsd.org/port-hp300/2020/05/01/msg000164.html Worth to pullup to netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.34.1 src/sys/arch/hp300/dev/diofb.c cvs rdiff -u -r1.4 -r1.4.64.1 src/sys/arch/hp300/dev/topcat.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/hp300/dev/diofb.c diff -u src/sys/arch/hp300/dev/diofb.c:1.4 src/sys/arch/hp300/dev/diofb.c:1.4.34.1 --- src/sys/arch/hp300/dev/diofb.c:1.4 Mon Mar 24 19:42:58 2014 +++ src/sys/arch/hp300/dev/diofb.c Wed Apr 21 17:59:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: diofb.c,v 1.4 2014/03/24 19:42:58 christos Exp $ */ +/* $NetBSD: diofb.c,v 1.4.34.1 2021/04/21 17:59:47 martin Exp $ */ /* $OpenBSD: diofb.c,v 1.18 2010/12/26 15:40:59 miod Exp $ */ /* @@ -146,6 +146,15 @@ diofb_fbinquire(struct diofb *fb, int sc if (fb->dheight > fb->fbheight) fb->dheight = fb->fbheight; + /* + * Some displays, such as the HP332 and HP340 internal video + * appear to return a display width of 1024 instead of 512. + */ + if (fbr->num_planes == 1 || fbr->num_planes == 4) { + if (fb->dwidth == 1024 && fb->dheight == 400) + fb->dwidth = 512; + } + fb->planes = fbr->num_planes; if (fb->planes > 8) fb->planes = 8; Index: src/sys/arch/hp300/dev/topcat.c diff -u src/sys/arch/hp300/dev/topcat.c:1.4 src/sys/arch/hp300/dev/topcat.c:1.4.64.1 --- src/sys/arch/hp300/dev/topcat.c:1.4 Fri Feb 18 19:15:43 2011 +++ src/sys/arch/hp300/dev/topcat.c Wed Apr 21 17:59:47 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: topcat.c,v 1.4 2011/02/18 19:15:43 tsutsui Exp $ */ +/* $NetBSD: topcat.c,v 1.4.64.1 2021/04/21 17:59:47 martin Exp $ */ /* $OpenBSD: topcat.c,v 1.15 2006/08/11 18:33:13 miod Exp $ */ /* @@ -274,7 +274,10 @@ topcat_end_attach(struct topcat_softc *s case GID_TOPCAT: switch (sc->sc_fb->planes) { case 1: - fbname = "HP98544 topcat"; + if (sc->sc_fb->dheight == 400) +fbname = "HP98542 topcat"; + else +fbname = "HP98544 topcat"; break; case 4: if (sc->sc_fb->dheight == 400) @@ -413,8 +416,12 @@ topcat_ioctl(void *v, void *vs, u_long c *(u_int *)data = fb->ri.ri_stride; return 0; case WSDISPLAYIO_GETCMAP: + if (fb->planemask == 1) + return EPASSTHROUGH; return diofb_getcmap(fb, (struct wsdisplay_cmap *)data); case WSDISPLAYIO_PUTCMAP: + if (fb->planemask == 1) + return EPASSTHROUGH; return topcat_setcmap(fb, (struct wsdisplay_cmap *)data); case WSDISPLAYIO_GVIDEO: case WSDISPLAYIO_SVIDEO: @@ -429,6 +436,10 @@ topcat_setcolor(struct diofb *fb, u_int { volatile struct tcboxfb *tc = (struct tcboxfb *)fb->regkva; + /* No color map registers on monochrome framebuffers. */ + if (fb->planemask == 1) + return; + if (tc->regs.fbid != GID_TOPCAT) { tccm_waitbusy(tc); tc->plane_mask = 0xff;
CVS commit: [netbsd-9] src/sys/arch/zaurus/dev
Module Name:src Committed By: martin Date: Wed Apr 21 17:51:34 UTC 2021 Modified Files: src/sys/arch/zaurus/dev [netbsd-9]: w100lcd.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1247): sys/arch/zaurus/dev/w100lcd.c: revision 1.3 Make LCD BrightnessUp/BrightnessDown work on C7x0/860. Patch from steleto: https://gist.github.com/steleto/10f62a074bff0c188fcc10c14ef40b5a and also confirmed by me on SL-C700. Worth to pullup to netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.2.56.1 src/sys/arch/zaurus/dev/w100lcd.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/zaurus/dev/w100lcd.c diff -u src/sys/arch/zaurus/dev/w100lcd.c:1.2 src/sys/arch/zaurus/dev/w100lcd.c:1.2.56.1 --- src/sys/arch/zaurus/dev/w100lcd.c:1.2 Fri Feb 10 11:25:42 2012 +++ src/sys/arch/zaurus/dev/w100lcd.c Wed Apr 21 17:51:34 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $ */ +/* $NetBSD: w100lcd.c,v 1.2.56.1 2021/04/21 17:51:34 martin Exp $ */ /* * Copyright (c) 2002, 2003 Genetec Corporation. All rights reserved. * Written by Hiroyuki Bessho for Genetec Corporation. @@ -39,7 +39,9 @@ * LCD on/off switch and backlight brightness are done in lcdctl.c. */ #include -__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.2 2012/02/10 11:25:42 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v 1.2.56.1 2021/04/21 17:51:34 martin Exp $"); + +#include "lcdctl.h" #include #include @@ -58,6 +60,9 @@ __KERNEL_RCSID(0, "$NetBSD: w100lcd.c,v #include #include +#if NLCDCTL > 0 +#include +#endif /* * wsdisplay glue
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Apr 21 17:50:03 UTC 2021 Modified Files: src/doc [netbsd-8]: CHANGES-8.3 Log Message: Ticket #1671 To generate a diff of this commit: cvs rdiff -u -r1.1.2.82 -r1.1.2.83 src/doc/CHANGES-8.3 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-8.3 diff -u src/doc/CHANGES-8.3:1.1.2.82 src/doc/CHANGES-8.3:1.1.2.83 --- src/doc/CHANGES-8.3:1.1.2.82 Tue Apr 6 18:10:43 2021 +++ src/doc/CHANGES-8.3 Wed Apr 21 17:50:03 2021 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.3,v 1.1.2.82 2021/04/06 18:10:43 martin Exp $ +# $NetBSD: CHANGES-8.3,v 1.1.2.83 2021/04/21 17:50:03 martin Exp $ A complete list of changes from the NetBSD 8.2 release to the NetBSD 8.3 release: @@ -1840,3 +1840,8 @@ bin/ps/print.c 1.133 column header is specified. [simonb, ticket #1669] +external/bsd/file/dist/magic/magdir/python (apply patch) +external/bsd/file/dist/magic/magdir/windows (apply patch) + + Enhance regex portability (by copying over the versions from file 5.40). + [mrg, ticket #1671}
CVS commit: [netbsd-8] src/external/bsd/file/dist/magic/magdir
Module Name:src Committed By: martin Date: Wed Apr 21 17:47:40 UTC 2021 Modified Files: src/external/bsd/file/dist/magic/magdir [netbsd-8]: python windows Log Message: Apply patch, requested by mrg in ticket #1671: external/bsd/file/dist/magic/magdir/python external/bsd/file/dist/magic/magdir/windows Enhance regex portability (by copying over the versions from file 5.40). To generate a diff of this commit: cvs rdiff -u -r1.1.1.9 -r1.1.1.9.2.1 \ src/external/bsd/file/dist/magic/magdir/python cvs rdiff -u -r1.1.1.8 -r1.1.1.8.2.1 \ src/external/bsd/file/dist/magic/magdir/windows Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/file/dist/magic/magdir/python diff -u src/external/bsd/file/dist/magic/magdir/python:1.1.1.9 src/external/bsd/file/dist/magic/magdir/python:1.1.1.9.2.1 --- src/external/bsd/file/dist/magic/magdir/python:1.1.1.9 Wed May 24 23:59:57 2017 +++ src/external/bsd/file/dist/magic/magdir/python Wed Apr 21 17:47:40 2021 @@ -71,7 +71,8 @@ !:mime text/x-python # def name(args, args): -0 regex \^(\ |\\t){0,50}def\ {1,50}[a-zA-Z]{1,100} ->&0 regex \ {0,50}\\(([a-zA-Z]|,|\ ){1,255}\\):$ Python script text executable -!:mime text/x-python +0 search/8192 def\ +>0 regex \^[[:space:]]{0,50}def\ {1,50}[_a-zA-Z]{1,100} +>>&0 regex \\(([[:alpha:]*_,\ ]){0,255}\\):$ Python script text executable !:strength + 15 +!:mime text/x-script.python Index: src/external/bsd/file/dist/magic/magdir/windows diff -u src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8 src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8.2.1 --- src/external/bsd/file/dist/magic/magdir/windows:1.1.1.8 Wed May 24 23:59:57 2017 +++ src/external/bsd/file/dist/magic/magdir/windows Wed Apr 21 17:47:40 2021 @@ -299,7 +299,7 @@ # Windows *.INF *.INI files updated by Joerg Jenderek at Apr 2013 # empty ,comment , section # PR/383: remove unicode BOM because it is not portable across regex impls -0 regex/s \\`(\\r\\n|;|[[]) +#0 regex/s \\`(\\r\\n|;|[[]) # left bracket in section line >&0 search/8192 [ # http://en.wikipedia.org/wiki/Autorun.inf
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Wed Apr 21 16:23:47 UTC 2021 Modified Files: src/common/lib/libc/arch/aarch64/atomic: Makefile.inc atomic_swap_16.S atomic_swap_32.S atomic_swap_64.S atomic_swap_8.S Added Files: src/common/lib/libc/arch/aarch64/atomic: __aarch64_swp1_acq.S __aarch64_swp1_acq_rel.S __aarch64_swp1_rel.S __aarch64_swp1_relax.S __aarch64_swp2_acq.S __aarch64_swp2_acq_rel.S __aarch64_swp2_rel.S __aarch64_swp2_relax.S __aarch64_swp4_acq.S __aarch64_swp4_acq_rel.S __aarch64_swp4_rel.S __aarch64_swp4_relax.S __aarch64_swp8_acq.S __aarch64_swp8_acq_rel.S __aarch64_swp8_rel.S __aarch64_swp8_relax.S Removed Files: src/common/lib/libc/arch/aarch64/atomic: atomic_swap_acq_16.S atomic_swap_acq_32.S atomic_swap_acq_64.S atomic_swap_acq_8.S atomic_swap_acq_rel_16.S atomic_swap_acq_rel_32.S atomic_swap_acq_rel_64.S atomic_swap_acq_rel_8.S atomic_swap_rel_16.S atomic_swap_rel_32.S atomic_swap_rel_64.S atomic_swap_rel_8.S Log Message: Do previous differently as the API is different. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/common/lib/libc/arch/aarch64/atomic/Makefile.inc cvs rdiff -u -r0 -r1.1 \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp1_acq.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp1_acq_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp1_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp1_relax.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp2_acq.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp2_acq_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp2_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp2_relax.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp4_acq.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp4_acq_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp4_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp4_relax.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp8_acq.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp8_acq_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp8_rel.S \ src/common/lib/libc/arch/aarch64/atomic/__aarch64_swp8_relax.S cvs rdiff -u -r1.3 -r1.4 \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_8.S cvs rdiff -u -r1.1 -r0 \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_8.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_8.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/atomic/Makefile.inc diff -u src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.2 src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.3 --- src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.2 Wed Apr 21 07:31:37 2021 +++ src/common/lib/libc/arch/aarch64/atomic/Makefile.inc Wed Apr 21 16:23:47 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.2 2021/04/21 07:31:37 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.3 2021/04/21 16:23:47 skrll Exp $ .if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \ || ${LIB} == "rump") @@ -12,10 +12,10 @@ SRCS.atomic+= atomic_dec_32.S atomic_dec SRCS.atomic+= atomic_inc_32.S atomic_inc_64.S SRCS.atomic+= membar_ops.S #and cas nand or sub swap xor -.for op in swap -.for sz in 8 16 32 64 -.for ar in acq rel acq_rel -SRCS.atomic+= atomic_${op}_${ar}_${sz}.S +.for op in swp +.for sz in 1 2 4 8 +.for ar in relax acq rel acq_rel +SRCS.atomic+= __aarch64_${op}${sz}_${ar}.S .endfor .endfor .endfor Index: src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S diff -u src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.3 src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.4 --- src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.3 Wed Apr 21 07:31:37 2021 +++
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Wed Apr 21 14:04:26 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Added Files: src/tests/usr.bin/xlint/lint1: emit.ln Log Message: Put things back, emit.ln it was meant to be there. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r0 -r1.3 src/tests/usr.bin/xlint/lint1/emit.ln Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/Makefile diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.50 src/tests/usr.bin/xlint/lint1/Makefile:1.51 --- src/tests/usr.bin/xlint/lint1/Makefile:1.50 Wed Apr 21 09:41:42 2021 +++ src/tests/usr.bin/xlint/lint1/Makefile Wed Apr 21 10:04:26 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2021/04/21 13:41:42 christos Exp $ +# $NetBSD: Makefile,v 1.51 2021/04/21 14:04:26 christos Exp $ NOMAN= # defined MAX_MESSAGE= 343 # see lint1/err.c @@ -102,6 +102,7 @@ FILES+= d_typename_as_var.c FILES+= d_zero_sized_arrays.c FILES+= emit.c FILES+= emit.exp +FILES+= emit.ln FILES+= feat_stacktrace.c FILES+= feat_stacktrace.exp FILES+= gcc_init_compound_literal.c Added files: Index: src/tests/usr.bin/xlint/lint1/emit.ln diff -u /dev/null src/tests/usr.bin/xlint/lint1/emit.ln:1.3 --- /dev/null Wed Apr 21 10:04:26 2021 +++ src/tests/usr.bin/xlint/lint1/emit.ln Wed Apr 21 10:04:26 2021 @@ -0,0 +1,52 @@ +0semit.c +Semit.c +47d0.47e12extern__BoolB +48d0.48e21extern__Complex_floatsX +49d0.49e22extern__Complex_doubleX +50d0.50e27extern__Complex_long_doublelX +51d0.51e11extern_charC +52d0.52e18extern_signed_charsC +53d0.53e20extern_unsigned_charuC +54d0.54e12extern_shortS +55d0.55e19extern_signed_shortS +56d0.56e21extern_unsigned_shortuS +57d0.57e10extern_intI +58d0.58e17extern_signed_intI +59d0.59e19extern_unsigned_intuI +60d0.60e11extern_longL +61d0.61e18extern_signed_longL +62d0.62e20extern_unsigned_longuL +63d0.63e16extern_long_longQ +64d0.64e23extern_signed_long_longQ +65d0.65e25extern_unsigned_long_longuQ +66d0.66e12extern_floatsD +67d0.67e13extern_doubleD +68d0.68e18extern_long_doublelD +74d0.74e22extern_pointer_to_voidPV +75d0.75e21extern_array_5_of_intA5I +82d0.82e17extern_struct_tagsT110struct_tag +83d0.83e21extern_struct_typedefsT214struct_typedef +84d0.84e16extern_union_taguT19union_tag +85d0.85e20extern_union_typedefuT213union_typedef +86d0.86e15extern_enum_tageT18enum_tag +87d0.87e19extern_enum_typedefeT212enum_typedef +91d0.91e23extern_anonymous_structsT389.0.0 +94d0.94e22extern_anonymous_unionuT392.0.0 +97d0.97e21extern_anonymous_enumeT395.0.0 +105d0.105e12declared_intI +106d0.106t11defined_intI +113d0.113e16extern_const_intcI +114d0.114e19extern_volatile_intvI +115d0.115e25extern_const_volatile_intcvI +121d0.121e30return_void_unknown_parametersFV +122d0.122e38return_implicit_int_unknown_parametersFI +125d0.125e32extern_return_void_no_parametersF0V +126d0.126e25return_void_no_parametersF0V +127d0.127es32static_return_void_no_parametersF0V +129d0.129e10taking_intF1IV +131d0.131e16taking_const_intF1cIV +132d0.132e22taking_int_double_boolF3IDBV +134d0.133e29taking_struct_union_enum_tagsF3sT110struct_taguT19union_tageT18enum_tagV +136d0.135e33taking_struct_union_enum_typedefsF3sT214struct_typedefuT213union_typedefeT212enum_typedefV +138d0.138e14taking_varargsF2PcCEV +146d0.146es15static_functionF0I
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: christos Date: Wed Apr 21 13:41:42 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Removed Files: src/tests/usr.bin/xlint/lint1: emit.ln Log Message: remove emit.ln; looks like an accident and breaks the build. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/tests/usr.bin/xlint/lint1/Makefile cvs rdiff -u -r1.1 -r0 src/tests/usr.bin/xlint/lint1/emit.ln Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/Makefile diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.49 src/tests/usr.bin/xlint/lint1/Makefile:1.50 --- src/tests/usr.bin/xlint/lint1/Makefile:1.49 Wed Apr 21 09:26:16 2021 +++ src/tests/usr.bin/xlint/lint1/Makefile Wed Apr 21 09:41:42 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2021/04/21 13:26:16 rillig Exp $ +# $NetBSD: Makefile,v 1.50 2021/04/21 13:41:42 christos Exp $ NOMAN= # defined MAX_MESSAGE= 343 # see lint1/err.c @@ -102,7 +102,6 @@ FILES+= d_typename_as_var.c FILES+= d_zero_sized_arrays.c FILES+= emit.c FILES+= emit.exp -FILES+= emit.ln FILES+= feat_stacktrace.c FILES+= feat_stacktrace.exp FILES+= gcc_init_compound_literal.c
CVS commit: src/tests/usr.bin/xlint/lint1
Module Name:src Committed By: rillig Date: Wed Apr 21 13:26:16 UTC 2021 Modified Files: src/tests/usr.bin/xlint/lint1: Makefile Log Message: tests/lint: fix the hack for emit.ln to also work if MKUPDATE != "no" To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/tests/usr.bin/xlint/lint1/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.bin/xlint/lint1/Makefile diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.48 src/tests/usr.bin/xlint/lint1/Makefile:1.49 --- src/tests/usr.bin/xlint/lint1/Makefile:1.48 Tue Apr 20 23:30:35 2021 +++ src/tests/usr.bin/xlint/lint1/Makefile Wed Apr 21 13:26:16 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2021/04/20 23:30:35 rillig Exp $ +# $NetBSD: Makefile,v 1.49 2021/04/21 13:26:16 rillig Exp $ NOMAN= # defined MAX_MESSAGE= 343 # see lint1/err.c @@ -117,7 +117,11 @@ FILES+= op_colon.exp # depend in ${DESTDIR}/emit.c, but these files are not intended to depend on # each other, they have these suffixes just for convenience and convention. .if make(install) +. if ${MKUPDATE} == "no" # see bsd.files.mk ${DESTDIR}${FILESDIR}/emit.ln! .PHONY +. else +${DESTDIR}${FILESDIR}/emit.ln: .PHONY +. endif .endif # - end hack -
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Wed Apr 21 13:12:43 UTC 2021 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: regenerate To generate a diff of this commit: cvs rdiff -u -r1.1411 -r1.1412 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1410 -r1.1411 src/sys/dev/pci/pcidevs_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/pci/pcidevs.h diff -u src/sys/dev/pci/pcidevs.h:1.1411 src/sys/dev/pci/pcidevs.h:1.1412 --- src/sys/dev/pci/pcidevs.h:1.1411 Fri Apr 2 01:08:02 2021 +++ src/sys/dev/pci/pcidevs.h Wed Apr 21 13:12:42 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs.h,v 1.1411 2021/04/02 01:08:02 rin Exp $ */ +/* $NetBSD: pcidevs.h,v 1.1412 2021/04/21 13:12:42 jakllsch Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1425 2021/04/02 01:07:16 rin Exp + * NetBSD: pcidevs,v 1.1426 2021/04/21 13:09:33 jakllsch Exp */ /* @@ -7567,7 +7567,7 @@ #define PCI_PRODUCT_REALTEK_RT8029 0x8029 /* 8029 Ethernet */ #define PCI_PRODUCT_REALTEK_RT8139D 0x8039 /* 8139D 10/100 Ethernet */ #define PCI_PRODUCT_REALTEK_RT8100 0x8100 /* 8100 10/100 Ethernet */ -#define PCI_PRODUCT_REALTEK_RT8125 0x8125 /* 8129 10/100/1G/2.5G Ethernet */ +#define PCI_PRODUCT_REALTEK_RT8125 0x8125 /* 8125 10/100/1G/2.5G Ethernet */ #define PCI_PRODUCT_REALTEK_RT8129 0x8129 /* 8129 10/100 Ethernet */ #define PCI_PRODUCT_REALTEK_RT8101E 0x8136 /* 8100E/8101E/8102E 10/100 Ethernet */ #define PCI_PRODUCT_REALTEK_RT8138 0x8138 /* 8138 10/100 Ethernet */ Index: src/sys/dev/pci/pcidevs_data.h diff -u src/sys/dev/pci/pcidevs_data.h:1.1410 src/sys/dev/pci/pcidevs_data.h:1.1411 --- src/sys/dev/pci/pcidevs_data.h:1.1410 Fri Apr 2 01:08:02 2021 +++ src/sys/dev/pci/pcidevs_data.h Wed Apr 21 13:12:42 2021 @@ -1,10 +1,10 @@ -/* $NetBSD: pcidevs_data.h,v 1.1410 2021/04/02 01:08:02 rin Exp $ */ +/* $NetBSD: pcidevs_data.h,v 1.1411 2021/04/21 13:12:42 jakllsch Exp $ */ /* * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: pcidevs,v 1.1425 2021/04/02 01:07:16 rin Exp + * NetBSD: pcidevs,v 1.1426 2021/04/21 13:09:33 jakllsch Exp */ /* @@ -13470,439 +13470,439 @@ static const uint16_t pci_products[] = { PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8125, 33098, 33103, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8129, - 33098, 5786, 5684, 0, - PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8101E, 33118, 5786, 5684, 0, + PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8101E, + 33123, 5786, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8138, - 33136, 5786, 5684, 0, + 33141, 5786, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8139, 7566, 5786, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169SC, - 33141, 5699, 5684, 0, + 33146, 5699, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8168, - 33155, 5699, 5684, 0, + 33160, 5699, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8169, - 33165, 5699, 5684, 0, + 33170, 5699, 5684, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8188CE, - 33175, 4759, 4534, 33185, 18821, 19433, 0, + 33180, 4759, 4534, 33190, 18821, 19433, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8192CE, - 33193, 4759, 4534, 33185, 18821, 19433, 0, + 33198, 4759, 4534, 33190, 18821, 19433, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8188EE, - 33203, 4759, 4534, 33185, 18821, 19433, 0, + 33208, 4759, 4534, 33190, 18821, 19433, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8180, - 33213, 7653, 0, + 33218, 7653, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RT8185, - 33218, 33223, 0, + 33223, 33228, 0, PCI_VENDOR_REALTEK, PCI_PRODUCT_REALTEK_RTL8192EE, - 33235, 4759, 4534, 33185, 18821, 19433, 0, + 33240, 4759, 4534, 33190, 18821, 19433, 0, PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_PPB, - 33245, 8506, 0, + 33250, 8506, 0, PCI_VENDOR_REDHAT, PCI_PRODUCT_REDHAT_QXL, - 33250, 234, 0, + 33255, 234, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7780, - 33254, 615, 6422, 0, + 33259, 615, 6422, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7785, - 33261, 615, 6422, 0, + 33266, 615, 6422, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PBI, - 33268, 8140, 33275, 33285, 0, + 33273, 8140, 33280, 33290, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PPB, - 33268, 9419, 6530, 33291, 0, + 33273, 9419, 6530, 33296, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_SH7757_PS, - 33268, 8140, 14350, 33297, 0, + 33273, 8140, 14350, 33302, 0, PCI_VENDOR_RENESAS, PCI_PRODUCT_RENESAS_PD720201, - 33302, 6912, 8200, 6920, 6422, 0, + 33307, 6912, 8200, 6920, 6422, 0, P
CVS commit: src/sys/dev/pci
Module Name:src Committed By: jakllsch Date: Wed Apr 21 13:09:33 UTC 2021 Modified Files: src/sys/dev/pci: pcidevs Log Message: Fix Realtek RTL8125 description To generate a diff of this commit: cvs rdiff -u -r1.1425 -r1.1426 src/sys/dev/pci/pcidevs 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/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1425 src/sys/dev/pci/pcidevs:1.1426 --- src/sys/dev/pci/pcidevs:1.1425 Fri Apr 2 01:07:16 2021 +++ src/sys/dev/pci/pcidevs Wed Apr 21 13:09:33 2021 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1425 2021/04/02 01:07:16 rin Exp $ +$NetBSD: pcidevs,v 1.1426 2021/04/21 13:09:33 jakllsch Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -7560,7 +7560,7 @@ product REALTEK RTL8411 0x5289 RTL8411 product REALTEK RT8029 0x8029 8029 Ethernet product REALTEK RT8139D 0x8039 8139D 10/100 Ethernet product REALTEK RT8100 0x8100 8100 10/100 Ethernet -product REALTEK RT8125 0x8125 8129 10/100/1G/2.5G Ethernet +product REALTEK RT8125 0x8125 8125 10/100/1G/2.5G Ethernet product REALTEK RT8129 0x8129 8129 10/100 Ethernet product REALTEK RT8101E 0x8136 8100E/8101E/8102E 10/100 Ethernet product REALTEK RT8138 0x8138 8138 10/100 Ethernet
CVS commit: src/external/cddl/osnet/dist/uts/common/fs/zfs
Module Name:src Committed By: hannken Date: Wed Apr 21 10:02:34 UTC 2021 Modified Files: src/external/cddl/osnet/dist/uts/common/fs/zfs: arc.c Log Message: Prevent blocking l2arc_feed_thread() forever, skip the cv_timedwait() for negative or zero ticks. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 \ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.19 src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.20 --- src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c:1.19 Thu Jun 11 19:20:42 2020 +++ src/external/cddl/osnet/dist/uts/common/fs/zfs/arc.c Wed Apr 21 10:02:34 2021 @@ -7246,8 +7246,15 @@ l2arc_feed_thread(void *dummy __unused) while (l2arc_thread_exit == 0) { CALLB_CPR_SAFE_BEGIN(&cpr); +#ifdef __NetBSD__ + clock_t now = ddi_get_lbolt(); + if (next > now) + (void) cv_timedwait(&l2arc_feed_thr_cv, + &l2arc_feed_thr_lock, next - now); +#else (void) cv_timedwait(&l2arc_feed_thr_cv, &l2arc_feed_thr_lock, next - ddi_get_lbolt()); +#endif CALLB_CPR_SAFE_END(&cpr, &l2arc_feed_thr_lock); next = ddi_get_lbolt() + hz;
CVS commit: src/sys/arch/aarch64/aarch64
Module Name:src Committed By: ryo Date: Wed Apr 21 09:52:21 UTC 2021 Modified Files: src/sys/arch/aarch64/aarch64: pmap.c Log Message: added more attributes of PTE displayed by "ddb>machine pte" To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/sys/arch/aarch64/aarch64/pmap.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/aarch64/aarch64/pmap.c diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.104 src/sys/arch/aarch64/aarch64/pmap.c:1.105 --- src/sys/arch/aarch64/aarch64/pmap.c:1.104 Sat Apr 17 01:53:58 2021 +++ src/sys/arch/aarch64/aarch64/pmap.c Wed Apr 21 09:52:20 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.104 2021/04/17 01:53:58 mrg Exp $ */ +/* $NetBSD: pmap.c,v 1.105 2021/04/21 09:52:20 ryo Exp $ */ /* * Copyright (c) 2017 Ryo Shimizu @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.104 2021/04/17 01:53:58 mrg Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.105 2021/04/21 09:52:20 ryo Exp $"); #include "opt_arm_debug.h" #include "opt_ddb.h" @@ -2779,6 +2779,12 @@ pmap_db_pte_print(pt_entry_t pte, int le case LX_BLKPAG_ATTR_DEVICE_MEM: pr(", DEVICE"); break; + case LX_BLKPAG_ATTR_DEVICE_MEM_SO: + pr(", DEVICE(SO)"); + break; + default: + pr(", ATTR(%lu)", __SHIFTOUT(pte, LX_BLKPAG_ATTR_INDX)); + break; } if (pte & LX_BLKPAG_OS_BOOT)
CVS commit: src/common/lib/libc/arch/aarch64/atomic
Module Name:src Committed By: skrll Date: Wed Apr 21 07:31:38 UTC 2021 Modified Files: src/common/lib/libc/arch/aarch64/atomic: Makefile.inc atomic_swap_16.S atomic_swap_32.S atomic_swap_64.S atomic_swap_8.S Added Files: src/common/lib/libc/arch/aarch64/atomic: atomic_swap_acq_16.S atomic_swap_acq_32.S atomic_swap_acq_64.S atomic_swap_acq_8.S atomic_swap_acq_rel_16.S atomic_swap_acq_rel_32.S atomic_swap_acq_rel_64.S atomic_swap_acq_rel_8.S atomic_swap_rel_16.S atomic_swap_rel_32.S atomic_swap_rel_64.S atomic_swap_rel_8.S Log Message: Provide some more operations that are part of compiler lse.S. This is incomplete, but at least covers all the atomic_swap ops and allows the aa64 kernel to link with gcc 10. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/aarch64/atomic/Makefile.inc cvs rdiff -u -r1.2 -r1.3 \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_8.S cvs rdiff -u -r0 -r1.1 \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_8.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_acq_rel_8.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_16.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_32.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_64.S \ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_rel_8.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/aarch64/atomic/Makefile.inc diff -u src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.1 src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.2 --- src/common/lib/libc/arch/aarch64/atomic/Makefile.inc:1.1 Sun Aug 10 05:47:35 2014 +++ src/common/lib/libc/arch/aarch64/atomic/Makefile.inc Wed Apr 21 07:31:37 2021 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.1 2014/08/10 05:47:35 matt Exp $ +# $NetBSD: Makefile.inc,v 1.2 2021/04/21 07:31:37 skrll Exp $ .if defined(LIB) && (${LIB} == "kern" || ${LIB} == "c" || ${LIB} == "pthread" \ || ${LIB} == "rump") @@ -11,6 +11,14 @@ SRCS.atomic+= atomic_${op}_${sz}.S SRCS.atomic+= atomic_dec_32.S atomic_dec_64.S SRCS.atomic+= atomic_inc_32.S atomic_inc_64.S SRCS.atomic+= membar_ops.S +#and cas nand or sub swap xor +.for op in swap +.for sz in 8 16 32 64 +.for ar in acq rel acq_rel +SRCS.atomic+= atomic_${op}_${ar}_${sz}.S +.endfor +.endfor +.endfor #.for op in add and nand or sub xor #SRCS.atomic+= sync_fetch_and_${op}_8.S #.endfor Index: src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S diff -u src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.2 src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.3 --- src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S:1.2 Wed Aug 12 12:59:57 2020 +++ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_16.S Wed Apr 21 07:31:37 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap_16.S,v 1.2 2020/08/12 12:59:57 skrll Exp $ */ +/* $NetBSD: atomic_swap_16.S,v 1.3 2021/04/21 07:31:37 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -43,6 +43,7 @@ END(_atomic_swap_16) ATOMIC_OP_ALIAS(atomic_swap_16,_atomic_swap_16) ATOMIC_OP_ALIAS(atomic_swap_short,_atomic_swap_16) ATOMIC_OP_ALIAS(atomic_swap_ushort,_atomic_swap_16) +ATOMIC_OP_ALIAS(__aarch64_swp2_relax,_atomic_swap_16) STRONG_ALIAS(__sync_lock_test_and_set_2,_atomic_swap_16) STRONG_ALIAS(_atomic_swap_short,_atomic_swap_16) STRONG_ALIAS(_atomic_swap_ushort,_atomic_swap_16) Index: src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S diff -u src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S:1.2 src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S:1.3 --- src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S:1.2 Wed Aug 12 12:59:57 2020 +++ src/common/lib/libc/arch/aarch64/atomic/atomic_swap_32.S Wed Apr 21 07:31:37 2021 @@ -1,4 +1,4 @@ -/* $NetBSD: atomic_swap_32.S,v 1.2 2020/08/12 12:59:57 skrll Exp $ */ +/* $NetBSD: atomic_swap_32.S,v 1.3 2021/04/21 07:31:37 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -42,6 +42,7 @@ END(_atomic_swap_32) ATOMIC_OP_ALIAS(atomic_swap_32,_atomic_swap_32) ATOMIC_OP_ALIAS(atomic_swap_uint,_atomic_swap_32) +ATOMIC_OP_ALIAS(__aarch64_swp4_relax,_atomic_swap_32) STRONG_ALIA