Re: CVS commit: src/lib/libnvmm
Le 11/11/2018 à 01:06, Maya Rashish a écrit : Module Name:src Committed By: maya Date: Sun Nov 11 00:06:48 UTC 2018 Modified Files: src/lib/libnvmm: libnvmm_x86.c Log Message: Add missing include for struct nvmm_x64_state (Pointed out by the clang build) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libnvmm/libnvmm_x86.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. ? libnvmm_x86.c includes "nvmm.h", which includes 40 #ifdef __x86_64__ 41 #include 42 #endif Is there rather a problem with the ifdef? It's the second time someone tells me libnvmm doesn't build, yet on my machine it builds.
Re: CVS commit: src/lib/libnvmm
It looked like it was building a 32bit version of the library too, which might have been the source of the build failure. I'm not sure if that changed since.
Re: CVS commit: src/distrib/sets/lists
On Sun, 11 Nov 2018 13:03:08 +0100, "Maxime Villard" wrote: > > Module Name: src > Committed By: maxv > Date: Sun Nov 11 12:03:08 UTC 2018 > > Modified Files: > src/distrib/sets/lists/base: md.amd64 > src/distrib/sets/lists/comp: md.amd64 > src/distrib/sets/lists/debug: md.amd64 > > Log Message: > Fix the libnvmm sets, do the same as libx86_64. I still get: === 9 extra files in DESTDIR = Files in DESTDIR but missing from flist. File is obsolete or flist is out of date ? -- ./lib/libnvmm.so ./lib/libnvmm.so.0 ./lib/libnvmm.so.0.1 ./usr/lib/i386/libnvmm.a ./usr/lib/i386/libnvmm.so ./usr/lib/i386/libnvmm.so.0 ./usr/lib/i386/libnvmm.so.0.1 ./usr/lib/i386/libnvmm_p.a ./usr/lib/i386/libnvmm_pic.a = end of 9 extra files === I am building on FreeBSD 12.0-BETA4 (amd64): ./build.sh -j4 -a x86_64 -m amd64 -T ../tools -O ../obj -U distribution -- Herbert
Re: CVS commit: src/distrib/sets/lists
Le 12/11/2018 à 00:30, Martin Husemann a écrit :
On Sun, Nov 11, 2018 at 10:24:28PM +0100, Maxime Villard wrote:
It's not complicated, we just want /usr/lib/libnvmm*, and nothing else. Just
like libx86_64.
In src/lib/libarch/x86_64/Makefile.inc:
.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
The MLIBDIR is the (unfortunately undocumented in share/mk/bsd.README)
key, it will iterate over all compat lib types (AFAICT). See
compat/README.
Martin
I did test this, but it didn't work. I tested three combinations of MLIBDIR
and the error was still the same each time.
Re: CVS commit: src/distrib/sets/lists
On Sun, Nov 11, 2018 at 10:24:28PM +0100, Maxime Villard wrote:
> It's not complicated, we just want /usr/lib/libnvmm*, and nothing else. Just
> like libx86_64.
In src/lib/libarch/x86_64/Makefile.inc:
.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
The MLIBDIR is the (unfortunately undocumented in share/mk/bsd.README)
key, it will iterate over all compat lib types (AFAICT). See
compat/README.
Martin
Re: CVS commit: src/distrib/sets/lists
Le 11/11/2018 à 18:01, Maxime Villard a écrit : For reference: | I was having trouble compile-testing, the build was failing because of libssl | and I didn't understand how to work around this. Also this is an old AMD | machine that takes ages to build stuff... I will retry to rebuild, but feel free to fix before I do. It looks like the 32bit version of libnvmm gets built, but we don't want that. I've tested several combinations, I still don't understand how we can tell the build system to NOT build the 32bit version. It's not complicated, we just want /usr/lib/libnvmm*, and nothing else. Just like libx86_64. Yet it keeps building /lib/libnvmm.so* and /usr/lib/i386/libnvmm*, I've no idea why. This is insane.
Re: CVS commit: src/distrib/sets/lists
Le 11/11/2018 à 17:49, Herbert J. Skuhra a écrit : On Sun, 11 Nov 2018 13:03:08 +0100, "Maxime Villard" wrote: Module Name:src Committed By: maxv Date: Sun Nov 11 12:03:08 UTC 2018 Modified Files: src/distrib/sets/lists/base: md.amd64 src/distrib/sets/lists/comp: md.amd64 src/distrib/sets/lists/debug: md.amd64 Log Message: Fix the libnvmm sets, do the same as libx86_64. I still get: === 9 extra files in DESTDIR = Files in DESTDIR but missing from flist. File is obsolete or flist is out of date ? -- ./lib/libnvmm.so ./lib/libnvmm.so.0 ./lib/libnvmm.so.0.1 ./usr/lib/i386/libnvmm.a ./usr/lib/i386/libnvmm.so ./usr/lib/i386/libnvmm.so.0 ./usr/lib/i386/libnvmm.so.0.1 ./usr/lib/i386/libnvmm_p.a ./usr/lib/i386/libnvmm_pic.a = end of 9 extra files === I am building on FreeBSD 12.0-BETA4 (amd64): ./build.sh -j4 -a x86_64 -m amd64 -T ../tools -O ../obj -U distribution For reference: | I was having trouble compile-testing, the build was failing because of libssl | and I didn't understand how to work around this. Also this is an old AMD | machine that takes ages to build stuff... I will retry to rebuild, but feel free to fix before I do. It looks like the 32bit version of libnvmm gets built, but we don't want that.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jakllsch
Date: Sun Nov 11 22:39:25 UTC 2018
Modified Files:
src/sys/arch/arm/rockchip: rk3399_cru.c
Log Message:
Add clock information for RK3399 PCIe
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk3399_cru.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/rockchip/rk3399_cru.c
diff -u src/sys/arch/arm/rockchip/rk3399_cru.c:1.3 src/sys/arch/arm/rockchip/rk3399_cru.c:1.4
--- src/sys/arch/arm/rockchip/rk3399_cru.c:1.3 Sat Sep 1 19:35:53 2018
+++ src/sys/arch/arm/rockchip/rk3399_cru.c Sun Nov 11 22:39:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_cru.c,v 1.3 2018/09/01 19:35:53 jmcneill Exp $ */
+/* $NetBSD: rk3399_cru.c,v 1.4 2018/11/11 22:39:25 jakllsch Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_cru.c,v 1.3 2018/09/01 19:35:53 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_cru.c,v 1.4 2018/11/11 22:39:25 jakllsch Exp $");
#include
#include
@@ -348,6 +348,7 @@ static const char * armclkb_parents[] =
static const char * mux_pll_src_cpll_gpll_parents[] = { "cpll", "gpll" };
static const char * mux_pll_src_cpll_gpll_npll_parents[] = { "cpll", "gpll", "npll" };
static const char * mux_pll_src_cpll_gpll_upll_parents[] = { "cpll", "gpll", "upll" };
+static const char * mux_pll_src_cpll_gpll_npll_24m_parents[] = { "cpll", "gpll", "npll", "xin24m" };
static const char * mux_pll_src_cpll_gpll_npll_ppll_upll_24m_parents[] = { "cpll", "gpll", "npll", "ppll", "upll", "xin24m" };
static const char * mux_aclk_perilp0_parents[] = { "cpll_aclk_perilp0_src", "gpll_aclk_perilp0_src" };
static const char * mux_hclk_perilp1_parents[] = { "cpll_hclk_perilp1_src", "gpll_hclk_perilp1_src" };
@@ -359,6 +360,8 @@ static const char * mux_uart2_parents[]
static const char * mux_uart3_parents[] = { "clk_uart3_div", "clk_uart3_frac", "xin24m" };
static const char * mux_rmii_parents[] = { "clk_gmac", "clkin_gmac" };
static const char * mux_aclk_gmac_parents[] = { "cpll_aclk_gmac_src", "gpll_aclk_gmac_src" };
+static const char * mux_pll_src_24m_pciephy_parents[] = { "xin24m", "clk_pciephy_ref100m" };
+static const char * mux_pciecore_cru_phy_parents[] = { "clk_pcie_core_cru", "clk_pcie_core_phy" };
static struct rk_cru_clk rk3399_cru_clks[] = {
RK3399_PLL(RK3399_PLL_APLLL, "lpll", pll_parents,
@@ -733,6 +736,33 @@ static struct rk_cru_clk rk3399_cru_clks
RK_GATE(RK3399_PCLK_I2C6, "pclk_rki2c6", "pclk_perilp1", CLKGATE_CON(22), 8),
RK_GATE(RK3399_PCLK_I2C2, "pclk_rki2c2", "pclk_perilp1", CLKGATE_CON(22), 9),
RK_GATE(RK3399_PCLK_I2C3, "pclk_rki2c3", "pclk_perilp1", CLKGATE_CON(22), 10),
+
+ /* PCIe */
+ RK_GATE(RK3399_ACLK_PERF_PCIE, "aclk_perf_pcie", "aclk_perihp", CLKGATE_CON(20), 2),
+ RK_GATE(RK3399_ACLK_PCIE, "aclk_pcie", "aclk_perihp", CLKGATE_CON(20), 10),
+ RK_GATE(RK3399_PCLK_PCIE, "pclk_pcie", "pclk_perihp", CLKGATE_CON(20), 11),
+ RK_COMPOSITE(RK3399_SCLK_PCIE_PM, "clk_pcie_pm", mux_pll_src_cpll_gpll_npll_24m_parents,
+ CLKSEL_CON(17), /* muxdiv_reg */
+ __BITS(10,8), /* mux_mask */
+ __BITS(6,0), /* div_mask */
+ CLKGATE_CON(6), /* gate_reg */
+ __BIT(2), /* gate_mask */
+ 0),
+ RK_COMPOSITE_NOMUX(RK3399_SCLK_PCIEPHY_REF100M, "clk_pciephy_ref100m", "npll",
+ CLKSEL_CON(18), /* div_reg */
+ __BITS(15,11), /* div_mask */
+ CLKGATE_CON(12), /* gate_reg */
+ __BIT(6), /* gate_mask */
+ 0),
+ RK_MUX(RK3399_SCLK_PCIEPHY_REF, "clk_pciephy_ref", mux_pll_src_24m_pciephy_parents, CLKSEL_CON(18), __BIT(10)),
+ RK_COMPOSITE(0, "clk_pcie_core_cru", mux_pll_src_cpll_gpll_npll_parents,
+ CLKSEL_CON(18), /* muxdiv_reg */
+ __BITS(9,8), /* mux_mask */
+ __BITS(6,0), /* div_mask */
+ CLKGATE_CON(6), /* gate_reg */
+ __BIT(3), /* gate_mask */
+ 0),
+ RK_MUX(RK3399_SCLK_PCIE_CORE, "clk_pcie_core", mux_pciecore_cru_phy_parents, CLKSEL_CON(18), __BIT(7)),
};
static int
CVS commit: src/external/gpl3/gcc.old
Module Name:src Committed By: mrg Date: Sun Nov 11 22:50:13 UTC 2018 Modified Files: src/external/gpl3/gcc.old: Makefile Makefile.gcc_path Makefile.hooks src/external/gpl3/gcc.old/dist: LAST_UPDATED MD5SUMS NEWS src/external/gpl3/gcc.old/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.old/dist/contrib: gcc_update src/external/gpl3/gcc.old/dist/fixincludes: fixincl.x inclhack.def src/external/gpl3/gcc.old/dist/fixincludes/tests/base/sys: pthread.h src/external/gpl3/gcc.old/dist/gcc: BASE-VER DATESTAMP alias.c asan.c bb-reorder.c builtins.c calls.c cfgexpand.c cfgrtl.c cgraph.c cgraph.h collect2.c combine.c config.gcc config.in configure configure.ac convert.c dce.c dse.c dwarf2out.c emit-rtl.c expmed.c expr.c final.c fold-const.c function.c gcc.c gengtype-lex.c ggc-page.c gimple-ssa-strength-reduction.c gimplify.c graphite.h hwint.h internal-fn.c ipa-cp.c ipa-inline.c ipa-utils.c ira.c is-a.h loop-unroll.c lower-subreg.c lto-streamer-out.c omp-low.c opts-common.c opts-global.c opts.c opts.h postreload.c regsub.c rtlanal.c sched-deps.c simplify-rtx.c stor-layout.c symtab.c toplev.c tree-cfg.c tree-dfa.c tree-inline.c tree-object-size.c tree-predcom.c tree-ssa-alias.c tree-ssa-math-opts.c tree-ssa-phiopt.c tree-ssa-reassoc.c tree-ssa-sccvn.c tree-ssa-structalias.c tree-ssa-tail-merge.c tree-tailcall.c tree-vect-loop-manip.c tree-vect-patterns.c tree-vect-slp.c tree-vect-stmts.c tree-vrp.c tree.c valtrack.c varasm.c src/external/gpl3/gcc.old/dist/gcc/c: c-decl.c c-parser.c src/external/gpl3/gcc.old/dist/gcc/c-family: c-common.c c-cppbuiltin.c c-gimplify.c c-omp.c c-pragma.c src/external/gpl3/gcc.old/dist/gcc/config: gnu-user.h sol2.h src/external/gpl3/gcc.old/dist/gcc/config/aarch64: aarch64.c aarch64.h aarch64.md constraints.md src/external/gpl3/gcc.old/dist/gcc/config/alpha: alpha.c alpha.md sync.md src/external/gpl3/gcc.old/dist/gcc/config/arm: arm-cores.def arm.c arm.h arm.md freebsd.h neon.md src/external/gpl3/gcc.old/dist/gcc/config/avr: avr.c avr.opt src/external/gpl3/gcc.old/dist/gcc/config/i386: constraints.md gnu-user.h gnu-user64.h i386-protos.h i386.c i386.h i386.md predicates.md sol2.h sse.md src/external/gpl3/gcc.old/dist/gcc/config/pa: pa.c pa.h pa.md pa.opt pa32-linux.h pa64-hpux.h predicates.md src/external/gpl3/gcc.old/dist/gcc/config/rs6000: altivec.md power6.md ppc-asm.h rs6000-builtin.def rs6000-c.c rs6000-protos.h rs6000.c rs6000.h rs6000.md sysv4.h sysv4.opt vsx.md src/external/gpl3/gcc.old/dist/gcc/config/s390: s390-opts.h s390-protos.h s390.c s390.h s390.md s390.opt src/external/gpl3/gcc.old/dist/gcc/config/sh: sh-protos.h src/external/gpl3/gcc.old/dist/gcc/config/sparc: sparc.c sparc.md src/external/gpl3/gcc.old/dist/gcc/config/xtensa: xtensa.c xtensa.md src/external/gpl3/gcc.old/dist/gcc/cp: call.c class.c cp-gimplify.c cp-tree.h cvt.c decl.c decl2.c name-lookup.c optimize.c parser.c pt.c semantics.c tree.c typeck2.c src/external/gpl3/gcc.old/dist/gcc/doc: aot-compile.1 cpp.1 cpp.info cppinternals.info extend.texi fsf-funding.7 g++.1 gc-analyze.1 gcc.1 gcc.info gccinstall.info gccint.info gcj-dbtool.1 gcj.1 gcj.info gcov.1 gcov.texi gfdl.7 gfortran.1 gij.1 gpl.7 grmic.1 invoke.texi jcf-dump.1 jv-convert.1 rebuild-gcj-db.1 src/external/gpl3/gcc.old/dist/gcc/lto: lto-lang.c lto-partition.c lto.c src/external/gpl3/gcc.old/dist/libcpp: lex.c src/external/gpl3/gcc.old/dist/libgcc: config.host configure configure.ac libgcc2.c src/external/gpl3/gcc.old/dist/libgcc/config/aarch64: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/alpha: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/bfin: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/i386: cpuinfo.c linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/m68k: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/pa: fptr.c linux-atomic.c linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/sh: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/tilepro: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/xtensa: ieee754-df.S ieee754-sf.S linux-unwind.h src/external/gpl3/gcc.old/dist/libgomp:
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jakllsch Date: Sun Nov 11 22:39:25 UTC 2018 Modified Files: src/sys/arch/arm/rockchip: rk3399_cru.c Log Message: Add clock information for RK3399 PCIe To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk3399_cru.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc.old
Module Name:src Committed By: mrg Date: Sun Nov 11 22:50:13 UTC 2018 Modified Files: src/external/gpl3/gcc.old: Makefile Makefile.gcc_path Makefile.hooks src/external/gpl3/gcc.old/dist: LAST_UPDATED MD5SUMS NEWS src/external/gpl3/gcc.old/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.old/dist/contrib: gcc_update src/external/gpl3/gcc.old/dist/fixincludes: fixincl.x inclhack.def src/external/gpl3/gcc.old/dist/fixincludes/tests/base/sys: pthread.h src/external/gpl3/gcc.old/dist/gcc: BASE-VER DATESTAMP alias.c asan.c bb-reorder.c builtins.c calls.c cfgexpand.c cfgrtl.c cgraph.c cgraph.h collect2.c combine.c config.gcc config.in configure configure.ac convert.c dce.c dse.c dwarf2out.c emit-rtl.c expmed.c expr.c final.c fold-const.c function.c gcc.c gengtype-lex.c ggc-page.c gimple-ssa-strength-reduction.c gimplify.c graphite.h hwint.h internal-fn.c ipa-cp.c ipa-inline.c ipa-utils.c ira.c is-a.h loop-unroll.c lower-subreg.c lto-streamer-out.c omp-low.c opts-common.c opts-global.c opts.c opts.h postreload.c regsub.c rtlanal.c sched-deps.c simplify-rtx.c stor-layout.c symtab.c toplev.c tree-cfg.c tree-dfa.c tree-inline.c tree-object-size.c tree-predcom.c tree-ssa-alias.c tree-ssa-math-opts.c tree-ssa-phiopt.c tree-ssa-reassoc.c tree-ssa-sccvn.c tree-ssa-structalias.c tree-ssa-tail-merge.c tree-tailcall.c tree-vect-loop-manip.c tree-vect-patterns.c tree-vect-slp.c tree-vect-stmts.c tree-vrp.c tree.c valtrack.c varasm.c src/external/gpl3/gcc.old/dist/gcc/c: c-decl.c c-parser.c src/external/gpl3/gcc.old/dist/gcc/c-family: c-common.c c-cppbuiltin.c c-gimplify.c c-omp.c c-pragma.c src/external/gpl3/gcc.old/dist/gcc/config: gnu-user.h sol2.h src/external/gpl3/gcc.old/dist/gcc/config/aarch64: aarch64.c aarch64.h aarch64.md constraints.md src/external/gpl3/gcc.old/dist/gcc/config/alpha: alpha.c alpha.md sync.md src/external/gpl3/gcc.old/dist/gcc/config/arm: arm-cores.def arm.c arm.h arm.md freebsd.h neon.md src/external/gpl3/gcc.old/dist/gcc/config/avr: avr.c avr.opt src/external/gpl3/gcc.old/dist/gcc/config/i386: constraints.md gnu-user.h gnu-user64.h i386-protos.h i386.c i386.h i386.md predicates.md sol2.h sse.md src/external/gpl3/gcc.old/dist/gcc/config/pa: pa.c pa.h pa.md pa.opt pa32-linux.h pa64-hpux.h predicates.md src/external/gpl3/gcc.old/dist/gcc/config/rs6000: altivec.md power6.md ppc-asm.h rs6000-builtin.def rs6000-c.c rs6000-protos.h rs6000.c rs6000.h rs6000.md sysv4.h sysv4.opt vsx.md src/external/gpl3/gcc.old/dist/gcc/config/s390: s390-opts.h s390-protos.h s390.c s390.h s390.md s390.opt src/external/gpl3/gcc.old/dist/gcc/config/sh: sh-protos.h src/external/gpl3/gcc.old/dist/gcc/config/sparc: sparc.c sparc.md src/external/gpl3/gcc.old/dist/gcc/config/xtensa: xtensa.c xtensa.md src/external/gpl3/gcc.old/dist/gcc/cp: call.c class.c cp-gimplify.c cp-tree.h cvt.c decl.c decl2.c name-lookup.c optimize.c parser.c pt.c semantics.c tree.c typeck2.c src/external/gpl3/gcc.old/dist/gcc/doc: aot-compile.1 cpp.1 cpp.info cppinternals.info extend.texi fsf-funding.7 g++.1 gc-analyze.1 gcc.1 gcc.info gccinstall.info gccint.info gcj-dbtool.1 gcj.1 gcj.info gcov.1 gcov.texi gfdl.7 gfortran.1 gij.1 gpl.7 grmic.1 invoke.texi jcf-dump.1 jv-convert.1 rebuild-gcj-db.1 src/external/gpl3/gcc.old/dist/gcc/lto: lto-lang.c lto-partition.c lto.c src/external/gpl3/gcc.old/dist/libcpp: lex.c src/external/gpl3/gcc.old/dist/libgcc: config.host configure configure.ac libgcc2.c src/external/gpl3/gcc.old/dist/libgcc/config/aarch64: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/alpha: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/bfin: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/i386: cpuinfo.c linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/m68k: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/pa: fptr.c linux-atomic.c linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/sh: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/tilepro: linux-unwind.h src/external/gpl3/gcc.old/dist/libgcc/config/xtensa: ieee754-df.S ieee754-sf.S linux-unwind.h src/external/gpl3/gcc.old/dist/libgomp:
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sun Nov 11 21:24:28 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: gic_fdt.c
Log Message:
Add GICv2m support
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/fdt/gic_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/arch/arm/fdt/gic_fdt.c
diff -u src/sys/arch/arm/fdt/gic_fdt.c:1.13 src/sys/arch/arm/fdt/gic_fdt.c:1.14
--- src/sys/arch/arm/fdt/gic_fdt.c:1.13 Mon Sep 3 16:29:23 2018
+++ src/sys/arch/arm/fdt/gic_fdt.c Sun Nov 11 21:24:28 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: gic_fdt.c,v 1.13 2018/09/03 16:29:23 riastradh Exp $ */
+/* $NetBSD: gic_fdt.c,v 1.14 2018/11/11 21:24:28 jmcneill Exp $ */
/*-
* Copyright (c) 2015-2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.13 2018/09/03 16:29:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v 1.14 2018/11/11 21:24:28 jmcneill Exp $");
#include
#include
@@ -39,15 +39,25 @@ __KERNEL_RCSID(0, "$NetBSD: gic_fdt.c,v
#include
#include
+#include
+
#include
+#include
+#include
#include
#include
#define GIC_MAXIRQ 1020
+extern struct pic_softc *pic_list[];
+
+struct gic_fdt_softc;
+struct gic_fdt_irq;
+
static int gic_fdt_match(device_t, cfdata_t, void *);
static void gic_fdt_attach(device_t, device_t, void *);
+static void gic_fdt_attach_v2m(struct gic_fdt_softc *, bus_space_tag_t, int);
static int gic_fdt_intr(void *);
@@ -62,9 +72,6 @@ struct fdtbus_interrupt_controller_func
.intrstr = gic_fdt_intrstr
};
-struct gic_fdt_softc;
-struct gic_fdt_irq;
-
struct gic_fdt_irqhandler {
struct gic_fdt_irq *ih_irq;
int (*ih_fn)(void *);
@@ -87,8 +94,11 @@ struct gic_fdt_irq {
struct gic_fdt_softc {
device_t sc_dev;
+ device_t sc_gicdev;
int sc_phandle;
+ int sc_v2m_count;
+
struct gic_fdt_irq *sc_irq[GIC_MAXIRQ];
};
@@ -107,7 +117,7 @@ gic_fdt_match(device_t parent, cfdata_t
};
struct fdt_attach_args * const faa = aux;
- return of_compatible(faa->faa_phandle, compatible) >= 0;
+ return of_match_compatible(faa->faa_phandle, compatible);
}
static void
@@ -115,15 +125,16 @@ gic_fdt_attach(device_t parent, device_t
{
struct gic_fdt_softc * const sc = device_private(self);
struct fdt_attach_args * const faa = aux;
+ const int phandle = faa->faa_phandle;
bus_addr_t addr_d, addr_c;
bus_size_t size_d, size_c;
bus_space_handle_t bsh;
- int error;
+ int error, child;
sc->sc_dev = self;
- sc->sc_phandle = faa->faa_phandle;
+ sc->sc_phandle = phandle;
- error = fdtbus_register_interrupt_controller(self, faa->faa_phandle,
+ error = fdtbus_register_interrupt_controller(self, phandle,
_fdt_funcs);
if (error) {
aprint_error(": couldn't register with fdtbus: %d\n", error);
@@ -160,9 +171,58 @@ gic_fdt_attach(device_t parent, device_t
.mpcaa_off2 = addr_c - addr,
};
- config_found(self, , NULL);
+ sc->sc_gicdev = config_found(self, , NULL);
arm_fdt_irq_set_handler(armgic_irq_handler);
+
+ for (child = OF_child(phandle); child; child = OF_peer(child)) {
+ if (!fdtbus_status_okay(child))
+ continue;
+ const char * const v2m_compat[] = { "arm,gic-v2m-frame", NULL };
+ if (of_match_compatible(child, v2m_compat))
+ gic_fdt_attach_v2m(sc, faa->faa_bst, child);
+ }
+}
+
+static void
+gic_fdt_attach_v2m(struct gic_fdt_softc *sc, bus_space_tag_t bst, int phandle)
+{
+ struct gic_v2m_frame *frame;
+ u_int base_spi, num_spis;
+ bus_space_handle_t bsh;
+ bus_addr_t addr;
+ bus_size_t size;
+
+ if (fdtbus_get_reg(phandle, 0, , ) != 0) {
+ aprint_error_dev(sc->sc_gicdev, "couldn't get V2M address\n");
+ return;
+ }
+
+ if (bus_space_map(bst, addr, size, 0, ) != 0) {
+ aprint_error_dev(sc->sc_gicdev, "couldn't map V2M frame\n");
+ return;
+ }
+ const uint32_t typer = bus_space_read_4(bst, bsh, GIC_MSI_TYPER);
+ bus_space_unmap(bst, bsh, size);
+
+ if (of_getprop_uint32(phandle, "arm,msi-base-spi", _spi))
+ base_spi = __SHIFTOUT(typer, GIC_MSI_TYPER_BASE);
+ if (of_getprop_uint32(phandle, "arm,msi-num-spis", _spis))
+ num_spis = __SHIFTOUT(typer, GIC_MSI_TYPER_NUMBER);
+
+ frame = kmem_zalloc(sizeof(*frame), KM_SLEEP);
+ frame->frame_reg = addr;
+ frame->frame_pic = pic_list[0];
+ frame->frame_base = base_spi;
+ frame->frame_count = num_spis;
+
+ if (gic_v2m_init(frame, sc->sc_gicdev, sc->sc_v2m_count++) != 0) {
+ aprint_error_dev(sc->sc_gicdev, "failed to initialize GICv2m\n");
+ } else {
+ aprint_normal_dev(sc->sc_gicdev, "GICv2m @ %#" PRIx64 ", SPIs %u-%u\n",
+ (uint64_t)frame->frame_reg, frame->frame_base,
+ frame->frame_base + frame->frame_count);
+ }
}
static void *
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Sun Nov 11 21:24:38 UTC 2018
Modified Files:
src/sys/arch/arm/fdt: pcihost_fdt.c
Log Message:
Add MSI/MSI-X support.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/fdt/pcihost_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/arch/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.2 src/sys/arch/arm/fdt/pcihost_fdt.c:1.3
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.2 Sun Sep 9 13:40:28 2018
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Sun Nov 11 21:24:38 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.2 2018/09/09 13:40:28 jmcneill Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.3 2018/11/11 21:24:38 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.2 2018/09/09 13:40:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.3 2018/11/11 21:24:38 jmcneill Exp $");
#include
#include
@@ -50,6 +50,8 @@ __KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.
#include
+#include
+
#define IH_INDEX_MASK 0x
#define IH_MPSAFE 0x8000
@@ -72,6 +74,8 @@ __KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.
#define PHYS_HI_FUNCTION __BITS(10,8)
#define PHYS_HI_REGISTER __BITS(7,0)
+static int pcihost_segment = 0;
+
enum pcihost_type {
PCIHOST_CAM = 1,
PCIHOST_ECAM,
@@ -86,6 +90,7 @@ struct pcihost_softc {
enum pcihost_type sc_type;
+ u_int sc_seg;
u_int sc_bus_min;
u_int sc_bus_max;
@@ -103,6 +108,7 @@ static void pcihost_attach_hook(device_t
static int pcihost_bus_maxdevs(void *, int);
static pcitag_t pcihost_make_tag(void *, int, int, int);
static void pcihost_decompose_tag(void *, pcitag_t, int *, int *, int *);
+static u_int pcihost_get_segment(void *);
static pcireg_t pcihost_conf_read(void *, pcitag_t, int);
static void pcihost_conf_write(void *, pcitag_t, int, pcireg_t);
static int pcihost_conf_hook(void *, int, int, int, pcireg_t);
@@ -178,6 +184,15 @@ pcihost_attach(device_t parent, device_t
sc->sc_bus_max = PCIHOST_DEFAULT_BUS_MAX;
}
+ /*
+ * Assign a fixed PCI segment ("domain") number. If the property is not
+ * present, assign one. The binding spec says if this property is used to
+ * assign static segment numbers, all host bridges should have segments
+ * astatic assigned to prevent overlaps.
+ */
+ if (of_getprop_uint32(sc->sc_phandle, "linux,pci-domain", >sc_seg))
+ sc->sc_seg = pcihost_segment++;
+
pcihost_init(>sc_pc, sc);
if (pcihost_config(sc) != 0)
@@ -189,6 +204,12 @@ pcihost_attach(device_t parent, device_t
PCI_FLAGS_MWI_OKAY |
PCI_FLAGS_MEM_OKAY |
PCI_FLAGS_IO_OKAY;
+#ifdef __HAVE_PCI_MSI_MSIX
+ if (sc->sc_type == PCIHOST_ECAM) {
+ pba.pba_flags |= PCI_FLAGS_MSI_OKAY |
+ PCI_FLAGS_MSIX_OKAY;
+ }
+#endif
pba.pba_iot = sc->sc_bst;
pba.pba_memt = sc->sc_bst;
pba.pba_dmat = sc->sc_dmat;
@@ -196,7 +217,7 @@ pcihost_attach(device_t parent, device_t
pba.pba_dmat64 = sc->sc_dmat;
#endif
pba.pba_pc = >sc_pc;
- pba.pba_bus = 0;
+ pba.pba_bus = sc->sc_bus_min;
config_found_ia(self, "pcibus", , pcibusprint);
}
@@ -209,6 +230,7 @@ pcihost_init(pci_chipset_tag_t pc, void
pc->pc_bus_maxdevs = pcihost_bus_maxdevs;
pc->pc_make_tag = pcihost_make_tag;
pc->pc_decompose_tag = pcihost_decompose_tag;
+ pc->pc_get_segment = pcihost_get_segment;
pc->pc_conf_read = pcihost_conf_read;
pc->pc_conf_write = pcihost_conf_write;
pc->pc_conf_hook = pcihost_conf_hook;
@@ -228,8 +250,17 @@ pcihost_config(struct pcihost_softc *sc)
{
struct extent *ioext = NULL, *memext = NULL, *pmemext = NULL;
const u_int *ranges;
+ u_int probe_only;
int error, len;
+ /*
+ * If this flag is set, skip configuration of the PCI bus and use existing config.
+ */
+ if (of_getprop_uint32(sc->sc_phandle, "linux,pci-probe-only", _only))
+ probe_only = 0;
+ if (probe_only)
+ return 0;
+
ranges = fdtbus_get_prop(sc->sc_phandle, "ranges", );
if (ranges == NULL) {
aprint_error_dev(sc->sc_dev, "missing 'ranges' property\n");
@@ -334,6 +365,14 @@ pcihost_decompose_tag(void *v, pcitag_t
*fp = (tag >> 8) & 0x7;
}
+static u_int
+pcihost_get_segment(void *v)
+{
+ struct pcihost_softc *sc = v;
+
+ return sc->sc_seg;
+}
+
static pcireg_t
pcihost_conf_read(void *v, pcitag_t tag, int offset)
{
@@ -489,16 +528,24 @@ pcihost_find_intr(struct pcihost_softc *
static const char *
pcihost_intr_string(void *v, pci_intr_handle_t ih, char *buf, size_t len)
{
+ const int irq = __SHIFTOUT(ih, ARM_PCI_INTR_IRQ);
+ const int vec = __SHIFTOUT(ih, ARM_PCI_INTR_MSI_VEC);
struct pcihost_softc *sc = v;
const u_int *specifier;
int ihandle;
- specifier = pcihost_find_intr(sc, ih & IH_INDEX_MASK, );
- if (specifier == NULL)
- return NULL;
+ if (ih & ARM_PCI_INTR_MSIX) {
+ snprintf(buf, len, "irq %d (MSI-X vec %d)", irq, vec);
+ }
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Sun Nov 11 21:24:28 UTC 2018 Modified Files: src/sys/arch/arm/fdt: gic_fdt.c Log Message: Add GICv2m support To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/fdt/gic_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Sun Nov 11 21:24:38 UTC 2018 Modified Files: src/sys/arch/arm/fdt: pcihost_fdt.c Log Message: Add MSI/MSI-X support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/fdt/pcihost_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: knakahara Date: Mon Nov 12 03:37:33 UTC 2018 Modified Files: src/sys/net: if_gif.c Log Message: Fix ALTQ on gif(4). Reported and tested by Anthony Mallet, advised by Greg Troxel, thanks. l2tp(4) and ipsecif(4) don't support ALTQ yet. So, they don't require this fix. XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/net/if_gif.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/net/if_gif.c diff -u src/sys/net/if_gif.c:1.144 src/sys/net/if_gif.c:1.145 --- src/sys/net/if_gif.c:1.144 Fri Oct 19 00:12:56 2018 +++ src/sys/net/if_gif.c Mon Nov 12 03:37:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_gif.c,v 1.144 2018/10/19 00:12:56 knakahara Exp $ */ +/* $NetBSD: if_gif.c,v 1.145 2018/11/12 03:37:33 knakahara Exp $ */ /* $KAME: if_gif.c,v 1.76 2001/08/20 02:01:02 kjc Exp $ */ /* @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.144 2018/10/19 00:12:56 knakahara Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_gif.c,v 1.145 2018/11/12 03:37:33 knakahara Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -487,7 +487,8 @@ gif_output(struct ifnet *ifp, struct mbu m->m_pkthdr.csum_flags = 0; m->m_pkthdr.csum_data = 0; - error = gif_transmit_direct(var, m); + error = if_transmit_lock(ifp, m); + end: if (var != NULL) gif_putref_variant(var, );
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Nov 12 04:37:27 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel 100 series and C230 series devices. To generate a diff of this commit: cvs rdiff -u -r1.1351 -r1.1352 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.1351 src/sys/dev/pci/pcidevs:1.1352 --- src/sys/dev/pci/pcidevs:1.1351 Thu Nov 8 06:44:50 2018 +++ src/sys/dev/pci/pcidevs Mon Nov 12 04:37:26 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1351 2018/11/08 06:44:50 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1352 2018/11/12 04:37:26 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -5059,7 +5059,9 @@ product INTEL PINEVIEW_M_HB 0xa010 Pinev product INTEL PINEVIEW_M_IGD 0xa011 Pineview Integrated Graphics Device product INTEL PINEVIEW_M_IGD_1 0xa012 Pineview Integrated Graphics Device product INTEL Z170_AHCI 0xa102 Z170 AHCI +product INTEL 100SERIES_AHCI_2 0xa103 HM170, QM170 AHCI product INTEL Z170_3RD_AHCI 0xa106 Z170 3rd Party RAID +product INTEL 100SERIES_3RD_RAID 0xa107 HM170, QM170 3rd Party RAID product INTEL 100SERIES_PCIE_1 0xa110 100 Series PCIE product INTEL 100SERIES_PCIE_2 0xa111 100 Series PCIE product INTEL 100SERIES_PCIE_3 0xa112 100 Series PCIE @@ -5095,9 +5097,20 @@ product INTEL 100SERIES_MEI_2 0xa13b 100 product INTEL 100SERIES_IDE_R 0xa13c 100 Series IDE-R product INTEL 100SERIES_KT 0xa13d 100 Series KT product INTEL 100SERIES_MEI_3 0xa13e 100 Series MEI 3 +product INTEL H110_LPC 0xa143 H110 LPC product INTEL H170_LPC 0xa144 H170 LPC product INTEL Z170_LPC 0xa145 Z170 LPC product INTEL Q170_LPC 0xa146 Q170 LPC +product INTEL Q150_LPC 0xa147 Q150 LPC +product INTEL B150_LPC 0xa148 B150 LPC +product INTEL C236_LPC 0xa149 C236 LPC +product INTEL C232_LPC 0xa14a C232 LPC +product INTEL QM170_LPC 0xa14d QM170 LPC +product INTEL HM170_LPC 0xa14e HM170 LPC +product INTEL CM236_LPC 0xa150 CM236 LPC +product INTEL HM175_LPC 0xa152 HM175 LPC +product INTEL QM175_LPC 0xa153 QM175 LPC +product INTEL CM238_LPC 0xa154 CM238 LPC product INTEL 100SERIES_I2C_0 0xa160 100 Series I2C 0 product INTEL 100SERIES_I2C_1 0xa161 100 Series I2C 1 product INTEL 100SERIES_I2C_2 0xa162 100 Series I2C 2 @@ -5108,6 +5121,7 @@ product INTEL 100SERIES_PCIE_18 0xa168 1 product INTEL 100SERIES_PCIE_19 0xa169 100 Series PCIE product INTEL 100SERIES_PCIE_20 0xa16a 100 Series PCIE product INTEL 100SERIES_HDA 0xa170 100 Series HD Audio +product INTEL 100SERIES_HDA_2 0xa171 100 Series HD Audio product INTEL C620_AHCI 0xa182 C620 AHCI product INTEL C620_3RD_RAID 0xa186 C620 3rd Party RAID product INTEL C620_PCIE_0 0xa190 C620 PCIe Root Port
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Nov 12 04:37:54 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs.h pcidevs_data.h Log Message: Regen. To generate a diff of this commit: cvs rdiff -u -r1.1341 -r1.1342 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1340 -r1.1341 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.
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Nov 12 04:37:27 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add some Intel 100 series and C230 series devices. To generate a diff of this commit: cvs rdiff -u -r1.1351 -r1.1352 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src Committed By: riastradh Date: Mon Nov 12 05:02:00 UTC 2018 Modified Files: src/tests/kernel: h_segv.c Log Message: Make fenv.h optional for this test to unbreak the vax build. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/tests/kernel/h_segv.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sliplogin
Module Name:src Committed By: christos Date: Mon Nov 12 00:50:54 UTC 2018 Modified Files: src/usr.sbin/sliplogin: sliplogin.8 Log Message: FILES section from Dan Plassche To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sliplogin/sliplogin.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sliplogin/sliplogin.8 diff -u src/usr.sbin/sliplogin/sliplogin.8:1.9 src/usr.sbin/sliplogin/sliplogin.8:1.10 --- src/usr.sbin/sliplogin/sliplogin.8:1.9 Thu Aug 7 07:25:43 2003 +++ src/usr.sbin/sliplogin/sliplogin.8 Sun Nov 11 19:50:54 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: sliplogin.8,v 1.9 2003/08/07 11:25:43 agc Exp $ +.\" $NetBSD: sliplogin.8,v 1.10 2018/11/12 00:50:54 christos Exp $ .\" .\" Copyright (c) 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" from: @(#)sliplogin.8 8.2 (Berkeley) 1/5/94 .\" -.Dd January 5, 1994 +.Dd November 11, 2018 .Dt SLIPLOGIN 8 .Os .Sh NAME @@ -166,6 +166,16 @@ is in group and mode 4550 (setuid root, only group .Em slip can execute binary). +.Sh FILES +.Bl -tag -width /usr/share/examples/slip/slip.login -compact +.It Pa /usr/share/examples/slip/slip.login +Sample slip.login script +.It Pa /etc/sliphome/slip.login.loginname +Login script for +.Em loginname +.It Pa /etc/sliphome/slip.hosts +Per host settings +.El .Sh DIAGNOSTICS .Nm logs various information to the system log daemon,
CVS commit: src/sbin/slattach
Module Name:src Committed By: christos Date: Mon Nov 12 00:56:26 UTC 2018 Modified Files: src/sbin/slattach: slattach.8 Log Message: Improve examples and netmask information (from Dan Plassche) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sbin/slattach/slattach.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/slattach/slattach.8 diff -u src/sbin/slattach/slattach.8:1.28 src/sbin/slattach/slattach.8:1.29 --- src/sbin/slattach/slattach.8:1.28 Sat Jul 8 13:22:14 2006 +++ src/sbin/slattach/slattach.8 Sun Nov 11 19:56:26 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: slattach.8,v 1.28 2006/07/08 17:22:14 tsutsui Exp $ +.\" $NetBSD: slattach.8,v 1.29 2018/11/12 00:56:26 christos Exp $ .\" .\" Copyright (c) 1986, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)slattach.8 8.2 (Berkeley) 4/1/94 .\" -.Dd July 8, 2006 +.Dd November 11, 2018 .Dt SLATTACH 8 .Os .Sh NAME @@ -55,6 +55,8 @@ or interfaces. These interfaces have to be created using the .Xr ifconfig 8 +The resulting point-to-point link is not a broadcast interface +and normally has a netmask of 255.255.255.255. .Cm create subcommand before the .Nm @@ -116,9 +118,19 @@ process. is the name that is shown by .Xr netstat 1 . .Sh EXAMPLES +Lock, initialize, and attach a line (on both sides): .Bd -literal -offset indent -compact -slattach ttyh8 -slattach \-s 4800 /dev/tty01 +cu -t -F [hard|soft] -l /dev/dty00 +ifconfig sl0 create +slattach -l -t slip /dev/dty00 +.Ed +On the local side: +.Bd -literal -offset indent -compact +ifconfig sl0 inet 10.0.0.2 10.0.0.1 netmask 255.255.255.255 +.Ed +On the remote side: +.Bd -literal -offset indent -compact +ifconfig sl0 inet 10.0.0.1 10.0.0.2 netmask 255.255.255.255 .Ed .Sh DIAGNOSTICS Messages indicating that the specified interface is not configured or created,
CVS commit: src/usr.sbin/sliplogin
Module Name:src Committed By: christos Date: Mon Nov 12 00:50:54 UTC 2018 Modified Files: src/usr.sbin/sliplogin: sliplogin.8 Log Message: FILES section from Dan Plassche To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/sliplogin/sliplogin.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sbin/slattach
Module Name:src Committed By: christos Date: Mon Nov 12 00:56:26 UTC 2018 Modified Files: src/sbin/slattach: slattach.8 Log Message: Improve examples and netmask information (from Dan Plassche) To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sbin/slattach/slattach.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:04:27 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: note GCC 6.5 was released (and imported.) To generate a diff of this commit: cvs rdiff -u -r1.1571 -r1.1572 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1571 src/doc/3RDPARTY:1.1572 --- src/doc/3RDPARTY:1.1571 Sat Oct 27 22:32:54 2018 +++ src/doc/3RDPARTY Sun Nov 11 23:04:27 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1571 2018/10/27 22:32:54 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1572 2018/11/11 23:04:27 mrg Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -451,8 +451,8 @@ Notes: There is a flex2netbsd script to help newer imports. Package: gcc -Version: 6.4 -Current Vers: 6.4/7.3/8.2 +Version: 6.5 +Current Vers: 6.5/7.3/8.2 Maintainer: FSF Archive Site: ftp://ftp.gnu.org/gnu/gcc/ Home Page: http://www.gnu.org/software/gcc/
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Nov 11 23:05:25 UTC 2018
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
our GCC 6.5 is "nb4 20181109".
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 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/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.11 src/tools/gcc/gcc-version.mk:1.12
--- src/tools/gcc/gcc-version.mk:1.11 Wed Sep 5 05:03:28 2018
+++ src/tools/gcc/gcc-version.mk Sun Nov 11 23:05:25 2018
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.11 2018/09/05 05:03:28 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.12 2018/11/11 23:05:25 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 6
-NETBSD_GCC_VERSION=nb3 20180905
+NETBSD_GCC_VERSION=nb4 20181109
.elif ${HAVE_GCC} == 7
NETBSD_GCC_VERSION=nb1 20180905
.endif
CVS commit: src/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:04:27 UTC 2018 Modified Files: src/doc: 3RDPARTY Log Message: note GCC 6.5 was released (and imported.) To generate a diff of this commit: cvs rdiff -u -r1.1571 -r1.1572 src/doc/3RDPARTY Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:05:25 UTC 2018 Modified Files: src/tools/gcc: gcc-version.mk Log Message: our GCC 6.5 is "nb4 20181109". To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 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.
CVS commit: src/external/gpl3/gcc/dist/gcc/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:13:10 UTC 2018 Modified Files: src/external/gpl3/gcc/dist/gcc/doc: cpp.info gcc.1 gcc.info Log Message: regen after GCC 6.5. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.info Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Sun Nov 11 18:02:23 UTC 2018 Modified Files: src/share/mk: bsd.own.mk Log Message: disorder police To generate a diff of this commit: cvs rdiff -u -r1.1081 -r1.1082 src/share/mk/bsd.own.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.1081 src/share/mk/bsd.own.mk:1.1082 --- src/share/mk/bsd.own.mk:1.1081 Sun Nov 11 03:28:35 2018 +++ src/share/mk/bsd.own.mk Sun Nov 11 13:02:23 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1081 2018/11/11 08:28:35 maya Exp $ +# $NetBSD: bsd.own.mk,v 1.1082 2018/11/11 18:02:23 christos Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -485,8 +485,8 @@ TOOL_CTFCONVERT= ctfconvert TOOL_CTFMERGE= ctfmerge TOOL_CVSLATEST= cvslatest TOOL_DB= db -TOOL_DTC= dtc TOOL_DISKLABEL= disklabel +TOOL_DTC= dtc TOOL_EQN= eqn TOOL_FDISK= fdisk TOOL_FGEN= fgen
CVS commit: src/share/mk
Module Name:src Committed By: christos Date: Sun Nov 11 18:02:23 UTC 2018 Modified Files: src/share/mk: bsd.own.mk Log Message: disorder police To generate a diff of this commit: cvs rdiff -u -r1.1081 -r1.1082 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:13:10 UTC 2018 Modified Files: src/external/gpl3/gcc/dist/gcc/doc: cpp.info gcc.1 gcc.info Log Message: regen after GCC 6.5. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc/dist/gcc/doc/gcc.info Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/gpl3/gcc.old/dist/gcc/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:14:17 UTC 2018 Modified Files: src/external/gpl3/gcc.old/dist/gcc/doc: cpp.info gcc.1 gcc.info Log Message: pull across from gcc/: regen after GCC 6.5. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc.old/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc.old/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc.old/dist/gcc/doc/gcc.info Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. diffs are larger than 1MB and have been omitted
CVS commit: src/external/gpl3/gcc.old/dist/gcc/doc
Module Name:src Committed By: mrg Date: Sun Nov 11 23:14:17 UTC 2018 Modified Files: src/external/gpl3/gcc.old/dist/gcc/doc: cpp.info gcc.1 gcc.info Log Message: pull across from gcc/: regen after GCC 6.5. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/external/gpl3/gcc.old/dist/gcc/doc/cpp.info \ src/external/gpl3/gcc.old/dist/gcc/doc/gcc.1 \ src/external/gpl3/gcc.old/dist/gcc/doc/gcc.info Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net
Module Name:src Committed By: knakahara Date: Mon Nov 12 03:37:33 UTC 2018 Modified Files: src/sys/net: if_gif.c Log Message: Fix ALTQ on gif(4). Reported and tested by Anthony Mallet, advised by Greg Troxel, thanks. l2tp(4) and ipsecif(4) don't support ALTQ yet. So, they don't require this fix. XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/net/if_gif.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/kernel
Module Name:src
Committed By: riastradh
Date: Mon Nov 12 05:02:00 UTC 2018
Modified Files:
src/tests/kernel: h_segv.c
Log Message:
Make fenv.h optional for this test to unbreak the vax build.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/tests/kernel/h_segv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/kernel/h_segv.c
diff -u src/tests/kernel/h_segv.c:1.9 src/tests/kernel/h_segv.c:1.10
--- src/tests/kernel/h_segv.c:1.9 Sun Nov 11 01:26:08 2018
+++ src/tests/kernel/h_segv.c Mon Nov 12 05:02:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: h_segv.c,v 1.9 2018/11/11 01:26:08 riastradh Exp $ */
+/* $NetBSD: h_segv.c,v 1.10 2018/11/12 05:02:00 riastradh Exp $ */
/*-
* Copyright (c) 2017 The NetBSD Foundation, Inc.
@@ -29,7 +29,9 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include
-__RCSID("$NetBSD: h_segv.c,v 1.9 2018/11/11 01:26:08 riastradh Exp $");
+__RCSID("$NetBSD: h_segv.c,v 1.10 2018/11/12 05:02:00 riastradh Exp $");
+
+#define __TEST_FENV
#include
#include
@@ -107,7 +109,9 @@ trigger_fpe(void)
volatile double a = getpid();
volatile double b = strtol("0", NULL, 0);
+#ifdef __HAVE_FENV
feenableexcept(FE_ALL_EXCEPT);
+#endif
usleep((int)(a/b));
}
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: maxv
Date: Mon Nov 12 06:53:43 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_socket.c
Log Message:
Fix inverted logic, which leads to buffer overflow. Detected by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/sys/compat/netbsd32/netbsd32_socket.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/compat/netbsd32/netbsd32_socket.c
diff -u src/sys/compat/netbsd32/netbsd32_socket.c:1.47 src/sys/compat/netbsd32/netbsd32_socket.c:1.48
--- src/sys/compat/netbsd32/netbsd32_socket.c:1.47 Sun May 13 00:04:23 2018
+++ src/sys/compat/netbsd32/netbsd32_socket.c Mon Nov 12 06:53:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_socket.c,v 1.47 2018/05/13 00:04:23 christos Exp $ */
+/* $NetBSD: netbsd32_socket.c,v 1.48 2018/11/12 06:53:43 maxv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.47 2018/05/13 00:04:23 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_socket.c,v 1.48 2018/11/12 06:53:43 maxv Exp $");
#include
#include
@@ -102,7 +102,7 @@ copyout32_msg_control_mbuf(struct lwp *l
}
ktrkuser(mbuftypes[MT_CONTROL], cmsg, cmsg->cmsg_len);
- error = copyout(, *q, MAX(i, sizeof(cmsg32)));
+ error = copyout(, *q, MIN(i, sizeof(cmsg32)));
if (error)
return (error);
if (i > CMSG32_LEN(0)) {
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Mon Nov 12 06:55:03 UTC 2018
Modified Files:
src/sys/kern: kern_proc.c
Log Message:
Fix buffer overflow, which can lead to severe information leak. Detected
by kASan.
To generate a diff of this commit:
cvs rdiff -u -r1.218 -r1.219 src/sys/kern/kern_proc.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/kern_proc.c
diff -u src/sys/kern/kern_proc.c:1.218 src/sys/kern/kern_proc.c:1.219
--- src/sys/kern/kern_proc.c:1.218 Fri Oct 5 22:12:38 2018
+++ src/sys/kern/kern_proc.c Mon Nov 12 06:55:03 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_proc.c,v 1.218 2018/10/05 22:12:38 christos Exp $ */
+/* $NetBSD: kern_proc.c,v 1.219 2018/11/12 06:55:03 maxv Exp $ */
/*-
* Copyright (c) 1999, 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.218 2018/10/05 22:12:38 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_proc.c,v 1.219 2018/11/12 06:55:03 maxv Exp $");
#ifdef _KERNEL_OPT
#include "opt_kstack.h"
@@ -2459,7 +2459,8 @@ fill_pathname(struct lwp *l, pid_t pid,
size_t len = strlen(p->p_path) + 1;
if (oldp != NULL) {
- error = sysctl_copyout(l, p->p_path, oldp, *oldlenp);
+ size_t copylen = uimin(len, *oldlenp);
+ error = sysctl_copyout(l, p->p_path, oldp, copylen);
if (error == 0 && *oldlenp < len)
error = ENOSPC;
}
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: maxv Date: Mon Nov 12 06:53:43 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_socket.c Log Message: Fix inverted logic, which leads to buffer overflow. Detected by kASan. To generate a diff of this commit: cvs rdiff -u -r1.47 -r1.48 src/sys/compat/netbsd32/netbsd32_socket.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Mon Nov 12 06:55:03 UTC 2018 Modified Files: src/sys/kern: kern_proc.c Log Message: Fix buffer overflow, which can lead to severe information leak. Detected by kASan. To generate a diff of this commit: cvs rdiff -u -r1.218 -r1.219 src/sys/kern/kern_proc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: maxv
Date: Sun Nov 11 11:17:49 UTC 2018
Modified Files:
src/sys/kern: kern_time.c
Log Message:
Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks
like there are other leaks related to timeval in this file.
[ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4]
[ 133.414352] #0 0x80224d0a in kleak_note
[ 133.424360] #1 0x80224d8a in kleak_copyout
[ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50
[ 133.434361] #3 0x8025a89c in sy_call
[ 133.444351] #4 0x8025aace in sy_invoke
[ 133.454365] #5 0x8025ab54 in syscall
To generate a diff of this commit:
cvs rdiff -u -r1.189 -r1.190 src/sys/kern/kern_time.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/kern_time.c
diff -u src/sys/kern/kern_time.c:1.189 src/sys/kern/kern_time.c:1.190
--- src/sys/kern/kern_time.c:1.189 Fri Nov 11 15:29:36 2016
+++ src/sys/kern/kern_time.c Sun Nov 11 11:17:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_time.c,v 1.189 2016/11/11 15:29:36 njoly Exp $ */
+/* $NetBSD: kern_time.c,v 1.190 2018/11/11 11:17:49 maxv Exp $ */
/*-
* Copyright (c) 2000, 2004, 2005, 2007, 2008, 2009 The NetBSD Foundation, Inc.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.189 2016/11/11 15:29:36 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_time.c,v 1.190 2018/11/11 11:17:49 maxv Exp $");
#include
#include
@@ -424,6 +424,7 @@ sys___gettimeofday50(struct lwp *l, cons
struct timezone tzfake;
if (SCARG(uap, tp)) {
+ memset(, 0, sizeof(atv));
microtime();
error = copyout(, SCARG(uap, tp), sizeof(atv));
if (error)
CVS commit: src/sys/arch/arm/dts
Module Name:src
Committed By: mrg
Date: Sun Nov 11 11:44:53 UTC 2018
Modified Files:
src/sys/arch/arm/dts: sun50i-a64-pinebook.dts
Log Message:
pull across this patch:
https://github.com/anarsoul/linux-2.6/commit/26b3d6f8ffa77cb05066c11967a498d6dacbdc42#diff-61a0580c3eaa34a373cc7ee7ee46dd2a
---
arm64: allwinner: a64: enable Bluetooth On Pinebook
Pinebook has an RTL8723CS WiFi + BT chip, BT is connected to UART1
and uses PL4 as BT reset, PL5 as device wake GPIO, PL6 as host wake GPIO
the I2C controlling signals are connected to R_I2C bus.
Enable it in the device tree.
Signed-off-by: Vasily Khoruzhick
---
this enables:
[ 1.19] com1 at simplebus1: ns16550a, working fifo
[ 1.19] com1: interrupting on GIC irq 33
to attach. more work with firmware and btattach will be required,
for the BT to be actually functional.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/dts/sun50i-a64-pinebook.dts
diff -u src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.12 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.13
--- src/sys/arch/arm/dts/sun50i-a64-pinebook.dts:1.12 Mon Jul 9 10:07:42 2018
+++ src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Sun Nov 11 11:44:53 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: sun50i-a64-pinebook.dts,v 1.12 2018/07/09 10:07:42 jmcneill Exp $ */
+/* $NetBSD: sun50i-a64-pinebook.dts,v 1.13 2018/11/11 11:44:53 mrg Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -117,6 +117,19 @@
status = "okay";
};
+ {
+ pinctrl-names = "default";
+ pinctrl-0 = <_pins>, <_rts_cts_pins>;
+ status = "okay";
+ bluetooth {
+ compatible = "realtek,rtl8723cs-bt";
+ reset-gpios = <_pio 0 4 GPIO_ACTIVE_LOW>; /* PL4 */
+ device-wake-gpios = <_pio 0 5 GPIO_ACTIVE_LOW>; /* PL5 */
+ host-wake-gpios = <_pio 0 6 GPIO_ACTIVE_HIGH>; /* PL6 */
+ firmware-postfix = "pinebook";
+ };
+};
+
_otg {
dr_mode = "host";
status = "okay";
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: maxv Date: Sun Nov 11 12:03:08 UTC 2018 Modified Files: src/distrib/sets/lists/base: md.amd64 src/distrib/sets/lists/comp: md.amd64 src/distrib/sets/lists/debug: md.amd64 Log Message: Fix the libnvmm sets, do the same as libx86_64. To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.261 -r1.262 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/debug/md.amd64 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/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.276 src/distrib/sets/lists/base/md.amd64:1.277 --- src/distrib/sets/lists/base/md.amd64:1.276 Sun Sep 30 15:56:47 2018 +++ src/distrib/sets/lists/base/md.amd64 Sun Nov 11 12:03:08 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.276 2018/09/30 15:56:47 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.277 2018/11/11 12:03:08 maxv Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic @@ -11,6 +11,9 @@ ./usr/lib/i386/libproc.so.1.0 base-compat-shlib compat,pic,dtrace ./usr/lib/i386/librtld_db.so.0 base-compat-shlib compat,pic,dtrace ./usr/lib/i386/librtld_db.so.0.0 base-compat-shlib compat,pic,dtrace +./usr/lib/libnvmm.sobase-sys-shlib pic +./usr/lib/libnvmm.so.0base-sys-shlib pic +./usr/lib/libnvmm.so.0.1 base-sys-shlib pic ./usr/lib/libx86_64.sobase-sys-shlib pic ./usr/lib/libx86_64.so.0 base-sys-shlib pic ./usr/lib/libx86_64.so.0.0 base-sys-shlib pic Index: src/distrib/sets/lists/comp/md.amd64 diff -u src/distrib/sets/lists/comp/md.amd64:1.261 src/distrib/sets/lists/comp/md.amd64:1.262 --- src/distrib/sets/lists/comp/md.amd64:1.261 Sat Nov 10 09:28:56 2018 +++ src/distrib/sets/lists/comp/md.amd64 Sun Nov 11 12:03:07 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.amd64,v 1.261 2018/11/10 09:28:56 maxv Exp $ +# $NetBSD: md.amd64,v 1.262 2018/11/11 12:03:07 maxv Exp $ ./usr/include/amd64comp-c-include ./usr/include/amd64/ansi.h comp-c-include @@ -784,12 +784,9 @@ ./usr/lib/i386/libi386.so comp-sys-shlib compat,pic ./usr/lib/i386/libi386_p.a comp-c-proflib compat,profile ./usr/lib/i386/libi386_pic.a comp-c-piclib compat,pic,picinstall -./usr/lib/libnvmm.acomp-c-lib compatfile -./usr/lib/libnvmm.socomp-sys-shlib compat,pic -./usr/lib/libnvmm.so.0comp-sys-shlib compat,pic -./usr/lib/libnvmm.so.0.1 comp-sys-shlib compat,pic -./usr/lib/libnvmm_p.acomp-c-proflib compatfile,profile -./usr/lib/libnvmm_pic.acomp-c-piclib compat,pic,picinstall +./usr/lib/libnvmm.acomp-c-lib +./usr/lib/libnvmm_p.acomp-c-proflib profile +./usr/lib/libnvmm_pic.acomp-c-piclib pic,picinstall ./usr/lib/libx86_64.acomp-c-lib ./usr/lib/libx86_64_p.acomp-c-proflib profile ./usr/lib/libx86_64_pic.a comp-c-piclib pic,picinstall Index: src/distrib/sets/lists/debug/md.amd64 diff -u src/distrib/sets/lists/debug/md.amd64:1.102 src/distrib/sets/lists/debug/md.amd64:1.103 --- src/distrib/sets/lists/debug/md.amd64:1.102 Mon Oct 1 08:23:53 2018 +++ src/distrib/sets/lists/debug/md.amd64 Sun Nov 11 12:03:08 2018 @@ -1,7 +1,8 @@ -# $NetBSD: md.amd64,v 1.102 2018/10/01 08:23:53 jmcneill Exp $ +# $NetBSD: md.amd64,v 1.103 2018/11/11 12:03:08 maxv Exp $ ./usr/lib/i386/12.202++_g.a comp-c-debuglib debuglib,compat,12.202xx ./usr/lib/i386/libi386_g.a comp-c-debuglib debuglib,compat ./usr/lib/i386/libiberty_g.a comp-obsolete obsolete +./usr/lib/libnvmm_g.acomp-c-debuglib debuglib ./usr/lib/libx86_64_g.acomp-c-debuglib debuglib ./usr/libdata/debug/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug @@ -11,6 +12,7 @@ ./usr/libdata/debug/usr/lib/i386/libpam.so.4.1.debug comp-compat-shlib compat,pic,debug,pam ./usr/libdata/debug/usr/lib/i386/libproc.so.1.0.debug comp-compat-shlib compat,pic,debug,dtrace ./usr/libdata/debug/usr/lib/i386/librtld_db.so.0.0.debug comp-compat-shlib compat,pic,debug,dtrace +./usr/libdata/debug/usr/lib/libnvmm.so.0.1.debug comp-sys-shlib pic,debug ./usr/libdata/debug/usr/lib/libx86_64.so.0.0.debug comp-sys-shlib pic,debug ./usr/libdata/debug/usr/libexec/ld.elf_so-i386 comp-obsolete obsolete ./usr/libdata/debug/usr/libexec/ld.elf_so-i386.debug comp-sys-debug debug,compat
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Sun Nov 11 11:17:49 UTC 2018 Modified Files: src/sys/kern: kern_time.c Log Message: Fix stack info leak. There are 4 bytes of padding in struct timeval. Looks like there are other leaks related to timeval in this file. [ 133.414352] kleak: Possible leak in copyout: [len=16, leaked=4] [ 133.414352] #0 0x80224d0a in kleak_note [ 133.424360] #1 0x80224d8a in kleak_copyout [ 133.434361] #2 0x80b5fd79 in sys___gettimeofday50 [ 133.434361] #3 0x8025a89c in sy_call [ 133.444351] #4 0x8025aace in sy_invoke [ 133.454365] #5 0x8025ab54 in syscall To generate a diff of this commit: cvs rdiff -u -r1.189 -r1.190 src/sys/kern/kern_time.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/dts
Module Name:src Committed By: mrg Date: Sun Nov 11 11:44:53 UTC 2018 Modified Files: src/sys/arch/arm/dts: sun50i-a64-pinebook.dts Log Message: pull across this patch: https://github.com/anarsoul/linux-2.6/commit/26b3d6f8ffa77cb05066c11967a498d6dacbdc42#diff-61a0580c3eaa34a373cc7ee7ee46dd2a --- arm64: allwinner: a64: enable Bluetooth On Pinebook Pinebook has an RTL8723CS WiFi + BT chip, BT is connected to UART1 and uses PL4 as BT reset, PL5 as device wake GPIO, PL6 as host wake GPIO the I2C controlling signals are connected to R_I2C bus. Enable it in the device tree. Signed-off-by: Vasily Khoruzhick --- this enables: [ 1.19] com1 at simplebus1: ns16550a, working fifo [ 1.19] com1: interrupting on GIC irq 33 to attach. more work with firmware and btattach will be required, for the BT to be actually functional. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/arch/arm/dts/sun50i-a64-pinebook.dts Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Nov 11 10:06:10 UTC 2018
Modified Files:
src/usr.sbin/sysinst: defs.h disks.c util.c
Log Message:
Skip floopies when selecting an install target, but do not add them to
the CD list when selecting an installation source device.
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/disks.c
cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.23 src/usr.sbin/sysinst/defs.h:1.24
--- src/usr.sbin/sysinst/defs.h:1.23 Sun Nov 11 09:17:10 2018
+++ src/usr.sbin/sysinst/defs.h Sun Nov 11 10:06:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.23 2018/11/11 09:17:10 martin Exp $ */
+/* $NetBSD: defs.h,v 1.24 2018/11/11 10:06:09 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -482,7 +482,7 @@ void toplevel(void);
bool get_default_cdrom(char *, size_t);
int find_disks(const char *);
bool enumerate_disks(void *state,bool (*func)(void *state, const char *dev));
-bool is_cdrom_device(const char *dev);
+bool is_cdrom_device(const char *dev, bool as_target);
struct menudesc;
void fmt_fspart(struct menudesc *, int, void *);
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.24 src/usr.sbin/sysinst/disks.c:1.25
--- src/usr.sbin/sysinst/disks.c:1.24 Sun Nov 11 09:17:10 2018
+++ src/usr.sbin/sysinst/disks.c Sun Nov 11 10:06:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.24 2018/11/11 09:17:10 martin Exp $ */
+/* $NetBSD: disks.c,v 1.25 2018/11/11 10:06:09 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -369,7 +369,7 @@ get_default_cdrom_helper(void *state, co
{
struct default_cdrom_data *data = state;
- if (!is_cdrom_device(dev))
+ if (!is_cdrom_device(dev, false))
return true;
strlcpy(data->device, dev, data->max_len);
@@ -511,11 +511,12 @@ is_ffs_wedge(const char *dev)
/*
* Does this device match an entry in our default CDROM device list?
+ * If looking for install targets, we also flag floopy devices.
*/
bool
-is_cdrom_device(const char *dev)
+is_cdrom_device(const char *dev, bool as_target)
{
- static const char *cdrom_devices[] = {
+ static const char *target_devices[] = {
#ifdef CD_NAMES
CD_NAMES
#endif
@@ -530,8 +531,15 @@ is_cdrom_device(const char *dev)
#endif
0
};
+ static const char *src_devices[] = {
+#ifdef CD_NAMES
+ CD_NAMES ,
+#endif
+ 0
+ };
- for (const char **dev_pat = cdrom_devices; *dev_pat; dev_pat++)
+ for (const char **dev_pat = as_target ? target_devices : src_devices;
+ *dev_pat; dev_pat++)
if (fnmatch(*dev_pat, dev, 0) == 0)
return true;
@@ -593,7 +601,7 @@ get_disks_helper(void *arg, const char *
struct disklabel l;
/* is this a CD device? */
- if (is_cdrom_device(dev))
+ if (is_cdrom_device(dev, true))
return true;
strlcpy(state->dd->dd_name, dev, sizeof state->dd->dd_name - 2);
Index: src/usr.sbin/sysinst/util.c
diff -u src/usr.sbin/sysinst/util.c:1.15 src/usr.sbin/sysinst/util.c:1.16
--- src/usr.sbin/sysinst/util.c:1.15 Thu Nov 8 20:29:37 2018
+++ src/usr.sbin/sysinst/util.c Sun Nov 11 10:06:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.15 2018/11/08 20:29:37 martin Exp $ */
+/* $NetBSD: util.c,v 1.16 2018/11/11 10:06:09 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -431,7 +431,7 @@ get_available_cds_helper(void *arg, cons
struct disklabel label;
int part, dev, error, sess, ready;
- if (!is_cdrom_device(device))
+ if (!is_cdrom_device(device, false))
return true;
sprintf(dname, "/dev/r%s%c", device, 'a'+RAW_PART);
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Nov 11 10:06:10 UTC 2018 Modified Files: src/usr.sbin/sysinst: defs.h disks.c util.c Log Message: Skip floopies when selecting an install target, but do not add them to the CD list when selecting an installation source device. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/sysinst/disks.c cvs rdiff -u -r1.15 -r1.16 src/usr.sbin/sysinst/util.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/pic
Module Name:src Committed By: jmcneill Date: Sun Nov 11 10:14:15 UTC 2018 Modified Files: src/sys/arch/arm/pic: pic.c Log Message: Add support for intrctl(8). To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arm/pic/pic.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Sun Nov 11 10:55:58 UTC 2018 Modified Files: src/sys/kern: kern_exec.c Log Message: Fix stack info leak. There are 2x4 bytes of padding in struct ps_strings. [ 223.896199] kleak: Possible leak in copyout: [len=32, leaked=8] [ 223.906430] #0 0x80224d0a in kleak_note [ 223.906430] #1 0x80224d8a in kleak_copyout [ 223.918363] #2 0x80b1e26c in copyoutpsstrs [ 223.926560] #3 0x80b1e331 in copyoutargs [ 223.936216] #4 0x80b21768 in execve_runproc [ 223.946225] #5 0x80b21cc9 in execve1 [ 223.946225] #6 0x8025a89c in sy_call [ 223.956225] #7 0x8025aace in sy_invoke [ 223.966232] #8 0x8025ab54 in syscall To generate a diff of this commit: cvs rdiff -u -r1.461 -r1.462 src/sys/kern/kern_exec.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/kern_exec.c diff -u src/sys/kern/kern_exec.c:1.461 src/sys/kern/kern_exec.c:1.462 --- src/sys/kern/kern_exec.c:1.461 Mon Sep 3 16:29:35 2018 +++ src/sys/kern/kern_exec.c Sun Nov 11 10:55:58 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kern_exec.c,v 1.461 2018/09/03 16:29:35 riastradh Exp $ */ +/* $NetBSD: kern_exec.c,v 1.462 2018/11/11 10:55:58 maxv Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -59,7 +59,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.461 2018/09/03 16:29:35 riastradh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kern_exec.c,v 1.462 2018/11/11 10:55:58 maxv Exp $"); #include "opt_exec.h" #include "opt_execfmt.h" @@ -1424,6 +1424,8 @@ copyoutargs(struct execve_data * restric struct proc *p = l->l_proc; int error; + memset(>ed_arginfo, 0, sizeof(data->ed_arginfo)); + /* remember information about the process */ data->ed_arginfo.ps_nargvstr = data->ed_argc; data->ed_arginfo.ps_nenvstr = data->ed_envc;
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: maxv Date: Sun Nov 11 10:58:40 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: machdep.c Log Message: Fix stack info leak. There is a big padding in struct sigframe_siginfo. [ 224.006287] kleak: Possible leak in copyout: [len=920, leaked=92] [ 224.016977] #0 0x80224d0a in kleak_note [ 224.026268] #1 0x80224d8a in kleak_copyout [ 224.026268] #2 0x802224b5 in sendsig_siginfo [ 224.036261] #3 0x80b51564 in sendsig [ 224.046475] #4 0x80b51282 in postsig [ 224.046475] #5 0x80b2fc5d in lwp_userret [ 224.056273] #6 0x8025a951 in mi_userret [ 224.066277] #7 0x8025ab89 in syscall To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/sys/arch/amd64/amd64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.320 src/sys/arch/amd64/amd64/machdep.c:1.321 --- src/sys/arch/amd64/amd64/machdep.c:1.320 Wed Oct 31 06:26:25 2018 +++ src/sys/arch/amd64/amd64/machdep.c Sun Nov 11 10:58:40 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.320 2018/10/31 06:26:25 maxv Exp $ */ +/* $NetBSD: machdep.c,v 1.321 2018/11/11 10:58:40 maxv Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -110,7 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.320 2018/10/31 06:26:25 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.321 2018/11/11 10:58:40 maxv Exp $"); #include "opt_modular.h" #include "opt_user_ldt.h" @@ -626,6 +626,7 @@ sendsig_siginfo(const ksiginfo_t *ksi, c /* Round down the stackpointer to a multiple of 16 for the ABI. */ fp = (struct sigframe_siginfo *)(((unsigned long)sp & ~15) - 8); + memset(, 0, sizeof(frame)); frame.sf_ra = (uint64_t)ps->sa_sigdesc[sig].sd_tramp; frame.sf_si._info = ksi->ksi_info; frame.sf_uc.uc_flags = _UC_SIGMASK; @@ -633,7 +634,6 @@ sendsig_siginfo(const ksiginfo_t *ksi, c frame.sf_uc.uc_link = l->l_ctxlink; frame.sf_uc.uc_flags |= (l->l_sigstk.ss_flags & SS_ONSTACK) ? _UC_SETSTACK : _UC_CLRSTACK; - memset(_uc.uc_stack, 0, sizeof(frame.sf_uc.uc_stack)); sendsig_reset(l, sig); mutex_exit(p->p_lock);
CVS commit: src/sys/kern
Module Name:src Committed By: maxv Date: Sun Nov 11 10:55:58 UTC 2018 Modified Files: src/sys/kern: kern_exec.c Log Message: Fix stack info leak. There are 2x4 bytes of padding in struct ps_strings. [ 223.896199] kleak: Possible leak in copyout: [len=32, leaked=8] [ 223.906430] #0 0x80224d0a in kleak_note [ 223.906430] #1 0x80224d8a in kleak_copyout [ 223.918363] #2 0x80b1e26c in copyoutpsstrs [ 223.926560] #3 0x80b1e331 in copyoutargs [ 223.936216] #4 0x80b21768 in execve_runproc [ 223.946225] #5 0x80b21cc9 in execve1 [ 223.946225] #6 0x8025a89c in sy_call [ 223.956225] #7 0x8025aace in sy_invoke [ 223.966232] #8 0x8025ab54 in syscall To generate a diff of this commit: cvs rdiff -u -r1.461 -r1.462 src/sys/kern/kern_exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: maxv Date: Sun Nov 11 10:58:40 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: machdep.c Log Message: Fix stack info leak. There is a big padding in struct sigframe_siginfo. [ 224.006287] kleak: Possible leak in copyout: [len=920, leaked=92] [ 224.016977] #0 0x80224d0a in kleak_note [ 224.026268] #1 0x80224d8a in kleak_copyout [ 224.026268] #2 0x802224b5 in sendsig_siginfo [ 224.036261] #3 0x80b51564 in sendsig [ 224.046475] #4 0x80b51282 in postsig [ 224.046475] #5 0x80b2fc5d in lwp_userret [ 224.056273] #6 0x8025a951 in mi_userret [ 224.066277] #7 0x8025ab89 in syscall To generate a diff of this commit: cvs rdiff -u -r1.320 -r1.321 src/sys/arch/amd64/amd64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src Committed By: maya Date: Sun Nov 11 08:28:35 UTC 2018 Modified Files: src/share/mk: bsd.own.mk Log Message: Provide a fallback dtc if USE_TOOLS isn't in use. >From Daniel Loffgren in PR kern/53720. To generate a diff of this commit: cvs rdiff -u -r1.1080 -r1.1081 src/share/mk/bsd.own.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.1080 src/share/mk/bsd.own.mk:1.1081 --- src/share/mk/bsd.own.mk:1.1080 Sat Nov 10 22:19:33 2018 +++ src/share/mk/bsd.own.mk Sun Nov 11 08:28:35 2018 @@ -1,4 +1,4 @@ -# $NetBSD: bsd.own.mk,v 1.1080 2018/11/10 22:19:33 maya Exp $ +# $NetBSD: bsd.own.mk,v 1.1081 2018/11/11 08:28:35 maya Exp $ # This needs to be before bsd.init.mk .if defined(BSD_MK_COMPAT_FILE) @@ -485,6 +485,7 @@ TOOL_CTFCONVERT= ctfconvert TOOL_CTFMERGE= ctfmerge TOOL_CVSLATEST= cvslatest TOOL_DB= db +TOOL_DTC= dtc TOOL_DISKLABEL= disklabel TOOL_EQN= eqn TOOL_FDISK= fdisk
CVS commit: src/usr.sbin/sysinst
Module Name:src
Committed By: martin
Date: Sun Nov 11 09:17:11 UTC 2018
Modified Files:
src/usr.sbin/sysinst: defs.h disks.c
Log Message:
Do not allow installation onto floppy disk - can be overriden by
architectures where it would make sense (none currently), and also
works around a bug in QEMU for sparc that kills our -current anita tests.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/defs.h
cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/disks.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/defs.h
diff -u src/usr.sbin/sysinst/defs.h:1.22 src/usr.sbin/sysinst/defs.h:1.23
--- src/usr.sbin/sysinst/defs.h:1.22 Thu Nov 8 20:29:37 2018
+++ src/usr.sbin/sysinst/defs.h Sun Nov 11 09:17:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: defs.h,v 1.22 2018/11/08 20:29:37 martin Exp $ */
+/* $NetBSD: defs.h,v 1.23 2018/11/11 09:17:10 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -178,8 +178,14 @@ enum {
#define PI_ISBSDFS(p) ((p)->pi_fstype == FS_BSDLFS || \
(p)->pi_fstype == FS_BSDFFS)
-/* standard cd0 device */
+/*
+ * We do not offer CDs or floppies as installation target usually.
+ * Architectures might want to undefine if they want to allow
+ * these devices or redefine if they have unusual CD device names.
+ * Do not define to empty or an empty string, undefine instead.
+ */
#define CD_NAMES "cd*"
+#define FLOPPY_NAMES "fd*"
/* Types */
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.23 src/usr.sbin/sysinst/disks.c:1.24
--- src/usr.sbin/sysinst/disks.c:1.23 Fri Nov 9 15:20:36 2018
+++ src/usr.sbin/sysinst/disks.c Sun Nov 11 09:17:10 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.23 2018/11/09 15:20:36 martin Exp $ */
+/* $NetBSD: disks.c,v 1.24 2018/11/11 09:17:10 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -515,7 +515,21 @@ is_ffs_wedge(const char *dev)
bool
is_cdrom_device(const char *dev)
{
- static const char *cdrom_devices[] = { CD_NAMES, 0 };
+ static const char *cdrom_devices[] = {
+#ifdef CD_NAMES
+ CD_NAMES
+#endif
+#if defined(CD_NAMES) && defined(FLOPPY_NAMES)
+ ,
+#endif
+#ifdef FLOPPY_NAMES
+ FLOPPY_NAMES
+#endif
+#if defined(CD_NAMES) || defined(FLOPPY_NAMES)
+ ,
+#endif
+ 0
+ };
for (const char **dev_pat = cdrom_devices; *dev_pat; dev_pat++)
if (fnmatch(*dev_pat, dev, 0) == 0)
CVS commit: src/share/mk
Module Name:src Committed By: maya Date: Sun Nov 11 08:28:35 UTC 2018 Modified Files: src/share/mk: bsd.own.mk Log Message: Provide a fallback dtc if USE_TOOLS isn't in use. >From Daniel Loffgren in PR kern/53720. To generate a diff of this commit: cvs rdiff -u -r1.1080 -r1.1081 src/share/mk/bsd.own.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Sun Nov 11 09:17:11 UTC 2018 Modified Files: src/usr.sbin/sysinst: defs.h disks.c Log Message: Do not allow installation onto floppy disk - can be overriden by architectures where it would make sense (none currently), and also works around a bug in QEMU for sparc that kills our -current anita tests. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/usr.sbin/sysinst/defs.h cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/sysinst/disks.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/pic
Module Name:src
Committed By: jmcneill
Date: Sun Nov 11 10:14:15 UTC 2018
Modified Files:
src/sys/arch/arm/pic: pic.c
Log Message:
Add support for intrctl(8).
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 src/sys/arch/arm/pic/pic.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/pic/pic.c
diff -u src/sys/arch/arm/pic/pic.c:1.45 src/sys/arch/arm/pic/pic.c:1.46
--- src/sys/arch/arm/pic/pic.c:1.45 Fri Oct 12 21:46:32 2018
+++ src/sys/arch/arm/pic/pic.c Sun Nov 11 10:14:14 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pic.c,v 1.45 2018/10/12 21:46:32 jmcneill Exp $ */
+/* $NetBSD: pic.c,v 1.46 2018/11/11 10:14:14 jmcneill Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -33,7 +33,7 @@
#include "opt_multiprocessor.h"
#include
-__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.45 2018/10/12 21:46:32 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pic.c,v 1.46 2018/11/11 10:14:14 jmcneill Exp $");
#include
#include
@@ -901,7 +901,187 @@ intr_string(intr_handle_t irq, char *buf
return NULL;
}
+static struct intrsource *
+intr_get_source(const char *intrid)
+{
+ struct intrsource *is;
+ intrid_t buf;
+ size_t slot;
+ int irq;
+
+ KASSERT(mutex_owned(_lock));
+
+ for (slot = 0; slot < PIC_MAXPICS; slot++) {
+ struct pic_softc * const pic = pic_list[slot];
+ if (pic == NULL || pic->pic_irqbase < 0)
+ continue;
+ for (irq = 0; irq < pic->pic_maxsources; irq++) {
+ is = pic->pic_sources[irq - pic->pic_irqbase];
+ if (is == NULL || is->is_source[0] == '\0')
+continue;
+
+ snprintf(buf, sizeof(buf), "%s %s", pic->pic_name, is->is_source);
+ if (strcmp(buf, intrid) == 0)
+return is;
+ }
+ }
+
+ return NULL;
+}
+
+struct intrids_handler *
+interrupt_construct_intrids(const kcpuset_t *cpuset)
+{
+ struct intrids_handler *iih;
+ struct intrsource *is;
+ int count, irq, n;
+ size_t slot;
+
+ if (kcpuset_iszero(cpuset))
+ return NULL;
+
+ count = 0;
+ for (slot = 0; slot < PIC_MAXPICS; slot++) {
+ struct pic_softc * const pic = pic_list[slot];
+ if (pic != NULL && pic->pic_irqbase >= 0) {
+ for (irq = 0; irq < pic->pic_maxsources; irq++) {
+is = pic->pic_sources[irq - pic->pic_irqbase];
+if (is && is->is_source[0] != '\0')
+ count++;
+ }
+ }
+ }
+
+ iih = kmem_zalloc(sizeof(int) + sizeof(intrid_t) * count, KM_SLEEP);
+ iih->iih_nids = count;
+
+ for (n = 0, slot = 0; n < count && slot < PIC_MAXPICS; slot++) {
+ struct pic_softc * const pic = pic_list[slot];
+ if (pic == NULL || pic->pic_irqbase < 0)
+ continue;
+ for (irq = 0; irq < pic->pic_maxsources; irq++) {
+ is = pic->pic_sources[irq - pic->pic_irqbase];
+ if (is == NULL || is->is_source[0] == '\0')
+continue;
+
+ snprintf(iih->iih_intrids[n++], sizeof(intrid_t), "%s %s",
+ pic->pic_name, is->is_source);
+ }
+ }
+
+ return iih;
+}
+
+void
+interrupt_destruct_intrids(struct intrids_handler *iih)
+{
+ if (iih == NULL)
+ return;
+
+ kmem_free(iih, sizeof(int) + sizeof(intrid_t) * iih->iih_nids);
+}
+
+void
+interrupt_get_available(kcpuset_t *cpuset)
+{
+ CPU_INFO_ITERATOR cii;
+ struct cpu_info *ci;
+
+ kcpuset_zero(cpuset);
+
+ mutex_enter(_lock);
+ for (CPU_INFO_FOREACH(cii, ci)) {
+ if ((ci->ci_schedstate.spc_flags & SPCF_NOINTR) == 0)
+ kcpuset_set(cpuset, cpu_index(ci));
+ }
+ mutex_exit(_lock);
+}
+
+void
+interrupt_get_devname(const char *intrid, char *buf, size_t len)
+{
+ buf[0] = '\0';
+}
+
+struct interrupt_get_count_arg {
+ struct intrsource *is;
+ uint64_t count;
+ u_int cpu_idx;
+};
+
+static void
+interrupt_get_count_cb(void *v0, void *v1, struct cpu_info *ci)
+{
+ struct pic_percpu * const pcpu = v0;
+ struct interrupt_get_count_arg * const arg = v1;
+
+ if (arg->cpu_idx != cpu_index(ci))
+ return;
+
+ arg->count = pcpu->pcpu_evs[arg->is->is_irq].ev_count;
+}
+
+uint64_t
+interrupt_get_count(const char *intrid, u_int cpu_idx)
+{
+ struct interrupt_get_count_arg arg;
+ struct intrsource *is;
+ uint64_t count;
+
+ count = 0;
+
+ mutex_enter(_lock);
+ is = intr_get_source(intrid);
+ if (is != NULL && is->is_pic != NULL) {
+ arg.is = is;
+ arg.count = 0;
+ arg.cpu_idx = cpu_idx;
+ percpu_foreach(is->is_pic->pic_percpu, interrupt_get_count_cb, );
+ count = arg.count;
+ }
+ mutex_exit(_lock);
+
+ return count;
+}
+
#ifdef MULTIPROCESSOR
+void
+interrupt_get_assigned(const char *intrid, kcpuset_t *cpuset)
+{
+ struct intrsource *is;
+ struct pic_softc *pic;
+
+ kcpuset_zero(cpuset);
+
+ mutex_enter(_lock);
+ is = intr_get_source(intrid);
+ if (is != NULL) {
+ pic = is->is_pic;
+ if (pic && pic->pic_ops->pic_get_affinity)
+ pic->pic_ops->pic_get_affinity(pic, is->is_irq, cpuset);
+ }
+ mutex_exit(_lock);
+}
+
+int
+interrupt_distribute_handler(const char *intrid, const kcpuset_t *newset,
+kcpuset_t *oldset)
+{
+ struct intrsource *is;
+ int error;
+
+ mutex_enter(_lock);
+ is = intr_get_source(intrid);
CVS commit: src/sys/dev/dm
Module Name:src Committed By: mlelstv Date: Sun Nov 11 10:21:11 UTC 2018 Modified Files: src/sys/dev/dm: dm_ioctl.c Log Message: Only _if_ an inactive table has been loaded, make it active when resuming. Fixes lvrename operation. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dm/dm_ioctl.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/dm/dm_ioctl.c diff -u src/sys/dev/dm/dm_ioctl.c:1.32 src/sys/dev/dm/dm_ioctl.c:1.33 --- src/sys/dev/dm/dm_ioctl.c:1.32 Fri Jan 5 14:22:05 2018 +++ src/sys/dev/dm/dm_ioctl.c Sun Nov 11 10:21:11 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: dm_ioctl.c,v 1.32 2018/01/05 14:22:05 christos Exp $ */ +/* $NetBSD: dm_ioctl.c,v 1.33 2018/11/11 10:21:11 mlelstv Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -29,7 +29,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.32 2018/01/05 14:22:05 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: dm_ioctl.c,v 1.33 2018/11/11 10:21:11 mlelstv Exp $"); /* * Locking is used to synchronise between ioctl calls and between dm_table's @@ -542,11 +542,14 @@ dm_dev_resume_ioctl(prop_dictionary_t dm DM_REMOVE_FLAG(flags, DM_EXISTS_FLAG); return ENOENT; } + + /* Make inactive table active, if it exists */ + if (dmv->flags & DM_INACTIVE_PRESENT_FLAG) + dm_table_switch_tables(>table_head); + atomic_and_32(>flags, ~(DM_SUSPEND_FLAG | DM_INACTIVE_PRESENT_FLAG)); atomic_or_32(>flags, DM_ACTIVE_PRESENT_FLAG); - dm_table_switch_tables(>table_head); - DM_ADD_FLAG(flags, DM_EXISTS_FLAG); dmgetproperties(dmv->diskp, >table_head);
CVS commit: src/sys/dev/dm
Module Name:src Committed By: mlelstv Date: Sun Nov 11 10:21:11 UTC 2018 Modified Files: src/sys/dev/dm: dm_ioctl.c Log Message: Only _if_ an inactive table has been loaded, make it active when resuming. Fixes lvrename operation. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dm/dm_ioctl.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: maxv Date: Sun Nov 11 12:03:08 UTC 2018 Modified Files: src/distrib/sets/lists/base: md.amd64 src/distrib/sets/lists/comp: md.amd64 src/distrib/sets/lists/debug: md.amd64 Log Message: Fix the libnvmm sets, do the same as libx86_64. To generate a diff of this commit: cvs rdiff -u -r1.276 -r1.277 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.261 -r1.262 src/distrib/sets/lists/comp/md.amd64 cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/debug/md.amd64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
