CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jun 20 21:53:15 UTC 2018 Modified Files: src/share/misc: acronyms.comp Log Message: An acronym entry needs to be all uppercase. Thanks to Thorsten Glaser To generate a diff of this commit: cvs rdiff -u -r1.200 -r1.201 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/acronyms.comp diff -u src/share/misc/acronyms.comp:1.200 src/share/misc/acronyms.comp:1.201 --- src/share/misc/acronyms.comp:1.200 Fri Jun 15 21:59:17 2018 +++ src/share/misc/acronyms.comp Wed Jun 20 21:53:15 2018 @@ -1,4 +1,4 @@ -$NetBSD: acronyms.comp,v 1.200 2018/06/15 21:59:17 sevan Exp $ +$NetBSD: acronyms.comp,v 1.201 2018/06/20 21:53:15 sevan Exp $ 3WHS three-way handshake 8VSB 8-state vestigial side band modulation AA anti-aliasing @@ -1040,7 +1040,7 @@ POSIX Portable Operating System Interfac POST power on self test POTS plain old telephone system POWER Performance Optimization With Enhanced RISC -PowerPC Performance Optimization With Enhanced RISC - Performance Computing +POWERPC Performance Optimization With Enhanced RISC - Performance Computing PP pair programming PPB PCI [to] PCI bridge PPC PowerPC
CVS commit: src/sys/arch
Module Name:src Committed By: jdolecek Date: Wed Jun 20 20:43:21 UTC 2018 Modified Files: src/sys/arch/x86/include: fpu.h src/sys/arch/x86/x86: cpu.c fpu.c src/sys/arch/xen/x86: cpu.c Log Message: as a stop-gap, make fpuinit_mxcsr_mask() for native independant of XSAVE as it should be, only xen case checks the flag now; need to investigate further why exactly the fault happens for the xen no-xsave case pointed out by maxv To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/x86/include/fpu.h cvs rdiff -u -r1.156 -r1.157 src/sys/arch/x86/x86/cpu.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/x86/x86/fpu.c cvs rdiff -u -r1.118 -r1.119 src/sys/arch/xen/x86/cpu.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/include/fpu.h diff -u src/sys/arch/x86/include/fpu.h:1.10 src/sys/arch/x86/include/fpu.h:1.11 --- src/sys/arch/x86/include/fpu.h:1.10 Tue Jun 19 19:50:19 2018 +++ src/sys/arch/x86/include/fpu.h Wed Jun 20 20:43:20 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.h,v 1.10 2018/06/19 19:50:19 jdolecek Exp $ */ +/* $NetBSD: fpu.h,v 1.11 2018/06/20 20:43:20 jdolecek Exp $ */ #ifndef _X86_FPU_H_ #define _X86_FPU_H_ @@ -12,7 +12,7 @@ struct lwp; struct trapframe; void fpuinit(struct cpu_info *); -void fpuinit_mxcsr_mask(uint32_t); +void fpuinit_mxcsr_mask(bool); void fpusave_lwp(struct lwp *, bool); void fpusave_cpu(bool); Index: src/sys/arch/x86/x86/cpu.c diff -u src/sys/arch/x86/x86/cpu.c:1.156 src/sys/arch/x86/x86/cpu.c:1.157 --- src/sys/arch/x86/x86/cpu.c:1.156 Tue Jun 19 19:50:19 2018 +++ src/sys/arch/x86/x86/cpu.c Wed Jun 20 20:43:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.156 2018/06/19 19:50:19 jdolecek Exp $ */ +/* $NetBSD: cpu.c,v 1.157 2018/06/20 20:43:21 jdolecek Exp $ */ /* * Copyright (c) 2000-2012 NetBSD Foundation, Inc. @@ -62,7 +62,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.156 2018/06/19 19:50:19 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.157 2018/06/20 20:43:21 jdolecek Exp $"); #include "opt_ddb.h" #include "opt_mpbios.h" /* for MPDEBUG */ @@ -638,7 +638,7 @@ cpu_init(struct cpu_info *ci) } if (x86_fpu_save >= FPU_SAVE_FXSAVE) { - fpuinit_mxcsr_mask(cr4); + fpuinit_mxcsr_mask(true); } /* If xsave is enabled, enable all fpu features */ Index: src/sys/arch/x86/x86/fpu.c diff -u src/sys/arch/x86/x86/fpu.c:1.40 src/sys/arch/x86/x86/fpu.c:1.41 --- src/sys/arch/x86/x86/fpu.c:1.40 Tue Jun 19 19:50:19 2018 +++ src/sys/arch/x86/x86/fpu.c Wed Jun 20 20:43:21 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.40 2018/06/19 19:50:19 jdolecek Exp $ */ +/* $NetBSD: fpu.c,v 1.41 2018/06/20 20:43:21 jdolecek Exp $ */ /* * Copyright (c) 2008 The NetBSD Foundation, Inc. All @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.40 2018/06/19 19:50:19 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.41 2018/06/20 20:43:21 jdolecek Exp $"); #include "opt_multiprocessor.h" @@ -237,10 +237,10 @@ fpuinit(struct cpu_info *ci) * Get the value of MXCSR_MASK supported by the CPU. */ void -fpuinit_mxcsr_mask(uint32_t cr4) +fpuinit_mxcsr_mask(bool has_fxsave) { - if ((cr4 & CR4_OSXSAVE) == 0) { + if (!has_fxsave) { x86_fpu_mxcsr_mask = __INITIAL_MXCSR_MASK__; return; } Index: src/sys/arch/xen/x86/cpu.c diff -u src/sys/arch/xen/x86/cpu.c:1.118 src/sys/arch/xen/x86/cpu.c:1.119 --- src/sys/arch/xen/x86/cpu.c:1.118 Tue Jun 19 19:50:19 2018 +++ src/sys/arch/xen/x86/cpu.c Wed Jun 20 20:43:20 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.118 2018/06/19 19:50:19 jdolecek Exp $ */ +/* $NetBSD: cpu.c,v 1.119 2018/06/20 20:43:20 jdolecek Exp $ */ /*- * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -65,7 +65,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.118 2018/06/19 19:50:19 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cpu.c,v 1.119 2018/06/20 20:43:20 jdolecek Exp $"); #include "opt_ddb.h" #include "opt_multiprocessor.h" @@ -564,7 +564,8 @@ cpu_init(struct cpu_info *ci) } if (x86_fpu_save >= FPU_SAVE_FXSAVE) { - fpuinit_mxcsr_mask(cr4); + /* XXX fxsave() faults on Xen with no-xsave flag, why? */ + fpuinit_mxcsr_mask((cr4 & CR4_OSXSAVE) != 0); } /*
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Wed Jun 20 20:12:51 UTC 2018 Modified Files: src/sys/arch/arm/rockchip: rk_usb.c Log Message: Add missing return in error path To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk_usb.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/rk_usb.c diff -u src/sys/arch/arm/rockchip/rk_usb.c:1.1 src/sys/arch/arm/rockchip/rk_usb.c:1.2 --- src/sys/arch/arm/rockchip/rk_usb.c:1.1 Sat Jun 16 00:19:04 2018 +++ src/sys/arch/arm/rockchip/rk_usb.c Wed Jun 20 20:12:51 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: rk_usb.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $ */ +/* $NetBSD: rk_usb.c,v 1.2 2018/06/20 20:12:51 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -28,7 +28,7 @@ #include -__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.1 2018/06/16 00:19:04 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rk_usb.c,v 1.2 2018/06/20 20:12:51 jmcneill Exp $"); #include #include @@ -174,6 +174,7 @@ rk_usb_attach(device_t parent, device_t if (fdtbus_get_reg(OF_parent(phandle), 0, &grf_addr, NULL) != 0) { aprint_error(": couldn't get grf registers\n"); + return; } if (fdtbus_get_reg(phandle, 0, &phy_addr, &phy_size) != 0) { aprint_error(": couldn't get phy registers\n");
CVS commit: src/sys/dev/fdt
Module Name:src Committed By: thorpej Date: Wed Jun 20 19:11:02 UTC 2018 Modified Files: src/sys/dev/fdt: fdtbus.c Log Message: Revert previous. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/dev/fdt/fdtbus.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/fdtbus.c diff -u src/sys/dev/fdt/fdtbus.c:1.18 src/sys/dev/fdt/fdtbus.c:1.19 --- src/sys/dev/fdt/fdtbus.c:1.18 Wed Jun 20 05:59:17 2018 +++ src/sys/dev/fdt/fdtbus.c Wed Jun 20 19:11:01 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: fdtbus.c,v 1.18 2018/06/20 05:59:17 thorpej Exp $ */ +/* $NetBSD: fdtbus.c,v 1.19 2018/06/20 19:11:01 thorpej Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.18 2018/06/20 05:59:17 thorpej Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fdtbus.c,v 1.19 2018/06/20 19:11:01 thorpej Exp $"); #include #include @@ -336,7 +336,7 @@ fdtbus_print(void *aux, const char *pnp) compat += (strlen(compat) + 1); } } else - aprint_normal(" (%s)", name); + aprint_debug(" (%s)", name); return UNCONF; }
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Jun 20 12:41:45 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Note release note changes To generate a diff of this commit: cvs rdiff -u -r1.1.2.212 -r1.1.2.213 src/doc/CHANGES-8.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.212 src/doc/CHANGES-8.0:1.1.2.213 --- src/doc/CHANGES-8.0:1.1.2.212 Mon Jun 18 15:44:05 2018 +++ src/doc/CHANGES-8.0 Wed Jun 20 12:41:45 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.212 2018/06/18 15:44:05 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.213 2018/06/20 12:41:45 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -13951,3 +13951,6 @@ share/mk/bsd.sys.mk1.282 MAKEOBJDIRPREFIX. Keep using our standard NETBSDOBJDIR if it was set. [christos, ticket #886] +distrib/notes/common/main (changed manually) + + Updated for the upcoming release.
CVS commit: [netbsd-8] src/distrib/notes/common
Module Name:src Committed By: martin Date: Wed Jun 20 12:39:52 UTC 2018 Modified Files: src/distrib/notes/common [netbsd-8]: main Log Message: Update for NetBSD-8 To generate a diff of this commit: cvs rdiff -u -r1.535 -r1.535.2.1 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.535 src/distrib/notes/common/main:1.535.2.1 --- src/distrib/notes/common/main:1.535 Tue May 16 17:40:01 2017 +++ src/distrib/notes/common/main Wed Jun 20 12:39:52 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: main,v 1.535 2017/05/16 17:40:01 snj Exp $ +.\" $NetBSD: main,v 1.535.2.1 2018/06/20 12:39:52 martin Exp $ .\" .\" Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -480,7 +480,23 @@ possible, would not exist. . .if \n[FOR_RELEASE] \{\ -.Ss Changes Between The NetBSD 6.0 and 7.0 Releases +.Ss "Dedication" +.Pp +. +.Nx +8.0 is dedicated to the memory of Nicolas Joly, who +passed away in June 2017. +.Pp +Nicolas' technical contributions are too many to list here in full. +He commited more than 1000 changes all over the +.Nx +source tree and pkgsrc. +.Pp +Beyond that he was always helpful and friendly. His +example encouraged users to contribute to the project and share their +work with the community. +.Pp +.Ss Changes Between The NetBSD 7.0 and 8.0 Releases .Pp The .Nx @@ -497,12 +513,15 @@ went into the \*V release. The complete list of changes can be found in the CHANGES: -.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.0/CHANGES +.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0_RC2/CHANGES and -CHANGES-7.0: -.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-7.0/CHANGES-7.0 -files in the top level directory of the NetBSD 7.0 release tree. -.Pp +CHANGES-8.0: +.Lk https://cdn.netbsd.org/pub/NetBSD/NetBSD-8.0_RC2/CHANGES-8.0 +files in the top level directory of the NetBSD 8.0 release tree. +.Pp +The release anouncements, status, updates and links to other resources +can be found at +.Lk https://www.netbsd.org/releases/formal-8/ .\" fill in with changes.mdoc . .\} \" \n[FOR_RELEASE] @@ -566,9 +585,9 @@ The root directory of the .Pa .../NetBSD-\*V/ .(tag README.files .It Li CHANGES -Changes between the 6.0 and 7.0 releases. -.It Li CHANGES-7.0 -Changes between the initial 7.0 branch and final release of 7.0. +Changes between the 7.0 and 8.0 releases. +.It Li CHANGES-8.0 +Changes between the initial 8.0 branch and final release of 8.0. .It Li CHANGES.prev Changes in previous .Nx @@ -740,12 +759,6 @@ and thus all issues that are fixed by .Ic postinstall by default will be handled. .Pp -A number of things have been removed from the -.Nx -\*V release. -See the -.Dq Components removed from NetBSD -section near the beginning of this document for a list. .if \n[arm] \{\ .Ss2 Important note regarding ABI change on ARM ports .Pp @@ -803,7 +816,7 @@ again. .\} .Ss2 Issues affecting an upgrade from NetBSD 5.x releases .Pp -See the section below on upgrading from NetBSD 6.x as well. +See the section below on upgrading from NetBSD 6.x and 7.x as well. .Pp The following users need to be created: .(bullet -compact -offset indent @@ -836,6 +849,8 @@ algorithms (hmac_sha256, hmac_sha384, hm . .Ss2 Issues affecting an upgrade from NetBSD 6.x releases .Pp +See the section on upgrading from NetBSD 7.x as well +.Pp The following user needs to be created: .(bullet -compact -offset indent _rtadvd @@ -848,6 +863,22 @@ _gpio _rtadvd .bullet) . +.Ss2 Issues affecting an upgrade from NetBSD 7.x releases +.Pp +The following user needs to be created: +.(bullet -compact -offset indent +_unbound +.It +_nsd +.bullet) +.Pp +The following groups need to be created: +.(bullet -compact -offset indent +_unbound +.It +_nsd +.bullet) +. .Ss "Using online NetBSD documentation" .Pp Documentation is available if you installed the manual
CVS commit: src/sys/arch/x86/x86
Module Name:src Committed By: maxv Date: Wed Jun 20 11:57:22 UTC 2018 Modified Files: src/sys/arch/x86/x86: pmap.c Log Message: Use PMAP_DIRECT_UNMAP. To generate a diff of this commit: cvs rdiff -u -r1.290 -r1.291 src/sys/arch/x86/x86/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/x86/x86/pmap.c diff -u src/sys/arch/x86/x86/pmap.c:1.290 src/sys/arch/x86/x86/pmap.c:1.291 --- src/sys/arch/x86/x86/pmap.c:1.290 Sat May 19 11:39:37 2018 +++ src/sys/arch/x86/x86/pmap.c Wed Jun 20 11:57:22 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.290 2018/05/19 11:39:37 jdolecek Exp $ */ +/* $NetBSD: pmap.c,v 1.291 2018/06/20 11:57:22 maxv Exp $ */ /* * Copyright (c) 2008, 2010, 2016, 2017 The NetBSD Foundation, Inc. @@ -170,7 +170,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.290 2018/05/19 11:39:37 jdolecek Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.291 2018/06/20 11:57:22 maxv Exp $"); #include "opt_user_ldt.h" #include "opt_lockdebug.h" @@ -3091,7 +3091,7 @@ pmap_extract(struct pmap *pmap, vaddr_t #ifdef __HAVE_DIRECT_MAP if (va >= PMAP_DIRECT_BASE && va < PMAP_DIRECT_END) { if (pap != NULL) { - *pap = va - PMAP_DIRECT_BASE; + *pap = PMAP_DIRECT_UNMAP(va); } return true; }
CVS commit: src/sys/arch
Module Name:src Committed By: maxv Date: Wed Jun 20 11:49:38 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: machdep.c src/sys/arch/amd64/stand/prekern: mm.c prekern.h src/sys/arch/x86/include: pmap.h Log Message: Add and use bootspace.smodule. Initialize it in locore/prekern to better hide the specifics from the "upper" layers. This allows for greater flexibility. To generate a diff of this commit: cvs rdiff -u -r1.304 -r1.305 src/sys/arch/amd64/amd64/machdep.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/amd64/stand/prekern/mm.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/amd64/stand/prekern/prekern.h cvs rdiff -u -r1.79 -r1.80 src/sys/arch/x86/include/pmap.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/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.304 src/sys/arch/amd64/amd64/machdep.c:1.305 --- src/sys/arch/amd64/amd64/machdep.c:1.304 Tue May 8 17:20:44 2018 +++ src/sys/arch/amd64/amd64/machdep.c Wed Jun 20 11:49:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.304 2018/05/08 17:20:44 maxv Exp $ */ +/* $NetBSD: machdep.c,v 1.305 2018/06/20 11:49:37 maxv Exp $ */ /* * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -110,9 +110,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.304 2018/05/08 17:20:44 maxv Exp $"); - -/* #define XENDEBUG_LOW */ +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.305 2018/06/20 11:49:37 maxv Exp $"); #include "opt_modular.h" #include "opt_user_ldt.h" @@ -261,11 +259,9 @@ paddr_t gdt_paddr; vaddr_t ldt_vaddr; paddr_t ldt_paddr; -vaddr_t module_start, module_end; static struct vm_map module_map_store; extern struct vm_map *module_map; extern struct bootspace bootspace; -vaddr_t kern_end; struct vm_map *phys_map = NULL; @@ -374,15 +370,15 @@ cpu_startup(void) * Create the module map. * * The kernel uses RIP-relative addressing with a maximum offset of - * 2GB. The problem is, kernel_map is too far away in memory from - * the kernel .text. So we cannot use it, and have to create a - * special module_map. + * 2GB. Because of that, we can't put the kernel modules in kernel_map + * (like i386 does), since kernel_map is too far away in memory from + * the kernel sections. So we have to create a special module_map. * * The module map is taken as what is left of the bootstrap memory - * created in locore.S. This memory is right above the kernel - * image, so this is the best place to put our modules. + * created in locore/prekern. */ - uvm_map_setup(&module_map_store, module_start, module_end, 0); + uvm_map_setup(&module_map_store, bootspace.smodule, + bootspace.emodule, 0); module_map_store.pmap = pmap_kernel(); module_map = &module_map_store; @@ -1577,9 +1573,11 @@ init_bootspace(void) /* In locore.S, we allocated a tmp va. We will use it now. */ bootspace.spareva = KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2; - /* Virtual address of the L4 page */ + /* Virtual address of the L4 page. */ bootspace.pdir = (vaddr_t)(PDPpaddr + KERNBASE); + /* Kernel module map. */ + bootspace.smodule = (vaddr_t)atdevbase + IOM_SIZE; bootspace.emodule = KERNBASE + NKL2_KIMG_ENTRIES * NBPD_L2; } @@ -1665,13 +1663,6 @@ init_x86_64(paddr_t first_avail) pmap_pa_end = avail_end; #endif - /* End of the virtual space we have created so far. */ - kern_end = (vaddr_t)atdevbase + IOM_SIZE; - - /* The area for the module map. */ - module_start = kern_end; - module_end = bootspace.emodule; - /* * Call pmap initialization to make new kernel address space. * We must do this before loading pages into the VM system. @@ -2123,7 +2114,7 @@ mm_md_kernacc(void *ptr, vm_prot_t prot, return 0; } - if (v >= module_start && v < module_end) { + if (v >= bootspace.smodule && v < bootspace.emodule) { *handled = true; if (!uvm_map_checkprot(module_map, v, v + 1, prot)) return EFAULT; Index: src/sys/arch/amd64/stand/prekern/mm.c diff -u src/sys/arch/amd64/stand/prekern/mm.c:1.21 src/sys/arch/amd64/stand/prekern/mm.c:1.22 --- src/sys/arch/amd64/stand/prekern/mm.c:1.21 Thu Dec 21 14:32:06 2017 +++ src/sys/arch/amd64/stand/prekern/mm.c Wed Jun 20 11:49:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: mm.c,v 1.21 2017/12/21 14:32:06 maxv Exp $ */ +/* $NetBSD: mm.c,v 1.22 2018/06/20 11:49:37 maxv Exp $ */ /* * Copyright (c) 2017 The NetBSD Foundation, Inc. All rights reserved. @@ -420,6 +420,7 @@ mm_map_boot(void) extern uint64_t PDPpaddr; bootspace.spareva = bootspace.boot.va + NKL2_KIMG_ENTRIES * NBPD_L2; bootspace.pdir = bootspace.boot.va + (PDPpaddr - bootspace.boot.pa); + bootspace.smodule = (vaddr_t)iom_base + IOM_SIZE; bootspace.emodule = bootspace.boot.va + NKL2_KIMG_ENTRIES * NBPD_L2; } Index: src/sys/arch/amd64/stand/prekern/prekern.h diff -u src/sys/arch/amd64/stand/prekern/prekern.h:1.19 src/sys/arch/amd64/stand/prekern/prekern.h:1.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: maxv Date: Wed Jun 20 11:45:25 UTC 2018 Modified Files: src/sys/arch/amd64/amd64: vector.S Log Message: Put these arrays in .rodata, they aren't supposed to be executable. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/amd64/amd64/vector.S 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/vector.S diff -u src/sys/arch/amd64/amd64/vector.S:1.62 src/sys/arch/amd64/amd64/vector.S:1.63 --- src/sys/arch/amd64/amd64/vector.S:1.62 Tue Apr 3 07:20:52 2018 +++ src/sys/arch/amd64/amd64/vector.S Wed Jun 20 11:45:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: vector.S,v 1.62 2018/04/03 07:20:52 christos Exp $ */ +/* $NetBSD: vector.S,v 1.63 2018/06/20 11:45:25 maxv Exp $ */ /* * Copyright (c) 1998, 2007, 2008 The NetBSD Foundation, Inc. @@ -631,6 +631,8 @@ LABEL(name ## _stubs); \ INTRSTUB_ENTRY(name ## 31) ; \ END(name ## _stubs) + .section .rodata + INTRSTUB_ARRAY_16(legacy) #if NIOAPIC > 0
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jun 20 09:10:33 UTC 2018 Modified Files: src/sys/dev/pci: pcidevs Log Message: Add nSYS Technologies. To generate a diff of this commit: cvs rdiff -u -r1.1342 -r1.1343 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.1342 src/sys/dev/pci/pcidevs:1.1343 --- src/sys/dev/pci/pcidevs:1.1342 Thu Jun 14 03:59:53 2018 +++ src/sys/dev/pci/pcidevs Wed Jun 20 09:10:33 2018 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1342 2018/06/14 03:59:53 msaitoh Exp $ +$NetBSD: pcidevs,v 1.1343 2018/06/20 09:10:33 msaitoh Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -613,6 +613,7 @@ vendor LINKSYS 0x1737 Linksys vendor ALTIMA 0x173b Altima vendor ANTARES 0x1754 Antares Microsystems vendor CAVIUM 0x177d Cavium +vendor NSYS 0x1794 nSYS Technologies vendor FZJZEL 0x1796 FZ Juelich / ZEL vendor BELKIN 0x1799 Belkin vendor HAWKING 0x17b3 Hawking Technology
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Wed Jun 20 09:10:53 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.1333 -r1.1334 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1332 -r1.1333 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. diffs are larger than 1MB and have been omitted
CVS commit: src/sys/arch/arm
Module Name:src Committed By: hkenken Date: Wed Jun 20 08:03:55 UTC 2018 Modified Files: src/sys/arch/arm/cortex: pl310.c src/sys/arch/arm/fdt: files.fdt Added Files: src/sys/arch/arm/fdt: l2cc_fdt.c Log Message: Add l2cc support. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/cortex/pl310.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/fdt/files.fdt cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/fdt/l2cc_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/cortex/pl310.c diff -u src/sys/arch/arm/cortex/pl310.c:1.17 src/sys/arch/arm/cortex/pl310.c:1.18 --- src/sys/arch/arm/cortex/pl310.c:1.17 Fri Feb 27 20:40:09 2015 +++ src/sys/arch/arm/cortex/pl310.c Wed Jun 20 08:03:55 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: pl310.c,v 1.17 2015/02/27 20:40:09 jmcneill Exp $ */ +/* $NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.17 2015/02/27 20:40:09 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1.18 2018/06/20 08:03:55 hkenken Exp $"); #include #include @@ -47,7 +47,6 @@ __KERNEL_RCSID(0, "$NetBSD: pl310.c,v 1. static int arml2cc_match(device_t, cfdata_t, void *); static void arml2cc_attach(device_t, device_t, void *); -#define L2CC_BASE 0x2000 #define L2CC_SIZE 0x1000 struct arml2cc_softc { @@ -150,7 +149,7 @@ arml2cc_attach(device_t parent, device_t aprint_normal(": not configured\n"); return; } - off = L2CC_BASE; + off = mpcaa->mpcaa_off1; } arml2cc_sc = sc; Index: src/sys/arch/arm/fdt/files.fdt diff -u src/sys/arch/arm/fdt/files.fdt:1.16 src/sys/arch/arm/fdt/files.fdt:1.17 --- src/sys/arch/arm/fdt/files.fdt:1.16 Tue Jun 5 08:03:28 2018 +++ src/sys/arch/arm/fdt/files.fdt Wed Jun 20 08:03:55 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.fdt,v 1.16 2018/06/05 08:03:28 hkenken Exp $ +# $NetBSD: files.fdt,v 1.17 2018/06/20 08:03:55 hkenken Exp $ include "dev/pckbport/files.pckbport" @@ -25,6 +25,10 @@ device gic: mpcorebus attach gic at fdt with gic_fdt filearch/arm/fdt/gic_fdt.c gic_fdt +device l2cc: mpcorebus +attach l2cc at fdt with l2cc_fdt +filearch/arm/fdt/l2cc_fdt.c l2cc_fdt + attach plcom at fdt with plcom_fdt file arch/arm/fdt/plcom_fdt.c plcom_fdt Added files: Index: src/sys/arch/arm/fdt/l2cc_fdt.c diff -u /dev/null src/sys/arch/arm/fdt/l2cc_fdt.c:1.1 --- /dev/null Wed Jun 20 08:03:55 2018 +++ src/sys/arch/arm/fdt/l2cc_fdt.c Wed Jun 20 08:03:55 2018 @@ -0,0 +1,88 @@ +/* $NetBSD: l2cc_fdt.c,v 1.1 2018/06/20 08:03:55 hkenken Exp $ */ +/* + * Copyright (c) 2018 Genetec Corporation. All rights reserved. + * Written by Hashimoto Kenichi for Genetec Corporation. + * + * 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 GENETEC CORPORATION ``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 GENETEC CORPORATION + * 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. + */ + +#include +__KERNEL_RCSID(0, "$NetBSD: l2cc_fdt.c,v 1.1 2018/06/20 08:03:55 hkenken Exp $"); + +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +static int l2cc_fdt_match(device_t, cfdata_t, void *); +static void l2cc_fdt_attach(device_t, device_t, void *); + +CFATTACH_DECL_NEW(l2cc_fdt, 0, l2cc_fdt_match, l2cc_fdt_attach, NULL, NULL); + +static int +l2cc_fdt_match(device_t parent, cfdata_t cf, void *aux) +{ + const char * const compatible[] = { + "arm,pl310-cache", + NULL + }; + struct fdt_attach_args * const faa = aux; + + return of_compatible(faa->faa_phandle, compatible) >= 0; +} + +static void +l2cc_fdt_attach(device_t parent, device_t self, void *aux) +{ + struct fdt_attach_args * const faa = aux; + const
CVS commit: src/sys/arch/arm/imx
Module Name:src Committed By: hkenken Date: Wed Jun 20 07:08:35 UTC 2018 Modified Files: src/sys/arch/arm/imx: imxuart.c Log Message: Move intr_establish() before imxuart_attach_subr(). To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/imx/imxuart.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/imx/imxuart.c diff -u src/sys/arch/arm/imx/imxuart.c:1.20 src/sys/arch/arm/imx/imxuart.c:1.21 --- src/sys/arch/arm/imx/imxuart.c:1.20 Fri Sep 8 05:29:12 2017 +++ src/sys/arch/arm/imx/imxuart.c Wed Jun 20 07:08:35 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imxuart.c,v 1.20 2017/09/08 05:29:12 hkenken Exp $ */ +/* $NetBSD: imxuart.c,v 1.21 2018/06/20 07:08:35 hkenken Exp $ */ /* * Copyright (c) 2009, 2010 Genetec Corporation. All rights reserved. @@ -96,7 +96,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.20 2017/09/08 05:29:12 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imxuart.c,v 1.21 2018/06/20 07:08:35 hkenken Exp $"); #include "opt_imxuart.h" #include "opt_ddb.h" @@ -306,6 +306,13 @@ imxuart_attach_common(device_t parent, d } regsp->ur_ioh = ioh; + sc->sc_ih = intr_establish(sc->sc_intr, IPL_SERIAL, IST_LEVEL, + imxuintr, sc); + if (sc->sc_ih == NULL) { + aprint_error_dev(sc->sc_dev, "intr_establish failed\n"); + return; + } + imxuart_attach_subr(sc); } @@ -377,11 +384,6 @@ imxuart_attach_subr(struct imxuart_softc } } - sc->sc_ih = intr_establish(sc->sc_intr, IPL_SERIAL, IST_LEVEL, - imxuintr, sc); - if (sc->sc_ih == NULL) - aprint_error_dev(sc->sc_dev, "intr_establish failed\n"); - #ifdef KGDB /* * Allow kgdb to "take over" this port. If this is
CVS commit: src/sys/arch
Module Name:src Committed By: hkenken Date: Wed Jun 20 07:05:37 UTC 2018 Modified Files: src/sys/arch/arm/imx: files.imx6 imx6_ccm.c imx6_ccmreg.h imx6_reg.h src/sys/arch/evbarm/nitrogen6: nitrogen6_usb.c Log Message: Modified CCM register defines. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/imx/files.imx6 cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/imx/imx6_ccm.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/imx6_ccmreg.h \ src/sys/arch/arm/imx/imx6_reg.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/nitrogen6/nitrogen6_usb.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/imx/files.imx6 diff -u src/sys/arch/arm/imx/files.imx6:1.13 src/sys/arch/arm/imx/files.imx6:1.14 --- src/sys/arch/arm/imx/files.imx6:1.13 Sat Mar 17 18:34:09 2018 +++ src/sys/arch/arm/imx/files.imx6 Wed Jun 20 07:05:37 2018 @@ -1,4 +1,4 @@ -# $NetBSD: files.imx6,v 1.13 2018/03/17 18:34:09 ryo Exp $ +# $NetBSD: files.imx6,v 1.14 2018/06/20 07:05:37 hkenken Exp $ # # Configuration info for the Freescale i.MX6 # @@ -36,6 +36,8 @@ device imxccm attach imxccm at axi file arch/arm/imx/imx6_ccm.c imxccm needs-flag defflag opt_imx6clk.hIMXCCMDEBUG +defparam opt_imx6clk.hIMX6_OSC_FREQ +defparam opt_imx6clk.hIMX6_CKIL_FREQ # iMX6 Enhanced Periodic Interrupt Timer device imxclock Index: src/sys/arch/arm/imx/imx6_ccm.c diff -u src/sys/arch/arm/imx/imx6_ccm.c:1.8 src/sys/arch/arm/imx/imx6_ccm.c:1.9 --- src/sys/arch/arm/imx/imx6_ccm.c:1.8 Wed May 23 10:42:05 2018 +++ src/sys/arch/arm/imx/imx6_ccm.c Wed Jun 20 07:05:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_ccm.c,v 1.8 2018/05/23 10:42:05 hkenken Exp $ */ +/* $NetBSD: imx6_ccm.c,v 1.9 2018/06/20 07:05:37 hkenken Exp $ */ /* * Copyright (c) 2010-2012, 2014 Genetec Corporation. All rights reserved. @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.8 2018/05/23 10:42:05 hkenken Exp $"); +__KERNEL_RCSID(0, "$NetBSD: imx6_ccm.c,v 1.9 2018/06/20 07:05:37 hkenken Exp $"); #include "opt_imx.h" #include "opt_imx6clk.h" @@ -556,7 +556,7 @@ imx6_get_clock(enum imx6_clock_id clk) break; case IMX6CLK_PLL7: v = imx6_ccm_analog_read(CCM_ANALOG_PLL_USB2); - freq = IMX6_OSC_FREQ * ((v & CCM_ANALOG_PLL_USBn_DIV_SELECT) ? 22 : 20); + freq = IMX6_OSC_FREQ * ((v & CCM_ANALOG_PLL_DIV_SELECT) ? 22 : 20); break; #if 0 @@ -899,7 +899,7 @@ imx6_pll_power(uint32_t pllreg, int on, v = imx6_ccm_analog_read(pllreg); if (on) { v |= en; - v &= ~CCM_ANALOG_PLL_USBn_BYPASS; + v &= ~CCM_ANALOG_PLL_BYPASS; } else { v &= ~en; } Index: src/sys/arch/arm/imx/imx6_ccmreg.h diff -u src/sys/arch/arm/imx/imx6_ccmreg.h:1.7 src/sys/arch/arm/imx/imx6_ccmreg.h:1.8 --- src/sys/arch/arm/imx/imx6_ccmreg.h:1.7 Wed May 23 10:42:05 2018 +++ src/sys/arch/arm/imx/imx6_ccmreg.h Wed Jun 20 07:05:37 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: imx6_ccmreg.h,v 1.7 2018/05/23 10:42:05 hkenken Exp $ */ +/* $NetBSD: imx6_ccmreg.h,v 1.8 2018/06/20 07:05:37 hkenken Exp $ */ /* * Copyright (c) 2014 Ryo Shimizu @@ -44,6 +44,9 @@ #ifndef IMX6_OSC_FREQ #define IMX6_OSC_FREQ (24 * 1000 * 1000) /* 24MHz */ #endif +#ifndef IMX6_CKIL_FREQ +#define IMX6_CKIL_FREQ 32768 +#endif #define CCM_CCR 0x #define CCM_CCR_RBC_EN__BIT(27) @@ -292,6 +295,9 @@ #define CCM_CCGR6_USBOH3_CLK_ENABLE __BITS(1, 0) #define CCM_ANALOG_PLL_ARM 0x /* = 020c8000 */ +#define CCM_ANALOG_PLL_ARM_SET 0x0004 +#define CCM_ANALOG_PLL_ARM_CLR 0x0008 +#define CCM_ANALOG_PLL_ARM_TOG 0x000c #define CCM_ANALOG_PLL_ARM_LOCK __BIT(31) #define CCM_ANALOG_PLL_ARM_PLL_SEL __BIT(19) #define CCM_ANALOG_PLL_ARM_LVDS_24MHZ_SEL __BIT(18) @@ -302,10 +308,13 @@ #define CCM_ANALOG_PLL_ARM_POWERDOWN __BIT(12) #define CCM_ANALOG_PLL_ARM_DIV_SELECT __BITS(6, 0) -#define CCM_ANALOG_PLL_ARM_SET 0x0004 -#define CCM_ANALOG_PLL_ARM_CLR 0x0008 -#define CCM_ANALOG_PLL_ARM_TOG 0x000c -#define CCM_ANALOG_PLL_ARM_DIV_SELECT __BITS(6, 0) +#define CCM_ANALOG_PLL_LOCK __BIT(31) +#define CCM_ANALOG_PLL_BYPASS __BIT(16) +#define CCM_ANALOG_PLL_BYPASS_CLK_SRC __BITS(15, 14) +#define CCM_ANALOG_PLL_ENABLE __BIT(13) +#define CCM_ANALOG_PLL_POWER __BIT(12) +#define CCM_ANALOG_PLL_EN_USB_CLK __BIT(6) +#define CCM_ANALOG_PLL_DIV_SELECT __BITS(1, 0) #define CCM_ANALOG_PLL_USB1 0x0010 #define CCM_ANALOG_PLL_USB1_SET 0x0014 @@ -331,14 +340,6 @@ #define CCM_ANALOG_PLL_USB2_EN_USB_CLK __BIT(6) #define CCM_ANALOG_PLL_USB2_DIV_SELECT __BITS(1, 0) -#define CCM_ANALOG_PLL_USBn_LOCK __BIT(31) -#define CCM_ANALOG_PLL_USBn_BYPASS __BIT(16) -#define CCM_ANALOG_PLL_USBn_BYPASS_CLK_SRC __BITS(15, 14) -#define CCM_ANALOG_PLL_USBn_ENABLE __BIT(13) -#define CCM_ANALOG_PLL_USBn_POWER __BIT(12) -#define CCM_ANALOG_PLL_USBn_EN_USB_CLK __BIT(6) -#d