CVS commit: src/sys/arch/aarch64/include
Module Name:src Committed By: skrll Date: Sat Jan 19 09:11:55 UTC 2019 Modified Files: src/sys/arch/aarch64/include: param.h Log Message: Increase MSGBUFSIZE To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/aarch64/include/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/sys/arch/aarch64/include/param.h diff -u src/sys/arch/aarch64/include/param.h:1.10 src/sys/arch/aarch64/include/param.h:1.11 --- src/sys/arch/aarch64/include/param.h:1.10 Mon Jan 7 22:00:30 2019 +++ src/sys/arch/aarch64/include/param.h Sat Jan 19 09:11:55 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.10 2019/01/07 22:00:30 jdolecek Exp $ */ +/* $NetBSD: param.h,v 1.11 2019/01/19 09:11:55 skrll Exp $ */ /*- * Copyright (c) 2014 The NetBSD Foundation, Inc. @@ -123,7 +123,7 @@ #ifndef MSGBUFSIZE -#define MSGBUFSIZE 16384 /* default message buffer size */ +#define MSGBUFSIZE 65536 /* default message buffer size */ #endif #define COHERENCY_UNIT 128
CVS commit: xsrc/external/mit/libdrm/dist
Module Name:xsrc
Committed By: tnn
Date: Sat Jan 19 11:50:05 UTC 2019
Modified Files:
xsrc/external/mit/libdrm/dist/intel: intel_bufmgr_gem.c
xsrc/external/mit/libdrm/dist/radeon: radeon_bo_gem.c
Log Message:
reduce diff to upstream
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 \
xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
cvs rdiff -u -r1.8 -r1.9 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c
diff -u xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.16 xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.17
--- xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c:1.16 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/intel/intel_bufmgr_gem.c Sat Jan 19 11:50:05 2019
@@ -1539,10 +1539,12 @@ map_gtt(drm_intel_bo *bo)
}
/* and mmap it */
- ret = drmMap(bufmgr_gem->fd, mmap_arg.offset, bo->size,
- &bo_gem->gtt_virtual);
- if (ret) {
+ bo_gem->gtt_virtual = drm_mmap(0, bo->size, PROT_READ | PROT_WRITE,
+ MAP_SHARED, bufmgr_gem->fd,
+ mmap_arg.offset);
+ if (bo_gem->gtt_virtual == MAP_FAILED) {
bo_gem->gtt_virtual = NULL;
+ ret = -errno;
DBG("%s:%d: Error mapping buffer %d (%s): %s .\n",
__FILE__, __LINE__,
bo_gem->gem_handle, bo_gem->name,
Index: xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c
diff -u xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.8 xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.9
--- xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c:1.8 Thu Jan 10 08:59:43 2019
+++ xsrc/external/mit/libdrm/dist/radeon/radeon_bo_gem.c Sat Jan 19 11:50:05 2019
@@ -175,8 +175,8 @@ static int bo_map(struct radeon_bo_int *
boi, boi->handle, r);
return r;
}
-r = drmMap(boi->bom->fd, args.addr_ptr, args.size, &ptr);
-if (r)
+ptr = drm_mmap(0, args.size, PROT_READ|PROT_WRITE, MAP_SHARED, boi->bom->fd, args.addr_ptr);
+if (ptr == MAP_FAILED)
return -errno;
bo_gem->priv_ptr = ptr;
wait:
CVS commit: src/external/gpl3/gcc/dist
Module Name:src Committed By: mrg Date: Sat Jan 19 12:10:14 UTC 2019 Modified Files: src/external/gpl3/gcc/dist: LAST_UPDATED MD5SUMS NEWS config.guess config.sub configure configure.ac src/external/gpl3/gcc/dist/INSTALL: binaries.html build.html configure.html download.html finalinstall.html gfdl.html index.html old.html prerequisites.html specific.html test.html src/external/gpl3/gcc/dist/fixincludes: configure src/external/gpl3/gcc/dist/gcc: ChangeLog Makefile.in alias.c auto-profile.c builtins.c cfgexpand.c common.opt config.gcc config.host configure configure.ac cppdefault.c debug.h diagnostic.c dse.c dwarf2out.c except.c expr.c final.c gcc.c gcc.h genattrtab.c genemit.c gengtype-lex.c genmultilib genrecog.c ggc-common.c graphite-isl-ast-to-gimple.c graphite.h hwint.h ipa-inline.c ira-color.c opts-global.c opts.c output.h reload.c reload1.c rtlanal.c system.h target-def.h targhooks.c toplev.c tree-cfg.c tree-ssa-ccp.c var-tracking.c varasm.c src/external/gpl3/gcc/dist/gcc/c: Make-lang.in src/external/gpl3/gcc/dist/gcc/c-family: c-format.c c-format.h c-opts.c c.opt src/external/gpl3/gcc/dist/gcc/common/config/arm: arm-common.c src/external/gpl3/gcc/dist/gcc/config: freebsd-spec.h netbsd-elf.h netbsd.h t-linux src/external/gpl3/gcc/dist/gcc/config/aarch64: driver-aarch64.c t-aarch64 src/external/gpl3/gcc/dist/gcc/config/alpha: alpha.h elf.h netbsd.h src/external/gpl3/gcc/dist/gcc/config/arc: arc-modes.def arc-protos.h arc.c arc.h arc.md arc.opt src/external/gpl3/gcc/dist/gcc/config/arm: arm.c arm.h arm.md bpabi.h elf.h freebsd.h netbsd-elf.h t-arm thumb2.md src/external/gpl3/gcc/dist/gcc/config/i386: constraints.md cpuid.h driver-i386.c i386-opts.h i386-protos.h i386.c i386.h i386.md i386.opt netbsd-elf.h netbsd64.h pmm_malloc.h predicates.md src/external/gpl3/gcc/dist/gcc/config/m68k: constraints.md m68k.c m68k.md netbsd-elf.h src/external/gpl3/gcc/dist/gcc/config/mips: mips.c netbsd.h t-mips src/external/gpl3/gcc/dist/gcc/config/pa: pa.c pa.h src/external/gpl3/gcc/dist/gcc/config/rs6000: netbsd.h ppc-asm.h rs6000.c sysv4.h t-netbsd t-rs6000 vxworksae.h src/external/gpl3/gcc/dist/gcc/config/sh: netbsd-elf.h sh.c t-sh src/external/gpl3/gcc/dist/gcc/config/sparc: constraints.md netbsd-elf.h predicates.md sparc.md sync.md src/external/gpl3/gcc/dist/gcc/config/vax: builtins.md constraints.md elf.h netbsd-elf.h predicates.md vax-protos.h vax.c vax.h vax.md src/external/gpl3/gcc/dist/gcc/cp: Make-lang.in cfns.gperf cfns.h decl.c except.c src/external/gpl3/gcc/dist/gcc/doc: cpp.texi cppenv.texi cppinternals.info cppopts.texi extend.texi fsf-funding.7 g++.1 gccinstall.info gccint.info gcov-tool.1 gcov.1 gcov.texi gfdl.7 gfortran.1 gpl.7 invoke.texi src/external/gpl3/gcc/dist/gcc/ginclude: stddef.h unwind-arm-common.h src/external/gpl3/gcc/dist/gcc/objc: Make-lang.in src/external/gpl3/gcc/dist/gcc/objcp: Make-lang.in src/external/gpl3/gcc/dist/include: objalloc.h src/external/gpl3/gcc/dist/intl: configure src/external/gpl3/gcc/dist/libbacktrace: configure src/external/gpl3/gcc/dist/libcpp: Makefile.in configure configure.ac files.c init.c internal.h lex.c macro.c src/external/gpl3/gcc/dist/libcpp/include: cpplib.h src/external/gpl3/gcc/dist/libdecnumber: configure src/external/gpl3/gcc/dist/libgcc: Makefile.in config.host configure unwind-compat.c unwind-dw2-fde-dip.c unwind-dw2-fde.c unwind-dw2.c unwind-generic.h unwind-seh.c unwind-sjlj.c src/external/gpl3/gcc/dist/libgcc/config/alpha: qrnnd.S src/external/gpl3/gcc/dist/libgcc/config/arm: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/c6x: pr-support.c src/external/gpl3/gcc/dist/libgcc/config/cr16: unwind-cr16.c src/external/gpl3/gcc/dist/libgcc/config/i386: morestack.S src/external/gpl3/gcc/dist/libgcc/config/ia64: unwind-ia64.c src/external/gpl3/gcc/dist/libgcc/config/m68k: lb1sf68.S src/external/gpl3/gcc/dist/libgcc/config/xtensa: unwind-dw2-xtensa.c src/external/gpl3/gcc/dist/libgomp: Makefile.am Makefile.in configure configure.ac libgomp.info src/external/gpl3/gcc/dist/libiberty: Makefile.in configure configure.ac floatformat.c make-temp-file.c objalloc.c sha1.c vprintf-support.c src/external/gpl3/gcc/dist/libobjc: configure encoding.c hash.c objects.c sendmsg.c src/external/gpl3/gcc/dist/libsanit
CVS commit: src/external/gpl3/gcc/dist/gcc
Module Name:src Committed By: mrg Date: Sat Jan 19 12:32:06 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc: Makefile.in Log Message: disable new s-selftest rule that relies upon missing testsuite. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/Makefile.in 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/dist/gcc/Makefile.in diff -u src/external/gpl3/gcc/dist/gcc/Makefile.in:1.16 src/external/gpl3/gcc/dist/gcc/Makefile.in:1.17 --- src/external/gpl3/gcc/dist/gcc/Makefile.in:1.16 Sat Jan 19 12:10:04 2019 +++ src/external/gpl3/gcc/dist/gcc/Makefile.in Sat Jan 19 12:32:06 2019 @@ -1911,8 +1911,9 @@ SELFTEST_FLAGS = -nostdinc -x c /dev/nul # driver, cc1, or selftest data change. .PHONY: selftest selftest: s-selftest -s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs \ - $(srcdir)/testsuite/selftests +s-selftest: $(GCC_PASSES) cc1$(exeext) stmp-int-hdrs + @echo "NOT REBUILDING $@" +NetBSD_DISABLED_s-selftest: $(GCC_FOR_TARGET) $(SELFTEST_FLAGS) $(STAMP) $@
CVS commit: src/external/gpl3/gcc/dist/gcc/config
Module Name:src Committed By: mrg Date: Sat Jan 19 12:57:32 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config: netbsd.h Log Message: gcc 7 will use gcc-7 subdir. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/external/gpl3/gcc/dist/gcc/config/netbsd.h 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/dist/gcc/config/netbsd.h diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.25 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.26 --- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.25 Sat Jan 19 12:10:05 2019 +++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Sat Jan 19 12:57:32 2019 @@ -63,7 +63,7 @@ along with GCC; see the file COPYING3. * XXX figure out a better way to do this */ #undef GCC_INCLUDE_DIR -#define GCC_INCLUDE_DIR "/usr/include/gcc-6" +#define GCC_INCLUDE_DIR "/usr/include/gcc-7" /* Under NetBSD, the normal location of the various *crt*.o files is the /usr/lib directory. */
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Jan 19 12:58:37 UTC 2019
Modified Files:
src/share/mk: bsd.own.mk
src/tools/gcc: Makefile gcc-version.mk
Log Message:
obsolete gcc 5 support.
add gcc 7 support. call it "nb1 20190119"
To generate a diff of this commit:
cvs rdiff -u -r1.1094 -r1.1095 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.87 -r1.88 src/tools/gcc/Makefile
cvs rdiff -u -r1.12 -r1.13 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1094 src/share/mk/bsd.own.mk:1.1095
--- src/share/mk/bsd.own.mk:1.1094 Wed Jan 9 23:52:29 2019
+++ src/share/mk/bsd.own.mk Sat Jan 19 12:58:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1094 2019/01/09 23:52:29 mrg Exp $
+# $NetBSD: bsd.own.mk,v 1.1095 2019/01/19 12:58:37 mrg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -72,6 +72,8 @@ MKGCCCMDS?= no
#
.if ${HAVE_GCC} == 6
EXTERNAL_GCC_SUBDIR?= gcc.old
+.elif ${HAVE_GCC} == 7
+EXTERNAL_GCC_SUBDIR?= gcc
.else
EXTERNAL_GCC_SUBDIR=? /does/not/exist
.endif
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.87 src/tools/gcc/Makefile:1.88
--- src/tools/gcc/Makefile:1.87 Fri Oct 19 16:16:21 2018
+++ src/tools/gcc/Makefile Sat Jan 19 12:58:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2018/10/19 16:16:21 maya Exp $
+# $NetBSD: Makefile,v 1.88 2019/01/19 12:58:37 mrg Exp $
.include
@@ -8,7 +8,7 @@ MODULE= gcc4
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
-.if ${HAVE_GCC} == 5
+.if ${HAVE_GCC} == 6
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
@@ -47,10 +47,7 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GC
COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
-.if ${HAVE_GCC} >= 5
-# Turn on colour output only if GCC_COLORS env is set
COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
-.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
@@ -89,10 +86,10 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-.if ${HAVE_GCC} == 6
+.if ${HAVE_GCC} == 7
+MKNATIVE_TARGET= gcc7
+.elif ${HAVE_GCC} == 6
MKNATIVE_TARGET= gcc6
-.elif ${HAVE_GCC} == 5
-MKNATIVE_TARGET= gcc5
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.12 src/tools/gcc/gcc-version.mk:1.13
--- src/tools/gcc/gcc-version.mk:1.12 Sun Nov 11 23:05:25 2018
+++ src/tools/gcc/gcc-version.mk Sat Jan 19 12:58:37 2019
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.12 2018/11/11 23:05:25 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.13 2019/01/19 12:58:37 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 6
NETBSD_GCC_VERSION=nb4 20181109
.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb1 20180905
+NETBSD_GCC_VERSION=nb1 20190119
.endif
CVS commit: src
Module Name:src Committed By: mrg Date: Sat Jan 19 13:06:51 UTC 2019 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/comp: ad.aarch64 ad.arm ad.hppa ad.m68k ad.mips ad.powerpc ad.riscv ad.sh3 md.alpha md.amd64 md.hppa md.i386 md.ia64 md.or1k md.sparc md.sparc64 md.vax mi src/etc/mtree: NetBSD.dist.base Log Message: add basic gcc-7 support in sets lists and filesystem. mips gained a header. assumes it's otherwise mostly the same as gcc-7. To generate a diff of this commit: cvs rdiff -u -r1.1198 -r1.1199 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/comp/ad.aarch64 cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/comp/ad.arm cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/comp/ad.hppa cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/comp/ad.m68k cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/comp/ad.mips cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/comp/ad.powerpc cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/comp/ad.riscv \ src/distrib/sets/lists/comp/md.hppa cvs rdiff -u -r1.41 -r1.42 src/distrib/sets/lists/comp/ad.sh3 cvs rdiff -u -r1.75 -r1.76 src/distrib/sets/lists/comp/md.alpha cvs rdiff -u -r1.265 -r1.266 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.183 -r1.184 src/distrib/sets/lists/comp/md.i386 cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/comp/md.ia64 cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/comp/md.or1k cvs rdiff -u -r1.96 -r1.97 src/distrib/sets/lists/comp/md.sparc cvs rdiff -u -r1.204 -r1.205 src/distrib/sets/lists/comp/md.sparc64 cvs rdiff -u -r1.49 -r1.50 src/distrib/sets/lists/comp/md.vax cvs rdiff -u -r1.2250 -r1.2251 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.184 -r1.185 src/etc/mtree/NetBSD.dist.base 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/base/mi diff -u src/distrib/sets/lists/base/mi:1.1198 src/distrib/sets/lists/base/mi:1.1199 --- src/distrib/sets/lists/base/mi:1.1198 Tue Jan 1 18:46:09 2019 +++ src/distrib/sets/lists/base/mi Sat Jan 19 13:06:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1198 2019/01/01 18:46:09 maya Exp $ +# $NetBSD: mi,v 1.1199 2019/01/19 13:06:50 mrg Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -1173,11 +1173,13 @@ ./usr/include/g++/tr2base-cxx-usr ./usr/include/gcc-4.1base-obsolete obsolete ./usr/include/gcc-4.5base-obsolete obsolete -./usr/include/gcc-4.8base-c-usr obsolete -./usr/include/gcc-5base-c-usr -./usr/include/gcc-5/sanitizer base-c-usr +./usr/include/gcc-4.8base-obsolete obsolete +./usr/include/gcc-5base-obsolete obsolete +./usr/include/gcc-5/sanitizer base-obsolete obsolete ./usr/include/gcc-6base-c-usr ./usr/include/gcc-6/sanitizer base-c-usr +./usr/include/gcc-7base-c-usr +./usr/include/gcc-7/sanitizer base-c-usr ./usr/include/gssapibase-c-usr ./usr/include/gssapi/rpc base-obsolete obsolete ./usr/include/isofsbase-c-usr Index: src/distrib/sets/lists/comp/ad.aarch64 diff -u src/distrib/sets/lists/comp/ad.aarch64:1.28 src/distrib/sets/lists/comp/ad.aarch64:1.29 --- src/distrib/sets/lists/comp/ad.aarch64:1.28 Fri Jan 18 17:49:55 2019 +++ src/distrib/sets/lists/comp/ad.aarch64 Sat Jan 19 13:06:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ad.aarch64,v 1.28 2019/01/18 17:49:55 christos Exp $ +# $NetBSD: ad.aarch64,v 1.29 2019/01/19 13:06:50 mrg Exp $ ./usr/include/aarch64comp-c-include ./usr/include/aarch64/ansi.h comp-c-include ./usr/include/aarch64/aout_machdep.h comp-c-include @@ -138,6 +138,9 @@ ./usr/include/gcc-6/arm_acle.h comp-c-include gcc=6 ./usr/include/gcc-6/arm_neon.h comp-c-include gcc=6 ./usr/include/gcc-6/tgmath.h comp-c-include gcc=6 +./usr/include/gcc-7/arm_acle.h comp-c-include gcc=7 +./usr/include/gcc-7/arm_neon.h comp-c-include gcc=7 +./usr/include/gcc-7/tgmath.h comp-c-include gcc=7 ./usr/include/ieeefp.hcomp-c-include ./usr/lib/eabi/libarm.acomp-c-lib compat,llvm ./usr/lib/eabi/libarm.so base-sys-shlib compat,pic,llvm Index: src/distrib/sets/lists/comp/ad.arm diff -u src/distrib/sets/lists/comp/ad.arm:1.92 src/distrib/sets/lists/comp/ad.arm:1.93 --- src/distrib/sets/lists/comp/ad.arm:1.92 Fri Jan 18 17:49:55 2019 +++ src/distrib/sets/lists/comp/ad.arm Sat Jan 19 13:06:50 2019 @@ -1,4 +1,4 @@ -# $NetBSD: ad.arm,v 1.92 2019/01/18 17:49:55 christos Exp $ +# $NetBSD: ad.arm,v 1.93 2019/01/19 13:06:50 mrg Exp $ ./usr/bin/elf2aoutcomp-sysutil-bin ./usr/include/acorn26comp-obsolete obsolete ./usr/include/acorn26/ansi.h comp-obsolete obsolete @@ -418,6 +418,11 @@ ./usr/include/gcc-6/mmintrin.h comp-c-include gcc=6 ./usr/include/gcc-6/tgmath.h comp-c-include gcc=6 ./usr/include/gcc-6/unwind-arm-common.h comp-c-include gcc=6,eabi +./usr/include/gcc-7/arm_a
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Sat Jan 19 13:08:50 UTC 2019
Modified Files:
src/bin/sh: mknodes.sh
Log Message:
Add some error checking, and stop assuming what the input
will necessarily contain. Allow defined nodes to use any
intN_t or unintN_t (as well as plain old int) data types
in fields (along with the others that are permitted).
Note: this script is a part of the build procedure for /bin/sh,
the modified version generates the exact same output files
(for the unaltered input specifications) as the previous one
did, hence no visible change is expected (or even possible).
While there is a tiny chance that some host shell will fail
to be able to run this script while building, the script still
uses nothing even slightly exotic, and is much more conservative
than other scripts used during the build process, so there should
be no issues there either.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/bin/sh/mknodes.sh
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/mknodes.sh
diff -u src/bin/sh/mknodes.sh:1.3 src/bin/sh/mknodes.sh:1.4
--- src/bin/sh/mknodes.sh:1.3 Fri Jun 22 11:04:55 2018
+++ src/bin/sh/mknodes.sh Sat Jan 19 13:08:50 2019
@@ -1,5 +1,5 @@
#! /bin/sh
-# $NetBSD: mknodes.sh,v 1.3 2018/06/22 11:04:55 kre Exp $
+# $NetBSD: mknodes.sh,v 1.4 2019/01/19 13:08:50 kre Exp $
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -83,11 +83,35 @@ for struct in $struct_list; do
IFS=' '
set -- $line
name=$1
+ case "$name" in
+ type) if [ -n "$typetype" ] && [ "$typetype" != "$2" ]
+ then
+echo >&2 "Conflicting type fields: node" \
+ "$struct has $2, others $typetype"
+exit 1
+ fi
+ if [ $field -ne 1 ]
+ then
+echo >&2 "Node $struct has type as field" \
+ "$field (should only be first)"
+exit 1
+ fi
+ typetype=$2
+ ;;
+ *)
+ if [ $field -eq 1 ]
+ then
+echo >&2 "Node $struct does not have" \
+ "type as first field"
+exit 1
+ fi
+ ;;
+ esac
case $2 in
nodeptr ) type="union node *";;
nodelist ) type="struct nodelist *";;
string ) type="char *";;
- int ) type="int ";;
+ int*_t | uint*_t | int ) type="$2 ";;
* ) name=; shift 2; type="$*";;
esac
echo " $type$name;"
@@ -98,7 +122,7 @@ done
echo
echo
echo "union node {"
-echo " int type;"
+echo " $typetype type;"
for struct in $struct_list; do
echo " struct $struct $struct;"
done
@@ -200,7 +224,7 @@ while IFS=; read -r line; do
nodeptr ) fn="copynode(";;
nodelist ) fn="copynodelist(";;
string ) fn="nodesavestr(";;
-int ) fn=;;
+int*_t| uint*_t | int ) fn=;;
* ) continue;;
esac
f="$struct.$name"
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: martin
Date: Sat Jan 19 13:17:33 UTC 2019
Modified Files:
src/sys/arch/x86/x86: db_memrw.c
Log Message:
PR kern/53893: add missing #ifdef DDB around db_printf calls.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/x86/x86/db_memrw.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/x86/x86/db_memrw.c
diff -u src/sys/arch/x86/x86/db_memrw.c:1.7 src/sys/arch/x86/x86/db_memrw.c:1.8
--- src/sys/arch/x86/x86/db_memrw.c:1.7 Sun Nov 18 14:16:13 2018
+++ src/sys/arch/x86/x86/db_memrw.c Sat Jan 19 13:17:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: db_memrw.c,v 1.7 2018/11/18 14:16:13 christos Exp $ */
+/* $NetBSD: db_memrw.c,v 1.8 2019/01/19 13:17:32 martin Exp $ */
/*-
* Copyright (c) 1996, 2000 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.7 2018/11/18 14:16:13 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_memrw.c,v 1.8 2019/01/19 13:17:32 martin Exp $");
#include
#include
@@ -90,7 +90,9 @@ db_read_bytes(vaddr_t addr, size_t size,
src = (char *)addr;
if (db_validate_address((vaddr_t)src)) {
+#ifdef DDB
db_printf("address %p is invalid\n", src);
+#endif
return;
}
@@ -111,7 +113,9 @@ db_read_bytes(vaddr_t addr, size_t size,
while (size-- > 0) {
if (db_validate_address((vaddr_t)src)) {
+#ifdef DDB
db_printf("address %p is invalid\n", src);
+#endif
return;
}
@@ -144,7 +148,9 @@ db_write_text(vaddr_t addr, size_t size,
pte = *ppte;
if ((pte & PG_V) == 0) {
+#ifdef DDB
db_printf(" address %p not a valid page\n", dst);
+#endif
return;
}
CVS commit: src/bin/sleep
Module Name:src
Committed By: kre
Date: Sat Jan 19 13:27:12 UTC 2019
Modified Files:
src/bin/sleep: sleep.c
Log Message:
Allow the decimal radix character '.' to work, regardless of
what the current locale's radix character happens to be,
while still allowing locale specific entry of fractional
seconds (ie: if you're in locale where the radix character
is ',' you san use "sleep 2.5" or "sleep 2,5" and they
accomplish the same thing).
This avoids issues with the "sleep 0.05" in rc.subr which
generated usage messages when a locale that does not use
'.' as its radix character was in use.
Reported on netbsd-users by Dima Veselov, with the problem
diagnosed by Martin Husemann
While here, tighten the arg validity checking (3+4 is
no longer permitted as a synonym of 3) and allow 0.0
to mean the same thing as 0 rather than being an error.
Also, make the SIGINFO reports a little nicer (IMO).
The ATF tests for sleep all pass (not that that means a lot).
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/bin/sleep/sleep.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/sleep/sleep.c
diff -u src/bin/sleep/sleep.c:1.24 src/bin/sleep/sleep.c:1.25
--- src/bin/sleep/sleep.c:1.24 Mon Aug 29 14:51:19 2011
+++ src/bin/sleep/sleep.c Sat Jan 19 13:27:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $ */
+/* $NetBSD: sleep.c,v 1.25 2019/01/19 13:27:12 kre Exp $ */
/*
* Copyright (c) 1988, 1993, 1994
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)sleep.c 8.3 (Berkeley) 4/2/94";
#else
-__RCSID("$NetBSD: sleep.c,v 1.24 2011/08/29 14:51:19 joerg Exp $");
+__RCSID("$NetBSD: sleep.c,v 1.25 2019/01/19 13:27:12 kre Exp $");
#endif
#endif /* not lint */
@@ -68,6 +68,7 @@ int
main(int argc, char *argv[])
{
char *arg, *temp;
+ const char *msg;
double fval, ival, val;
struct timespec ntime;
time_t original;
@@ -100,36 +101,71 @@ main(int argc, char *argv[])
* problem. Why use an isdigit() check instead of checking for
* a period? Because doing it this way means locales will be
* handled transparently by the atof code.
+ *
+ * Since fracflag is set for any non-digit, we also fall
+ * into the floating point conversion path if the input
+ * is hex (the 'x' in 0xA is not a digit). Then if
+ * strtod() handles hex (on NetBSD it does) so will we.
*/
fracflag = 0;
arg = *argv;
for (temp = arg; *temp != '\0'; temp++)
- if (!isdigit((unsigned char)*temp))
+ if (!isdigit((unsigned char)*temp)) {
+ ch = *temp;
fracflag++;
+ }
if (fracflag) {
- val = atof(arg);
- if (val <= 0)
+ /*
+ * If the radix char in the arg was a '.'
+ * (as is likely when used from scripts, etc)
+ * then force the C locale, so atof() works
+ * as intended, even if the user's locale
+ * expects something different, like ','
+ * (but leave the locale alone otherwise, so if
+ * the user entered 2,4 and that is correct for
+ * the locale, it will work).
+ */
+ if (ch == '.')
+ (void)setlocale(LC_ALL, "C");
+ val = strtod(arg, &temp);
+ if (val < 0 || temp == arg || *temp != '\0')
usage();
ival = floor(val);
fval = (10 * (val-ival));
ntime.tv_sec = ival;
ntime.tv_nsec = fval;
- }
- else {
- ntime.tv_sec = atol(arg);
- if (ntime.tv_sec <= 0)
+ if (ntime.tv_sec == 0 && ntime.tv_nsec == 0)
+ return EXIT_SUCCESS; /* was 0.0 or underflowed */
+ } else {
+ ntime.tv_sec = strtol(arg, &temp, 10);
+ if (ntime.tv_sec < 0 || temp == arg || *temp != '\0')
+ usage();
+ if (ntime.tv_sec == 0)
return EXIT_SUCCESS;
ntime.tv_nsec = 0;
}
original = ntime.tv_sec;
+ if (ntime.tv_nsec != 0)
+ msg = " and a bit";
+ else
+ msg = "";
+
signal(SIGINFO, report_request);
while ((rv = nanosleep(&ntime, &ntime)) != 0) {
if (report_requested) {
- /* Reporting does not bother with nanoseconds. */
- warnx("about %d second(s) left out of the original %d",
- (int)ntime.tv_sec, (int)original);
+ /* Reporting does not bother (much) with nanoseconds. */
+ if (ntime.tv_sec == 0)
+ warnx("in the final moments of the original"
+ " %ld%s second%s", (long)original, msg,
+ original == 1 && *msg == '\0' ? "" : "s");
+ else
+ warnx("between %ld and %ld seconds left"
+" out of the original %ld%s",
+(long)ntime.tv_sec, (long)ntime.tv_sec + 1,
+(long)original, msg);
+
report_requested = 0;
} else
break;
CVS commit: src/bin/sh
Module Name:src
Committed By: kre
Date: Sat Jan 19 14:20:22 UTC 2019
Modified Files:
src/bin/sh: main.c
Log Message:
When we exit from running off the end of the input file (which
includes typing ^D) make sure LINENO is set to indicate the last
(actually one past last) line in the input file, rather than
whatever it was set to by the last command that was actually
executed (which could be some line in a function defined in
some other file).
No effect on exit via an explicit exit command - that would already
set the line number correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/bin/sh/main.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/main.c
diff -u src/bin/sh/main.c:1.79 src/bin/sh/main.c:1.80
--- src/bin/sh/main.c:1.79 Tue Dec 11 13:31:20 2018
+++ src/bin/sh/main.c Sat Jan 19 14:20:22 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.79 2018/12/11 13:31:20 kre Exp $ */
+/* $NetBSD: main.c,v 1.80 2019/01/19 14:20:22 kre Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1991, 19
#if 0
static char sccsid[] = "@(#)main.c 8.7 (Berkeley) 7/19/95";
#else
-__RCSID("$NetBSD: main.c,v 1.79 2018/12/11 13:31:20 kre Exp $");
+__RCSID("$NetBSD: main.c,v 1.80 2019/01/19 14:20:22 kre Exp $");
#endif
#endif /* not lint */
@@ -248,6 +248,7 @@ main(int argc, char **argv)
#if PROFILE
monitor(0);
#endif
+ line_number = plinno;
exitshell(exitstatus);
/* NOTREACHED */
}
CVS commit: src/sys/external/bsd/drm2/i915drm
Module Name:src
Committed By: dholland
Date: Sat Jan 19 16:58:29 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/i915drm: files.i915drmkms
Log Message:
i915drmkms requires firmload. PR 53892
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/external/bsd/drm2/i915drm/files.i915drmkms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/i915drm/files.i915drmkms
diff -u src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.33 src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.34
--- src/sys/external/bsd/drm2/i915drm/files.i915drmkms:1.33 Fri Sep 21 11:27:13 2018
+++ src/sys/external/bsd/drm2/i915drm/files.i915drmkms Sat Jan 19 16:58:29 2019
@@ -1,9 +1,9 @@
-# $NetBSD: files.i915drmkms,v 1.33 2018/09/21 11:27:13 kamil Exp $
+# $NetBSD: files.i915drmkms,v 1.34 2019/01/19 16:58:29 dholland Exp $
version 20180827
define intelfbbus { }
-device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810
+device i915drmkms: drmkms, drmkms_pci, intelfbbus, agp_i810, firmload
attach i915drmkms at pci
device intelfb: intelfbbus, drmfb, drmfb_pci, wsemuldisplaydev
CVS commit: src/external/gpl3/gcc/dist/gcc/doc
Module Name:src Committed By: mrg Date: Sat Jan 19 17:04:07 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/doc: cpp.1 cpp.info cppinternals.info g++.1 gcc.1 gcc.info gccinstall.info gccint.info gcov-tool.1 gcov.1 Log Message: regen these for diffs are larger than 1MB and have been omitted
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Jan 19 17:08:40 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
also pull out these variables:
enable_execute_stack
unwind_header
md_unwind_header
sfp_machine_header
thread_header
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.94 src/tools/gcc/mknative-gcc:1.95
--- src/tools/gcc/mknative-gcc:1.94 Tue Sep 4 22:57:25 2018
+++ src/tools/gcc/mknative-gcc Sat Jan 19 17:08:39 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -82,6 +82,10 @@ get_libgcc () {
SHLIB_MAPFILES SHLIB_NM_FLAGS
getvars gcc/Makefile \
NOEXCEPTION_FLAGS EXTRA_HEADERS
+ getvars gcc/Makefile \
+ enable_execute_stack \
+ unwind_header md_unwind_header \
+ sfp_machine_header thread_header
getlinks config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
CVS commit: src/external/gpl3/gcc/lib
Module Name:src
Committed By: mrg
Date: Sat Jan 19 17:11:03 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.inc
src/external/gpl3/gcc/lib/libobjc: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3: Makefile
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/lib/libsupc++: Makefile
Added Files:
src/external/gpl3/gcc/lib: Makefile.gthr
Removed Files:
src/external/gpl3/gcc/lib/libgcc: Makefile.srcs
Log Message:
begin to handle new unwind.h and gthr-default.h stuff.
put gthr stuff in a common makefile.
remove ancient unused Makefile.srcs.
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/gpl3/gcc/lib/Makefile.gthr
cvs rdiff -u -r1.37 -r1.38 src/external/gpl3/gcc/lib/libgcc/Makefile.inc
cvs rdiff -u -r1.3 -r0 src/external/gpl3/gcc/lib/libgcc/Makefile.srcs
cvs rdiff -u -r1.15 -r1.16 src/external/gpl3/gcc/lib/libobjc/Makefile
cvs rdiff -u -r1.34 -r1.35 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/gpl3/gcc/lib/libsupc++/Makefile
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/lib/libgcc/Makefile.inc
diff -u src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.37 src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.38
--- src/external/gpl3/gcc/lib/libgcc/Makefile.inc:1.37 Wed Sep 5 00:51:42 2018
+++ src/external/gpl3/gcc/lib/libgcc/Makefile.inc Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.37 2018/09/05 00:51:42 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.38 2019/01/19 17:11:02 mrg Exp $
LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
@@ -103,7 +103,6 @@ LIB2DIVMOD= ${LIB2_DIVMOD_FUNCS:=.c}
.if ${HAVE_LIBGCC_EH} == "no"
LIB2_EH= ${G_LIB2ADDEH:M*.c:T:Nunwind-dw2.c:Nunwind-dw2-fde-dip.c:Nunwind-sjlj.c:Nunwind-c.c:Nunwind-arm.c:Npr-support.c}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T:Nlibunwind.S}
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
.else
LIB2_EH= ${G_LIB2ADDEH:M*.c:T}
LIB2_EHASM= ${G_LIB2ADDEH:M*.S:T}
@@ -192,14 +191,7 @@ dp-bit.c: ${.CURDIR}/Makefile
.include "../Makefile.tconfigh"
DPSRCS+= tconfig.h
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
+.include "../Makefile.gthr"
EXTRA_FAKEHEADERS= options.h libgcc_tm.h
.include "../../Makefile.hacks"
Index: src/external/gpl3/gcc/lib/libobjc/Makefile
diff -u src/external/gpl3/gcc/lib/libobjc/Makefile:1.15 src/external/gpl3/gcc/lib/libobjc/Makefile:1.16
--- src/external/gpl3/gcc/lib/libobjc/Makefile:1.15 Wed Apr 20 17:18:52 2016
+++ src/external/gpl3/gcc/lib/libobjc/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2016/04/20 17:18:52 christos Exp $
+# $NetBSD: Makefile,v 1.16 2019/01/19 17:11:02 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -74,19 +74,7 @@ ${OBJS} ${POBJS} ${SOBJS}: runtime-info.
${SRCS}: tconfig.h options.h
-.if ${HAVE_LIBGCC_EH} == "no"
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
-.endif
-
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+= ${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
-
+.include "../Makefile.gthr"
.include "../Makefile.tconfigh"
.include "../Makefile.hacks"
Index: src/external/gpl3/gcc/lib/libstdc++-v3/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.34 src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.35
--- src/external/gpl3/gcc/lib/libstdc++-v3/Makefile:1.34 Mon Nov 5 08:45:32 2018
+++ src/external/gpl3/gcc/lib/libstdc++-v3/Makefile Sat Jan 19 17:11:02 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2018/11/05 08:45:32 mrg Exp $
+# $NetBSD: Makefile,v 1.35 2019/01/19 17:11:02 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@@ -134,18 +134,7 @@ BUILDSYMLINKS+= \
${GLIBCXX_SRCDIR}/src/c++11/codecvt.cc c11-codecvt.cc
SRCS+= c98-codecvt.cc c11-codecvt.cc
-.if ${HAVE_LIBGCC_EH} == "no"
-G_CONFIGLINKS:= ${G_CONFIGLINKS:S,libgcc/config/arm/unwind-arm.h,libgcc/unwind-generic.h,}
-.endif
-
-.if ${MKGCC} != "no"
-.if defined(G_CONFIGLINKS) && !empty(G_CONFIGLINKS)
-BUILDSYMLINKS+=${G_CONFIGLINKS}
-.for _src _dst in ${G_CONFIGLINKS}
-DPSRCS+= ${_dst}
-.endfor
-.endif
-.endif
+.include "../Makefile.gthr"
# XXX Make this either/or, not one, and maybe another
CXX11_ALWAYS= localename.cc \
Index: src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
diff -u src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.19 src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile:1.20
--- src/external/g
CVS commit: src
Module Name:src
Committed By: mrg
Date: Sat Jan 19 20:02:06 UTC 2019
Modified Files:
src/external/gpl3/gcc/lib: Makefile.gthr
src/external/gpl3/gcc/lib/libgcc/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libobjc/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64: defs.mk
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64: configargs.h
src/tools/gcc: mknative-gcc
Added Files:
src/external/gpl3/gcc/lib/libgcc/arch/x86_64: gthr-defs.mk
Log Message:
make includes works now.
pull out more data needed for headers and fix gthr-defaults.h.
libgcc_s has multiple symbols.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/lib/Makefile.gthr
cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
cvs rdiff -u -r0 -r1.1 \
src/external/gpl3/gcc/lib/libgcc/arch/x86_64/gthr-defs.mk
cvs rdiff -u -r1.3 -r1.4 \
src/external/gpl3/gcc/lib/libobjc/arch/x86_64/defs.mk
cvs rdiff -u -r1.10 -r1.11 \
src/external/gpl3/gcc/lib/libstdc++-v3/arch/x86_64/defs.mk
cvs rdiff -u -r1.20 -r1.21 \
src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile
cvs rdiff -u -r1.39 -r1.40 \
src/external/gpl3/gcc/usr.bin/gcc/arch/x86_64/configargs.h
cvs rdiff -u -r1.95 -r1.96 src/tools/gcc/mknative-gcc
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/lib/Makefile.gthr
diff -u src/external/gpl3/gcc/lib/Makefile.gthr:1.1 src/external/gpl3/gcc/lib/Makefile.gthr:1.2
--- src/external/gpl3/gcc/lib/Makefile.gthr:1.1 Sat Jan 19 17:11:02 2019
+++ src/external/gpl3/gcc/lib/Makefile.gthr Sat Jan 19 20:02:06 2019
@@ -1,8 +1,13 @@
-# $NetBSD: Makefile.gthr,v 1.1 2019/01/19 17:11:02 mrg Exp $
+# $NetBSD: Makefile.gthr,v 1.2 2019/01/19 20:02:06 mrg Exp $
# makefile fragment to setup files selected by configure
.if ${MKGCC} != "no"
+
+LIBGCC_MACHINE_ARCH?=${MACHINE_ARCH:S/earmv5/earm/}
+
+. -include "${DIST}/../lib/libgcc/arch/${LIBGCC_MACHINE_ARCH}/gthr-defs.mk"
+
CONFIG_LINKS= \
${G_enable_execute_stack} enable-execute-stack.c \
${G_unwind_header} unwind.h \
@@ -13,4 +18,5 @@ BUILDSYMLINKS+= ${CONFIG_LINKS}
. for _src _dst in ${CONFIG_LINKS}
DPSRCS+= ${_dst}
. endfor
+
.endif
Index: src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk
diff -u src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.8 src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.9
--- src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk:1.8 Sat Jan 19 17:11:56 2019
+++ src/external/gpl3/gcc/lib/libgcc/arch/x86_64/defs.mk Sat Jan 19 20:02:06 2019
@@ -1,5 +1,5 @@
# This file is automatically generated. DO NOT EDIT!
-# Generated from: NetBSD: mknative-gcc,v 1.94 2018/09/04 22:57:25 mrg Exp
+# Generated from: NetBSD: mknative-gcc,v 1.95 2019/01/19 17:08:39 mrg Exp
# Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp
#
G_INCLUDES=-I. -I. -I../.././gcc -I${GNUHOSTDIST}/libgcc -I${GNUHOSTDIST}/libgcc/. -I${GNUHOSTDIST}/libgcc/../gcc -I${GNUHOSTDIST}/libgcc/../include
@@ -19,4 +19,4 @@ G_SHLIB_MAPFILES=libgcc-std.ver
G_SHLIB_NM_FLAGS=-pg
G_NOEXCEPTION_FLAGS=-fno-exceptions -fno-rtti -fasynchronous-unwind-tables
G_EXTRA_HEADERS=${GNUHOSTDIST}/gcc/config/i386/cpuid.h ${GNUHOSTDIST}/gcc/config/i386/mmintrin.h ${GNUHOSTDIST}/gcc/config/i386/mm3dnow.h ${GNUHOSTDIST}/gcc/config/i386/xmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/emmintrin.h ${GNUHOSTDIST}/gcc/config/i386/pmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/tmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/ammintrin.h ${GNUHOSTDIST}/gcc/config/i386/smmintrin.h ${GNUHOSTDIST}/gcc/config/i386/nmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/bmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/fma4intrin.h ${GNUHOSTDIST}/gcc/config/i386/wmmintrin.h ${GNUHOSTDIST}/gcc/config/i386/immintrin.h ${GNUHOSTDIST}/gcc/config/i386/x86intrin.h ${GNUHOSTDIST}/gcc/config/i386/avxintrin.h ${GNUHOSTDIST}/gcc/config/i386/xopintrin.h ${GNUHOSTDIST}/gcc/config/i386/ia32intrin.h ${GNUHOSTDIST}/gcc/config/i386/cross-stdarg.h ${GNUHOSTDIST}/gcc/config/i386/lwpintrin.h ${GNUHOSTDIST}/gcc/config/i386/popcntintrin.h ${GNUHOSTDIST}/gcc/config/i386/lzcntintrin.h ${GNUHOSTDIST}/gcc/config/i386/b
miintrin.h ${GNUHOSTDIST}/gcc/config/i386/tbmintrin.h ${GNUHOSTDIST}/gcc/config/i386/bmi2intrin.h ${GNUHOSTDIST}/gcc/config/i386/avx2intrin.h ${GNUHOSTDIST}/gcc/config/i386/avx512fintrin.h ${GNUHOSTDIST}/gcc/config/i386/fmaintrin.h ${GNUHOSTDIST}/gcc/config/i386/f16cintrin.h ${GNUHOSTDIST}/gcc/config/i386/rtmintrin.h ${GNUHOSTDIST}/gcc/config/i386/xtestintrin.h ${GNUHOSTDIST}/gcc/config/i386/rdseedintrin.h ${GNUHOSTDIST}/gcc/config/i386/prfchwintrin.h ${GNUHOSTDIST}/gcc/config/i386/adxintrin.h ${GNUHOSTDIST}/gcc/config/i386/fxsrintrin.h ${GNUHOSTDIST}/gcc/config/i386/xsaveintrin.h ${GNUHOSTDIST}/gcc/config/i386/
CVS commit: src/sys/kern
Module Name:src
Committed By: rmind
Date: Sat Jan 19 20:42:54 UTC 2019
Modified Files:
src/sys/kern: subr_thmap.c
Log Message:
thmap: use KM_NOSLEEP for now; might revisit later.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/kern/subr_thmap.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_thmap.c
diff -u src/sys/kern/subr_thmap.c:1.3 src/sys/kern/subr_thmap.c:1.4
--- src/sys/kern/subr_thmap.c:1.3 Sat Dec 22 21:53:06 2018
+++ src/sys/kern/subr_thmap.c Sat Jan 19 20:42:54 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_thmap.c,v 1.3 2018/12/22 21:53:06 christos Exp $ */
+/* $NetBSD: subr_thmap.c,v 1.4 2019/01/19 20:42:54 rmind Exp $ */
/*-
* Copyright (c) 2018 Mindaugas Rasiukevicius
@@ -112,7 +112,7 @@
#include "utils.h"
#endif
-THMAP_RCSID("$NetBSD: subr_thmap.c,v 1.3 2018/12/22 21:53:06 christos Exp $");
+THMAP_RCSID("$NetBSD: subr_thmap.c,v 1.4 2019/01/19 20:42:54 rmind Exp $");
/*
* NetBSD kernel wrappers
@@ -233,7 +233,7 @@ static void stage_mem_gc(thmap_t *, uint
static uintptr_t
alloc_wrapper(size_t len)
{
- return (uintptr_t)kmem_intr_alloc(len, KM_SLEEP);
+ return (uintptr_t)kmem_intr_alloc(len, KM_NOSLEEP);
}
static void
@@ -843,7 +843,7 @@ stage_mem_gc(thmap_t *thmap, uintptr_t a
{
thmap_gc_t *head, *gc;
- gc = kmem_intr_alloc(sizeof(thmap_gc_t), KM_SLEEP);
+ gc = kmem_intr_alloc(sizeof(thmap_gc_t), KM_NOSLEEP);
gc->addr = addr;
gc->len = len;
retry:
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Jan 19 20:50:48 UTC 2019
Modified Files:
src/sys/dev/fdt: fdtbus.c fdtvar.h
Log Message:
Add a helper to search the tree for a node with the specified property
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/fdt/fdtbus.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/fdt/fdtvar.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/fdt/fdtbus.c
diff -u src/sys/dev/fdt/fdtbus.c:1.25 src/sys/dev/fdt/fdtbus.c:1.26
--- src/sys/dev/fdt/fdtbus.c:1.25 Wed Jan 2 14:54:54 2019
+++ src/sys/dev/fdt/fdtbus.c Sat Jan 19 20:50:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtbus.c,v 1.25 2019/01/02 14:54:54 jmcneill Exp $ */
+/* $NetBSD: fdtbus.c,v 1.26 2019/01/19 20:50:48 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.25 2019/01/02 14:54:54 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.26 2019/01/19 20:50:48 jmcneill Exp $");
#include
#include
@@ -345,6 +345,24 @@ fdt_remove_bycompat(const char *compatib
}
}
+int
+fdt_find_with_property(const char *prop, int *pindex)
+{
+ struct fdt_node *node;
+ int index = 0;
+
+ TAILQ_FOREACH(node, &fdt_nodes, n_nodes) {
+ if (index < *pindex)
+ continue;
+ if (of_hasprop(node->n_phandle, prop)) {
+ *pindex = index;
+ return node->n_phandle;
+ }
+ }
+
+ return -1;
+}
+
static u_int
fdt_get_order(int phandle)
{
Index: src/sys/dev/fdt/fdtvar.h
diff -u src/sys/dev/fdt/fdtvar.h:1.44 src/sys/dev/fdt/fdtvar.h:1.45
--- src/sys/dev/fdt/fdtvar.h:1.44 Wed Jan 2 18:38:43 2019
+++ src/sys/dev/fdt/fdtvar.h Sat Jan 19 20:50:48 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: fdtvar.h,v 1.44 2019/01/02 18:38:43 jmcneill Exp $ */
+/* $NetBSD: fdtvar.h,v 1.45 2019/01/19 20:50:48 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -368,6 +368,7 @@ void fdt_add_child(device_t, int, struc
void fdt_remove_byhandle(int);
void fdt_remove_bycompat(const char *[]);
+int fdt_find_with_property(const char *, int *);
int fdtbus_print(void *, const char *);
#endif /* _DEV_FDT_FDTVAR_H */
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: jmcneill Date: Sat Jan 19 20:51:12 UTC 2019 Modified Files: src/sys/dev/fdt: gpioregulator.c Log Message: Set initial regulator states at attach time To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/fdt/gpioregulator.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/fdt/gpioregulator.c diff -u src/sys/dev/fdt/gpioregulator.c:1.1 src/sys/dev/fdt/gpioregulator.c:1.2 --- src/sys/dev/fdt/gpioregulator.c:1.1 Sun Aug 13 18:27:31 2017 +++ src/sys/dev/fdt/gpioregulator.c Sat Jan 19 20:51:12 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: gpioregulator.c,v 1.1 2017/08/13 18:27:31 jmcneill Exp $ */ +/* $NetBSD: gpioregulator.c,v 1.2 2019/01/19 20:51:12 jmcneill Exp $ */ /*- * Copyright (c) 2017 Jared McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gpioregulator.c,v 1.1 2017/08/13 18:27:31 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gpioregulator.c,v 1.2 2019/01/19 20:51:12 jmcneill Exp $"); #include #include @@ -100,6 +100,7 @@ gpioregulator_attach(device_t parent, de const int phandle = faa->faa_phandle; const uint32_t *pstates; uint32_t mask; + u_int gpios_states; char *name; int len, n; @@ -163,6 +164,14 @@ gpioregulator_attach(device_t parent, de } } + /* "gpios-states" property */ + if (of_getprop_uint32(phandle, "gpios-states", &gpios_states) != 0) + gpios_states = 0; + + /* Set initial state */ + for (n = 0; n < sc->sc_npins; n++) + fdtbus_gpio_write(sc->sc_pins[n], (gpios_states >> n) & 1); + fdtbus_register_regulator_controller(self, phandle, &gpioregulator_funcs);
CVS commit: src/sys/arch/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Sat Jan 19 20:52:26 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: pl310.c
Log Message:
Remove hard requirement for "offset" property on Cortex-A5. This is not
required w/ FDT.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/cortex/pl310.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/cortex/pl310.c
diff -u src/sys/arch/arm/cortex/pl310.c:1.18 src/sys/arch/arm/cortex/pl310.c:1.19
--- src/sys/arch/arm/cortex/pl310.c:1.18 Wed Jun 20 08:03:55 2018
+++ src/sys/arch/arm/cortex/pl310.c Sat Jan 19 20:52:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $ */
+/* $NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.19 2019/01/19 20:52:26 jmcneill Exp $");
#include
#include
@@ -140,17 +140,8 @@ arml2cc_attach(device_t parent, device_t
aprint_naive("\n");
- if (!prop_dictionary_get_uint32(dict, "offset", &off)) {
- if (CPU_ID_CORTEX_A5_P(curcpu()->ci_arm_cpuid)) {
- /*
- * PL310 on Cortex-A5 is external to PERIPHBASE, so
- * "offset" property is required.
- */
- aprint_normal(": not configured\n");
- return;
- }
+ if (!prop_dictionary_get_uint32(dict, "offset", &off))
off = mpcaa->mpcaa_off1;
- }
arml2cc_sc = sc;
sc->sc_dev = self;
CVS commit: src/sys/dev/fdt
Module Name:src
Committed By: jmcneill
Date: Sat Jan 19 20:53:32 UTC 2019
Modified Files:
src/sys/dev/fdt: dwc2_fdt.c
Log Message:
Add support for Meson8b
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/fdt/dwc2_fdt.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/fdt/dwc2_fdt.c
diff -u src/sys/dev/fdt/dwc2_fdt.c:1.3 src/sys/dev/fdt/dwc2_fdt.c:1.4
--- src/sys/dev/fdt/dwc2_fdt.c:1.3 Wed Aug 15 07:46:15 2018
+++ src/sys/dev/fdt/dwc2_fdt.c Sat Jan 19 20:53:32 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc2_fdt.c,v 1.3 2018/08/15 07:46:15 skrll Exp $ */
+/* $NetBSD: dwc2_fdt.c,v 1.4 2019/01/19 20:53:32 jmcneill Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.3 2018/08/15 07:46:15 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dwc2_fdt.c,v 1.4 2019/01/19 20:53:32 jmcneill Exp $");
#include
#include
@@ -64,6 +64,7 @@ static int dwc2_fdt_match(device_t, stru
static void dwc2_fdt_attach(device_t, device_t, void *);
static void dwc2_fdt_deferred(device_t);
+static void dwc2_fdt_amlogic_params(struct dwc2_fdt_softc *, struct dwc2_core_params *);
static void dwc2_fdt_rockchip_params(struct dwc2_fdt_softc *, struct dwc2_core_params *);
struct dwc2_fdt_config {
@@ -74,10 +75,15 @@ static const struct dwc2_fdt_config dwc2
.params = dwc2_fdt_rockchip_params,
};
+static const struct dwc2_fdt_config dwc2_fdt_meson8b_config = {
+ .params = dwc2_fdt_amlogic_params,
+};
+
static const struct dwc2_fdt_config dwc2_fdt_generic_config = {
};
static const struct of_compat_data compat_data[] = {
+ { "amlogic,meson8b-usb", (uintptr_t)&dwc2_fdt_meson8b_config },
{ "rockchip,rk3066-usb", (uintptr_t)&dwc2_fdt_rk3066_config },
{ "snps,dwc2", (uintptr_t)&dwc2_fdt_generic_config },
{ NULL }
@@ -197,6 +203,24 @@ dwc2_fdt_deferred(device_t self)
}
static void
+dwc2_fdt_amlogic_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params)
+{
+ dwc2_set_all_params(params, -1);
+
+ params->otg_cap = DWC2_CAP_PARAM_NO_HNP_SRP_CAPABLE;
+ params->speed = DWC2_SPEED_PARAM_HIGH;
+ params->host_rx_fifo_size = 512;
+ params->host_nperio_tx_fifo_size = 500;
+ params->host_perio_tx_fifo_size = 500;
+ params->host_channels = 16;
+ params->phy_type = DWC2_PHY_TYPE_PARAM_UTMI;
+ params->ahbcfg = GAHBCFG_HBSTLEN_INCR8 << GAHBCFG_HBSTLEN_SHIFT;
+#ifdef DWC2_POWER_DOWN_PARAM_NONE
+ params->power_down = DWC2_POWER_DOWN_PARAM_NONE;
+#endif
+}
+
+static void
dwc2_fdt_rockchip_params(struct dwc2_fdt_softc *sc, struct dwc2_core_params *params)
{
dwc2_set_all_params(params, -1);
CVS commit: src/doc
Module Name:src Committed By: rmind Date: Sat Jan 19 21:36:09 UTC 2019 Modified Files: src/doc: CHANGES Log Message: Mention NPF improvements. To generate a diff of this commit: cvs rdiff -u -r1.2491 -r1.2492 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.2491 src/doc/CHANGES:1.2492 --- src/doc/CHANGES:1.2491 Fri Jan 18 04:14:47 2019 +++ src/doc/CHANGES Sat Jan 19 21:36:09 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2491 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2492 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -308,3 +308,7 @@ Changes from NetBSD 8.0 to NetBSD 9.0: sgimips: Import irisboot, yet another bootloader for pre-ARC sgimips machines. Submitted by Naruaki Etomi via PR port-sgimips/53539. [tsutsui 20190112] + npf: Major NPF improvements (added support for dynamic NAT address, + NETMAP algorithm for static NAT, lock-free lookup for 'ipset' + tables, lock-free state lookup, incremental state G/C, etc). + [rmind 20190119]
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sat Jan 19 21:43:07 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add WSDISPLAY_MULTICONS To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbarm/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/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.19 src/sys/arch/evbarm/conf/GENERIC:1.20 --- src/sys/arch/evbarm/conf/GENERIC:1.19 Sat Jan 19 20:56:03 2019 +++ src/sys/arch/evbarm/conf/GENERIC Sat Jan 19 21:43:07 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.19 2019/01/19 20:56:03 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.20 2019/01/19 21:43:07 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -568,6 +568,7 @@ options WSDISPLAY_COMPAT_SYSCONS options WSDISPLAY_COMPAT_USL options WSDISPLAY_COMPAT_RAWKBD options WSDISPLAY_DEFAULTSCREENS=4 +options WSDISPLAY_MULTICONS pseudo-device wsmux pseudo-device wsfont
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jmcneill Date: Sat Jan 19 21:43:43 UTC 2019 Modified Files: src/sys/arch/arm/amlogic: files.meson Added Files: src/sys/arch/arm/amlogic: meson_canvasreg.h meson_genfb.c meson_hdmireg.h meson_vpureg.h Log Message: Add Meson (FDT) framebuffer support. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/amlogic/files.meson cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/amlogic/meson_canvasreg.h \ src/sys/arch/arm/amlogic/meson_genfb.c \ src/sys/arch/arm/amlogic/meson_hdmireg.h \ src/sys/arch/arm/amlogic/meson_vpureg.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/amlogic/files.meson diff -u src/sys/arch/arm/amlogic/files.meson:1.1 src/sys/arch/arm/amlogic/files.meson:1.2 --- src/sys/arch/arm/amlogic/files.meson:1.1 Sat Jan 19 20:56:03 2019 +++ src/sys/arch/arm/amlogic/files.meson Sat Jan 19 21:43:43 2019 @@ -1,4 +1,4 @@ -# $NetBSD: files.meson,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ +# $NetBSD: files.meson,v 1.2 2019/01/19 21:43:43 jmcneill Exp $ # # Configuration info for Amlogic Meson family SoCs # @@ -32,6 +32,10 @@ device mesonuart attach mesonuart at fdt with meson_uart file arch/arm/amlogic/meson_uart.c meson_uart +# Framebuffer console +attach genfb at fdt with meson_genfb +file arch/arm/amlogic/meson_genfb.c meson_genfb & soc_meson + # GPIO device mesonpinctrl: gpiobus attach mesonpinctrl at fdt with meson_pinctrl Added files: Index: src/sys/arch/arm/amlogic/meson_canvasreg.h diff -u /dev/null src/sys/arch/arm/amlogic/meson_canvasreg.h:1.1 --- /dev/null Sat Jan 19 21:43:43 2019 +++ src/sys/arch/arm/amlogic/meson_canvasreg.h Sat Jan 19 21:43:43 2019 @@ -0,0 +1,54 @@ +/* $NetBSD: meson_canvasreg.h,v 1.1 2019/01/19 21:43:43 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015 Jared McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef _MESON_CANVASREG_H +#define _MESON_CANVASREG_H + +#define CANVAS_REG(n) ((n) << 2) + +#define DC_CAV_LUT_DATAL_REG CANVAS_REG(0x12) +#define DC_CAV_LUT_DATAH_REG CANVAS_REG(0x13) +#define DC_CAV_LUT_ADDR_REG CANVAS_REG(0x14) + +#define DC_CAV_LUT_DATAL_FBADDR __BITS(28,0) +#define DC_CAV_LUT_DATAL_WIDTH_L __BITS(31,29) + +#define DC_CAV_LUT_DATAH_BLKMODE __BITS(25,24) +#define DC_CAV_LUT_DATAH_BLKMODE_LINEAR 0 +#define DC_CAV_LUT_DATAH_BLKMODE_32X32 1 +#define DC_CAV_LUT_DATAH_BLKMODE_64X64 2 +#define DC_CAV_LUT_DATAH_YWRAP __BIT(23) +#define DC_CAV_LUT_DATAH_XWRAP __BIT(22) +#define DC_CAV_LUT_DATAH_HEIGHT __BITS(21,9) +#define DC_CAV_LUT_DATAH_WIDTH_H __BITS(8,0) + +#define DC_CAV_LUT_ADDR_WR_EN __BIT(9) +#define DC_CAV_LUT_ADDR_RD_EN __BIT(8) +#define DC_CAV_LUT_ADDR_INDEX __BITS(2,0) + +#endif /* _MESON_CANVASREG_H */ Index: src/sys/arch/arm/amlogic/meson_genfb.c diff -u /dev/null src/sys/arch/arm/amlogic/meson_genfb.c:1.1 --- /dev/null Sat Jan 19 21:43:43 2019 +++ src/sys/arch/arm/amlogic/meson_genfb.c Sat Jan 19 21:43:43 2019 @@ -0,0 +1,728 @@ +/* $NetBSD: meson_genfb.c,v 1.1 2019/01/19 21:43:43 jmcneill Exp $ */ + +/*- + * Copyright (c) 2015-2019 Jared McNeill + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribut
CVS commit: src/sys/arch/arm/dts
Module Name:src
Committed By: jmcneill
Date: Sat Jan 19 21:44:02 UTC 2019
Modified Files:
src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi
Log Message:
Add (non-standard) fb node for meson8b
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/dts/meson8b-odroidc1.dts \
src/sys/arch/arm/dts/meson8b.dtsi
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/meson8b-odroidc1.dts
diff -u src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.1 src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.2
--- src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.1 Sat Jan 19 20:56:03 2019
+++ src/sys/arch/arm/dts/meson8b-odroidc1.dts Sat Jan 19 21:44:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b-odroidc1.dts,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ */
+/* $NetBSD: meson8b-odroidc1.dts,v 1.2 2019/01/19 21:44:02 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -28,3 +28,7 @@
#include_next "meson8b-odroidc1.dts"
#include "meson8b.dtsi"
+
+&genfb {
+ status = "okay";
+};
Index: src/sys/arch/arm/dts/meson8b.dtsi
diff -u src/sys/arch/arm/dts/meson8b.dtsi:1.1 src/sys/arch/arm/dts/meson8b.dtsi:1.2
--- src/sys/arch/arm/dts/meson8b.dtsi:1.1 Sat Jan 19 20:56:03 2019
+++ src/sys/arch/arm/dts/meson8b.dtsi Sat Jan 19 21:44:02 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b.dtsi,v 1.1 2019/01/19 20:56:03 jmcneill Exp $ */
+/* $NetBSD: meson8b.dtsi,v 1.2 2019/01/19 21:44:02 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -35,4 +35,12 @@
interrupts = ;
clocks = <&clkc CLKID_PERIPH>;
};
+
+ genfb: fb@c8006000 {
+ compatible = "amlogic,meson8b-fb";
+ reg = <0xc8006000 0x400>, /* DMC */
+ <0xd004 0x1>, /* HDMI */
+ <0xd010 0x10>; /* VPU */
+ status = "disabled";
+ };
};
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Jan 20 00:44:17 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC Log Message: Add mesonsdhc To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/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/evbarm/conf/GENERIC diff -u src/sys/arch/evbarm/conf/GENERIC:1.20 src/sys/arch/evbarm/conf/GENERIC:1.21 --- src/sys/arch/evbarm/conf/GENERIC:1.20 Sat Jan 19 21:43:07 2019 +++ src/sys/arch/evbarm/conf/GENERIC Sun Jan 20 00:44:17 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC,v 1.20 2019/01/19 21:43:07 jmcneill Exp $ +# $NetBSD: GENERIC,v 1.21 2019/01/20 00:44:17 jmcneill Exp $ # # GENERIC ARM (aarch32) kernel # @@ -510,6 +510,7 @@ spkr* at audio? # SDMMC dwcmmc* at fdt? # DesignWare SDMMC mesonsdio* at fdt? # Amlogic Meson SDIO controller +mesonsdhc* at fdt? # Amlogic Meson SDHC controller mmcpwrseq* at fdt? # Simple MMC power sequence provider plmmc* at fdt? # ARM PrimeCell MCI sdhc* at fdt? # SD Host Controller Interface
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: jmcneill
Date: Sun Jan 20 00:44:01 UTC 2019
Modified Files:
src/sys/arch/arm/amlogic: files.meson
src/sys/arch/arm/dts: meson8b-odroidc1.dts meson8b.dtsi
Added Files:
src/sys/arch/arm/amlogic: meson_sdhc.c meson_sdhcreg.h
Log Message:
Add Amlogic Meson SDHC driver (non-standard bindings)
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/files.meson
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/amlogic/meson_sdhc.c \
src/sys/arch/arm/amlogic/meson_sdhcreg.h
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/dts/meson8b-odroidc1.dts \
src/sys/arch/arm/dts/meson8b.dtsi
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/amlogic/files.meson
diff -u src/sys/arch/arm/amlogic/files.meson:1.2 src/sys/arch/arm/amlogic/files.meson:1.3
--- src/sys/arch/arm/amlogic/files.meson:1.2 Sat Jan 19 21:43:43 2019
+++ src/sys/arch/arm/amlogic/files.meson Sun Jan 20 00:44:01 2019
@@ -1,4 +1,4 @@
-# $NetBSD: files.meson,v 1.2 2019/01/19 21:43:43 jmcneill Exp $
+# $NetBSD: files.meson,v 1.3 2019/01/20 00:44:01 jmcneill Exp $
#
# Configuration info for Amlogic Meson family SoCs
#
@@ -43,9 +43,9 @@ file arch/arm/amlogic/meson_pinctrl.c me
file arch/arm/amlogic/meson8b_pinctrl.c meson_pinctrl & soc_meson8b
# SDHC
-#device mesonsdhc: sdmmcbus
-#attach mesonsdhc at fdt with meson_sdhc
-#file arch/arm/amlogic/meson_sdhc.c meson_sdhc
+device mesonsdhc: sdmmcbus
+attach mesonsdhc at fdt with meson_sdhc
+file arch/arm/amlogic/meson_sdhc.c meson_sdhc
# SDIO
device mesonsdio: sdmmcbus
Index: src/sys/arch/arm/dts/meson8b-odroidc1.dts
diff -u src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.2 src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.3
--- src/sys/arch/arm/dts/meson8b-odroidc1.dts:1.2 Sat Jan 19 21:44:02 2019
+++ src/sys/arch/arm/dts/meson8b-odroidc1.dts Sun Jan 20 00:44:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b-odroidc1.dts,v 1.2 2019/01/19 21:44:02 jmcneill Exp $ */
+/* $NetBSD: meson8b-odroidc1.dts,v 1.3 2019/01/20 00:44:01 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -32,3 +32,23 @@
&genfb {
status = "okay";
};
+
+&sdhc {
+ status = "okay";
+
+ pinctrl-0 = <&sdxc_c_pins>;
+ pinctrl-names = "default";
+
+ /* eMMC card */
+ emmc_card_slot: slot@2 {
+ compatible = "mmc-slot";
+ reg = <2>;
+ status = "okay";
+
+ bus-width = <8>;
+ no-sdio;
+ cap-mmc-highspeed;
+ cap-sd-highspeed;
+ disable-wp;
+ };
+};
Index: src/sys/arch/arm/dts/meson8b.dtsi
diff -u src/sys/arch/arm/dts/meson8b.dtsi:1.2 src/sys/arch/arm/dts/meson8b.dtsi:1.3
--- src/sys/arch/arm/dts/meson8b.dtsi:1.2 Sat Jan 19 21:44:02 2019
+++ src/sys/arch/arm/dts/meson8b.dtsi Sun Jan 20 00:44:01 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: meson8b.dtsi,v 1.2 2019/01/19 21:44:02 jmcneill Exp $ */
+/* $NetBSD: meson8b.dtsi,v 1.3 2019/01/20 00:44:01 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -44,3 +44,25 @@
status = "disabled";
};
};
+
+&pinctrl_cbus {
+ sdxc_c_pins: sdxc-c {
+ mux {
+ groups = "sdxc_d0_c", "sdxc_d13_c", "sdxc_d47_c", "sdxc_clk_c", "sdxc_cmd_c";
+ function = "sdxc_c";
+ };
+ };
+};
+
+&cbus {
+ sdhc: mmc@8e00 {
+ compatible = "amlogic,meson8b-sdhc";
+ reg = <0x8e00 0x30>;
+ interrupts = ;
+ clocks = <&clkc CLKID_SDHC>, <&clkc CLKID_FCLK_DIV3>;
+ clock-names = "core", "clkin";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ status = "disabled";
+ };
+};
Added files:
Index: src/sys/arch/arm/amlogic/meson_sdhc.c
diff -u /dev/null src/sys/arch/arm/amlogic/meson_sdhc.c:1.1
--- /dev/null Sun Jan 20 00:44:01 2019
+++ src/sys/arch/arm/amlogic/meson_sdhc.c Sun Jan 20 00:44:01 2019
@@ -0,0 +1,978 @@
+/* $NetBSD: meson_sdhc.c,v 1.1 2019/01/20 00:44:01 jmcneill Exp $ */
+
+/*-
+ * Copyright (c) 2015-2019 Jared McNeill
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN
