CVS commit: src/sys/dev/nvmm/x86

2020-07-18 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sun Jul 19 06:56:10 UTC 2020

Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_vmx.c

Log Message:
Switch to fpu_kern_enter/leave, to prevent clobbering, now that the kernel
itself uses the fpu.


To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/dev/nvmm/x86/nvmm_x86_svm.c \
src/sys/dev/nvmm/x86/nvmm_x86_vmx.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/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.64 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.65
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.64	Sun Jul 19 06:36:37 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c	Sun Jul 19 06:56:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_svm.c,v 1.65 2020/07/19 06:56:09 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.65 2020/07/19 06:56:09 maxv Exp $");
 
 #include 
 #include 
@@ -1219,7 +1219,7 @@ svm_vcpu_guest_fpu_enter(struct nvmm_cpu
 {
 	struct svm_cpudata *cpudata = vcpu->cpudata;
 
-	fpu_save();
+	fpu_kern_enter();
 	fpu_area_restore(&cpudata->gfpu, svm_xcr0_mask);
 
 	if (svm_xcr0_mask != 0) {
@@ -1239,6 +1239,7 @@ svm_vcpu_guest_fpu_leave(struct nvmm_cpu
 	}
 
 	fpu_area_save(&cpudata->gfpu, svm_xcr0_mask);
+	fpu_kern_leave();
 }
 
 static void
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.64 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.65
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.64	Sun Jul 19 06:36:37 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Sun Jul 19 06:56:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_vmx.c,v 1.65 2020/07/19 06:56:09 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.65 2020/07/19 06:56:09 maxv Exp $");
 
 #include 
 #include 
@@ -1875,7 +1875,7 @@ vmx_vcpu_guest_fpu_enter(struct nvmm_cpu
 {
 	struct vmx_cpudata *cpudata = vcpu->cpudata;
 
-	fpu_save();
+	fpu_kern_enter();
 	fpu_area_restore(&cpudata->gfpu, vmx_xcr0_mask);
 
 	if (vmx_xcr0_mask != 0) {
@@ -1895,6 +1895,7 @@ vmx_vcpu_guest_fpu_leave(struct nvmm_cpu
 	}
 
 	fpu_area_save(&cpudata->gfpu, vmx_xcr0_mask);
+	fpu_kern_leave();
 }
 
 static void

CVS commit: src/sys/dev/nvmm/x86

2020-07-18 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sun Jul 19 06:36:38 UTC 2020

Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_svm.c nvmm_x86_svmfunc.S nvmm_x86_vmx.c
nvmm_x86_vmxfunc.S

Log Message:
The TLB flush IPIs do not respect the IPL, so enforcing IPL_HIGH has no
effect. Disable interrupts earlier instead. This prevents a possible race
against such IPIs.


To generate a diff of this commit:
cvs rdiff -u -r1.63 -r1.64 src/sys/dev/nvmm/x86/nvmm_x86_svm.c \
src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S \
src/sys/dev/nvmm/x86/nvmm_x86_vmxfunc.S

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/dev/nvmm/x86/nvmm_x86_svm.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.63 src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.64
--- src/sys/dev/nvmm/x86/nvmm_x86_svm.c:1.63	Fri Jul  3 16:09:54 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_svm.c	Sun Jul 19 06:36:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.63 2020/07/03 16:09:54 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
 
 #include 
 #include 
@@ -56,6 +56,18 @@ __KERNEL_RCSID(0, "$NetBSD: nvmm_x86_svm
 
 int svm_vmrun(paddr_t, uint64_t *);
 
+static inline void
+svm_clgi(void)
+{
+	asm volatile ("clgi" ::: "memory");
+}
+
+static inline void
+svm_stgi(void)
+{
+	asm volatile ("stgi" ::: "memory");
+}
+
 #define	MSR_VM_HSAVE_PA	0xC0010117
 
 /* -- */
@@ -1347,7 +1359,7 @@ svm_vcpu_run(struct nvmm_machine *mach, 
 	struct svm_cpudata *cpudata = vcpu->cpudata;
 	struct vmcb *vmcb = cpudata->vmcb;
 	uint64_t machgen;
-	int hcpu, s;
+	int hcpu;
 
 	if (__predict_false(svm_vcpu_event_commit(vcpu) != 0)) {
 		return EINVAL;
@@ -1382,11 +1394,11 @@ svm_vcpu_run(struct nvmm_machine *mach, 
 			svm_vmcb_cache_flush(vmcb, VMCB_CTRL_VMCB_CLEAN_I);
 		}
 
-		s = splhigh();
+		svm_clgi();
 		machgen = svm_htlb_flush(machdata, cpudata);
 		svm_vmrun(cpudata->vmcb_pa, cpudata->gprs);
 		svm_htlb_flush_ack(cpudata, machgen);
-		splx(s);
+		svm_stgi();
 
 		svm_vmcb_cache_default(vmcb);
 
Index: src/sys/dev/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.63 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.64
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.63	Sat Jul 18 20:56:53 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Sun Jul 19 06:36:37 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.64 2020/07/19 06:36:37 maxv Exp $");
 
 #include 
 #include 
@@ -178,6 +178,18 @@ vmx_vmclear(paddr_t *pa)
 	);
 }
 
+static inline void
+vmx_cli(void)
+{
+	asm volatile ("cli" ::: "memory");
+}
+
+static inline void
+vmx_sti(void)
+{
+	asm volatile ("sti" ::: "memory");
+}
+
 #define MSR_IA32_FEATURE_CONTROL	0x003A
 #define		IA32_FEATURE_CONTROL_LOCK	__BIT(0)
 #define		IA32_FEATURE_CONTROL_IN_SMX	__BIT(1)
@@ -2043,7 +2055,7 @@ vmx_vcpu_run(struct nvmm_machine *mach, 
 	uint64_t exitcode;
 	uint64_t intstate;
 	uint64_t machgen;
-	int hcpu, s, ret;
+	int hcpu, ret;
 	bool launched;
 
 	vmx_vmcs_enter(vcpu);
@@ -2088,7 +2100,7 @@ vmx_vcpu_run(struct nvmm_machine *mach, 
 			cpudata->gtsc_want_update = false;
 		}
 
-		s = splhigh();
+		vmx_cli();
 		machgen = vmx_htlb_flush(machdata, cpudata);
 		lcr2(cpudata->gcr2);
 		if (launched) {
@@ -2098,7 +2110,7 @@ vmx_vcpu_run(struct nvmm_machine *mach, 
 		}
 		cpudata->gcr2 = rcr2();
 		vmx_htlb_flush_ack(cpudata, machgen);
-		splx(s);
+		vmx_sti();
 
 		if (__predict_false(ret != 0)) {
 			vmx_exit_invalid(exit, -1);

Index: src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S
diff -u src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.3 src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.4
--- src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S:1.3	Wed Apr 24 18:45:15 2019
+++ src/sys/dev/nvmm/x86/nvmm_x86_svmfunc.S	Sun Jul 19 06:36:37 2020
@@ -1,7 +1,7 @@
-/*	$NetBSD: nvmm_x86_svmfunc.S,v 1.3 2019/04/24 18:45:15 maxv Exp $	*/
+/*	$NetBSD: nvmm_x86_svmfunc.S,v 1.4 2020/07/19 06:36:37 maxv Exp $	*/
 
 /*
- * Copyright (c) 2018 The NetBSD Foundation, Inc.
+ * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
  * All rights reserved.
  *
  * This code is derived from software contributed to The NetBSD Foundation
@@ -136,9 +136,6 @@ ENTRY(svm_vmrun)
 	/* Save the Host GPRs. */
 	HOST_SAVE_GPRS
 
-	/* Disabl

CVS commit: src/sys/arch/evbmips/cavium

2020-07-18 Thread Simon Burge 
Module Name:src
Committed By:   simonb
Date:   Sun Jul 19 06:31:13 UTC 2020

Modified Files:
src/sys/arch/evbmips/cavium: machdep.c

Log Message:
Call fdtbus_intr_init() during startup.


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbmips/cavium/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/evbmips/cavium/machdep.c
diff -u src/sys/arch/evbmips/cavium/machdep.c:1.18 src/sys/arch/evbmips/cavium/machdep.c:1.19
--- src/sys/arch/evbmips/cavium/machdep.c:1.18	Thu Jul 16 11:49:37 2020
+++ src/sys/arch/evbmips/cavium/machdep.c	Sun Jul 19 06:31:13 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: machdep.c,v 1.18 2020/07/16 11:49:37 jmcneill Exp $	*/
+/*	$NetBSD: machdep.c,v 1.19 2020/07/19 06:31:13 simonb Exp $	*/
 
 /*
  * Copyright 2001, 2002 Wasabi Systems, Inc.
@@ -114,7 +114,7 @@
 #include "opt_multiprocessor.h"
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.18 2020/07/16 11:49:37 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.19 2020/07/19 06:31:13 simonb Exp $");
 
 #include 
 #include 
@@ -154,6 +154,7 @@ __KERNEL_RCSID(0, "$NetBSD: machdep.c,v 
 #include 
 
 #include 
+#include 
 
 static void	mach_init_vector(void);
 static void	mach_init_bus_space(void);
@@ -459,6 +460,8 @@ cpu_startup(void)
 	 * that memory allocation is now safe.
 	 */
 	octeon_configuration.mc_mallocsafe = 1;
+
+	fdtbus_intr_init();
 }
 
 void

CVS commit: src/usr.bin/make

2020-07-18 Thread Simon J. Gerraty 
Module Name:src
Committed By:   sjg
Date:   Sat Jul 18 21:37:38 UTC 2020

Modified Files:
src/usr.bin/make: hash.c hash.h main.c make.1 make.h

Log Message:
Add -dh for DEBUG_HASH

Allow tracking of max chain length, to see how well the hash
tables are working.
Pull the actual hash operation into a marco so it can be
easily changed - for experimenting.

The current hash, is pretty good.

Reviewed by: christos


To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/usr.bin/make/hash.c
cvs rdiff -u -r1.13 -r1.14 src/usr.bin/make/hash.h
cvs rdiff -u -r1.279 -r1.280 src/usr.bin/make/main.c
cvs rdiff -u -r1.282 -r1.283 src/usr.bin/make/make.1
cvs rdiff -u -r1.109 -r1.110 src/usr.bin/make/make.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/usr.bin/make/hash.c
diff -u src/usr.bin/make/hash.c:1.22 src/usr.bin/make/hash.c:1.23
--- src/usr.bin/make/hash.c:1.22	Fri Jul  3 17:03:09 2020
+++ src/usr.bin/make/hash.c	Sat Jul 18 21:37:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.c,v 1.22 2020/07/03 17:03:09 rillig Exp $	*/
+/*	$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -70,14 +70,14 @@
  */
 
 #ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: hash.c,v 1.22 2020/07/03 17:03:09 rillig Exp $";
+static char rcsid[] = "$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg Exp $";
 #else
 #include 
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)hash.c	8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: hash.c,v 1.22 2020/07/03 17:03:09 rillig Exp $");
+__RCSID("$NetBSD: hash.c,v 1.23 2020/07/18 21:37:38 sjg Exp $");
 #endif
 #endif /* not lint */
 #endif
@@ -107,6 +107,14 @@ static void RebuildTable(Hash_Table *);
 
 #define rebuildLimit 3
 
+/* The hash function(s) */
+/* This one matches Gosling's emacs */
+#define HASH(h, key, p) do { \
+	for (h = 0, p = key; *p;) \
+		h = (h << 5) - h + *p++; \
+	} while (0)
+
+
 /*
  *-
  *
@@ -146,6 +154,7 @@ Hash_InitTable(Hash_Table *t, int numBuc
 			 continue;
 	}
 	t->numEntries = 0;
+	t->maxlen = 0;
 	t->size = i;
 	t->mask = i - 1;
 	t->bucketPtr = hp = bmake_malloc(sizeof(*hp) * i);
@@ -220,17 +229,25 @@ Hash_FindEntry(Hash_Table *t, const char
 	Hash_Entry *e;
 	unsigned h;
 	const char *p;
+	int chainlen;
 
 	if (t == NULL || t->bucketPtr == NULL) {
 	return NULL;
 	}
-	for (h = 0, p = key; *p;)
-		h = (h << 5) - h + *p++;
+	HASH(h, key, p);
 	p = key;
-	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next)
-		if (e->namehash == h && strcmp(e->name, p) == 0)
-			return e;
-	return NULL;
+	if (DEBUG(HASH))
+		fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
+		t, h, key);
+	chainlen = 0;
+	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
+		chainlen++;
+		if (e->namehash == h && strcmp(e->name, p) == 0) 
+			break;
+	}
+	if (chainlen > t->maxlen)
+		t->maxlen = chainlen;
+	return e;
 }
 
 /*
@@ -265,23 +282,32 @@ Hash_CreateEntry(Hash_Table *t, const ch
 	unsigned h;
 	const char *p;
 	int keylen;
+	int chainlen;
 	struct Hash_Entry **hp;
 
 	/*
 	 * Hash the key.  As a side effect, save the length (strlen) of the
 	 * key in case we need to create the entry.
 	 */
-	for (h = 0, p = key; *p;)
-		h = (h << 5) - h + *p++;
+	HASH(h, key, p);
 	keylen = p - key;
 	p = key;
+	if (DEBUG(HASH))
+		fprintf(debug_file, "%s: %p h=%x key=%s\n", __func__,
+		t, h, key);
+	chainlen = 0;
 	for (e = t->bucketPtr[h & t->mask]; e != NULL; e = e->next) {
+		chainlen++;
 		if (e->namehash == h && strcmp(e->name, p) == 0) {
 			if (newPtr != NULL)
 *newPtr = FALSE;
-			return e;
+			break;
 		}
 	}
+	if (chainlen > t->maxlen)
+		t->maxlen = chainlen;
+	if (e)
+		return e;
 
 	/*
 	 * The desired entry isn't there.  Before allocating a new entry,
@@ -463,6 +489,10 @@ RebuildTable(Hash_Table *t)
 		}
 	}
 	free(oldhp);
+	if (DEBUG(HASH))
+		fprintf(debug_file, "%s: %p size=%d entries=%d maxlen=%d\n",
+		__func__, t, t->size, t->numEntries, t->maxlen);
+	t->maxlen = 0;
 }
 
 void Hash_ForEach(Hash_Table *t, void (*action)(void *, void *), void *data)

Index: src/usr.bin/make/hash.h
diff -u src/usr.bin/make/hash.h:1.13 src/usr.bin/make/hash.h:1.14
--- src/usr.bin/make/hash.h:1.13	Fri Jul  3 17:03:09 2020
+++ src/usr.bin/make/hash.h	Sat Jul 18 21:37:38 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: hash.h,v 1.13 2020/07/03 17:03:09 rillig Exp $	*/
+/*	$NetBSD: hash.h,v 1.14 2020/07/18 21:37:38 sjg Exp $	*/
 
 /*
  * Copyright (c) 1988, 1989, 1990 The Regents of the University of California.
@@ -100,6 +100,7 @@ typedef struct Hash_Table {
 int 	size;		/* Actual size of array. */
 int 	numEntries;	/* Number of entries in the table. */
 int 	mask;		/* Used to select bits for hashing. */
+int 	maxlen;		/* max length of chain detected */
 } Hash_Table;
 
 /*

Index: src/usr.bin/make/main.

CVS commit: src/sys/dev/nvmm/x86

2020-07-18 Thread Maxime Villard 
Module Name:src
Committed By:   maxv
Date:   Sat Jul 18 20:56:53 UTC 2020

Modified Files:
src/sys/dev/nvmm/x86: nvmm_x86_vmx.c

Log Message:
Now that the IDT is per-CPU, it must be saved/restored on each CPU
independently.


To generate a diff of this commit:
cvs rdiff -u -r1.62 -r1.63 src/sys/dev/nvmm/x86/nvmm_x86_vmx.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/nvmm/x86/nvmm_x86_vmx.c
diff -u src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.62 src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.63
--- src/sys/dev/nvmm/x86/nvmm_x86_vmx.c:1.62	Tue Jul 14 00:45:53 2020
+++ src/sys/dev/nvmm/x86/nvmm_x86_vmx.c	Sat Jul 18 20:56:53 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: nvmm_x86_vmx.c,v 1.62 2020/07/14 00:45:53 yamaguchi Exp $	*/
+/*	$NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $	*/
 
 /*
  * Copyright (c) 2018-2020 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.62 2020/07/14 00:45:53 yamaguchi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nvmm_x86_vmx.c,v 1.63 2020/07/18 20:56:53 maxv Exp $");
 
 #include 
 #include 
@@ -1921,6 +1921,7 @@ vmx_vcpu_guest_misc_enter(struct nvmm_cp
 	struct vmx_cpudata *cpudata = vcpu->cpudata;
 
 	/* This gets restored automatically by the CPU. */
+	vmx_vmwrite(VMCS_HOST_IDTR_BASE, (uint64_t)curcpu()->ci_idtvec.iv_idt);
 	vmx_vmwrite(VMCS_HOST_FS_BASE, rdmsr(MSR_FSBASE));
 	vmx_vmwrite(VMCS_HOST_CR3, rcr3());
 	vmx_vmwrite(VMCS_HOST_CR4, rcr4());
@@ -2698,8 +2699,7 @@ vmx_vcpu_init(struct nvmm_machine *mach,
 	struct vmcs *vmcs = cpudata->vmcs;
 	struct msr_entry *gmsr = cpudata->gmsr;
 	extern uint8_t vmx_resume_rip;
-	uint64_t rev, eptp, idt;
-	struct cpu_info *ci;
+	uint64_t rev, eptp;
 
 	rev = vmx_get_revision();
 
@@ -2766,9 +2766,6 @@ vmx_vcpu_init(struct nvmm_machine *mach,
 	vmx_vmwrite(VMCS_CR4_MASK, CR4_VMXE);
 
 	/* Set the Host state for resuming. */
-	ci = curcpu();
-	idt = (uint64_t)ci->ci_idtvec.iv_idt;
-
 	vmx_vmwrite(VMCS_HOST_RIP, (uint64_t)&vmx_resume_rip);
 	vmx_vmwrite(VMCS_HOST_CS_SELECTOR, GSEL(GCODE_SEL, SEL_KPL));
 	vmx_vmwrite(VMCS_HOST_SS_SELECTOR, GSEL(GDATA_SEL, SEL_KPL));
@@ -2779,7 +2776,6 @@ vmx_vcpu_init(struct nvmm_machine *mach,
 	vmx_vmwrite(VMCS_HOST_IA32_SYSENTER_CS, 0);
 	vmx_vmwrite(VMCS_HOST_IA32_SYSENTER_ESP, 0);
 	vmx_vmwrite(VMCS_HOST_IA32_SYSENTER_EIP, 0);
-	vmx_vmwrite(VMCS_HOST_IDTR_BASE, idt);
 	vmx_vmwrite(VMCS_HOST_IA32_PAT, rdmsr(MSR_CR_PAT));
 	vmx_vmwrite(VMCS_HOST_IA32_EFER, rdmsr(MSR_EFER));
 	vmx_vmwrite(VMCS_HOST_CR0, rcr0() & ~CR0_TS);

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 18:11:46 UTC 2020

Modified Files:
src/distrib/notes/evbarm: hardware

Log Message:
missing e.g.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/notes/evbarm/hardware

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.13 src/distrib/notes/evbarm/hardware:1.14
--- src/distrib/notes/evbarm/hardware:1.13	Sat Jul 18 18:09:42 2020
+++ src/distrib/notes/evbarm/hardware	Sat Jul 18 18:11:46 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hardware,v 1.13 2020/07/18 18:09:42 nia Exp $
+.\"	$NetBSD: hardware,v 1.14 2020/07/18 18:11:46 nia Exp $
 .\"
 .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 is also supported.
 .Bl -bullet -offset indent -compact
 .It
-Allwinner A10, A13, A20, A32, A80, A83T, H3 (Cubieboard, OLinuXino, LeMaker Banana Pi...)
+Allwinner A10, A13, A20, A32, A80, A83T, H3 (e.g. Cubieboard, OLinuXino, LeMaker Banana Pi...)
 .It
 Amlogic S805 (e.g. ODROID-C1)
 .It

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 18:09:42 UTC 2020

Modified Files:
src/distrib/notes/evbarm: hardware

Log Message:
more hardware


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/notes/evbarm/hardware

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/hardware
diff -u src/distrib/notes/evbarm/hardware:1.12 src/distrib/notes/evbarm/hardware:1.13
--- src/distrib/notes/evbarm/hardware:1.12	Sat Jul 18 16:41:14 2020
+++ src/distrib/notes/evbarm/hardware	Sat Jul 18 18:09:42 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: hardware,v 1.12 2020/07/18 16:41:14 nia Exp $
+.\"	$NetBSD: hardware,v 1.13 2020/07/18 18:09:42 nia Exp $
 .\"
 .\" Copyright (c) 2001-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -30,7 +30,7 @@
 is also supported.
 .Bl -bullet -offset indent -compact
 .It
-Allwinner A10, A13, A20, A32, A80, A83T, H3
+Allwinner A10, A13, A20, A32, A80, A83T, H3 (Cubieboard, OLinuXino, LeMaker Banana Pi...)
 .It
 Amlogic S805 (e.g. ODROID-C1)
 .It
@@ -50,13 +50,13 @@ and
 are also supported.
 .Bl -bullet -offset indent -compact
 .It
-Allwinner H5, H6, A64 (e.g. PINE64...)
+Allwinner H5, H6, A64 (e.g. PINE64, Pinebook, NanoPi A64, OLinuXino...)
 .It
-Amlogic S905 (e.g. ODROID-C2)
+Amlogic S905 (e.g. ODROID-C2, Le Potato, NanoPi K2...)
 .It
 Broadcom BCM2837 (e.g. Raspberry Pi 3)
 .It
-Rockchip RK3328, RK3328 (e.g. Pinebook Pro, RockPro64...)
+Rockchip RK3328, RK3328 (e.g. Pinebook Pro, RockPro64, Firefly...)
 .It
 NVIDIA Tegra X1
 .El

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 17:45:11 UTC 2020

Modified Files:
src/distrib/notes/evbarm: upgrade

Log Message:
clarify


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/notes/evbarm/upgrade

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/upgrade
diff -u src/distrib/notes/evbarm/upgrade:1.3 src/distrib/notes/evbarm/upgrade:1.4
--- src/distrib/notes/evbarm/upgrade:1.3	Sat Jul 18 17:40:14 2020
+++ src/distrib/notes/evbarm/upgrade	Sat Jul 18 17:45:11 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: upgrade,v 1.3 2020/07/18 17:40:14 nia Exp $
+.\"	$NetBSD: upgrade,v 1.4 2020/07/18 17:45:11 nia Exp $
 .\"
 .\" Copyright (c) 2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -62,11 +62,13 @@ Finally:
 # sysupgrade modules
 # reboot
 # sysupgrade sets
-# reboot
+# sysupgrade etcupdate
 # sysupgrade postinstall
+# reboot
 .Ed
 .Pp
-This is the most careful possible path.
+Rebooting with a new kernel before updating the sets is the most
+careful possible path.
 It is also possible to:
 .Bd -literal
 # sysupgrade auto

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 17:40:15 UTC 2020

Modified Files:
src/distrib/notes/evbarm: upgrade

Log Message:
Initial evbarm upgrade instructions - need work


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/notes/evbarm/upgrade

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/upgrade
diff -u src/distrib/notes/evbarm/upgrade:1.2 src/distrib/notes/evbarm/upgrade:1.3
--- src/distrib/notes/evbarm/upgrade:1.2	Thu Apr 23 01:56:49 2009
+++ src/distrib/notes/evbarm/upgrade	Sat Jul 18 17:40:14 2020
@@ -1,3 +1,74 @@
-.\"	$NetBSD: upgrade,v 1.2 2009/04/23 01:56:49 snj Exp $
+.\"	$NetBSD: upgrade,v 1.3 2020/07/18 17:40:14 nia Exp $
+.\"
+.\" Copyright (c) 2020 The NetBSD Foundation, Inc.
+.\" All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"notice, this list of conditions and the following disclaimer in the
+.\"documentation and/or other materials provided with the distribution.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+.\" ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+.\" TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+.\" POSSIBILITY OF SUCH DAMAGE.
+.\"
 .
-.so ../common/upgrade
+.Pp
+The easiest way to upgrade to
+.Nx
+\*M
+\*V
+is by using the sysutils/sysupgrade package from pkgsrc.
+.Pp
+First, edit
+.Pa /usr/pkg/etc/sysupgrade.conf .
+Make sure RELEASEDIR and KERNEL are correct:
+.Bd -literal
+RELEASEDIR="https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-aarch64/";
+.Ed
+or
+.Bd -literal
+RELEASEDIR="https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-earmv7hf/";
+.Ed
+or
+.Bd -literal
+RELEASEDIR="https://cdn.netbsd.org/pub/NetBSD/NetBSD-\*V/evbarm-earmv6hf/";
+.Ed
+.Pp
+Make sure
+.Pa /boot
+is mounted, and copy the new board-specific
+.Pa *.dts
+file into place, and
+.Pa bootaa64.efi
+if applicable.
+.Pp
+Finally:
+.Bd -literal
+# sysupgrade fetch
+# sysupgrade kernel netbsd-GENERIC (or netbsd-GENERIC64)
+# sysupgrade modules
+# reboot
+# sysupgrade sets
+# reboot
+# sysupgrade postinstall
+.Ed
+.Pp
+This is the most careful possible path.
+It is also possible to:
+.Bd -literal
+# sysupgrade auto
+# reboot
+.Ed

CVS commit: xsrc/external/mit/xorg-server/dist/fb

2020-07-18 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 17:37:08 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/fb: fb.h fbcmap_mi.c fbscreen.c

Log Message:
Pull 1bpp server fixes from xorg-server.old:

https://mail-index.netbsd.org/source-changes/2020/07/18/msg119488.html
> Fix 1bpp Xservers on "whitePixel=0, blackPixel=1" VRAMs.
>
> - Don't override pScreen->blackPixel and pScreen->whitePixel
>   (set in MD server Init functions per -filpPixels option)
>   on 1bpp servers in merged fbSetupScreen() (merged one
>   from cfbSetupScrenn and mfbSetupScreen() in old xsrc/xfree)
> - Pull mfbCreateColormap() function from old xsrc/xfree tree
>   and use it on 1bpp servers

Confirmed on luna68k 1bpp Xorg 1.20 server using xf86-video-wsfb
with "-flipPixels" option.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.6 -r1.2 xsrc/external/mit/xorg-server/dist/fb/fb.h \
xsrc/external/mit/xorg-server/dist/fb/fbscreen.c
cvs rdiff -u -r1.1.1.5 -r1.2 \
xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/fb/fb.h
diff -u xsrc/external/mit/xorg-server/dist/fb/fb.h:1.1.1.6 xsrc/external/mit/xorg-server/dist/fb/fb.h:1.2
--- xsrc/external/mit/xorg-server/dist/fb/fb.h:1.1.1.6	Mon Dec 31 09:36:09 2018
+++ xsrc/external/mit/xorg-server/dist/fb/fb.h	Sat Jul 18 17:37:08 2020
@@ -734,6 +734,9 @@ fbResolveColor(unsigned short *pred,
 extern _X_EXPORT Bool
  fbInitializeColormap(ColormapPtr pmap);
 
+extern _X_EXPORT Bool
+ mfbCreateColormap(ColormapPtr pmap);
+
 extern _X_EXPORT int
 
 fbExpandDirectColors(ColormapPtr pmap,
Index: xsrc/external/mit/xorg-server/dist/fb/fbscreen.c
diff -u xsrc/external/mit/xorg-server/dist/fb/fbscreen.c:1.1.1.6 xsrc/external/mit/xorg-server/dist/fb/fbscreen.c:1.2
--- xsrc/external/mit/xorg-server/dist/fb/fbscreen.c:1.1.1.6	Mon Dec 31 09:36:09 2018
+++ xsrc/external/mit/xorg-server/dist/fb/fbscreen.c	Sat Jul 18 17:37:08 2020
@@ -100,8 +100,10 @@ fbSetupScreen(ScreenPtr pScreen, void *p
 if (!fbAllocatePrivates(pScreen))
 return FALSE;
 pScreen->defColormap = FakeClientID(0);
-/* let CreateDefColormap do whatever it wants for pixels */
-pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+if (bpp > 1) {
+	/* let CreateDefColormap do whatever it wants for pixels */
+	pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+}
 pScreen->QueryBestSize = fbQueryBestSize;
 /* SaveScreen */
 pScreen->GetImage = fbGetImage;
@@ -118,7 +120,11 @@ fbSetupScreen(ScreenPtr pScreen, void *p
 pScreen->RealizeFont = fbRealizeFont;
 pScreen->UnrealizeFont = fbUnrealizeFont;
 pScreen->CreateGC = fbCreateGC;
-pScreen->CreateColormap = fbInitializeColormap;
+if (bpp == 1) {
+	pScreen->CreateColormap = mfbCreateColormap;
+} else {
+	pScreen->CreateColormap = fbInitializeColormap;
+}
 pScreen->DestroyColormap = (void (*)(ColormapPtr)) NoopDDA;
 pScreen->InstallColormap = fbInstallColormap;
 pScreen->UninstallColormap = fbUninstallColormap;

Index: xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c
diff -u xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c:1.1.1.5 xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c:1.2
--- xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c:1.1.1.5	Wed Aug 10 07:44:35 2016
+++ xsrc/external/mit/xorg-server/dist/fb/fbcmap_mi.c	Sat Jul 18 17:37:08 2020
@@ -66,6 +66,41 @@ fbInitializeColormap(ColormapPtr pmap)
 return miInitializeColormap(pmap);
 }
 
+Bool
+mfbCreateColormap(ColormapPtr pmap)
+{
+ScreenPtr	pScreen;
+unsigned short  red0, green0, blue0;
+unsigned short  red1, green1, blue1;
+Pixel pix;
+
+pScreen = pmap->pScreen;
+if (pScreen->whitePixel == 0)
+{
+	red0 = green0 = blue0 = ~0;
+	red1 = green1 = blue1 = 0;
+}
+else
+{
+	red0 = green0 = blue0 = 0;
+	red1 = green1 = blue1 = ~0;
+}
+
+/* this is a monochrome colormap, it only has two entries, just fill
+ * them in by hand.  If it were a more complex static map, it would be
+ * worth writing a for loop or three to initialize it */
+
+/* this will be pixel 0 */
+pix = 0;
+if (AllocColor(pmap, &red0, &green0, &blue0, &pix, 0) != Success)
+	return FALSE;
+
+/* this will be pixel 1 */
+if (AllocColor(pmap, &red1, &green1, &blue1, &pix, 0) != Success)
+	return FALSE;
+return TRUE;
+}
+
 int
 fbExpandDirectColors(ColormapPtr pmap,
  int ndef, xColorItem * indefs, xColorItem * outdefs)

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 17:20:59 UTC 2020

Modified Files:
src/distrib/notes/evbarm: contents

Log Message:
more contents


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/distrib/notes/evbarm/contents

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/contents
diff -u src/distrib/notes/evbarm/contents:1.9 src/distrib/notes/evbarm/contents:1.10
--- src/distrib/notes/evbarm/contents:1.9	Sat Jul 18 16:41:14 2020
+++ src/distrib/notes/evbarm/contents	Sat Jul 18 17:20:59 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: contents,v 1.9 2020/07/18 16:41:14 nia Exp $
+.\"	$NetBSD: contents,v 1.10 2020/07/18 17:20:59 nia Exp $
 .\"
 .\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -61,6 +61,8 @@ operating system for a range of 64-bit d
 A gzipped writable image containing the complete 32-bit
 .Nx
 operating system for Raspberry Pi variants only (includes RPI kernels).
+.			It Pa *.dtb.gz
+Gzipped board-specific device trees.
 .		tag) \" binary/gzimg/
 .		It Pa kernel/
 .		(tag netbsd.gz -compact \" binary/kernel
@@ -91,9 +93,12 @@ see below.
 root file systems for expert usage.
 .
 .		It Pa misc/
-.
-Miscellaneous \*M installation utilities; see
-installation section below.
+.		(tag bootaa64.efi -compact \" misc/bootaa64.efi
+.			It Pa bootaa64.efi
+.			(tag bootaa64.efi -compact \" misc/bootaa64.efi
+AArch64 EFI bootloader
+.			tag) \" misc/bootaa64.efi
+.		tag) \" misc/bootaa64.efi
 .
 .	tag) \" installation/
 .

CVS commit: xsrc/external/mit/xorg-server.old/dist/fb

2020-07-18 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 17:18:09 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server.old/dist/fb: fb.h fbcmap_mi.c fbscreen.c

Log Message:
Fix 1bpp Xservers on "whitePixel=0, blackPixel=1" VRAMs.

- Don't override pScreen->blackPixel and pScreen->whitePixel
  (set in MD server Init functions per -filpPixels option)
  on 1bpp servers in merged fbSetupScreen() (merged one
  from cfbSetupScrenn and mfbSetupScreen() in old xsrc/xfree)
- Pull mfbCreateColormap() function from old xsrc/xfree tree
  and use it on 1bpp servers

Required by forthcoming X11R7'fied ancient Xsun and XsunMono servers:
 https://mail-index.netbsd.org/port-sun3/2020/07/17/msg000157.html

Without these fixes, mouse pointers and twm window titlebar etc. are
rendered inverted.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 xsrc/external/mit/xorg-server.old/dist/fb/fb.h \
xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c \
xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server.old/dist/fb/fb.h
diff -u xsrc/external/mit/xorg-server.old/dist/fb/fb.h:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/fb/fb.h:1.2
--- xsrc/external/mit/xorg-server.old/dist/fb/fb.h:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/fb/fb.h	Sat Jul 18 17:18:09 2020
@@ -1282,6 +1282,9 @@ fbResolveColor(unsigned short	*pred, 
 extern _X_EXPORT Bool
 fbInitializeColormap(ColormapPtr pmap);
 
+extern _X_EXPORT Bool
+mfbCreateColormap(ColormapPtr pmap);
+
 extern _X_EXPORT int
 fbExpandDirectColors (ColormapPtr   pmap, 
 		  int	ndef,
Index: xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c
diff -u xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/fb/fbcmap_mi.c	Sat Jul 18 17:18:09 2020
@@ -69,6 +69,41 @@ fbInitializeColormap(ColormapPtr pmap)
 return miInitializeColormap(pmap);
 }
 
+Bool
+mfbCreateColormap(ColormapPtr pmap)
+{
+ScreenPtr	pScreen;
+unsigned short  red0, green0, blue0;
+unsigned short  red1, green1, blue1;
+Pixel pix;
+
+pScreen = pmap->pScreen;
+if (pScreen->whitePixel == 0)
+{
+	red0 = green0 = blue0 = ~0;
+	red1 = green1 = blue1 = 0;
+}
+else
+{
+	red0 = green0 = blue0 = 0;
+	red1 = green1 = blue1 = ~0;
+}
+
+/* this is a monochrome colormap, it only has two entries, just fill
+ * them in by hand.  If it were a more complex static map, it would be
+ * worth writing a for loop or three to initialize it */
+
+/* this will be pixel 0 */
+pix = 0;
+if (AllocColor(pmap, &red0, &green0, &blue0, &pix, 0) != Success)
+	return FALSE;
+
+/* this will be pixel 1 */
+if (AllocColor(pmap, &red1, &green1, &blue1, &pix, 0) != Success)
+	return FALSE;
+return TRUE;
+}
+
 int
 fbExpandDirectColors (ColormapPtr   pmap,
 		  int	ndef,
Index: xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c
diff -u xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c:1.1.1.1 xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c:1.2
--- xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c:1.1.1.1	Thu Jun  9 09:07:56 2016
+++ xsrc/external/mit/xorg-server.old/dist/fb/fbscreen.c	Sat Jul 18 17:18:09 2020
@@ -103,8 +103,10 @@ fbSetupScreen(ScreenPtr	pScreen, 
 if (!fbAllocatePrivates(pScreen, NULL))
 	return FALSE;
 pScreen->defColormap = FakeClientID(0);
-/* let CreateDefColormap do whatever it wants for pixels */ 
-pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+if (bpp > 1) {
+	/* let CreateDefColormap do whatever it wants for pixels */
+	pScreen->blackPixel = pScreen->whitePixel = (Pixel) 0;
+}
 pScreen->QueryBestSize = fbQueryBestSize;
 /* SaveScreen */
 pScreen->GetImage = fbGetImage;
@@ -121,7 +123,11 @@ fbSetupScreen(ScreenPtr	pScreen, 
 pScreen->RealizeFont = fbRealizeFont;
 pScreen->UnrealizeFont = fbUnrealizeFont;
 pScreen->CreateGC = fbCreateGC;
-pScreen->CreateColormap = fbInitializeColormap;
+if (bpp == 1) {
+	pScreen->CreateColormap = mfbCreateColormap;
+} else {
+	pScreen->CreateColormap = fbInitializeColormap;
+}
 pScreen->DestroyColormap = (void (*)(ColormapPtr))NoopDDA;
 pScreen->InstallColormap = fbInstallColormap;
 pScreen->UninstallColormap = fbUninstallColormap;

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 17:10:23 UTC 2020

Modified Files:
src/distrib/notes/evbarm: xfer

Log Message:
safe estimation of required storage


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/notes/evbarm/xfer

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/xfer
diff -u src/distrib/notes/evbarm/xfer:1.3 src/distrib/notes/evbarm/xfer:1.4
--- src/distrib/notes/evbarm/xfer:1.3	Sat Jul 18 16:41:14 2020
+++ src/distrib/notes/evbarm/xfer	Sat Jul 18 17:10:23 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: xfer,v 1.3 2020/07/18 16:41:14 nia Exp $
+.\"	$NetBSD: xfer,v 1.4 2020/07/18 17:10:23 nia Exp $
 .\"
 .\" Copyright (c) 2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -30,6 +30,7 @@ Generally, NetBSD is installed on ARM de
 (armv7.img, or arm64.img for 64-bit devices)
 to a SD card or USB device.
 For ARMv6 Raspberry Pi 1s, this image is rpi.img.gz.
+The storage device should be at least 2GB.
 .Pp
 If you're on Windows rather than a Unix variant, you can use
 .Lk https://www.netbsd.org/~martin/rawrite32/index.html rawrite32

CVS commit: src/distrib/notes/evbarm

2020-07-18 Thread Nia Alarie 
Module Name:src
Committed By:   nia
Date:   Sat Jul 18 16:41:14 UTC 2020

Modified Files:
src/distrib/notes/evbarm: Makefile contents hardware install prep xfer

Log Message:
more modernization of evbarm install instructions


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/distrib/notes/evbarm/Makefile \
src/distrib/notes/evbarm/xfer
cvs rdiff -u -r1.8 -r1.9 src/distrib/notes/evbarm/contents
cvs rdiff -u -r1.11 -r1.12 src/distrib/notes/evbarm/hardware \
src/distrib/notes/evbarm/prep
cvs rdiff -u -r1.13 -r1.14 src/distrib/notes/evbarm/install

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/notes/evbarm/Makefile
diff -u src/distrib/notes/evbarm/Makefile:1.2 src/distrib/notes/evbarm/Makefile:1.3
--- src/distrib/notes/evbarm/Makefile:1.2	Sun Jul 21 08:14:48 2002
+++ src/distrib/notes/evbarm/Makefile	Sat Jul 18 16:41:14 2020
@@ -1,5 +1,3 @@
-#	$NetBSD: Makefile,v 1.2 2002/07/21 08:14:48 lukem Exp $
-
-MERGED_SRCS+=	${COMMON}/xfer
+#	$NetBSD: Makefile,v 1.3 2020/07/18 16:41:14 nia Exp $
 
 .include 
Index: src/distrib/notes/evbarm/xfer
diff -u src/distrib/notes/evbarm/xfer:1.2 src/distrib/notes/evbarm/xfer:1.3
--- src/distrib/notes/evbarm/xfer:1.2	Fri May 27 17:38:42 2011
+++ src/distrib/notes/evbarm/xfer	Sat Jul 18 16:41:14 2020
@@ -1,6 +1,6 @@
-.\"	$NetBSD: xfer,v 1.2 2011/05/27 17:38:42 tsutsui Exp $
+.\"	$NetBSD: xfer,v 1.3 2020/07/18 16:41:14 nia Exp $
 .\"
-.\" Copyright (c) 1999-2004 The NetBSD Foundation, Inc.
+.\" Copyright (c) 2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -25,10 +25,24 @@
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"
 .
-.\" -- MD instructions on setting up boot media
-.
-.\" XXX to be written
-.
-.\" -- MI instructions for getting distribution off installation medium
-.
-.so ../common/xfer
+.Pp
+Generally, NetBSD is installed on ARM devices by writing a live image
+(armv7.img, or arm64.img for 64-bit devices)
+to a SD card or USB device.
+For ARMv6 Raspberry Pi 1s, this image is rpi.img.gz.
+.Pp
+If you're on Windows rather than a Unix variant, you can use
+.Lk https://www.netbsd.org/~martin/rawrite32/index.html rawrite32
+instead of
+.Xr dd 1
+to write images, and
+.Lk https://www.7-zip.org/ 7-Zip
+to decompress .gz files.
+.Pp
+ARM devices generally also ship with a vendor-specific U-Boot
+bootloader, which may be replaced with a board-specific "mainline"
+U-Boot image from pkgsrc for an an optimal NetBSD experience.
+The images available from
+.Lk http://www.armbsd.org/arm/ "armbsd.org"
+come pre-prepared with a board-specific U-Boot image if one is
+available, and otherwise a generic image can be used.

Index: src/distrib/notes/evbarm/contents
diff -u src/distrib/notes/evbarm/contents:1.8 src/distrib/notes/evbarm/contents:1.9
--- src/distrib/notes/evbarm/contents:1.8	Tue Jun 23 06:28:02 2020
+++ src/distrib/notes/evbarm/contents	Sat Jul 18 16:41:14 2020
@@ -1,6 +1,6 @@
-.\"	$NetBSD: contents,v 1.8 2020/06/23 06:28:02 martin Exp $
+.\"	$NetBSD: contents,v 1.9 2020/07/18 16:41:14 nia Exp $
 .\"
-.\" Copyright (c) 1999-2005 The NetBSD Foundation, Inc.
+.\" Copyright (c) 1999-2020 The NetBSD Foundation, Inc.
 .\" All rights reserved.
 .\"
 .\" Redistribution and use in source and binary forms, with or without
@@ -45,34 +45,51 @@ The
 file contains underlined text using the
 .Xr more 1
 conventions for indicating italic and bold display.
-.
-.\" MD binary and installation directories ---
-.
 .	It Pa binary/
-.
 .	(tag kernel/ -compact \" binary/
-.
+.		It Pa gzimg/
+.		(tag armv7.img.gz -compact \" binary/gzimg
+.			It Pa armv7.img.gz
+A gzipped writable image containing the complete
+.Nx
+operating system for a range of 32-bit devices (includes a GENERIC kernel).
+.			It Pa arm64.img.gz
+A gzipped writable image containing the complete
+.Nx
+operating system for a range of 64-bit devices (includes a GENERIC64 kernel).
+.			It Pa rpi.img.gz
+A gzipped writable image containing the complete 32-bit
+.Nx
+operating system for Raspberry Pi variants only (includes RPI kernels).
+.		tag) \" binary/gzimg/
 .		It Pa kernel/
-.
 .		(tag netbsd.gz -compact \" binary/kernel
 .			It Pa netbsd-GENERIC.gz
-A gzipped
-.Nx
-kernel containing code for everything supported in this release.
-.
+A gzipped ARMv7 kernel which supports a range of 32-bit devices that
+do not need board-specific kernels.
+.			It Pa netbsd-GENERIC64.gz
+A gzipped AArch64 kernel which supports a range of 64-bit devices that
+do not need board-specific kernels.
+.			It Pa netbsd-RPI.gz
+A gzipped ARMv6 kernel which supports the Raspberry Pi 1 only.
+.			It Pa netbsd-RPI2.gz
+A gzipped ARMv6 kernel which supports the Raspberry Pi 2 only.
 .		tag) \" binary/kernel/
 .
 .		It Pa sets/
-.
 \*M binary distribution sets;
 see below.
 .
 .	tag) \" binary/
-.
 .	It Pa ins

CVS commit: src/sys/uvm/pmap

2020-07-18 Thread Nick Hudson 
Module Name:src
Committed By:   skrll
Date:   Sat Jul 18 16:12:09 UTC 2020

Modified Files:
src/sys/uvm/pmap: pmap.c

Log Message:
Always call pmap_segtab_activate in pmap_activate.  pmap_segtab_activate
does the right thing if called with non-curlwp.


To generate a diff of this commit:
cvs rdiff -u -r1.49 -r1.50 src/sys/uvm/pmap/pmap.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/uvm/pmap/pmap.c
diff -u src/sys/uvm/pmap/pmap.c:1.49 src/sys/uvm/pmap/pmap.c:1.50
--- src/sys/uvm/pmap/pmap.c:1.49	Sun Apr 12 15:36:18 2020
+++ src/sys/uvm/pmap/pmap.c	Sat Jul 18 16:12:09 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: pmap.c,v 1.49 2020/04/12 15:36:18 skrll Exp $	*/
+/*	$NetBSD: pmap.c,v 1.50 2020/07/18 16:12:09 skrll Exp $	*/
 
 /*-
  * Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -67,7 +67,7 @@
 
 #include 
 
-__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.49 2020/04/12 15:36:18 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.50 2020/07/18 16:12:09 skrll Exp $");
 
 /*
  *	Manages physical address maps.
@@ -723,9 +723,7 @@ pmap_activate(struct lwp *l)
 	kpreempt_disable();
 	pmap_tlb_miss_lock_enter();
 	pmap_tlb_asid_acquire(pmap, l);
-	if (l == curlwp) {
-		pmap_segtab_activate(pmap, l);
-	}
+	pmap_segtab_activate(pmap, l);
 	pmap_tlb_miss_lock_exit();
 	kpreempt_enable();

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat Jul 18 16:07:15 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Xorg 1.20 servers require libXfont2 instead of libXfont.

Per the following upstream commit:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=05a793f5b3c40747d5a92a076def7f4fb673c7e7
 > dix: Switch to the libXfont2 API (v2)

Now Xorg 1.20 based X68k server builds and confirmed working on XM6i.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.7
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6	Sat Jul 18 15:26:30 2020
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sat Jul 18 16:07:15 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
+#	$NetBSD: Makefile,v 1.7 2020/07/18 16:07:15 tsutsui Exp $
 
 .include 
 
@@ -63,7 +63,7 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.miext/damage} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
-	-lXfont \
+	-lXfont2 \
 	-lpixman-1 \
 	-lXext \
 	-lX11 \
@@ -84,7 +84,7 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.miext/damage} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
-	${LIBXFONT} \
+	${LIBXFONT2} \
 	${LIBPIXMAN-1} \
 	${LIBXEXT} \
 	${LIBX11} \

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 15:48:08 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kInit.c

Log Message:
Add a stub for miinitext of GLX.

As per upstream commits for Xnest:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=67c303fff303f94b62f03a76de97116c6ebcfda9

Note GLXEXT is defined as 1 in xorg-server/include/xorg-server.h
(i.e. /usr/X11R7/include/xorg/xorg-server.h) so no proper way to
disable it on building MD servers per ${MACHINE} basis.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.5 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.6
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c:1.5	Sat Jul 18 04:46:22 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kInit.c	Sat Jul 18 15:48:08 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kInit.c,v 1.5 2020/07/18 04:46:22 tsutsui Exp $ */
+/* $NetBSD: x68kInit.c,v 1.6 2020/07/18 15:48:08 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -71,6 +71,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include "Xos.h"
 #include "x68k.h"
 #include "mi.h"
+#include "extinit.h"
 
 static int nscreens;
 
@@ -79,6 +80,13 @@ OsVendorInit(void)
 {
 }
 
+#ifdef GLXEXT
+void
+GlxExtensionInit(void)
+{
+}
+#endif
+
 /*-
  * function "InitOutput"[ called by DIX ]
  *

CVS commit: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui 
Module Name:xsrc
Committed By:   tsutsui
Date:   Sat Jul 18 15:37:02 UTC 2020

Modified Files:
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k: x68kKbd.c
x68kMouse.c

Log Message:
Update for removal of AddEnabledDevice and RemoveEnabledDevice.

Use the NotifyFd API instead as per upstream commits:
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=55c2e1a3aa587c58a74066724e11e30b3df267b8
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=be5a513fee6cbf29ef7570e57eb0436d70fbd88c
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=60a91031d13e4d29c383087120e318f6b528b6e5
 
https://cgit.freedesktop.org/xorg/xserver/commit/?id=7def2fea30060d47780dc1eedc91fada5ae1934f


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c \
xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c:1.4	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kKbd.c	Sat Jul 18 15:37:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kKbd.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kKbd.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -87,6 +87,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 X68kKbdPriv x68kKbdPriv;
 DeviceIntPtr x68kKeyboardDevice = NULL;
 
+static void x68kKbdHandlerNotify(int, int, void *);
 static void x68kInitModMap(KeySymsRec *, CARD8 *);
 static void x68kInitKbdNames(XkbRMLVOSet *, X68kKbdPrivPtr);
 static void x68kKbdRingBell(DeviceIntPtr, int, int);
@@ -94,6 +95,11 @@ static void x68kKbdBell(int, DeviceIntPt
 static void x68kKbdCtrl(DeviceIntPtr, KeybdCtrl *);
 static void x68kSetLeds(X68kKbdPrivPtr, u_char);
 
+static void
+x68kKbdHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
+
 /*
  * x68kKbdProc --
  *	Handle the initialization, etc. of a keyboard.
@@ -144,13 +150,14 @@ x68kKbdProc(DeviceIntPtr pDev, 	/* Keybo
 return !Success;
 }
 	x68kSetLeds(&x68kKbdPriv, (u_char)x68kKbdPriv.leds);
-(void) AddEnabledDevice(x68kKbdPriv.fd);
+SetNotifyFd(x68kKbdPriv.fd, x68kKbdHandlerNotify,
+		X_NOTIFY_READ, NULL);
 pKeyboard->on = TRUE;
 break;
 
 case DEVICE_CLOSE:
 case DEVICE_OFF:
-RemoveEnabledDevice(x68kKbdPriv.fd);
+RemoveNotifyFd(x68kKbdPriv.fd);
 pKeyboard->on = FALSE;
 break;
 default:
Index: xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c
diff -u xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.4 xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.5
--- xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c:1.4	Fri Apr 10 16:49:36 2020
+++ xsrc/external/mit/xorg-server/dist/hw/netbsd/x68k/x68kMouse.c	Sat Jul 18 15:37:02 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: x68kMouse.c,v 1.4 2020/04/10 16:49:36 tsutsui Exp $ */
+/* $NetBSD: x68kMouse.c,v 1.5 2020/07/18 15:37:02 tsutsui Exp $ */
 /*-
  * Copyright (c) 1996 Yasushi Yamasaki
  * All rights reserved.
@@ -87,6 +87,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
 #include 
 #include "xserver-properties.h"
 
+static void x68kMouseHandlerNotify(int, int, void *);
 static Bool x68kCursorOffScreen(ScreenPtr *, int *, int *);
 static void x68kCrossScreen(ScreenPtr, int);
 static void x68kWarpCursor(DeviceIntPtr, ScreenPtr, int, int);
@@ -102,6 +103,11 @@ DeviceIntPtr x68kPointerDevice = NULL;
 
 static X68kMousePriv x68kMousePriv;
 
+static void
+x68kMouseHandlerNotify(int fd __unused, int ready __unused, void *data __unused)
+{
+}
+
 /*-
  *---
  * x68kMouseProc --
@@ -162,13 +168,14 @@ x68kMouseProc(DeviceIntPtr device, int w
 return !Success;
 }
 	x68kMousePriv.bmask = 0;
-	AddEnabledDevice(x68kMousePriv.fd);
+	SetNotifyFd(x68kMousePriv.fd, x68kMouseHandlerNotify,
+		X_NOTIFY_READ, NULL);
 	pMouse->on = TRUE;
 	break;
 
 	case DEVICE_OFF:
 	pMouse->on = FALSE;
-	RemoveEnabledDevice(x68kMousePriv.fd);
+	RemoveNotifyFd(x68kMousePriv.fd);
 	break;
 
 	case DEVICE_CLOSE:

CVS commit: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat Jul 18 15:26:30 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k: Makefile

Log Message:
Sync with xorg-server.old: No need to link miext/libshadow.a.


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5 src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.6
--- src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile:1.5	Thu Jan  3 23:26:58 2019
+++ src/external/mit/xorg/server/xorg-server/hw/netbsd/x68k/Makefile	Sat Jul 18 15:26:30 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2019/01/03 23:26:58 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2020/07/18 15:26:30 tsutsui Exp $
 
 .include 
 
@@ -61,7 +61,6 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xfixes} \
 	${LDADD.damageext} \
 	${LDADD.miext/damage} \
-	${LDADD.miext/shadow} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
 	-lXfont \
@@ -83,7 +82,6 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xfixes} \
 	${DPADD.damageext} \
 	${DPADD.miext/damage} \
-	${DPADD.miext/shadow} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
 	${LIBXFONT} \

CVS commit: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k

2020-07-18 Thread Izumi Tsutsui 
Module Name:src
Committed By:   tsutsui
Date:   Sat Jul 18 15:24:31 UTC 2020

Modified Files:
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k: Makefile

Log Message:
No need to link miext/libshadow.a.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile:1.1.1.1	Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/netbsd/x68k/Makefile	Sat Jul 18 15:24:31 2020
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+#	$NetBSD: Makefile,v 1.2 2020/07/18 15:24:31 tsutsui Exp $
 
 .include 
 
@@ -58,7 +58,6 @@ LDADD+= ${LDADD.dix} \
 	${LDADD.xfixes} \
 	${LDADD.damageext} \
 	${LDADD.miext/damage} \
-	${LDADD.miext/shadow} \
 	${LDADD.miext/sync} \
 	${LDADD.Xi} \
 	-lXfont \
@@ -80,7 +79,6 @@ DPADD+= ${LDADD.dix} \
 	${DPADD.xfixes} \
 	${DPADD.damageext} \
 	${DPADD.miext/damage} \
-	${DPADD.miext/shadow} \
 	${DPADD.miext/sync} \
 	${DPADD.Xi} \
 	${LIBXFONT} \

CVS commit: [netbsd-9] src/doc

2020-07-18 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sat Jul 18 15:10:21 UTC 2020

Modified Files:
src/doc [netbsd-9]: CHANGES-9.1

Log Message:
Ticket #1020


To generate a diff of this commit:
cvs rdiff -u -r1.1.2.81 -r1.1.2.82 src/doc/CHANGES-9.1

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.1
diff -u src/doc/CHANGES-9.1:1.1.2.81 src/doc/CHANGES-9.1:1.1.2.82
--- src/doc/CHANGES-9.1:1.1.2.81	Fri Jul 17 15:31:20 2020
+++ src/doc/CHANGES-9.1	Sat Jul 18 15:10:21 2020
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-9.1,v 1.1.2.81 2020/07/17 15:31:20 martin Exp $
+# $NetBSD: CHANGES-9.1,v 1.1.2.82 2020/07/18 15:10:21 martin Exp $
 
 A complete list of changes from the NetBSD 9.0 release to the NetBSD 9.1
 release:
@@ -3482,3 +3482,9 @@ sys/dev/pci/radeonfbvar.h			1.21
 	Reduce stack usage in radeonfb_pickres() and radeonfb_set_cursor().
 	[macallan, ticket #1019]
 
+sys/dev/usb/usbdi.c1.203
+
+	Avoid a diagnostic assertion for inconsistent USB transfer
+	states.
+	[mrg, ticket #1020]
+

CVS commit: [netbsd-9] src/sys/dev/usb

2020-07-18 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sat Jul 18 15:09:29 UTC 2020

Modified Files:
src/sys/dev/usb [netbsd-9]: usbdi.c

Log Message:
Pull up following revision(s) (requested by mrg in ticket #1020):

sys/dev/usb/usbdi.c: revision 1.203

for both usbd_transfer() and usbd_ar_pipe() be sure to reset the
xfer ux_state to XFER_BUSY when removing from the queue.
seems to fix an occasional panic i was seeing on pinebook and
pinebookpro lately with axen(4).

from riastradh@.

XXX: pullup-9.


To generate a diff of this commit:
cvs rdiff -u -r1.182.4.4 -r1.182.4.5 src/sys/dev/usb/usbdi.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/usb/usbdi.c
diff -u src/sys/dev/usb/usbdi.c:1.182.4.4 src/sys/dev/usb/usbdi.c:1.182.4.5
--- src/sys/dev/usb/usbdi.c:1.182.4.4	Fri Apr  3 12:27:55 2020
+++ src/sys/dev/usb/usbdi.c	Sat Jul 18 15:09:28 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: usbdi.c,v 1.182.4.4 2020/04/03 12:27:55 martin Exp $	*/
+/*	$NetBSD: usbdi.c,v 1.182.4.5 2020/07/18 15:09:28 martin Exp $	*/
 
 /*
  * Copyright (c) 1998, 2012, 2015 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.4 2020/04/03 12:27:55 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi.c,v 1.182.4.5 2020/07/18 15:09:28 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_usb.h"
@@ -337,6 +337,9 @@ usbd_transfer(struct usbd_xfer *xfer)
 		USBHIST_LOG(usbdebug, "xfer failed: %s, reinserting",
 		err, 0, 0, 0);
 		usbd_lock_pipe(pipe);
+#ifdef DIAGNOSTIC
+		xfer->ux_state = XFER_BUSY;
+#endif
 		SIMPLEQ_REMOVE_HEAD(&pipe->up_queue, ux_next);
 		if (pipe->up_serialise)
 			usbd_start_next(pipe);
@@ -892,6 +895,9 @@ usbd_ar_pipe(struct usbd_pipe *pipe)
 		"(methods = %#jx)", (uintptr_t)pipe, (uintptr_t)xfer,
 		(uintptr_t)pipe->up_methods, 0);
 		if (xfer->ux_status == USBD_NOT_STARTED) {
+#ifdef DIAGNOSTIC
+			xfer->ux_state = XFER_BUSY;
+#endif
 			SIMPLEQ_REMOVE_HEAD(&pipe->up_queue, ux_next);
 		} else {
 			/* Make the HC abort it (and invoke the callback). */

CVS commit: src/external/gpl2/rcs/dist/man

2020-07-18 Thread Thomas Klausner 
Module Name:src
Committed By:   wiz
Date:   Sat Jul 18 14:53:10 UTC 2020

Modified Files:
src/external/gpl2/rcs/dist/man: rlog.1

Log Message:
Add missing linebreak.

Reported by Anon.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl2/rcs/dist/man/rlog.1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl2/rcs/dist/man/rlog.1
diff -u src/external/gpl2/rcs/dist/man/rlog.1:1.2 src/external/gpl2/rcs/dist/man/rlog.1:1.3
--- src/external/gpl2/rcs/dist/man/rlog.1:1.2	Thu Jan 14 04:22:39 2016
+++ src/external/gpl2/rcs/dist/man/rlog.1	Sat Jul 18 14:53:10 2020
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rlog.1,v 1.2 2016/01/14 04:22:39 christos Exp $
+.\"	$NetBSD: rlog.1,v 1.3 2020/07/18 14:53:10 wiz Exp $
 .\"
 .de Id
 .ds Rv \\$3
@@ -50,6 +50,7 @@ The options below restrict this output.
 .TP \*n
 .B \-c
 Print the commitid if available.
+.TP
 .B \-L
 Ignore \*r files that have no locks set.
 This is convenient in combination with

CVS commit: [netbsd-9] src/sbin/wsconsctl

2020-07-18 Thread Martin Husemann 
Module Name:src
Committed By:   martin
Date:   Sat Jul 18 14:53:35 UTC 2020

Modified Files:
src/sbin/wsconsctl [netbsd-9]: wsconsctl.8

Log Message:
Fix editor mishap during processing of ticket #1002


To generate a diff of this commit:
cvs rdiff -u -r1.28.42.1 -r1.28.42.2 src/sbin/wsconsctl/wsconsctl.8

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sbin/wsconsctl/wsconsctl.8
diff -u src/sbin/wsconsctl/wsconsctl.8:1.28.42.1 src/sbin/wsconsctl/wsconsctl.8:1.28.42.2
--- src/sbin/wsconsctl/wsconsctl.8:1.28.42.1	Mon Jul 13 14:22:47 2020
+++ src/sbin/wsconsctl/wsconsctl.8	Sat Jul 18 14:53:35 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: wsconsctl.8,v 1.28.42.1 2020/07/13 14:22:47 martin Exp $
+.\" $NetBSD: wsconsctl.8,v 1.28.42.2 2020/07/18 14:53:35 martin Exp $
 .\"
 .\" Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -27,7 +27,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 .\" POSSIBILITY OF SUCH DAMAGE.
 .\"/
-+.Dd July 13, 2020
+.Dd July 13, 2020
 .Dt WSCONSCTL 8
 .Os
 .Sh NAME

CVS commit: src/sys/compat/netbsd32

2020-07-18 Thread Jared D. McNeill 
Module Name:src
Committed By:   jmcneill
Date:   Sat Jul 18 12:46:19 UTC 2020

Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.c netbsd32_ioctl.h

Log Message:
Add BIOCSETWF32 (bpf)


To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/compat/netbsd32/netbsd32_ioctl.c
cvs rdiff -u -r1.70 -r1.71 src/sys/compat/netbsd32/netbsd32_ioctl.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/compat/netbsd32/netbsd32_ioctl.c
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.c:1.112 src/sys/compat/netbsd32/netbsd32_ioctl.c:1.113
--- src/sys/compat/netbsd32/netbsd32_ioctl.c:1.112	Mon Mar 16 01:37:51 2020
+++ src/sys/compat/netbsd32/netbsd32_ioctl.c	Sat Jul 18 12:46:19 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ioctl.c,v 1.112 2020/03/16 01:37:51 christos Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.c,v 1.113 2020/07/18 12:46:19 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -31,7 +31,7 @@
  */
 
 #include 
-__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.112 2020/03/16 01:37:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netbsd32_ioctl.c,v 1.113 2020/07/18 12:46:19 jmcneill Exp $");
 
 #if defined(_KERNEL_OPT)
 #include "opt_ntp.h"
@@ -1425,6 +1425,8 @@ netbsd32_ioctl(struct lwp *l,
 
 	case BIOCSETF32:
 		IOCTL_STRUCT_CONV_TO(BIOCSETF, bpf_program);
+	case BIOCSETWF32:
+		IOCTL_STRUCT_CONV_TO(BIOCSETWF, bpf_program);
 	case BIOCSTCPF32:
 		IOCTL_STRUCT_CONV_TO(BIOCSTCPF, bpf_program);
 	case BIOCSUDPF32:

Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.70 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.71
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.70	Mon Nov 18 04:17:08 2019
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h	Sat Jul 18 12:46:19 2020
@@ -1,4 +1,4 @@
-/*	$NetBSD: netbsd32_ioctl.h,v 1.70 2019/11/18 04:17:08 rin Exp $	*/
+/*	$NetBSD: netbsd32_ioctl.h,v 1.71 2020/07/18 12:46:19 jmcneill Exp $	*/
 
 /*
  * Copyright (c) 1998, 2001 Matthew R. Green
@@ -120,6 +120,7 @@ struct netbsd32_bpf_dltlist {
 #define BIOCSUDPF32	_IOW('B',115, struct netbsd32_bpf_program)
 #define BIOCGDLTLIST32	_IOWR('B',119, struct netbsd32_bpf_dltlist)
 #define BIOCSRTIMEOUT32	_IOW('B',122, struct netbsd32_timeval)
+#define BIOCSETWF32	_IOW('B',127, struct netbsd32_bpf_program)
 
 
 struct netbsd32_wsdisplay_addscreendata {