CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src
Committed By: msaitoh
Date: Tue Nov 5 04:09:51 UTC 2019
Modified Files:
src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c
Log Message:
Avoid null pointer dereference found by kUBSan with "member access within
null pointer of type 'struct drm_fb_helper_crtc'".
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.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/external/bsd/drm2/dist/drm/drm_fb_helper.c
diff -u src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.12 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.13
--- src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c:1.12 Mon Aug 27 13:37:21 2018
+++ src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Tue Nov 5 04:09:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: drm_fb_helper.c,v 1.12 2018/08/27 13:37:21 riastradh Exp $ */
+/* $NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $ */
/*
* Copyright (c) 2006-2009 Red Hat Inc.
@@ -30,7 +30,7 @@
* Jesse Barnes
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.12 2018/08/27 13:37:21 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: drm_fb_helper.c,v 1.13 2019/11/05 04:09:51 msaitoh Exp $");
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
@@ -2086,9 +2086,9 @@ static void drm_setup_crtcs(struct drm_f
struct drm_display_mode *mode = modes[i];
struct drm_fb_helper_crtc *fb_crtc = crtcs[i];
struct drm_fb_offset *offset = [i];
- modeset = _crtc->mode_set;
if (mode && fb_crtc) {
+ modeset = _crtc->mode_set;
DRM_DEBUG_KMS("desired mode %s set on crtc %d (%d,%d)\n",
mode->name, fb_crtc->mode_set.crtc->base.id, offset->x, offset->y);
fb_crtc->desired_mode = mode;
CVS commit: src/sys/external/bsd/drm2/dist/drm
Module Name:src Committed By: msaitoh Date: Tue Nov 5 04:09:51 UTC 2019 Modified Files: src/sys/external/bsd/drm2/dist/drm: drm_fb_helper.c Log Message: Avoid null pointer dereference found by kUBSan with "member access within null pointer of type 'struct drm_fb_helper_crtc'". To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/drm2/dist/drm/drm_fb_helper.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: prlw1
Date: Mon Nov 4 15:12:10 UTC 2019
Modified Files:
src/sys/dev/ic: wdc.c
Log Message:
Fix locking bug seen when using WDCNDELAY_DEBUG in PR kern/52126
(Observed
piixide0:0:0: warning: busy-wait took 200us
with no panic)
To generate a diff of this commit:
cvs rdiff -u -r1.294 -r1.295 src/sys/dev/ic/wdc.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/ic/wdc.c
diff -u src/sys/dev/ic/wdc.c:1.294 src/sys/dev/ic/wdc.c:1.295
--- src/sys/dev/ic/wdc.c:1.294 Wed Oct 23 14:44:41 2019
+++ src/sys/dev/ic/wdc.c Mon Nov 4 15:12:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: wdc.c,v 1.294 2019/10/23 14:44:41 christos Exp $ */
+/* $NetBSD: wdc.c,v 1.295 2019/11/04 15:12:10 prlw1 Exp $ */
/*
* Copyright (c) 1998, 2001, 2003 Manuel Bouyer. All rights reserved.
@@ -58,7 +58,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.294 2019/10/23 14:44:41 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wdc.c,v 1.295 2019/11/04 15:12:10 prlw1 Exp $");
#include "opt_ata.h"
#include "opt_wdc.h"
@@ -1240,7 +1240,7 @@ __wdcwait(struct ata_channel *chp, int m
if (!cold && xtime > WDCNDELAY_DEBUG) {
struct ata_xfer *xfer;
- xfer = ata_queue_get_active_xfer(chp);
+ xfer = ata_queue_get_active_xfer_locked(chp);
if (xfer == NULL)
printf("%s channel %d: warning: busy-wait took %dus\n",
device_xname(chp->ch_atac->atac_dev),
CVS commit: src/sys/dev/ic
Module Name:src Committed By: prlw1 Date: Mon Nov 4 15:12:10 UTC 2019 Modified Files: src/sys/dev/ic: wdc.c Log Message: Fix locking bug seen when using WDCNDELAY_DEBUG in PR kern/52126 (Observed piixide0:0:0: warning: busy-wait took 200us with no panic) To generate a diff of this commit: cvs rdiff -u -r1.294 -r1.295 src/sys/dev/ic/wdc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:53:35 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1711 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.3 diff -u src/doc/CHANGES-7.3:1.1.2.65 src/doc/CHANGES-7.3:1.1.2.66 --- src/doc/CHANGES-7.3:1.1.2.65 Thu Oct 31 01:53:00 2019 +++ src/doc/CHANGES-7.3 Mon Nov 4 14:53:35 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.3,v 1.1.2.65 2019/10/31 01:53:00 martin Exp $ +# $NetBSD: CHANGES-7.3,v 1.1.2.66 2019/11/04 14:53:35 martin Exp $ A complete list of changes from the NetBSD 7.2 release to the NetBSD 7.3 release: @@ -702,3 +702,14 @@ sys/modules/filemon/Makefile 1.4 (manu Do not install the filemon module. [maya, ticket #1710] +sys/compat/netbsd32/syscalls.master 1.129 +sys/compat/netbsd32/netbsd32_syscallargs.h (regen) +sys/compat/netbsd32/netbsd32_syscall.h (regen) +sys/compat/netbsd32/netbsd32_sysent.c (regen) +sys/compat/netbsd32/netbsd32_syscalls.c (regen) +sys/compat/netbsd32/netbsd32_syscalls_autoload.c (regen) +sys/compat/netbsd32/netbsd32_systrace_args.c (regen) + + For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. + [rin, ticket #1711] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:53:35 UTC 2019 Modified Files: src/doc [netbsd-7]: CHANGES-7.3 Log Message: Ticket #1711 To generate a diff of this commit: cvs rdiff -u -r1.1.2.65 -r1.1.2.66 src/doc/CHANGES-7.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:52:15 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-7]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c Log Message: Regen for ticket #1711 To generate a diff of this commit: cvs rdiff -u -r1.109.2.3 -r1.109.2.4 \ src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.108.2.3 -r1.108.2.4 \ src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:52:15 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-7]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_sysent.c
Log Message:
Regen for ticket #1711
To generate a diff of this commit:
cvs rdiff -u -r1.109.2.3 -r1.109.2.4 \
src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.108.2.3 -r1.108.2.4 \
src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.109.2.3 src/sys/compat/netbsd32/netbsd32_syscall.h:1.109.2.4
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.109.2.3 Fri Nov 6 09:19:24 2015
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Nov 4 14:52:15 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.109.2.3 2015/11/06 09:19:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.109.2.4 2019/11/04 14:52:15 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.4 2019/11/04 14:51:31 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1231,7 +1231,7 @@
/* syscall: "netbsd32_openat" ret: "int" args: "int" "const netbsd32_charp" "int" "..." */
#define NETBSD32_SYS_netbsd32_openat 468
-/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
+/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
#define NETBSD32_SYS_netbsd32_readlinkat 469
/* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.109.2.3 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.109.2.4
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.109.2.3 Fri Nov 6 09:19:24 2015
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Nov 4 14:52:15 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.109.2.3 2015/11/06 09:19:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.109.2.4 2019/11/04 14:52:15 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.4 2019/11/04 14:51:31 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2416,7 +2416,7 @@ struct netbsd32_readlinkat_args {
syscallarg(int) fd;
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_charp) buf;
- syscallarg(size_t) bufsize;
+ syscallarg(netbsd32_size_t) bufsize;
};
check_syscall_args(netbsd32_readlinkat)
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.108.2.3 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.108.2.4
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.108.2.3 Fri Nov 6 09:19:24 2015
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Nov 4 14:52:15 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.108.2.4 2019/11/04 14:52:15 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.4 2019/11/04 14:51:31 martin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.108.2.4 2019/11/04 14:52:15 martin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.108.2.3 src/sys/compat/netbsd32/netbsd32_sysent.c:1.108.2.4
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.108.2.3 Fri Nov 6 09:19:24 2015
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Mon Nov 4 14:52:15 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.108.2.3 2015/11/06 09:19:24 martin Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.108.2.4 2019/11/04 14:52:15 martin Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp
+ * created from NetBSD: syscalls.master,v 1.101.2.4 2019/11/04 14:51:31 martin Exp
*/
#include
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:51:31 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-7]: syscalls.master Log Message: Pull up following revision(s) (requested by rin in ticket #1711): sys/compat/netbsd32/syscalls.master: revision 1.129 For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. Since bufsize is the last argument, this affects only LP64EB. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.101.2.3 -r1.101.2.4 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:51:31 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-7]: syscalls.master
Log Message:
Pull up following revision(s) (requested by rin in ticket #1711):
sys/compat/netbsd32/syscalls.master: revision 1.129
For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t.
Since bufsize is the last argument, this affects only LP64EB.
XXX
pullup to netbsd-9, -8, and -7
To generate a diff of this commit:
cvs rdiff -u -r1.101.2.3 -r1.101.2.4 src/sys/compat/netbsd32/syscalls.master
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/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.101.2.3 src/sys/compat/netbsd32/syscalls.master:1.101.2.4
--- src/sys/compat/netbsd32/syscalls.master:1.101.2.3 Fri Nov 6 09:16:48 2015
+++ src/sys/compat/netbsd32/syscalls.master Mon Nov 4 14:51:31 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.101.2.3 2015/11/06 09:16:48 martin Exp $
+ $NetBSD: syscalls.master,v 1.101.2.4 2019/11/04 14:51:31 martin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1016,7 +1016,7 @@
469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
- size_t bufsize); }
+ netbsd32_size_t bufsize); }
470 STD { int|netbsd32||symlinkat(const netbsd32_charp path1, \
int fd, \
const netbsd32_charp path2); }
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:50:32 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1421 - #1425 To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.2 diff -u src/doc/CHANGES-8.2:1.1.2.58 src/doc/CHANGES-8.2:1.1.2.59 --- src/doc/CHANGES-8.2:1.1.2.58 Sun Nov 3 11:39:47 2019 +++ src/doc/CHANGES-8.2 Mon Nov 4 14:50:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.58 2019/11/03 11:39:47 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.59 2019/11/04 14:50:32 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -1420,3 +1420,37 @@ sys/arch/zaurus/stand/zbsdmod/zbsdmod.c load buffer. [tsutsui, ticket #1420] +sys/dev/scsipi/st.c1.238 + + Add simple position recovery when positioning to EOM by reading + the position with READ_POSITION. + [jnemeth, ticket #1421] + +sys/dev/rasops/rasops.h1.49 + + rasops(9): avoid size changes of struct rasops_info depending + on kernel options. + [tsutsui, ticket #1422] + +etc/MAKEDEV.awk 1.28 + + PR port-arm/54640: hack to work around conditional RAW_PART + definition in arm/include/disklabel.h. + [tsutsui, ticket #1423] + +sys/arch/zaurus/dev/zrc.c 1.10 + + Fix build errors with options WSDISPLAY_COMPAT_RAWKBD. + [tsutsui, ticket #1424] + +sys/compat/netbsd32/syscalls.master 1.129 +sys/compat/netbsd32/netbsd32_syscallargs.h (regen) +sys/compat/netbsd32/netbsd32_syscall.h (regen) +sys/compat/netbsd32/netbsd32_sysent.c (regen) +sys/compat/netbsd32/netbsd32_syscalls.c (regen) +sys/compat/netbsd32/netbsd32_syscalls_autoload.c (regen) +sys/compat/netbsd32/netbsd32_systrace_args.c (regen) + + For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. + [rin, ticket #1425] +
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:50:32 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1421 - #1425 To generate a diff of this commit: cvs rdiff -u -r1.1.2.58 -r1.1.2.59 src/doc/CHANGES-8.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:49:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #393 - #398 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/doc
Module Name:src Committed By: martin Date: Mon Nov 4 14:49:31 UTC 2019 Modified Files: src/doc [netbsd-9]: CHANGES-9.0 Log Message: Tickets #393 - #398 To generate a diff of this commit: cvs rdiff -u -r1.1.2.94 -r1.1.2.95 src/doc/CHANGES-9.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-9.0 diff -u src/doc/CHANGES-9.0:1.1.2.94 src/doc/CHANGES-9.0:1.1.2.95 --- src/doc/CHANGES-9.0:1.1.2.94 Sun Nov 3 11:42:52 2019 +++ src/doc/CHANGES-9.0 Mon Nov 4 14:49:31 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-9.0,v 1.1.2.94 2019/11/03 11:42:52 martin Exp $ +# $NetBSD: CHANGES-9.0,v 1.1.2.95 2019/11/04 14:49:31 martin Exp $ A complete list of changes from the initial NetBSD 9.0 branch on 2019-07-30 until the 9.0 release: @@ -5425,3 +5425,43 @@ external/bsd/jemalloc/lib/Makefile.inc PR port-alpha/54307: workaround for random crash of userland binaries. [rin, ticket #392] +sys/arch/aarch64/aarch64/pmap.c 1.48 +sys/arch/aarch64/include/pmap.h 1.26 + + aarch64: synchronize icache more often. + [maya, ticket #393] + +sys/dev/rasops/rasops.h1.49 + + rasops(9): avoid size changes of struct rasops_info depending + on kernel options. + [tsutsui, ticket #394] + +sys/arch/zaurus/dev/zrc.c 1.10 + + Fix build errors with options WSDISPLAY_COMPAT_RAWKBD. + [tsutsui, ticket #395] + +sys/arch/zaurus/conf/GENERIC 1.88 + + Put back options WSDISPLAY_COMPAT_RAWKBD. It is required for the + Xorg server. + [tsutsui, ticket #396] + +etc/MAKEDEV.awk 1.28 + + PR port-arm/54640: hack to work around conditional RAW_PART + definition in arm/include/disklabel.h. + [tsutsui, ticket #397] + +sys/compat/netbsd32/syscalls.master 1.129 +sys/compat/netbsd32/netbsd32_syscallargs.h (regen) +sys/compat/netbsd32/netbsd32_syscall.h (regen) +sys/compat/netbsd32/netbsd32_sysent.c (regen) +sys/compat/netbsd32/netbsd32_syscalls.c (regen) +sys/compat/netbsd32/netbsd32_syscalls_autoload.c (regen) +sys/compat/netbsd32/netbsd32_systrace_args.c (regen) + + For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. + [rin, ticket #398] +
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:47:33 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen for ticket #398
To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.141 -r1.141.2.1 \
src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.21 -r1.21.2.1 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.140 -r1.140.2.1 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.32 -r1.32.2.1 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.142 src/sys/compat/netbsd32/netbsd32_syscall.h:1.142.2.1
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.142 Tue Jun 18 16:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Nov 4 14:47:33 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.142 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.142.2.1 2019/11/04 14:47:33 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127.2.1 2019/11/04 14:46:57 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1228,7 +1228,7 @@
/* syscall: "netbsd32_openat" ret: "int" args: "int" "const netbsd32_charp" "int" "..." */
#define NETBSD32_SYS_netbsd32_openat 468
-/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
+/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
#define NETBSD32_SYS_netbsd32_readlinkat 469
/* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141.2.1
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.141 Tue Jun 18 16:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Nov 4 14:47:33 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.141 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.141.2.1 2019/11/04 14:47:33 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127.2.1 2019/11/04 14:46:57 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2511,7 +2511,7 @@ struct netbsd32_readlinkat_args {
syscallarg(int) fd;
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_charp) buf;
- syscallarg(size_t) bufsize;
+ syscallarg(netbsd32_size_t) bufsize;
};
check_syscall_args(netbsd32_readlinkat)
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141.2.1
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.141 Tue Jun 18 16:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Nov 4 14:47:33 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.141.2.1 2019/11/04 14:47:33 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp
+ * created from NetBSD: syscalls.master,v 1.127.2.1 2019/11/04 14:46:57 martin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.141 2019/06/18 16:24:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.141.2.1 2019/11/04 14:47:33 martin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21.2.1
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.21 Tue Jun 18 16:24:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Mon Nov 4 14:47:33 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.21 2019/06/18 16:24:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.21.2.1 2019/11/04 14:47:33 martin Exp $ */
/*
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:47:33 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-9]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen for ticket #398 To generate a diff of this commit: cvs rdiff -u -r1.142 -r1.142.2.1 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.141 -r1.141.2.1 \ src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.21 -r1.21.2.1 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.140 -r1.140.2.1 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.32 -r1.32.2.1 \ src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:46:58 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-9]: syscalls.master Log Message: Pull up following revision(s) (requested by rin in ticket #398): sys/compat/netbsd32/syscalls.master: revision 1.129 For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. Since bufsize is the last argument, this affects only LP64EB. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.127 -r1.127.2.1 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:46:58 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-9]: syscalls.master
Log Message:
Pull up following revision(s) (requested by rin in ticket #398):
sys/compat/netbsd32/syscalls.master: revision 1.129
For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t.
Since bufsize is the last argument, this affects only LP64EB.
XXX
pullup to netbsd-9, -8, and -7
To generate a diff of this commit:
cvs rdiff -u -r1.127 -r1.127.2.1 src/sys/compat/netbsd32/syscalls.master
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/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.127 src/sys/compat/netbsd32/syscalls.master:1.127.2.1
--- src/sys/compat/netbsd32/syscalls.master:1.127 Tue Jun 18 16:23:24 2019
+++ src/sys/compat/netbsd32/syscalls.master Mon Nov 4 14:46:57 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.127 2019/06/18 16:23:24 christos Exp $
+ $NetBSD: syscalls.master,v 1.127.2.1 2019/11/04 14:46:57 martin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1116,7 +1116,7 @@
469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
- size_t bufsize); }
+ netbsd32_size_t bufsize); }
470 STD { int|netbsd32||symlinkat(const netbsd32_charp path1, \
int fd, \
const netbsd32_charp path2); }
CVS commit: [netbsd-8] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:44:47 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-8]: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: Regen for ticket #398 To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.129.2.1 src/sys/compat/netbsd32/netbsd32_syscall.h \ src/sys/compat/netbsd32/netbsd32_syscallargs.h cvs rdiff -u -r1.128 -r1.128.2.1 src/sys/compat/netbsd32/netbsd32_syscalls.c \ src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.11 -r1.11.2.1 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.19 -r1.19.2.1 \ src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:44:47 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-8]: netbsd32_syscall.h
netbsd32_syscallargs.h netbsd32_syscalls.c
netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
Regen for ticket #398
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.129.2.1 src/sys/compat/netbsd32/netbsd32_syscall.h \
src/sys/compat/netbsd32/netbsd32_syscallargs.h
cvs rdiff -u -r1.128 -r1.128.2.1 src/sys/compat/netbsd32/netbsd32_syscalls.c \
src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.11 -r1.11.2.1 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.19 -r1.19.2.1 \
src/sys/compat/netbsd32/netbsd32_systrace_args.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.129 src/sys/compat/netbsd32/netbsd32_syscall.h:1.129.2.1
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.129 Wed May 10 06:19:49 2017
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Nov 4 14:44:46 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.129 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.129.2.1 2019/11/04 14:44:46 martin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp
+ * created from NetBSD: syscalls.master,v 1.115.8.1 2019/11/04 14:39:59 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1227,7 +1227,7 @@
/* syscall: "netbsd32_openat" ret: "int" args: "int" "const netbsd32_charp" "int" "..." */
#define NETBSD32_SYS_netbsd32_openat 468
-/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
+/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
#define NETBSD32_SYS_netbsd32_readlinkat 469
/* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.129 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.129.2.1
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.129 Wed May 10 06:19:49 2017
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Nov 4 14:44:46 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.129 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.129.2.1 2019/11/04 14:44:46 martin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp
+ * created from NetBSD: syscalls.master,v 1.115.8.1 2019/11/04 14:39:59 martin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2512,7 +2512,7 @@ struct netbsd32_readlinkat_args {
syscallarg(int) fd;
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_charp) buf;
- syscallarg(size_t) bufsize;
+ syscallarg(netbsd32_size_t) bufsize;
};
check_syscall_args(netbsd32_readlinkat)
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.128 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.128.2.1
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.128 Wed May 10 06:19:49 2017
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Nov 4 14:44:46 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.128 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.128.2.1 2019/11/04 14:44:46 martin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp
+ * created from NetBSD: syscalls.master,v 1.115.8.1 2019/11/04 14:39:59 martin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.128 2017/05/10 06:19:49 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.128.2.1 2019/11/04 14:44:46 martin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_sysent.c
diff -u src/sys/compat/netbsd32/netbsd32_sysent.c:1.128 src/sys/compat/netbsd32/netbsd32_sysent.c:1.128.2.1
--- src/sys/compat/netbsd32/netbsd32_sysent.c:1.128 Wed May 10 06:19:49 2017
+++ src/sys/compat/netbsd32/netbsd32_sysent.c Mon Nov 4 14:44:47 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_sysent.c,v 1.128 2017/05/10 06:19:49 riastradh Exp $ */
+/* $NetBSD: netbsd32_sysent.c,v 1.128.2.1 2019/11/04 14:44:47 martin Exp $ */
/*
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from
CVS commit: [netbsd-8] src/sys/compat/netbsd32
Module Name:src Committed By: martin Date: Mon Nov 4 14:39:59 UTC 2019 Modified Files: src/sys/compat/netbsd32 [netbsd-8]: syscalls.master Log Message: Pull up following revision(s) (requested by rin in ticket #398): sys/compat/netbsd32/syscalls.master: revision 1.129 For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. Since bufsize is the last argument, this affects only LP64EB. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.115.8.1 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/compat/netbsd32
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:39:59 UTC 2019
Modified Files:
src/sys/compat/netbsd32 [netbsd-8]: syscalls.master
Log Message:
Pull up following revision(s) (requested by rin in ticket #398):
sys/compat/netbsd32/syscalls.master: revision 1.129
For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t.
Since bufsize is the last argument, this affects only LP64EB.
XXX
pullup to netbsd-9, -8, and -7
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.115.8.1 src/sys/compat/netbsd32/syscalls.master
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/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.115 src/sys/compat/netbsd32/syscalls.master:1.115.8.1
--- src/sys/compat/netbsd32/syscalls.master:1.115 Wed Oct 19 09:44:01 2016
+++ src/sys/compat/netbsd32/syscalls.master Mon Nov 4 14:39:59 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.115 2016/10/19 09:44:01 skrll Exp $
+ $NetBSD: syscalls.master,v 1.115.8.1 2019/11/04 14:39:59 martin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1018,7 +1018,7 @@
469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
- size_t bufsize); }
+ netbsd32_size_t bufsize); }
470 STD { int|netbsd32||symlinkat(const netbsd32_charp path1, \
int fd, \
const netbsd32_charp path2); }
CVS commit: [netbsd-8] src/etc
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:37:42 UTC 2019
Modified Files:
src/etc [netbsd-8]: MAKEDEV.awk
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1423):
etc/MAKEDEV.awk: revision 1.28
PR port-arm/54640: hack to work around conditional RAW_PART definition in
arm/include/disklabel.h.
Recognize this special case and skip lines between #ifndef RAW_PART and
the next #endif.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.25.8.1 src/etc/MAKEDEV.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.awk
diff -u src/etc/MAKEDEV.awk:1.25 src/etc/MAKEDEV.awk:1.25.8.1
--- src/etc/MAKEDEV.awk:1.25 Fri Sep 19 09:01:05 2014
+++ src/etc/MAKEDEV.awk Mon Nov 4 14:37:42 2019
@@ -1,6 +1,6 @@
#!/usr/bin/awk -
#
-# $NetBSD: MAKEDEV.awk,v 1.25 2014/09/19 09:01:05 matt Exp $
+# $NetBSD: MAKEDEV.awk,v 1.25.8.1 2019/11/04 14:37:42 martin Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -135,7 +135,18 @@ BEGIN {
diskpartitions = $3
else if ($1 == "#define" && $2 == "OLDMAXPARTITIONS")
diskbackcompat = $3
- else if ($1 == "#define" && $2 == "RAW_PART")
+ else if ($1 == "#ifndef" && $2 == "RAW_PART" &&
+ RAWDISK_OFF) {
+# special case to ignore #ifndef RAW_PART
+# sections (e.g. in arm/include/disklabel.h,
+# when it is already set in
+# zaurus/include/disklabel.h)
+while (getline < inc) {
+ # skip all lines upto the next #endif
+ if ($1 == "#endif")
+ break;
+}
+ } else if ($1 == "#define" && $2 == "RAW_PART")
RAWDISK_OFF = $3
else if ($1 == "#include" &&
$2 ~ "<.*/disklabel.h>" &&
@@ -214,7 +225,7 @@ BEGIN {
print "# Generated from:"
# MAKEDEV.awk (this script) RCS Id
- ARCSID = "$NetBSD: MAKEDEV.awk,v 1.25 2014/09/19 09:01:05 matt Exp $"
+ ARCSID = "$NetBSD: MAKEDEV.awk,v 1.25.8.1 2019/11/04 14:37:42 martin Exp $"
gsub(/\$/, "", ARCSID)
print "# " ARCSID
CVS commit: [netbsd-8] src/etc
Module Name:src Committed By: martin Date: Mon Nov 4 14:37:42 UTC 2019 Modified Files: src/etc [netbsd-8]: MAKEDEV.awk Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1423): etc/MAKEDEV.awk: revision 1.28 PR port-arm/54640: hack to work around conditional RAW_PART definition in arm/include/disklabel.h. Recognize this special case and skip lines between #ifndef RAW_PART and the next #endif. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.25.8.1 src/etc/MAKEDEV.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc
Module Name:src Committed By: martin Date: Mon Nov 4 14:35:57 UTC 2019 Modified Files: src/etc [netbsd-9]: MAKEDEV.awk Log Message: Pull up following revision(s) (requested by tsutsui in ticket #397): etc/MAKEDEV.awk: revision 1.28 PR port-arm/54640: hack to work around conditional RAW_PART definition in arm/include/disklabel.h. Recognize this special case and skip lines between #ifndef RAW_PART and the next #endif. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.26.2.1 src/etc/MAKEDEV.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/etc
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:35:57 UTC 2019
Modified Files:
src/etc [netbsd-9]: MAKEDEV.awk
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #397):
etc/MAKEDEV.awk: revision 1.28
PR port-arm/54640: hack to work around conditional RAW_PART definition in
arm/include/disklabel.h.
Recognize this special case and skip lines between #ifndef RAW_PART and
the next #endif.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.26.2.1 src/etc/MAKEDEV.awk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/MAKEDEV.awk
diff -u src/etc/MAKEDEV.awk:1.26 src/etc/MAKEDEV.awk:1.26.2.1
--- src/etc/MAKEDEV.awk:1.26 Thu Jun 13 20:54:04 2019
+++ src/etc/MAKEDEV.awk Mon Nov 4 14:35:57 2019
@@ -1,6 +1,6 @@
#!/usr/bin/awk -
#
-# $NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $
+# $NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $
#
# Copyright (c) 2003 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -135,7 +135,18 @@ BEGIN {
diskpartitions = $3
else if ($1 == "#define" && $2 == "OLDMAXPARTITIONS")
diskbackcompat = $3
- else if ($1 == "#define" && $2 == "RAW_PART")
+ else if ($1 == "#ifndef" && $2 == "RAW_PART" &&
+ RAWDISK_OFF) {
+# special case to ignore #ifndef RAW_PART
+# sections (e.g. in arm/include/disklabel.h,
+# when it is already set in
+# zaurus/include/disklabel.h)
+while (getline < inc) {
+ # skip all lines upto the next #endif
+ if ($1 == "#endif")
+ break;
+}
+ } else if ($1 == "#define" && $2 == "RAW_PART")
RAWDISK_OFF = $3
else if ($1 == "#include" &&
$2 ~ "<.*/disklabel.h>" &&
@@ -214,7 +225,7 @@ BEGIN {
print "# Generated from:"
# MAKEDEV.awk (this script) RCS Id
- ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26 2019/06/13 20:54:04 christos Exp $"
+ ARCSID = "$NetBSD: MAKEDEV.awk,v 1.26.2.1 2019/11/04 14:35:57 martin Exp $"
gsub(/\$/, "", ARCSID)
print "# " ARCSID
CVS commit: [netbsd-9] src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Mon Nov 4 14:34:28 UTC 2019 Modified Files: src/sys/arch/zaurus/conf [netbsd-9]: GENERIC Log Message: Pull up following revision(s) (requested by tsutsui in ticket #396): sys/arch/zaurus/conf/GENERIC: revision 1.88 Put back options WSDISPLAY_COMPAT_RAWKBD. It's required by Xorg server. Should be pulled up to netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/zaurus/conf/GENERIC diff -u src/sys/arch/zaurus/conf/GENERIC:1.86 src/sys/arch/zaurus/conf/GENERIC:1.86.2.1 --- src/sys/arch/zaurus/conf/GENERIC:1.86 Fri Jul 26 07:09:47 2019 +++ src/sys/arch/zaurus/conf/GENERIC Mon Nov 4 14:34:28 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.86 2019/07/26 07:09:47 martin Exp $ +# $NetBSD: GENERIC,v 1.86.2.1 2019/11/04 14:34:28 martin Exp $ # # GENERIC machine description file # @@ -143,7 +143,7 @@ options WS_KERNEL_FG=WSCOL_GREEN # compatibility to other console drivers options WSDISPLAY_COMPAT_PCVT # emulate some ioctls options WSDISPLAY_COMPAT_USL # wsconscfg VT handling -# options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes +options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes # Development and Debugging options
CVS commit: [netbsd-9] src/sys/arch/zaurus/conf
Module Name:src Committed By: martin Date: Mon Nov 4 14:34:28 UTC 2019 Modified Files: src/sys/arch/zaurus/conf [netbsd-9]: GENERIC Log Message: Pull up following revision(s) (requested by tsutsui in ticket #396): sys/arch/zaurus/conf/GENERIC: revision 1.88 Put back options WSDISPLAY_COMPAT_RAWKBD. It's required by Xorg server. Should be pulled up to netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.86 -r1.86.2.1 src/sys/arch/zaurus/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/arch/zaurus/dev
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:31:16 UTC 2019
Modified Files:
src/sys/arch/zaurus/dev [netbsd-8]: zrc.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1424):
sys/arch/zaurus/dev/zrc.c: revision 1.10
Fix build errors with options WSDISPLAY_COMPAT_RAWKBD.
- Add missing RAWKEY_* macro definitions (taken from OpenBSD)
- Explicitly include "opt_wsdisplay_compat.h" for
#ifdef WSDISPLAY_COMPAT_RAWKBD conditionals.
(it is not properly pulled at least in netbsd-8)
https://mail-index.netbsd.org/port-zaurus/2019/11/02/msg83.html
Should be pulled up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.30.1 src/sys/arch/zaurus/dev/zrc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/zrc.c
diff -u src/sys/arch/zaurus/dev/zrc.c:1.9 src/sys/arch/zaurus/dev/zrc.c:1.9.30.1
--- src/sys/arch/zaurus/dev/zrc.c:1.9 Sat Oct 27 17:18:14 2012
+++ src/sys/arch/zaurus/dev/zrc.c Mon Nov 4 14:31:16 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $ */
+/* $NetBSD: zrc.c,v 1.9.30.1 2019/11/04 14:31:16 martin Exp $ */
/* $OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $ */
/*
@@ -17,8 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "opt_wsdisplay_compat.h"
+
#include
-__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.9.30.1 2019/11/04 14:31:16 martin Exp $");
#include
#include
@@ -131,6 +133,11 @@ static const keysym_t zrc_keydesc[] = {
};
#ifdef WSDISPLAY_COMPAT_RAWKBD
+/* XXX see OpenBSD's */
+#define RAWKEY_Null 0x00
+#define RAWKEY_AudioMute 0x85
+#define RAWKEY_AudioLower 0x86
+#define RAWKEY_AudioRaise 0x87
#define RAWKEY_AudioRewind 0xa0
#define RAWKEY_AudioForward 0xa1
#define RAWKEY_AudioPlay 0xa2
CVS commit: [netbsd-8] src/sys/arch/zaurus/dev
Module Name:src Committed By: martin Date: Mon Nov 4 14:31:16 UTC 2019 Modified Files: src/sys/arch/zaurus/dev [netbsd-8]: zrc.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1424): sys/arch/zaurus/dev/zrc.c: revision 1.10 Fix build errors with options WSDISPLAY_COMPAT_RAWKBD. - Add missing RAWKEY_* macro definitions (taken from OpenBSD) - Explicitly include "opt_wsdisplay_compat.h" for #ifdef WSDISPLAY_COMPAT_RAWKBD conditionals. (it is not properly pulled at least in netbsd-8) https://mail-index.netbsd.org/port-zaurus/2019/11/02/msg83.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.30.1 src/sys/arch/zaurus/dev/zrc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/zaurus/dev
Module Name:src Committed By: martin Date: Mon Nov 4 14:29:26 UTC 2019 Modified Files: src/sys/arch/zaurus/dev [netbsd-9]: zrc.c Log Message: Pull up following revision(s) (requested by tsutsui in ticket #395): sys/arch/zaurus/dev/zrc.c: revision 1.10 Fix build errors with options WSDISPLAY_COMPAT_RAWKBD. - Add missing RAWKEY_* macro definitions (taken from OpenBSD) - Explicitly include "opt_wsdisplay_compat.h" for #ifdef WSDISPLAY_COMPAT_RAWKBD conditionals. (it is not properly pulled at least in netbsd-8) https://mail-index.netbsd.org/port-zaurus/2019/11/02/msg83.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.9.42.1 src/sys/arch/zaurus/dev/zrc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/zaurus/dev
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:29:26 UTC 2019
Modified Files:
src/sys/arch/zaurus/dev [netbsd-9]: zrc.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #395):
sys/arch/zaurus/dev/zrc.c: revision 1.10
Fix build errors with options WSDISPLAY_COMPAT_RAWKBD.
- Add missing RAWKEY_* macro definitions (taken from OpenBSD)
- Explicitly include "opt_wsdisplay_compat.h" for
#ifdef WSDISPLAY_COMPAT_RAWKBD conditionals.
(it is not properly pulled at least in netbsd-8)
https://mail-index.netbsd.org/port-zaurus/2019/11/02/msg83.html
Should be pulled up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.9.42.1 src/sys/arch/zaurus/dev/zrc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/zaurus/dev/zrc.c
diff -u src/sys/arch/zaurus/dev/zrc.c:1.9 src/sys/arch/zaurus/dev/zrc.c:1.9.42.1
--- src/sys/arch/zaurus/dev/zrc.c:1.9 Sat Oct 27 17:18:14 2012
+++ src/sys/arch/zaurus/dev/zrc.c Mon Nov 4 14:29:26 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $ */
+/* $NetBSD: zrc.c,v 1.9.42.1 2019/11/04 14:29:26 martin Exp $ */
/* $OpenBSD: zaurus_remote.c,v 1.1 2005/11/17 05:26:31 uwe Exp $ */
/*
@@ -17,8 +17,10 @@
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
+#include "opt_wsdisplay_compat.h"
+
#include
-__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.9 2012/10/27 17:18:14 chs Exp $");
+__KERNEL_RCSID(0, "$NetBSD: zrc.c,v 1.9.42.1 2019/11/04 14:29:26 martin Exp $");
#include
#include
@@ -131,6 +133,11 @@ static const keysym_t zrc_keydesc[] = {
};
#ifdef WSDISPLAY_COMPAT_RAWKBD
+/* XXX see OpenBSD's */
+#define RAWKEY_Null 0x00
+#define RAWKEY_AudioMute 0x85
+#define RAWKEY_AudioLower 0x86
+#define RAWKEY_AudioRaise 0x87
#define RAWKEY_AudioRewind 0xa0
#define RAWKEY_AudioForward 0xa1
#define RAWKEY_AudioPlay 0xa2
CVS commit: [netbsd-8] src/sys/dev/rasops
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:23:28 UTC 2019
Modified Files:
src/sys/dev/rasops [netbsd-8]: rasops.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #1422):
sys/dev/rasops/rasops.h: revision 1.49
Fix "Alignment Fault 3" kernel failure of NetBSD/zaurus 8.1 GENERIC.
structure in header files could be problematic.
See my post in port-zaurus@ for details:
https://mail-index.netbsd.org/port-zaurus/2019/10/31/msg79.html
Should be pulled up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/rasops/rasops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rasops/rasops.h
diff -u src/sys/dev/rasops/rasops.h:1.32 src/sys/dev/rasops/rasops.h:1.32.4.1
--- src/sys/dev/rasops/rasops.h:1.32 Sat Apr 22 15:05:02 2017
+++ src/sys/dev/rasops/rasops.h Mon Nov 4 14:23:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.h,v 1.32 2017/04/22 15:05:02 macallan Exp $ */
+/* $NetBSD: rasops.h,v 1.32.4.1 2019/11/04 14:23:28 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -132,10 +132,8 @@ struct rasops_info {
/* Callbacks so we can share some code */
void (*ri_do_cursor)(struct rasops_info *);
-#if NRASOPS_ROTATION > 0
/* Used to intercept putchar to permit display rotation */
struct wsdisplay_emulops ri_real_ops;
-#endif
};
#define DELTA(p, d, cast) ((p) = (cast)((char *)(p) + (d)))
CVS commit: [netbsd-8] src/sys/dev/rasops
Module Name:src Committed By: martin Date: Mon Nov 4 14:23:28 UTC 2019 Modified Files: src/sys/dev/rasops [netbsd-8]: rasops.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #1422): sys/dev/rasops/rasops.h: revision 1.49 Fix "Alignment Fault 3" kernel failure of NetBSD/zaurus 8.1 GENERIC. structure in header files could be problematic. See my post in port-zaurus@ for details: https://mail-index.netbsd.org/port-zaurus/2019/10/31/msg79.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/rasops/rasops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-8] src/sys/dev/scsipi
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:22:14 UTC 2019
Modified Files:
src/sys/dev/scsipi [netbsd-8]: st.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #1421):
sys/dev/scsipi/st.c: revision 1.238
Add simple position recovery when positioning to EOM by reading
the position with READ_POSITION.
this allows for
mt eom
mt st
to return the correct file position.
To generate a diff of this commit:
cvs rdiff -u -r1.230.8.3 -r1.230.8.4 src/sys/dev/scsipi/st.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/scsipi/st.c
diff -u src/sys/dev/scsipi/st.c:1.230.8.3 src/sys/dev/scsipi/st.c:1.230.8.4
--- src/sys/dev/scsipi/st.c:1.230.8.3 Fri Mar 1 17:29:32 2019
+++ src/sys/dev/scsipi/st.c Mon Nov 4 14:22:13 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: st.c,v 1.230.8.3 2019/03/01 17:29:32 martin Exp $ */
+/* $NetBSD: st.c,v 1.230.8.4 2019/11/04 14:22:13 martin Exp $ */
/*-
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.230.8.3 2019/03/01 17:29:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: st.c,v 1.230.8.4 2019/11/04 14:22:13 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_scsi.h"
@@ -355,6 +355,7 @@ static int st_rewind(struct st_softc *,
static int st_interpret_sense(struct scsipi_xfer *);
static int st_touch_tape(struct st_softc *);
static int st_erase(struct st_softc *, int full, int flags);
+static void st_updatefilepos(struct st_softc *);
static int st_rdpos(struct st_softc *, int, uint32_t *);
static int st_setpos(struct st_softc *, int, uint32_t *);
@@ -1821,8 +1822,7 @@ st_space(struct st_softc *st, int number
st->blkno = -1;
}
} else if (what == SP_EOM) {
- /* This loses us relative position. */
- st->fileno = st->blkno = -1;
+st_updatefilepos(st);
}
}
return error;
@@ -1995,6 +1995,54 @@ st_rewind(struct st_softc *st, u_int imm
return error;
}
+static void
+st_updatefilepos(struct st_softc *st)
+{
+int error;
+uint8_t posdata[32];
+struct scsi_tape_read_position cmd;
+
+memset(, 0, sizeof(cmd));
+memset(, 0, sizeof(posdata));
+cmd.opcode = READ_POSITION;
+cmd.byte1 = 6; /* service action: LONG FORM */
+
+error = scsipi_command(st->sc_periph, (void *), sizeof(cmd),
+(void *), sizeof(posdata), ST_RETRIES, ST_CTL_TIME, NULL,
+XS_CTL_SILENT | XS_CTL_DATA_IN);
+
+if (error == 0) {
+#ifdef SCSIPI_DEBUG
+if (st->sc_periph->periph_dbflags & SCSIPI_DB3) {
+int hard;
+
+printf("posdata: ");
+for (hard = 0; hard < sizeof(posdata); hard++)
+printf("%02x ", posdata[hard] & 0xff);
+printf("\n");
+}
+#endif
+if (posdata[0] & 0xC) { /* Block|Mark Position Unknown */
+SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+ ("st_updatefilepos block/mark position unknown (0x%02x)\n",
+ posdata[0]));
+} else {
+st->fileno = _8btol([16]);
+st->blkno = 0;
+SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+ ("st_updatefilepos file position %"PRId64"\n",
+ st->fileno));
+return;
+}
+} else {
+SC_DEBUG(st->sc_periph, SCSIPI_DB3,
+ ("st_updatefilepos READ POSITION(LONG_FORM) failed (error=%d)\n",
+ error));
+}
+st->fileno = -1;
+st->blkno = -1;
+}
+
static int
st_rdpos(struct st_softc *st, int hard, uint32_t *blkptr)
{
CVS commit: [netbsd-8] src/sys/dev/scsipi
Module Name:src Committed By: martin Date: Mon Nov 4 14:22:14 UTC 2019 Modified Files: src/sys/dev/scsipi [netbsd-8]: st.c Log Message: Pull up following revision(s) (requested by jnemeth in ticket #1421): sys/dev/scsipi/st.c: revision 1.238 Add simple position recovery when positioning to EOM by reading the position with READ_POSITION. this allows for mt eom mt st to return the correct file position. To generate a diff of this commit: cvs rdiff -u -r1.230.8.3 -r1.230.8.4 src/sys/dev/scsipi/st.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/dev/rasops
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:13:31 UTC 2019
Modified Files:
src/sys/dev/rasops [netbsd-9]: rasops.h
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #394):
sys/dev/rasops/rasops.h: revision 1.49
Fix "Alignment Fault 3" kernel failure of NetBSD/zaurus 8.1 GENERIC.
structure in header files could be problematic.
See my post in port-zaurus@ for details:
https://mail-index.netbsd.org/port-zaurus/2019/10/31/msg79.html
Should be pulled up to netbsd-8 and netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/dev/rasops/rasops.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/rasops/rasops.h
diff -u src/sys/dev/rasops/rasops.h:1.38.2.1 src/sys/dev/rasops/rasops.h:1.38.2.2
--- src/sys/dev/rasops/rasops.h:1.38.2.1 Thu Aug 15 12:21:27 2019
+++ src/sys/dev/rasops/rasops.h Mon Nov 4 14:13:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rasops.h,v 1.38.2.1 2019/08/15 12:21:27 martin Exp $ */
+/* $NetBSD: rasops.h,v 1.38.2.2 2019/11/04 14:13:31 martin Exp $ */
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -149,10 +149,8 @@ struct rasops_info {
/* Callbacks so we can share some code */
void (*ri_do_cursor)(struct rasops_info *);
-#if NRASOPS_ROTATION > 0
/* Used to intercept putchar to permit display rotation */
struct wsdisplay_emulops ri_real_ops;
-#endif
};
#define CHAR_IN_FONT(c, font) \
CVS commit: [netbsd-9] src/sys/dev/rasops
Module Name:src Committed By: martin Date: Mon Nov 4 14:13:31 UTC 2019 Modified Files: src/sys/dev/rasops [netbsd-9]: rasops.h Log Message: Pull up following revision(s) (requested by tsutsui in ticket #394): sys/dev/rasops/rasops.h: revision 1.49 Fix "Alignment Fault 3" kernel failure of NetBSD/zaurus 8.1 GENERIC. structure in header files could be problematic. See my post in port-zaurus@ for details: https://mail-index.netbsd.org/port-zaurus/2019/10/31/msg79.html Should be pulled up to netbsd-8 and netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.38.2.1 -r1.38.2.2 src/sys/dev/rasops/rasops.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-9] src/sys/arch/aarch64
Module Name:src
Committed By: martin
Date: Mon Nov 4 14:08:19 UTC 2019
Modified Files:
src/sys/arch/aarch64/aarch64 [netbsd-9]: pmap.c
src/sys/arch/aarch64/include [netbsd-9]: pmap.h
Log Message:
Pull up following revision(s) (requested by maya in ticket #393):
sys/arch/aarch64/include/pmap.h: revision 1.26
sys/arch/aarch64/aarch64/pmap.c: revision 1.48
Define PMAP_NEED_PROCWR, providing strategically placed i-cache
synchronization where just-changed memory is about to be executed.
Fixes SIGILLs seen when running Mono 6 on QEMU Cortex-A57.
ok ryo
To generate a diff of this commit:
cvs rdiff -u -r1.41.2.2 -r1.41.2.3 src/sys/arch/aarch64/aarch64/pmap.c
cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/arch/aarch64/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/aarch64/aarch64/pmap.c
diff -u src/sys/arch/aarch64/aarch64/pmap.c:1.41.2.2 src/sys/arch/aarch64/aarch64/pmap.c:1.41.2.3
--- src/sys/arch/aarch64/aarch64/pmap.c:1.41.2.2 Mon Sep 23 07:00:35 2019
+++ src/sys/arch/aarch64/aarch64/pmap.c Mon Nov 4 14:08:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.c,v 1.41.2.2 2019/09/23 07:00:35 martin Exp $ */
+/* $NetBSD: pmap.c,v 1.41.2.3 2019/11/04 14:08:18 martin Exp $ */
/*
* Copyright (c) 2017 Ryo Shimizu
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.2 2019/09/23 07:00:35 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.41.2.3 2019/11/04 14:08:18 martin Exp $");
#include "opt_arm_debug.h"
#include "opt_ddb.h"
@@ -874,6 +874,22 @@ pmap_icache_sync_range(pmap_t pm, vaddr_
pm_unlock(pm);
}
+/*
+ * Routine: pmap_procwr
+ *
+ * Function:
+ * Synchronize caches corresponding to [addr, addr+len) in p.
+ *
+ */
+void
+pmap_procwr(struct proc *p, vaddr_t va, int len)
+{
+
+ /* We only need to do anything if it is the current process. */
+ if (p == curproc)
+ cpu_icache_sync_range(va, len);
+}
+
static pt_entry_t
_pmap_pte_adjust_prot(pt_entry_t pte, vm_prot_t prot, vm_prot_t protmask,
bool user)
Index: src/sys/arch/aarch64/include/pmap.h
diff -u src/sys/arch/aarch64/include/pmap.h:1.24 src/sys/arch/aarch64/include/pmap.h:1.24.4.1
--- src/sys/arch/aarch64/include/pmap.h:1.24 Mon Apr 8 21:18:22 2019
+++ src/sys/arch/aarch64/include/pmap.h Mon Nov 4 14:08:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.24 2019/04/08 21:18:22 ryo Exp $ */
+/* $NetBSD: pmap.h,v 1.24.4.1 2019/11/04 14:08:18 martin Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -46,6 +46,7 @@
#include
+#define PMAP_NEED_PROCWR
#define PMAP_GROWKERNEL
#define PMAP_STEAL_MEMORY
@@ -272,6 +273,7 @@ aarch64_mmap_flags(paddr_t mdpgno)
#define pmap_wired_count(pmap) ((pmap)->pm_stats.wired_count)
#define pmap_resident_count(pmap) ((pmap)->pm_stats.resident_count)
+void pmap_procwr(struct proc *, vaddr_t, int);
bool pmap_extract_coherency(pmap_t, vaddr_t, paddr_t *, bool *);
void pmap_icache_sync_range(pmap_t, vaddr_t, vaddr_t);
CVS commit: [netbsd-9] src/sys/arch/aarch64
Module Name:src Committed By: martin Date: Mon Nov 4 14:08:19 UTC 2019 Modified Files: src/sys/arch/aarch64/aarch64 [netbsd-9]: pmap.c src/sys/arch/aarch64/include [netbsd-9]: pmap.h Log Message: Pull up following revision(s) (requested by maya in ticket #393): sys/arch/aarch64/include/pmap.h: revision 1.26 sys/arch/aarch64/aarch64/pmap.c: revision 1.48 Define PMAP_NEED_PROCWR, providing strategically placed i-cache synchronization where just-changed memory is about to be executed. Fixes SIGILLs seen when running Mono 6 on QEMU Cortex-A57. ok ryo To generate a diff of this commit: cvs rdiff -u -r1.41.2.2 -r1.41.2.3 src/sys/arch/aarch64/aarch64/pmap.c cvs rdiff -u -r1.24 -r1.24.4.1 src/sys/arch/aarch64/include/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src
On 04.11.2019 13:45, Joerg Sonnenberger wrote: > Module Name: src > Committed By: joerg > Date: Mon Nov 4 12:45:10 UTC 2019 > > Modified Files: > src/lib/libc/tls: Makefile.inc tls.c > src/libexec/ld.elf_so: Makefile tls.c > src/usr.bin/ldd: Makefile.elf > > Log Message: > PR 54093: Align static TLS area to max_align_t. > Thanks! This is helping. Could we add support for proper alignment of dynamic TLS allocations? Ideally respecting the alignas(x) keyword. (User: LLVM XRay with XRAY_TLS_ALIGNAS()). signature.asc Description: OpenPGP digital signature
CVS commit: src
Module Name:src
Committed By: joerg
Date: Mon Nov 4 12:45:10 UTC 2019
Modified Files:
src/lib/libc/tls: Makefile.inc tls.c
src/libexec/ld.elf_so: Makefile tls.c
src/usr.bin/ldd: Makefile.elf
Log Message:
PR 54093: Align static TLS area to max_align_t.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/tls/Makefile.inc
cvs rdiff -u -r1.9 -r1.10 src/lib/libc/tls/tls.c
cvs rdiff -u -r1.141 -r1.142 src/libexec/ld.elf_so/Makefile
cvs rdiff -u -r1.12 -r1.13 src/libexec/ld.elf_so/tls.c
cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/Makefile.elf
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/tls/Makefile.inc
diff -u src/lib/libc/tls/Makefile.inc:1.2 src/lib/libc/tls/Makefile.inc:1.3
--- src/lib/libc/tls/Makefile.inc:1.2 Sat Mar 12 07:55:09 2011
+++ src/lib/libc/tls/Makefile.inc Mon Nov 4 12:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.2 2011/03/12 07:55:09 matt Exp $
+# $NetBSD: Makefile.inc,v 1.3 2019/11/04 12:45:10 joerg Exp $
.include
@@ -6,4 +6,4 @@
.PATH: ${.PARSEDIR} ${ARCHDIR}/tls
SRCS+= tls.c
-CPPFLAGS.tls.c+= -D_LIBC_SOURCE
+CPPFLAGS.tls.c+= -D_LIBC_SOURCE -std=gnu11
Index: src/lib/libc/tls/tls.c
diff -u src/lib/libc/tls/tls.c:1.9 src/lib/libc/tls/tls.c:1.10
--- src/lib/libc/tls/tls.c:1.9 Fri Jul 13 19:50:21 2018
+++ src/lib/libc/tls/tls.c Mon Nov 4 12:45:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.9 2018/07/13 19:50:21 joerg Exp $ */
+/* $NetBSD: tls.c,v 1.10 2019/11/04 12:45:10 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__RCSID("$NetBSD: tls.c,v 1.9 2018/07/13 19:50:21 joerg Exp $");
+__RCSID("$NetBSD: tls.c,v 1.10 2019/11/04 12:45:10 joerg Exp $");
#include "namespace.h"
@@ -85,7 +85,7 @@ _rtld_tls_allocate(void)
if (initial_thread_tcb == NULL) {
#ifdef __HAVE_TLS_VARIANT_II
- tls_size = roundup2(tls_size, sizeof(void *));
+ tls_size = roundup2(tls_size, sizeof(max_align_t));
#endif
tls_allocation = tls_size + sizeof(*tcb);
Index: src/libexec/ld.elf_so/Makefile
diff -u src/libexec/ld.elf_so/Makefile:1.141 src/libexec/ld.elf_so/Makefile:1.142
--- src/libexec/ld.elf_so/Makefile:1.141 Wed Apr 3 21:37:58 2019
+++ src/libexec/ld.elf_so/Makefile Mon Nov 4 12:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.141 2019/04/03 21:37:58 christos Exp $
+# $NetBSD: Makefile,v 1.142 2019/11/04 12:45:10 joerg Exp $
#
# NOTE: when changing ld.so, ensure that ldd still compiles.
#
@@ -92,6 +92,7 @@ CLEANFILES+= errlist_concat.h ${PROG}.ma
BINDIR= ${SHLINKINSTALLDIR}
+CPPFLAGS.tls.c+= -std=gnu11
CPPFLAGS+= -DLIBDIR=\"${LIBDIR}\" -D_PATH_RTLD=\"${BINDIR}/${PROG}\"
CPPFLAGS+= -I${.CURDIR} -I. -D_KERNTYPES
CPPFLAGS+= -DRTLD_LOADER
Index: src/libexec/ld.elf_so/tls.c
diff -u src/libexec/ld.elf_so/tls.c:1.12 src/libexec/ld.elf_so/tls.c:1.13
--- src/libexec/ld.elf_so/tls.c:1.12 Sat Apr 13 00:23:32 2019
+++ src/libexec/ld.elf_so/tls.c Mon Nov 4 12:45:10 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tls.c,v 1.12 2019/04/13 00:23:32 rin Exp $ */
+/* $NetBSD: tls.c,v 1.13 2019/11/04 12:45:10 joerg Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -29,11 +29,12 @@
*/
#include
-__RCSID("$NetBSD: tls.c,v 1.12 2019/04/13 00:23:32 rin Exp $");
+__RCSID("$NetBSD: tls.c,v 1.13 2019/11/04 12:45:10 joerg Exp $");
#include
#include
#include
+#include
#include
#include "debug.h"
#include "rtld.h"
@@ -99,7 +100,7 @@ _rtld_tls_initial_allocation(void)
#ifndef __HAVE_TLS_VARIANT_I
_rtld_tls_static_space = roundup2(_rtld_tls_static_space,
- sizeof(void *));
+ sizeof(max_align_t));
#endif
dbg(("_rtld_tls_static_space %zu", _rtld_tls_static_space));
Index: src/usr.bin/ldd/Makefile.elf
diff -u src/usr.bin/ldd/Makefile.elf:1.5 src/usr.bin/ldd/Makefile.elf:1.6
--- src/usr.bin/ldd/Makefile.elf:1.5 Tue May 7 13:00:35 2013
+++ src/usr.bin/ldd/Makefile.elf Mon Nov 4 12:45:10 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.elf,v 1.5 2013/05/07 13:00:35 christos Exp $
+# $NetBSD: Makefile.elf,v 1.6 2019/11/04 12:45:10 joerg Exp $
# Makefile fragment to build a (32 or 64 bit) libldd_elfxx.a.
# Expects CPPFLAGS to have ELFSIZE set, and LIB to be set.
@@ -7,4 +7,6 @@ SRCS= ldd_elfxx.c
SRCS+= xmalloc.c debug.c expand.c map_object.c load.c search.c \
headers.c paths.c tls.c symver.c
+CPPFLAGS.tls.c+= -std=gnu11
+
.include "Makefile.common"
CVS commit: src
Module Name:src Committed By: joerg Date: Mon Nov 4 12:45:10 UTC 2019 Modified Files: src/lib/libc/tls: Makefile.inc tls.c src/libexec/ld.elf_so: Makefile tls.c src/usr.bin/ldd: Makefile.elf Log Message: PR 54093: Align static TLS area to max_align_t. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/tls/Makefile.inc cvs rdiff -u -r1.9 -r1.10 src/lib/libc/tls/tls.c cvs rdiff -u -r1.141 -r1.142 src/libexec/ld.elf_so/Makefile cvs rdiff -u -r1.12 -r1.13 src/libexec/ld.elf_so/tls.c cvs rdiff -u -r1.5 -r1.6 src/usr.bin/ldd/Makefile.elf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/compat/netbsd32
On 2019/11/04 20:20, Rin Okuyama wrote: Module Name:src Committed By: rin Date: Mon Nov 4 11:20:22 UTC 2019 Modified Files: src/sys/compat/netbsd32: syscalls.master Log Message: For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t. Since bufsize is the last argument, this affects only LP64EB. XXX pullup to netbsd-9, -8, and -7 To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. s/netbsd_size_t/netbsd32_size_t/ in the commit log.
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 4 11:33:01 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.144 -r1.145 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.24 -r1.25 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.143 -r1.144 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.35 -r1.36 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 4 11:33:01 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.144 -r1.145 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.24 -r1.25 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.143 -r1.144 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.35 -r1.36 src/sys/compat/netbsd32/netbsd32_systrace_args.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.145 src/sys/compat/netbsd32/netbsd32_syscall.h:1.146
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.145 Mon Nov 4 11:21:36 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Nov 4 11:33:01 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.145 2019/11/04 11:21:36 rin Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.146 2019/11/04 11:33:01 rin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
+ * created from NetBSD: syscalls.master,v 1.130 2019/11/04 11:32:22 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1274,7 +1274,7 @@
/* syscall: "netbsd32_clock_getcpuclockid2" ret: "int" args: "idtype_t" "id_t" "netbsd32_clockidp_t" */
#define NETBSD32_SYS_netbsd32_clock_getcpuclockid2 482
-/* syscall: "netbsd32___getvfsstat90" ret: "int" args: "netbsd32_statvfsp_t" "size_t" "int" */
+/* syscall: "netbsd32___getvfsstat90" ret: "int" args: "netbsd32_statvfsp_t" "netbsd32_size_t" "int" */
#define NETBSD32_SYS_netbsd32___getvfsstat90 483
/* syscall: "netbsd32___statvfs190" ret: "int" args: "netbsd32_charp" "netbsd32_statvfsp_t" "int" */
@@ -1283,7 +1283,7 @@
/* syscall: "netbsd32___fstatvfs190" ret: "int" args: "int" "netbsd32_statvfsp_t" "int" */
#define NETBSD32_SYS_netbsd32___fstatvfs190 485
-/* syscall: "netbsd32___fhstatvfs190" ret: "int" args: "netbsd32_voidp" "size_t" "netbsd32_statvfsp_t" "int" */
+/* syscall: "netbsd32___fhstatvfs190" ret: "int" args: "netbsd32_voidp" "netbsd32_size_t" "netbsd32_statvfsp_t" "int" */
#define NETBSD32_SYS_netbsd32___fhstatvfs190 486
#define NETBSD32_SYS_MAXSYSCALL 487
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.144 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.145
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.144 Mon Nov 4 11:21:36 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Nov 4 11:33:01 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.144 2019/11/04 11:21:36 rin Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.145 2019/11/04 11:33:01 rin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
+ * created from NetBSD: syscalls.master,v 1.130 2019/11/04 11:32:22 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2624,7 +2624,7 @@ check_syscall_args(netbsd32_clock_getcpu
struct netbsd32___getvfsstat90_args {
syscallarg(netbsd32_statvfsp_t) buf;
- syscallarg(size_t) bufsize;
+ syscallarg(netbsd32_size_t) bufsize;
syscallarg(int) flags;
};
check_syscall_args(netbsd32___getvfsstat90)
@@ -2645,7 +2645,7 @@ check_syscall_args(netbsd32___fstatvfs19
struct netbsd32___fhstatvfs190_args {
syscallarg(netbsd32_voidp) fhp;
- syscallarg(size_t) fh_size;
+ syscallarg(netbsd32_size_t) fh_size;
syscallarg(netbsd32_statvfsp_t) buf;
syscallarg(int) flags;
};
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.144 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.145
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.144 Mon Nov 4 11:21:36 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Nov 4 11:33:01 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.144 2019/11/04 11:21:36 rin Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.145 2019/11/04 11:33:01 rin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
+ * created from NetBSD: syscalls.master,v 1.130 2019/11/04 11:32:22 rin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.144 2019/11/04 11:21:36 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.145 2019/11/04 11:33:01 rin Exp $");
#if defined(_KERNEL_OPT)
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 4 11:32:23 UTC 2019
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
netbsd32_size_t should be used instead of size_t for argument of
32-bit syscalls:
- netbsd32___getvfsstat90: bufsize
- netbsd32___fhstatvfs190: fh_size
No need to pullup, since these syscalls were introduced after
branch of netbsd-9.
To generate a diff of this commit:
cvs rdiff -u -r1.129 -r1.130 src/sys/compat/netbsd32/syscalls.master
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/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.129 src/sys/compat/netbsd32/syscalls.master:1.130
--- src/sys/compat/netbsd32/syscalls.master:1.129 Mon Nov 4 11:20:22 2019
+++ src/sys/compat/netbsd32/syscalls.master Mon Nov 4 11:32:22 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp $
+ $NetBSD: syscalls.master,v 1.130 2019/11/04 11:32:22 rin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1169,11 +1169,11 @@
id_t id, netbsd32_clockidp_t clock_id); }
483 STD { int|netbsd32|90|getvfsstat( \
netbsd32_statvfsp_t buf, \
- size_t bufsize, int flags); }
+ netbsd32_size_t bufsize, int flags); }
484 STD { int|netbsd32|90|statvfs1(netbsd32_charp path, \
netbsd32_statvfsp_t buf, int flags); }
485 STD { int|netbsd32|90|fstatvfs1(int fd, \
netbsd32_statvfsp_t buf, int flags); }
486 STD { int|netbsd32|90|fhstatvfs1(netbsd32_voidp fhp, \
- size_t fh_size, netbsd32_statvfsp_t buf, \
+ netbsd32_size_t fh_size, netbsd32_statvfsp_t buf, \
int flags); }
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 4 11:32:23 UTC 2019 Modified Files: src/sys/compat/netbsd32: syscalls.master Log Message: netbsd32_size_t should be used instead of size_t for argument of 32-bit syscalls: - netbsd32___getvfsstat90: bufsize - netbsd32___fhstatvfs190: fh_size No need to pullup, since these syscalls were introduced after branch of netbsd-9. To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/sys/compat/netbsd32/syscalls.master Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 4 11:21:36 UTC 2019
Modified Files:
src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h
netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c
netbsd32_systrace_args.c
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.144 -r1.145 src/sys/compat/netbsd32/netbsd32_syscall.h
cvs rdiff -u -r1.143 -r1.144 src/sys/compat/netbsd32/netbsd32_syscallargs.h \
src/sys/compat/netbsd32/netbsd32_syscalls.c
cvs rdiff -u -r1.23 -r1.24 \
src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
cvs rdiff -u -r1.142 -r1.143 src/sys/compat/netbsd32/netbsd32_sysent.c
cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_systrace_args.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_syscall.h
diff -u src/sys/compat/netbsd32/netbsd32_syscall.h:1.144 src/sys/compat/netbsd32/netbsd32_syscall.h:1.145
--- src/sys/compat/netbsd32/netbsd32_syscall.h:1.144 Sun Oct 13 22:31:31 2019
+++ src/sys/compat/netbsd32/netbsd32_syscall.h Mon Nov 4 11:21:36 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscall.h,v 1.144 2019/10/13 22:31:31 christos Exp $ */
+/* $NetBSD: netbsd32_syscall.h,v 1.145 2019/11/04 11:21:36 rin Exp $ */
/*
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
+ * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALL_H_
@@ -1228,7 +1228,7 @@
/* syscall: "netbsd32_openat" ret: "int" args: "int" "const netbsd32_charp" "int" "..." */
#define NETBSD32_SYS_netbsd32_openat 468
-/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "size_t" */
+/* syscall: "netbsd32_readlinkat" ret: "netbsd32_ssize_t" args: "int" "const netbsd32_charp" "netbsd32_charp" "netbsd32_size_t" */
#define NETBSD32_SYS_netbsd32_readlinkat 469
/* syscall: "netbsd32_symlinkat" ret: "int" args: "const netbsd32_charp" "int" "const netbsd32_charp" */
Index: src/sys/compat/netbsd32/netbsd32_syscallargs.h
diff -u src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.143 src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.144
--- src/sys/compat/netbsd32/netbsd32_syscallargs.h:1.143 Sun Oct 13 22:31:31 2019
+++ src/sys/compat/netbsd32/netbsd32_syscallargs.h Mon Nov 4 11:21:36 2019
@@ -1,10 +1,10 @@
-/* $NetBSD: netbsd32_syscallargs.h,v 1.143 2019/10/13 22:31:31 christos Exp $ */
+/* $NetBSD: netbsd32_syscallargs.h,v 1.144 2019/11/04 11:21:36 rin Exp $ */
/*
* System call argument lists.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
+ * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
*/
#ifndef _NETBSD32_SYS_SYSCALLARGS_H_
@@ -2511,7 +2511,7 @@ struct netbsd32_readlinkat_args {
syscallarg(int) fd;
syscallarg(const netbsd32_charp) path;
syscallarg(netbsd32_charp) buf;
- syscallarg(size_t) bufsize;
+ syscallarg(netbsd32_size_t) bufsize;
};
check_syscall_args(netbsd32_readlinkat)
Index: src/sys/compat/netbsd32/netbsd32_syscalls.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls.c:1.143 src/sys/compat/netbsd32/netbsd32_syscalls.c:1.144
--- src/sys/compat/netbsd32/netbsd32_syscalls.c:1.143 Sun Oct 13 22:31:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls.c Mon Nov 4 11:21:36 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls.c,v 1.143 2019/10/13 22:31:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls.c,v 1.144 2019/11/04 11:21:36 rin Exp $ */
/*
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp
+ * created from NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.143 2019/10/13 22:31:32 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_syscalls.c,v 1.144 2019/11/04 11:21:36 rin Exp $");
#if defined(_KERNEL_OPT)
#if defined(_KERNEL_OPT)
Index: src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c
diff -u src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.23 src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.24
--- src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c:1.23 Sun Oct 13 22:31:32 2019
+++ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c Mon Nov 4 11:21:36 2019
@@ -1,14 +1,14 @@
-/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.23 2019/10/13 22:31:32 christos Exp $ */
+/* $NetBSD: netbsd32_syscalls_autoload.c,v 1.24 2019/11/04 11:21:36 rin Exp $ */
/*
* System call autoload table.
*
* DO NOT EDIT-- this file is automatically generated.
- * created from NetBSD: syscalls.master,v 1.128
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: rin Date: Mon Nov 4 11:21:36 UTC 2019 Modified Files: src/sys/compat/netbsd32: netbsd32_syscall.h netbsd32_syscallargs.h netbsd32_syscalls.c netbsd32_syscalls_autoload.c netbsd32_sysent.c netbsd32_systrace_args.c Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.144 -r1.145 src/sys/compat/netbsd32/netbsd32_syscall.h cvs rdiff -u -r1.143 -r1.144 src/sys/compat/netbsd32/netbsd32_syscallargs.h \ src/sys/compat/netbsd32/netbsd32_syscalls.c cvs rdiff -u -r1.23 -r1.24 \ src/sys/compat/netbsd32/netbsd32_syscalls_autoload.c cvs rdiff -u -r1.142 -r1.143 src/sys/compat/netbsd32/netbsd32_sysent.c cvs rdiff -u -r1.34 -r1.35 src/sys/compat/netbsd32/netbsd32_systrace_args.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: rin
Date: Mon Nov 4 11:20:22 UTC 2019
Modified Files:
src/sys/compat/netbsd32: syscalls.master
Log Message:
For netbsd32_readlinkat(2), bufsize is netbsd_size_t, not size_t.
Since bufsize is the last argument, this affects only LP64EB.
XXX
pullup to netbsd-9, -8, and -7
To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 src/sys/compat/netbsd32/syscalls.master
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/syscalls.master
diff -u src/sys/compat/netbsd32/syscalls.master:1.128 src/sys/compat/netbsd32/syscalls.master:1.129
--- src/sys/compat/netbsd32/syscalls.master:1.128 Sun Sep 22 22:59:38 2019
+++ src/sys/compat/netbsd32/syscalls.master Mon Nov 4 11:20:22 2019
@@ -1,4 +1,4 @@
- $NetBSD: syscalls.master,v 1.128 2019/09/22 22:59:38 christos Exp $
+ $NetBSD: syscalls.master,v 1.129 2019/11/04 11:20:22 rin Exp $
; from: NetBSD: syscalls.master,v 1.81 1998/07/05 08:49:50 jonathan Exp
; @(#)syscalls.master 8.2 (Berkeley) 1/13/94
@@ -1120,7 +1120,7 @@
469 STD { netbsd32_ssize_t|netbsd32||readlinkat(int fd, \
const netbsd32_charp path, \
netbsd32_charp buf, \
- size_t bufsize); }
+ netbsd32_size_t bufsize); }
470 STD { int|netbsd32||symlinkat(const netbsd32_charp path1, \
int fd, \
const netbsd32_charp path2); }
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Mon Nov 4 10:44:00 UTC 2019
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen32x64.h spleen5x8.h
Log Message:
Update Spleen kernel fonts to version 1.5.0, bringing the following
improvements:
- Tweak the digit '7' for consistency with other sizes (5x8 version)
- Tweak the digit '2' for consistency with other sizes (12x24 version)
- Shift the middle bar of the digit '3' one pixel up, for better
alignement (12x24 version)
- Make the 'Z' and 'z' characters more balanced, as is the case with
other sizes (12x24 version)
- Make the slash inside the digit '0' one pixel thiner (32x64 version)
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen32x64.h
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen5x8.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.3 src/sys/dev/wsfont/spleen12x24.h:1.4
--- src/sys/dev/wsfont/spleen12x24.h:1.3 Sat Sep 7 20:49:57 2019
+++ src/sys/dev/wsfont/spleen12x24.h Mon Nov 4 10:44:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.4 2019/11/04 10:44:00 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -502,6 +502,7 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**..**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
+ 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -509,7 +510,6 @@ static u_char spleen12x24_data[] = {
0x0c, 0x00, /* **.. */
0x18, 0x00, /* ...**... */
0x30, 0x00, /* ..** */
- 0x60, 0x00, /* .**. */
0x60, 0x60, /* .**..**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
@@ -527,13 +527,13 @@ static u_char spleen12x24_data[] = {
0x60, 0x60, /* .**..**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x0f, 0x80, /* *... */
0x00, 0xc0, /* **.. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
+ 0x00, 0x60, /* .**. */
0x60, 0x60, /* .**..**. */
0x30, 0xc0, /* ..****.. */
0x1f, 0x80, /* ...**... */
@@ -1501,7 +1501,6 @@ static u_char spleen12x24_data[] = {
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -1511,6 +1510,7 @@ static u_char spleen12x24_data[] = {
0x30, 0x00, /* ..** */
0x60, 0x00, /* .**. */
0x60, 0x00, /* .**. */
+ 0x60, 0x00, /* .**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
@@ -2303,7 +2303,6 @@ static u_char spleen12x24_data[] = {
0x00, 0x00, /* */
0x7f, 0xe0, /* .**. */
0x00, 0x60, /* .**. */
- 0x00, 0x60, /* .**. */
0x00, 0xc0, /* **.. */
0x01, 0x80, /* ...**... */
0x03, 0x00, /* ..** */
@@ -2311,6 +2310,7 @@ static u_char spleen12x24_data[] = {
0x0c, 0x00, /* **.. */
0x18, 0x00, /* ...**... */
0x30, 0x00, /* ..** */
+ 0x60, 0x00, /* .**. */
0x7f, 0xe0, /* .**. */
0x00, 0x00, /* */
0x00, 0x00, /* */
Index: src/sys/dev/wsfont/spleen32x64.h
diff -u src/sys/dev/wsfont/spleen32x64.h:1.3 src/sys/dev/wsfont/spleen32x64.h:1.4
--- src/sys/dev/wsfont/spleen32x64.h:1.3 Sat Sep 7 20:49:57 2019
+++ src/sys/dev/wsfont/spleen32x64.h Mon Nov 4 10:44:00 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen32x64.h,v 1.3 2019/09/07 20:49:57 fcambus Exp $ */
+/* $NetBSD: spleen32x64.h,v 1.4 2019/11/04 10:44:00 fcambus Exp $ */
/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -1110,16 +1110,15 @@ static u_char spleen32x64_data[] = {
0x0f, 0x00, 0x0f, 0xf0, /* */
0x0f, 0x00, 0x1f, 0xf0, /* ...* */
0x0f, 0x00, 0x3f, 0xf0, /* ..** */
- 0x0f, 0x00, 0x7f, 0xf0, /* .*** */
- 0x0f, 0x00, 0xfe, 0xf0, /* ***. */
- 0x0f, 0x01, 0xfc, 0xf0, /* ...***.. */
- 0x0f, 0x03, 0xf8, 0xf0, /*
CVS commit: src/sys/dev/wsfont
Module Name:src Committed By: fcambus Date: Mon Nov 4 10:44:00 UTC 2019 Modified Files: src/sys/dev/wsfont: spleen12x24.h spleen32x64.h spleen5x8.h Log Message: Update Spleen kernel fonts to version 1.5.0, bringing the following improvements: - Tweak the digit '7' for consistency with other sizes (5x8 version) - Tweak the digit '2' for consistency with other sizes (12x24 version) - Shift the middle bar of the digit '3' one pixel up, for better alignement (12x24 version) - Make the 'Z' and 'z' characters more balanced, as is the case with other sizes (12x24 version) - Make the slash inside the digit '0' one pixel thiner (32x64 version) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wsfont/spleen12x24.h \ src/sys/dev/wsfont/spleen32x64.h cvs rdiff -u -r1.2 -r1.3 src/sys/dev/wsfont/spleen5x8.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src
Committed By: tsutsui
Date: Mon Nov 4 10:36:18 UTC 2019
Modified Files:
src/sys/arch/zaurus/zaurus: machdep.c
Log Message:
Fix build with VERBOSE_INIT_ARM without DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/sys/arch/zaurus/zaurus/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/zaurus/zaurus/machdep.c
diff -u src/sys/arch/zaurus/zaurus/machdep.c:1.43 src/sys/arch/zaurus/zaurus/machdep.c:1.44
--- src/sys/arch/zaurus/zaurus/machdep.c:1.43 Sat Oct 19 14:42:30 2019
+++ src/sys/arch/zaurus/zaurus/machdep.c Mon Nov 4 10:36:18 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.43 2019/10/19 14:42:30 tsutsui Exp $ */
+/* $NetBSD: machdep.c,v 1.44 2019/11/04 10:36:18 tsutsui Exp $ */
/* $OpenBSD: zaurus_machdep.c,v 1.25 2006/06/20 18:24:04 todd Exp $ */
/*
@@ -107,7 +107,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.43 2019/10/19 14:42:30 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.44 2019/11/04 10:36:18 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -635,7 +635,7 @@ hw_isc1000(void)
vaddr_t
initarm(void *arg)
{
-#ifdef DIAGNOSTIC
+#if defined(DIAGNOSTIC) || defined(VERBOSE_INIT_ARM)
extern vsize_t xscale_minidata_clean_size; /* used in KASSERT */
#endif
extern vaddr_t xscale_cache_clean_addr;
CVS commit: src/sys/arch/zaurus/zaurus
Module Name:src Committed By: tsutsui Date: Mon Nov 4 10:36:18 UTC 2019 Modified Files: src/sys/arch/zaurus/zaurus: machdep.c Log Message: Fix build with VERBOSE_INIT_ARM without DIAGNOSTIC. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/zaurus/zaurus/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: jmcneill
Date: Mon Nov 4 10:02:39 UTC 2019
Modified Files:
src/sys/dev/i2c: tda19988.c
Log Message:
Speed up mode setting a bit and turn off the display while changing modes
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/tda19988.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/i2c/tda19988.c
diff -u src/sys/dev/i2c/tda19988.c:1.2 src/sys/dev/i2c/tda19988.c:1.3
--- src/sys/dev/i2c/tda19988.c:1.2 Sun Nov 3 23:28:59 2019
+++ src/sys/dev/i2c/tda19988.c Mon Nov 4 10:02:39 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: tda19988.c,v 1.2 2019/11/03 23:28:59 jmcneill Exp $ */
+/* $NetBSD: tda19988.c,v 1.3 2019/11/04 10:02:39 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Oleksandr Tymoshenko
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.2 2019/11/03 23:28:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tda19988.c,v 1.3 2019/11/04 10:02:39 jmcneill Exp $");
/*
* NXP TDA19988 HDMI encoder
@@ -257,6 +257,7 @@ struct tda19988_connector {
struct tda19988_softc {
device_t sc_dev;
+ int sc_phandle;
i2c_tag_t sc_i2c;
i2c_addr_t sc_addr;
uint32_t sc_cec_addr;
@@ -264,12 +265,14 @@ struct tda19988_softc {
int sc_current_page;
uint8_t *sc_edid;
uint32_t sc_edid_len;
+ bool sc_edid_valid;
struct drm_bridge sc_bridge;
struct tda19988_connector sc_connector;
struct fdt_device_ports sc_ports;
- struct drm_display_mode sc_curmode;
+
+ enum drm_connector_status sc_last_status;
};
#define to_tda_connector(x) container_of(x, struct tda19988_connector, base)
@@ -280,7 +283,8 @@ tda19988_set_page(struct tda19988_softc
uint8_t buf[2] = { TDA_CURPAGE_ADDR, page };
int result;
- result = iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr, buf, 2, NULL, 0, I2C_F_POLL);
+ result = iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr, buf, 2, NULL, 0,
+ cold ? I2C_F_POLL : 0);
if (result == 0)
sc->sc_current_page = page;
@@ -290,7 +294,8 @@ tda19988_set_page(struct tda19988_softc
static int
tda19988_cec_read(struct tda19988_softc *sc, uint8_t addr, uint8_t *data)
{
- return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_cec_addr, , 1, data, 1, I2C_F_POLL);
+ return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_cec_addr, , 1, data, 1,
+ cold ? I2C_F_POLL : 0);
}
static int
@@ -298,7 +303,8 @@ tda19988_cec_write(struct tda19988_softc
{
uint8_t buf[2] = { addr, data };
- return iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_cec_addr, buf, 2, NULL, 0, I2C_F_POLL);
+ return iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_cec_addr, buf, 2, NULL, 0,
+ cold ? I2C_F_POLL : 0);
}
static int
@@ -311,19 +317,8 @@ tda19988_block_read(struct tda19988_soft
if (sc->sc_current_page != REGPAGE(addr))
tda19988_set_page(sc, REGPAGE(addr));
-#if notyet
- return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, , 1, data, len, I2C_F_POLL);
-#else
- int error, i;
- for (i = 0; i < len; i++) {
- error = iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, , 1, [i], 1, I2C_F_POLL);
- if (error != 0)
- return error;
- reg++;
- }
-
- return 0;
-#endif
+ return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, , 1, data, len,
+ cold ? I2C_F_POLL : 0);
}
static int
@@ -336,7 +331,8 @@ tda19988_reg_read(struct tda19988_softc
if (sc->sc_current_page != REGPAGE(addr))
tda19988_set_page(sc, REGPAGE(addr));
- return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, , 1, data, 1, I2C_F_POLL);
+ return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, , 1, data, 1,
+ cold ? I2C_F_POLL : 0);
}
static int
@@ -347,7 +343,8 @@ tda19988_reg_write(struct tda19988_softc
if (sc->sc_current_page != REGPAGE(addr))
tda19988_set_page(sc, REGPAGE(addr));
- return iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr, buf, 2, NULL, 0, I2C_F_POLL);
+ return iic_exec(sc->sc_i2c, I2C_OP_WRITE_WITH_STOP, sc->sc_addr, buf, 2, NULL, 0,
+ cold ? I2C_F_POLL : 0);
}
static int
@@ -362,7 +359,8 @@ tda19988_reg_write2(struct tda19988_soft
if (sc->sc_current_page != REGPAGE(address))
tda19988_set_page(sc, REGPAGE(address));
- return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, buf, 3, NULL, 0, I2C_F_POLL);
+ return iic_exec(sc->sc_i2c, I2C_OP_READ_WITH_STOP, sc->sc_addr, buf, 3, NULL, 0,
+ cold ? I2C_F_POLL : 0);
}
static void
@@ -686,13 +684,6 @@ tda19988_start(struct tda19988_softc *sc
tda19988_cec_write(sc, TDA_CEC_FRO_IM_CLK_CTRL,
CEC_FRO_IM_CLK_CTRL_GHOST_DIS | CEC_FRO_IM_CLK_CTRL_IMCLK_SEL);
-#if 0
- if (tda19988_read_edid(sc) < 0) {
- device_printf(dev, "failed to read EDID\n");
- return;
- }
-#endif
-
/* Default values for RGB 4:4:4 mapping */
tda19988_reg_write(sc, TDA_VIP_CNTRL_0, 0x23);
tda19988_reg_write(sc,
CVS commit: src/sys/dev/i2c
Module Name:src Committed By: jmcneill Date: Mon Nov 4 10:02:39 UTC 2019 Modified Files: src/sys/dev/i2c: tda19988.c Log Message: Speed up mode setting a bit and turn off the display while changing modes To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/i2c/tda19988.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/ti
Module Name:src Committed By: jmcneill Date: Mon Nov 4 09:38:39 UTC 2019 Modified Files: src/sys/arch/arm/ti: ti_lcdc.c Log Message: Select closest rate to desired pixel clock To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/ti_lcdc.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/ti
Module Name:src
Committed By: jmcneill
Date: Mon Nov 4 09:38:39 UTC 2019
Modified Files:
src/sys/arch/arm/ti: ti_lcdc.c
Log Message:
Select closest rate to desired pixel clock
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/ti/ti_lcdc.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/ti/ti_lcdc.c
diff -u src/sys/arch/arm/ti/ti_lcdc.c:1.2 src/sys/arch/arm/ti/ti_lcdc.c:1.3
--- src/sys/arch/arm/ti/ti_lcdc.c:1.2 Sun Nov 3 23:31:49 2019
+++ src/sys/arch/arm/ti/ti_lcdc.c Mon Nov 4 09:38:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ti_lcdc.c,v 1.2 2019/11/03 23:31:49 jmcneill Exp $ */
+/* $NetBSD: ti_lcdc.c,v 1.3 2019/11/04 09:38:38 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.2 2019/11/03 23:31:49 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ti_lcdc.c,v 1.3 2019/11/04 09:38:38 jmcneill Exp $");
#include
#include
@@ -159,8 +159,8 @@ tilcdc_mode_set(struct drm_crtc *crtc, s
{
struct tilcdc_crtc *mixer_crtc = to_tilcdc_crtc(crtc);
struct tilcdc_softc * const sc = mixer_crtc->sc;
+ int clk_div, div, diff, best_diff;
uint32_t val;
- u_int clk_div;
const u_int hspw = adjusted_mode->crtc_hsync_end - adjusted_mode->crtc_hsync_start;
const u_int hbp = adjusted_mode->crtc_htotal - adjusted_mode->crtc_hsync_end;
@@ -170,9 +170,16 @@ tilcdc_mode_set(struct drm_crtc *crtc, s
const u_int vfp = adjusted_mode->crtc_vsync_start - adjusted_mode->crtc_vdisplay;
const u_int rate = clk_get_rate(sc->sc_clk);
- for (clk_div = 2; clk_div < 255; clk_div++) {
- if (rate / clk_div <= (int)adjusted_mode->crtc_clock * 1000)
- break;
+
+ clk_div = 255;
+ best_diff = -1;
+ for (div = 2; div < 255; div++) {
+ const int pixel_clock = (rate / div) / 1000;
+ diff = abs(adjusted_mode->crtc_clock - pixel_clock);
+ if (best_diff == -1 || diff < best_diff) {
+ best_diff = diff;
+ clk_div = div;
+ }
}
if (clk_div == 255) {
device_printf(sc->sc_dev, "couldn't configure pixel clock (%u)\n",
CVS commit: src/sys/arch/arm/ti
Module Name:src Committed By: jmcneill Date: Mon Nov 4 09:37:51 UTC 2019 Modified Files: src/sys/arch/arm/ti: am3_prcm.c Log Message: Use 297MHz for display clock To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ti/am3_prcm.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/ti
Module Name:src
Committed By: jmcneill
Date: Mon Nov 4 09:37:51 UTC 2019
Modified Files:
src/sys/arch/arm/ti: am3_prcm.c
Log Message:
Use 297MHz for display clock
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/ti/am3_prcm.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/ti/am3_prcm.c
diff -u src/sys/arch/arm/ti/am3_prcm.c:1.9 src/sys/arch/arm/ti/am3_prcm.c:1.10
--- src/sys/arch/arm/ti/am3_prcm.c:1.9 Sun Nov 3 22:59:06 2019
+++ src/sys/arch/arm/ti/am3_prcm.c Mon Nov 4 09:37:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: am3_prcm.c,v 1.9 2019/11/03 22:59:06 jmcneill Exp $ */
+/* $NetBSD: am3_prcm.c,v 1.10 2019/11/04 09:37:51 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.9 2019/11/03 22:59:06 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v 1.10 2019/11/04 09:37:51 jmcneill Exp $");
#include
#include
@@ -52,7 +52,6 @@ __KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v
#define AM3_PRCM_CLKCTRL_MODULEMODE __BITS(1,0)
#define AM3_PRCM_CLKCTRL_MODULEMODE_ENABLE 0x2
-/* WKUP */
#define AM3_PRCM_CM_IDLEST_DPLL_DISP (AM3_PRCM_CM_WKUP + 0x48)
#define AM3_PRCM_CM_IDLEST_DPLL_DISP_ST_MN_BYPASS __BIT(8)
#define AM3_PRCM_CM_IDLEST_DPLL_DISP_ST_DPLL_CLK __BIT(0)
@@ -64,6 +63,8 @@ __KERNEL_RCSID(1, "$NetBSD: am3_prcm.c,v
#define AM3_PRCM_CM_CLKMODE_DPLL_DISP_DPLL_EN_MN_BYPASS 4
#define AM3_PRCM_CM_CLKMODE_DPLL_DISP_DPLL_EN_LOCK 7
+#define DPLL_DISP_RATE29700
+
static int am3_prcm_match(device_t, cfdata_t, void *);
static void am3_prcm_attach(device_t, device_t, void *);
@@ -100,8 +101,8 @@ am3_prcm_hwmod_enable_display(struct ti_
delay(10);
}
- /* Set DPLL frequency to 270 MHz */
- val = __SHIFTIN(270, AM3_PRCM_CM_CLKSEL_DPLL_DISP_DPLL_MULT);
+ /* Set DPLL frequency to DPLL_DISP_RATE (297 MHz) */
+ val = __SHIFTIN(DPLL_DISP_RATE / 100, AM3_PRCM_CM_CLKSEL_DPLL_DISP_DPLL_MULT);
val |= __SHIFTIN(24 - 1, AM3_PRCM_CM_CLKSEL_DPLL_DISP_DPLL_DIV);
PRCM_WRITE(sc, AM3_PRCM_CM_CLKSEL_DPLL_DISP, val);
@@ -141,7 +142,7 @@ static struct ti_prcm_clk am3_prcm_clks[
TI_PRCM_FIXED("FIXED_24MHZ", 2400),
TI_PRCM_FIXED("FIXED_48MHZ", 4800),
TI_PRCM_FIXED("FIXED_96MHZ", 9600),
- TI_PRCM_FIXED("DISPLAY_CLK", 27000),
+ TI_PRCM_FIXED("DISPLAY_CLK", DPLL_DISP_RATE),
TI_PRCM_FIXED_FACTOR("PERIPH_CLK", 1, 1, "FIXED_48MHZ"),
TI_PRCM_FIXED_FACTOR("MMC_CLK", 1, 1, "FIXED_96MHZ"),
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Mon Nov 4 09:11:00 UTC 2019 Modified Files: src/doc: CHANGES Log Message: evbarm: Update TI OMAP3 SoC support to use FDT based configuration. To generate a diff of this commit: cvs rdiff -u -r1.2607 -r1.2608 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2607 src/doc/CHANGES:1.2608 --- src/doc/CHANGES:1.2607 Fri Nov 1 02:54:39 2019 +++ src/doc/CHANGES Mon Nov 4 09:11:00 2019 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2607 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2608 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -67,3 +67,5 @@ Changes from NetBSD 9.0 to NetBSD 10.0: [msaitoh 20191030] smscphy(4): Add support for SMSC LAN87xx 10/100 Ethernet PHY. [msaitoh 20191101] + evbarm: Update TI OMAP3 SoC support to use FDT based configuration. + [jmcneill 20191101]
CVS commit: src/doc
Module Name:src Committed By: jmcneill Date: Mon Nov 4 09:11:00 UTC 2019 Modified Files: src/doc: CHANGES Log Message: evbarm: Update TI OMAP3 SoC support to use FDT based configuration. To generate a diff of this commit: cvs rdiff -u -r1.2607 -r1.2608 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
