CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and extended partitioning support on size restrained install media. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/acorn32/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/emips/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ews4800mips/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/arch/acorn32/Makefile diff -u src/usr.sbin/sysinst/arch/acorn32/Makefile:1.1 src/usr.sbin/sysinst/arch/acorn32/Makefile:1.2 --- src/usr.sbin/sysinst/arch/acorn32/Makefile:1.1 Sat Jul 26 19:30:44 2014 +++ src/usr.sbin/sysinst/arch/acorn32/Makefile Thu Jun 13 06:34:30 2019 @@ -1,8 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:44 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:30 martin Exp $ # # Makefile for acorn32 # MD_OPTIONS= AOUT2ELF +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc" Index: src/usr.sbin/sysinst/arch/emips/Makefile diff -u src/usr.sbin/sysinst/arch/emips/Makefile:1.1 src/usr.sbin/sysinst/arch/emips/Makefile:1.2 --- src/usr.sbin/sysinst/arch/emips/Makefile:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/emips/Makefile Thu Jun 13 06:34:30 2019 @@ -1,6 +1,11 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:45 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:30 martin Exp $ # # Makefile for emips # +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc" Index: src/usr.sbin/sysinst/arch/ews4800mips/Makefile diff -u src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.1 src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.2 --- src/usr.sbin/sysinst/arch/ews4800mips/Makefile:1.1 Sat Jul 26 19:30:45 2014 +++ src/usr.sbin/sysinst/arch/ews4800mips/Makefile Thu Jun 13 06:34:31 2019 @@ -1,8 +1,13 @@ -# $NetBSD: Makefile,v 1.1 2014/07/26 19:30:45 dholland Exp $ +# $NetBSD: Makefile,v 1.2 2019/06/13 06:34:31 martin Exp $ # # Makefile for ews4800mips # LANGUAGES= # no translations +.ifdef SMALLPROG +NOPARTMAN= yes +NO_GPT= yes +.endif + .include "../../Makefile.inc"
CVS commit: src/usr.sbin/sysinst/arch
Module Name:src Committed By: martin Date: Thu Jun 13 06:34:31 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/acorn32: Makefile src/usr.sbin/sysinst/arch/emips: Makefile src/usr.sbin/sysinst/arch/ews4800mips: Makefile Log Message: Remove GPT and extended partitioning support on size restrained install media. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/acorn32/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/emips/Makefile cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/arch/ews4800mips/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sparc64/md.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.sbin/sysinst/arch/sparc64/md.h diff -u src/usr.sbin/sysinst/arch/sparc64/md.h:1.3 src/usr.sbin/sysinst/arch/sparc64/md.h:1.4 --- src/usr.sbin/sysinst/arch/sparc64/md.h:1.3 Wed Jun 12 06:20:23 2019 +++ src/usr.sbin/sysinst/arch/sparc64/md.h Thu Jun 13 06:25:03 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: md.h,v 1.3 2019/06/12 06:20:23 martin Exp $ */ +/* $NetBSD: md.h,v 1.4 2019/06/13 06:25:03 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -60,9 +60,8 @@ /* have support for booting from UFS2 */ #define HAVE_UFS2_BOOT -/* XXX - this is a lie! for testing only! */ /* have support for booting from GPT disks */ -#define HAVE_GPT_BOOT +/* #define HAVE_GPT_BOOT */ /* not yet */ /* allow using tmpfs for /tmp instead of mfs */ #define HAVE_TMPFS
CVS commit: src/usr.sbin/sysinst/arch/sparc64
Module Name:src Committed By: martin Date: Thu Jun 13 06:25:03 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/sparc64: md.h Log Message: Remove GPT boot (not available for sparc64 yet) To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/sparc64/md.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/sysinst/disklabel.c diff -u src/usr.sbin/sysinst/disklabel.c:1.1 src/usr.sbin/sysinst/disklabel.c:1.2 --- src/usr.sbin/sysinst/disklabel.c:1.1 Wed Jun 12 06:20:17 2019 +++ src/usr.sbin/sysinst/disklabel.c Thu Jun 13 06:20:34 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.c,v 1.1 2019/06/12 06:20:17 martin Exp $ */ +/* $NetBSD: disklabel.c,v 1.2 2019/06/13 06:20:34 martin Exp $ */ /* * Copyright 2018 The NetBSD Foundation, Inc. @@ -264,7 +264,7 @@ disklabel_write_to_disk(struct disk_part (struct disklabel_disk_partitions*)arg; FILE *f; char fname[PATH_MAX], packname[sizeof(parts->l.d_packname)+1]; - int i, rv; + int i, rv = 0; const char *disk = parts->dp.disk, *s; const struct partition *lp; char *d;
CVS commit: src/usr.sbin/sysinst
Module Name:src Committed By: martin Date: Thu Jun 13 06:20:35 UTC 2019 Modified Files: src/usr.sbin/sysinst: disklabel.c Log Message: Fix unitialized variable To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/usr.sbin/sysinst/disklabel.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
Module Name:src
Committed By: martin
Date: Thu Jun 13 06:12:55 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h
src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c
Log Message:
Ooops, fix misaplied patch from ticket #1281
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/arch/x86/x86/hypervvar.h
cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/dev/hyperv/genfb_vmbus.c \
src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/hypervvar.h
diff -u src/sys/arch/x86/x86/hypervvar.h:1.1.4.3 src/sys/arch/x86/x86/hypervvar.h:1.1.4.4
--- src/sys/arch/x86/x86/hypervvar.h:1.1.4.3 Wed Jun 12 11:35:40 2019
+++ src/sys/arch/x86/x86/hypervvar.h Thu Jun 13 06:12:54 2019
@@ -1,41 +1,4 @@
-/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
-
-/*-
- * Copyright (c) 2009-2012,2016 Microsoft Corp.
- * Copyright (c) 2012 NetApp Inc.
- * Copyright (c) 2012 Citrix 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 unmodified, this list of conditions, and the following
- *disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *notice, this list of conditions and the following disclaimer in the
- *documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _X86_HYPERVVAR_H_
-#define _X86_HYPERVVAR_H_
-
-void hyperv_early_init(void);
-device_t device_hyperv_register(device_t, void *);
-
-#endif /* _X86_HYPERVVAR_H_ */
-/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
+/* $NetBSD: hypervvar.h,v 1.1.4.4 2019/06/13 06:12:54 martin Exp $ */
/*-
* Copyright (c) 2009-2012,2016 Microsoft Corp.
Index: src/sys/dev/hyperv/genfb_vmbus.c
diff -u src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.3 src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.4
--- src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.3 Wed Jun 12 11:35:40 2019
+++ src/sys/dev/hyperv/genfb_vmbus.c Thu Jun 13 06:12:55 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
+/* $NetBSD: genfb_vmbus.c,v 1.1.4.4 2019/06/13 06:12:55 martin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,165 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $");
-
-#include "opt_wsfb.h"
-#include "opt_genfb.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include
-#include
-
-static int genfb_vmbus_match(device_t, cfdata_t, void *);
-static void genfb_vmbus_attach(device_t, device_t, void *);
-static int genfb_vmbus_ioctl(void *, void *, u_long, void *, int,
- struct lwp *);
-static paddr_t genfb_vmbus_mmap(void *, void *, off_t, int);
-static int genfb_vmbus_drm_print(void *, const char *);
-static bool genfb_vmbus_shutdown(device_t, int);
-
-CFATTACH_DECL_NEW(genfb_vmbus, sizeof(struct genfb_vmbus_softc),
-genfb_vmbus_match, genfb_vmbus_attach, NULL, NULL);
-
-static int
-genfb_vmbus_match(device_t parent, cfdata_t match, void *aux)
-{
- struct vmbus_attach_args *aa = aux;
-
- if (memcmp(aa->aa_type, &hyperv_guid_video, sizeof(*aa->aa_type)) != 0)
- return 0;
-
- if (!genfb_is_enabled())
- return 0; /* explicitly disabled by MD code */
-
- /* Use genfb(4) at pci in Gen.1 VM. */
- if (hyperv_is_gen1())
- return 0;
-
- return 1;
-}
-
-static void
-genfb_vmbus_attach(device_t parent, device_t self, void *aux)
-{
- static const struct genfb_ops zero_ops;
- struct genfb_vmbus_softc *sc = device_private(self);
- struct vmbus_attach_args *aa = aux;
- struct genfb_ops ops = zero_ops;
-
- aprint_naive("\n");
- aprint_normal(": Hyper-V Synthetic Video\n");
-
- sc->sc_gen.sc_dev = self;
- sc->sc_memt = aa->aa_memt;
-
- genfb_init(&sc->sc_gen);
-
- /* firmware / MD code responsible for restoring the display */
- if (sc->sc_gen.
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Thu Jun 13 06:12:55 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c Log Message: Ooops, fix misaplied patch from ticket #1281 To generate a diff of this commit: cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/arch/x86/x86/hypervvar.h cvs rdiff -u -r1.1.4.3 -r1.1.4.4 src/sys/dev/hyperv/genfb_vmbus.c \ src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.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/x86/x86
Module Name:src Committed By: msaitoh Date: Thu Jun 13 05:19:40 UTC 2019 Modified Files: src/sys/arch/x86/x86: lapic.c Log Message: No functional change: - Simplify some code for readability. - KNF a little. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/x86/lapic.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/x86/x86
Module Name:src
Committed By: msaitoh
Date: Thu Jun 13 05:19:40 UTC 2019
Modified Files:
src/sys/arch/x86/x86: lapic.c
Log Message:
No functional change:
- Simplify some code for readability.
- KNF a little.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/x86/x86/lapic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/lapic.c
diff -u src/sys/arch/x86/x86/lapic.c:1.71 src/sys/arch/x86/x86/lapic.c:1.72
--- src/sys/arch/x86/x86/lapic.c:1.71 Sat Mar 9 08:42:26 2019
+++ src/sys/arch/x86/x86/lapic.c Thu Jun 13 05:19:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: lapic.c,v 1.71 2019/03/09 08:42:26 maxv Exp $ */
+/* $NetBSD: lapic.c,v 1.72 2019/06/13 05:19:40 msaitoh Exp $ */
/*-
* Copyright (c) 2000, 2008 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.71 2019/03/09 08:42:26 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lapic.c,v 1.72 2019/06/13 05:19:40 msaitoh Exp $");
#include "acpica.h"
#include "ioapic.h"
@@ -282,7 +282,8 @@ lapic_setup_bsp(paddr_t lapic_base)
vmt_hvcall(VM_CMD_GET_VCPU_INFO, regs);
if (ISSET(regs[0], VCPUINFO_VCPU_RESERVED) ||
!ISSET(regs[0], VCPUINFO_LEGACY_X2APIC))
-reason = "inside VMWare without intr redirection";
+reason = "inside VMWare without intr "
+"redirection";
} else if (vm_guest == VM_GUEST_XEN) {
reason = "due to running under XEN";
} else if (vm_guest == VM_GUEST_NO &&
@@ -295,14 +296,14 @@ lapic_setup_bsp(paddr_t lapic_base)
* SandyBridge-based notebook BIOSes have a bug
* which prevents booting AP in x2APIC mode.
* Since the only way to detect mobile CPU is
- * to check northbridge pci id, which cannot be done
- * that early, disable x2APIC for all Lenovo and ASUS
- * SandyBridge machines.
+ * to check northbridge pci id, which cannot be
+ * done that early, disable x2APIC for all
+ * Lenovo and ASUS SandyBridge machines.
*/
if (strcmp(hw_vendor, "LENOVO") == 0 ||
strcmp(hw_vendor, "ASUSTeK Computer Inc.") == 0) {
- reason =
- "for a suspected SandyBridge BIOS bug";
+ reason = "for a suspected SandyBridge "
+ "BIOS bug";
}
}
}
@@ -315,7 +316,8 @@ lapic_setup_bsp(paddr_t lapic_base)
if (reason == NULL)
x2apic_mode = true;
else
- aprint_verbose("x2APIC available but disabled %s\n", reason);
+ aprint_verbose("x2APIC available but disabled %s\n",
+ reason);
if (x2apic_enable != x2apic_mode) {
if (bios_x2apic && !x2apic_enable)
aprint_verbose("x2APIC disabled by user and "
@@ -335,17 +337,20 @@ lapic_setup_bsp(paddr_t lapic_base)
#endif
#if defined(DDB) && defined(MULTIPROCESSOR)
#ifdef __x86_64__
- set_idtgate(&idt[ddb_vec], &Xintr_x2apic_ddbipi, 1, SDT_SYS386IGT,
- SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
+ set_idtgate(&idt[ddb_vec], &Xintr_x2apic_ddbipi, 1,
+ SDT_SYS386IGT, SEL_KPL, GSEL(GCODE_SEL, SEL_KPL));
#else
- /* Set DDB IPI handler in cpu_set_tss_gates() when cpu0 is attached. */
+ /*
+ * Set DDB IPI handler in cpu_set_tss_gates() when cpu0 is
+ * attached.
+ */
#endif
#endif
x86_disable_intr();
lapic_enable_x2apic();
#ifdef MULTIPROCESSOR
- cpu_init_first(); /* catch up to changed cpu_number() */
+ cpu_init_first(); /* Catch up to changed cpu_number() */
#endif
lapic_write_tpri(0);
x86_enable_intr();
@@ -391,7 +396,7 @@ lapic_map(paddr_t lapic_base)
invlpg(va);
#ifdef MULTIPROCESSOR
- cpu_init_first(); /* catch up to changed cpu_number() */
+ cpu_init_first(); /* Catch up to changed cpu_number() */
#endif
lapic_write_tpri(0);
@@ -474,16 +479,19 @@ lapic_boot_init(paddr_t lapic_base)
#ifdef MULTIPROCESSOR
idt_vec_reserve(LAPIC_IPI_VECTOR);
- idt_vec_set(LAPIC_IPI_VECTOR, x2apic_mode ? Xintr_x2apic_ipi : Xintr_lapic_ipi);
+ idt_vec_set(LAPIC_IPI_VECTOR,
+ x2apic_mode ? Xintr_x2apic_ipi : Xintr_lapic_ipi);
+
idt_vec_reserve(LAPIC_TLB_VECTOR);
- idt_vec_set(LAPIC_TLB_VECTOR, x2apic_mode ? Xintr_x2apic_tlb : Xintr_lapic_tlb);
+ idt_vec_set(LAPIC_TLB_VECTOR,
+ x2apic_mode ? Xintr_x2apic_tlb : Xintr_lapic_tlb);
#endif
idt_vec_reserve(LAPIC_SPURIOUS_VECTOR);
idt_vec_set(LAPIC_SPURIOUS_VECTOR, Xintrspurious);
idt_vec_reserve(LAPIC_TIMER_VECTOR);
- idt_vec_set(LAPIC_TIMER_VECTOR, x2apic_mode ? Xintr_x2apic_ltimer :
- Xintr_lapic_ltimer);
+ idt_vec_set(LAPIC_TIMER_VECTOR,
+ x2apic_mode ? Xintr_x2apic_ltimer : Xintr_lapic_ltimer);
}
static uint32_t
@@ -864,7 +872,8 @@ static int
x2apic_ipi_startup(int target, int vec)
{
- x2apic_write_icr(target, vec | LAPIC_DLMODE_STARTUP | LAPIC_LEVEL_ASSERT);
+ x2apic_write_icr(target,
+ vec | LAPIC_DLMODE_STARTUP | LAPIC_LEVEL_ASSERT);
return 0;
}
@@ -943,15 +952,11 @@ void
lapic_dump(void)
{
struct cpu_info *ci = curcpu();
+ const char *xname = device_xnam
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: hkenken
Date: Thu Jun 13 04:20:23 UTC 2019
Modified Files:
src/sys/arch/evbarm/conf: mk.netwalker std.netwalker
src/sys/arch/evbarm/netwalker: netwalker_machdep.c
Removed Files:
src/sys/arch/evbarm/netwalker: netwalker_start.S
Log Message:
Use armv6_start.S
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.netwalker
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.netwalker
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/netwalker/netwalker_machdep.c
cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/netwalker/netwalker_start.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/mk.netwalker
diff -u src/sys/arch/evbarm/conf/mk.netwalker:1.4 src/sys/arch/evbarm/conf/mk.netwalker:1.5
--- src/sys/arch/evbarm/conf/mk.netwalker:1.4 Wed Apr 9 04:00:50 2014
+++ src/sys/arch/evbarm/conf/mk.netwalker Thu Jun 13 04:20:23 2019
@@ -1,12 +1,11 @@
-# $NetBSD: mk.netwalker,v 1.4 2014/04/09 04:00:50 hkenken Exp $
+# $NetBSD: mk.netwalker,v 1.5 2019/06/13 04:20:23 hkenken Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
-SYSTEM_FIRST_OBJ= netwalker_start.o
-SYSTEM_FIRST_SFILE= ${THISARM}/netwalker/netwalker_start.S
+ENTRYPOINT= generic_start
-KERNEL_BASE_PHYS=0x9010
-KERNEL_BASE_VIRT=0x8010
+SYSTEM_FIRST_OBJ= armv6_start.o
+SYSTEM_FIRST_SFILE= ${ARM}/arm/armv6_start.S
SYSTEM_LD_TAIL_EXTRA+=; \
echo ${OBJCOPY} -S -O binary $@ $@.bin; \
Index: src/sys/arch/evbarm/conf/std.netwalker
diff -u src/sys/arch/evbarm/conf/std.netwalker:1.12 src/sys/arch/evbarm/conf/std.netwalker:1.13
--- src/sys/arch/evbarm/conf/std.netwalker:1.12 Mon Oct 15 16:54:54 2018
+++ src/sys/arch/evbarm/conf/std.netwalker Thu Jun 13 04:20:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: std.netwalker,v 1.12 2018/10/15 16:54:54 skrll Exp $
+# $NetBSD: std.netwalker,v 1.13 2019/06/13 04:20:23 hkenken Exp $
#
# standard NetBSD/evbarm options for Sharp NetWalker
@@ -8,21 +8,25 @@ include "arch/evbarm/conf/std.evbarm"
# Pull in i.mx51 config definitions.
include "arch/evbarm/conf/files.netwalker"
+options ARM_GENERIC_TODR
+options ARM_HAS_VBAR
+options ARM_INTR_IMPL=""
+options DRAM_BLOCKS=256
+options EVBARM_BOARDTYPE="netwalker"
+options FPU_VFP
options MODULAR
options MODULAR_DEFAULT_AUTOLOAD
-options __HAVE_FAST_SOFTINTS # should be in types.h
-options __HAVE_CPU_COUNTER
-options __HAVE_MM_MD_DIRECT_MAPPED_PHYS
-options ARM_HAS_VBAR
options TPIDRPRW_IS_CURCPU
+options __BUS_SPACE_HAS_STREAM_METHODS
+options __HAVE_CPU_COUNTER
+options __HAVE_CPU_UAREA_ALLOC_IDLELWP
+options __HAVE_GENERIC_START
+options __HAVE_GENERIC_CPU_INITCLOCKS
+options __HAVE_FAST_SOFTINTS # should be in types.h
options CORTEX_PMC
options CORTEX_PMC_CCNT_HZ=8
-options EVBARM_BOARDTYPE="netwalker"
-options FPU_VFP
-makeoptions LOADADDRESS="0x9010"
-makeoptions BOARDTYPE="netwalker"
makeoptions BOARDMKFRAG="${THISARM}/conf/mk.netwalker"
-options ARM_INTR_IMPL=""
-options ARM_GENERIC_TODR
+makeoptions KERNEL_BASE_PHYS=0x90008000
+makeoptions KERNEL_BASE_VIRT=0x80008000
Index: src/sys/arch/evbarm/netwalker/netwalker_machdep.c
diff -u src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.23 src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.24
--- src/sys/arch/evbarm/netwalker/netwalker_machdep.c:1.23 Mon Jan 21 07:47:30 2019
+++ src/sys/arch/evbarm/netwalker/netwalker_machdep.c Thu Jun 13 04:20:23 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: netwalker_machdep.c,v 1.23 2019/01/21 07:47:30 skrll Exp $ */
+/* $NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $ */
/*
* Copyright (c) 2002, 2003, 2005, 2010 Genetec Corporation.
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.23 2019/01/21 07:47:30 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: netwalker_machdep.c,v 1.24 2019/06/13 04:20:23 hkenken Exp $");
#include "opt_evbarm_boardtype.h"
#include "opt_arm_debug.h"
@@ -164,6 +164,8 @@ char *boot_args = NULL;
extern char KERNEL_BASE_phys[];
+u_int uboot_args[4] __attribute__((__section__(".data")));
+
extern int cpu_do_powersave;
/*
CVS commit: src/sys/arch/evbarm
Module Name:src Committed By: hkenken Date: Thu Jun 13 04:20:23 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: mk.netwalker std.netwalker src/sys/arch/evbarm/netwalker: netwalker_machdep.c Removed Files: src/sys/arch/evbarm/netwalker: netwalker_start.S Log Message: Use armv6_start.S To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/conf/mk.netwalker cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/conf/std.netwalker cvs rdiff -u -r1.23 -r1.24 src/sys/arch/evbarm/netwalker/netwalker_machdep.c cvs rdiff -u -r1.6 -r0 src/sys/arch/evbarm/netwalker/netwalker_start.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/sysinst/arch/dummy
Module Name:src
Committed By: mrg
Date: Thu Jun 13 03:07:24 UTC 2019
Modified Files:
src/usr.sbin/sysinst/arch/dummy: md.c
Log Message:
make this build and likely work with the new sysinst world order.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/dummy/md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/arch/dummy/md.c
diff -u src/usr.sbin/sysinst/arch/dummy/md.c:1.3 src/usr.sbin/sysinst/arch/dummy/md.c:1.4
--- src/usr.sbin/sysinst/arch/dummy/md.c:1.3 Wed Jun 12 06:20:19 2019
+++ src/usr.sbin/sysinst/arch/dummy/md.c Thu Jun 13 03:07:24 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2019/06/12 06:20:19 martin Exp $ */
+/* $NetBSD: md.c,v 1.4 2019/06/13 03:07:24 mrg Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -50,66 +50,89 @@ md_init_set_status(int flags)
}
bool
-md_get_info(void)
+md_get_info(struct install_partition_desc *desc)
{
return true;
}
-int
-md_make_bsd_partitions(void)
+bool
+md_make_bsd_partitions(struct install_partition_desc *desc)
{
- return make_bsd_partitions();
+ return make_bsd_partitions(desc);
}
-int
-md_check_partitions(void)
+bool
+md_check_partitions(struct install_partition_desc *desc)
{
- return 1;
+ return true;
}
-int
-md_pre_disklabel(void)
+bool
+md_pre_disklabel(struct install_partition_desc *install,
+struct disk_partitions *part)
{
- return 0;
+ return false;
}
-int
-md_post_disklabel(void)
+bool
+md_post_disklabel(struct install_partition_desc *install,
+struct disk_partitions *part)
{
return true;
}
int
-md_post_newfs(void)
+md_pre_mount(struct install_partition_desc *install)
+{
+ return 0;
+}
+
+int
+md_post_newfs(struct install_partition_desc *install)
{
return 0;
}
int
-md_post_extract(void)
+md_post_extract(struct install_partition_desc *install)
{
return 0;
}
void
-md_cleanup_install(void)
+md_cleanup_install(struct install_partition_desc *install)
{
}
int
-md_pre_update(void)
+md_pre_update(struct install_partition_desc *install)
{
return 1;
}
int
-md_update(void)
+md_update(struct install_partition_desc *install)
{
return 1;
}
-int
-md_pre_mount(void)
+#ifdef HAVE_GPT
+/*
+ * New GPT partitions have been written, update bootloader or remember
+ * data untill needed in md_post_newfs
+ */
+bool
+md_gpt_post_write(struct disk_partitions *parts, part_id root_id,
+bool root_is_new, part_id efi_id, bool efi_is_new)
{
- return 0;
+
+ return true;
}
+#endif
+
+bool
+md_parts_use_wholedisk(struct disk_partitions *parts)
+{
+ return parts_use_wholedisk(parts, 0, NULL);
+}
+
CVS commit: src/usr.sbin/sysinst/arch/dummy
Module Name:src Committed By: mrg Date: Thu Jun 13 03:07:24 UTC 2019 Modified Files: src/usr.sbin/sysinst/arch/dummy: md.c Log Message: make this build and likely work with the new sysinst world order. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.sbin/sysinst/arch/dummy/md.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: christos
Date: Thu Jun 13 02:07:31 UTC 2019
Modified Files:
src/sys/opencrypto: crypto.c
Log Message:
Try to load swcrypto if we we did not find any software drivers.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/sys/opencrypto/crypto.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/opencrypto/crypto.c
diff -u src/sys/opencrypto/crypto.c:1.106 src/sys/opencrypto/crypto.c:1.107
--- src/sys/opencrypto/crypto.c:1.106 Tue Jun 5 21:49:09 2018
+++ src/sys/opencrypto/crypto.c Wed Jun 12 22:07:31 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: crypto.c,v 1.106 2018/06/06 01:49:09 maya Exp $ */
+/* $NetBSD: crypto.c,v 1.107 2019/06/13 02:07:31 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/crypto.c,v 1.4.2.5 2003/02/26 00:14:05 sam Exp $ */
/* $OpenBSD: crypto.c,v 1.41 2002/07/17 23:52:38 art Exp $ */
@@ -53,7 +53,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.106 2018/06/06 01:49:09 maya Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crypto.c,v 1.107 2019/06/13 02:07:31 christos Exp $");
#include
#include
@@ -746,6 +746,7 @@ crypto_select_driver_lock(struct cryptoi
u_int32_t hid;
int accept;
struct cryptocap *cap, *best;
+ int error = 0;
best = NULL;
/*
@@ -810,6 +811,14 @@ again:
goto again;
}
+ if (best == NULL && hard == 0 && error == 0) {
+ error = module_autoload("swcrypto", MODULE_CLASS_DRIVER);
+ if (error == 0) {
+ error = EINVAL;
+ goto again;
+ }
+ }
+
return best;
}
CVS commit: src/sys/opencrypto
Module Name:src Committed By: christos Date: Thu Jun 13 02:07:31 UTC 2019 Modified Files: src/sys/opencrypto: crypto.c Log Message: Try to load swcrypto if we we did not find any software drivers. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/sys/opencrypto/crypto.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/opencrypto
Module Name:src
Committed By: christos
Date: Thu Jun 13 02:02:45 UTC 2019
Modified Files:
src/sys/opencrypto: cryptodev.c
Log Message:
don't always panic when modunload crypto (int the pool destroy code, because
the pools are busy). XXX: this is still racy; we need to prevent creating
more sessions while destroying.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/opencrypto/cryptodev.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/opencrypto/cryptodev.c
diff -u src/sys/opencrypto/cryptodev.c:1.100 src/sys/opencrypto/cryptodev.c:1.101
--- src/sys/opencrypto/cryptodev.c:1.100 Fri Mar 1 06:06:57 2019
+++ src/sys/opencrypto/cryptodev.c Wed Jun 12 22:02:45 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: cryptodev.c,v 1.100 2019/03/01 11:06:57 pgoyette Exp $ */
+/* $NetBSD: cryptodev.c,v 1.101 2019/06/13 02:02:45 christos Exp $ */
/* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */
/* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */
@@ -64,7 +64,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.100 2019/03/01 11:06:57 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.101 2019/06/13 02:02:45 christos Exp $");
#include
#include
@@ -2246,6 +2246,8 @@ crypto_modcmd(modcmd_t cmd, void *arg)
return error;
case MODULE_CMD_FINI:
#ifdef _MODULE
+ if (crypto_refcount != 0)
+ return EBUSY;
error = config_cfdata_detach(crypto_cfdata);
if (error) {
return error;
CVS commit: src/sys/opencrypto
Module Name:src Committed By: christos Date: Thu Jun 13 02:02:45 UTC 2019 Modified Files: src/sys/opencrypto: cryptodev.c Log Message: don't always panic when modunload crypto (int the pool destroy code, because the pools are busy). XXX: this is still racy; we need to prevent creating more sessions while destroying. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/sys/opencrypto/cryptodev.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Thu Jun 13 01:13:12 UTC 2019
Modified Files:
src/sys/kern: subr_pool.c
Log Message:
make pool assertion messages consistent.
To generate a diff of this commit:
cvs rdiff -u -r1.250 -r1.251 src/sys/kern/subr_pool.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/subr_pool.c
diff -u src/sys/kern/subr_pool.c:1.250 src/sys/kern/subr_pool.c:1.251
--- src/sys/kern/subr_pool.c:1.250 Thu May 9 04:16:14 2019
+++ src/sys/kern/subr_pool.c Wed Jun 12 21:13:12 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: subr_pool.c,v 1.250 2019/05/09 08:16:14 skrll Exp $ */
+/* $NetBSD: subr_pool.c,v 1.251 2019/06/13 01:13:12 christos Exp $ */
/*
* Copyright (c) 1997, 1999, 2000, 2002, 2007, 2008, 2010, 2014, 2015, 2018
@@ -33,7 +33,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.250 2019/05/09 08:16:14 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_pool.c,v 1.251 2019/06/13 01:13:12 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@@ -516,8 +516,8 @@ pr_rmpage(struct pool *pp, struct pool_i
if (ph->ph_nmissing == 0) {
KASSERT(pp->pr_nidle != 0);
KASSERTMSG((pp->pr_nitems >= pp->pr_itemsperpage),
- "nitems=%u < itemsperpage=%u",
- pp->pr_nitems, pp->pr_itemsperpage);
+ "%s: [%s] nitems=%u < itemsperpage=%u", __func__,
+ pp->pr_wchan, pp->pr_nitems, pp->pr_itemsperpage);
pp->pr_nidle--;
}
@@ -884,7 +884,8 @@ pool_destroy(struct pool *pp)
KASSERT(pp->pr_cache == NULL);
KASSERTMSG((pp->pr_nout == 0),
- "%s: pool busy: still out: %u", __func__, pp->pr_nout);
+ "%s: [%s] pool busy: still out: %u", __func__, pp->pr_wchan,
+ pp->pr_nout);
KASSERT(LIST_EMPTY(&pp->pr_fullpages));
KASSERT(LIST_EMPTY(&pp->pr_partpages));
@@ -1043,7 +1044,7 @@ pool_get(struct pool *pp, int flags)
}
if (pp->pr_roflags & PR_USEBMAP) {
KASSERTMSG((ph->ph_nmissing < pp->pr_itemsperpage),
- "%s: %s: page empty", __func__, pp->pr_wchan);
+ "%s: [%s] pool page empty", __func__, pp->pr_wchan);
v = pr_item_bitmap_get(pp, ph);
} else {
v = pr_item_linkedlist_get(pp, ph);
CVS commit: src/sys/kern
Module Name:src Committed By: christos Date: Thu Jun 13 01:13:12 UTC 2019 Modified Files: src/sys/kern: subr_pool.c Log Message: make pool assertion messages consistent. To generate a diff of this commit: cvs rdiff -u -r1.250 -r1.251 src/sys/kern/subr_pool.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Thu Jun 13 00:24:43 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
handle $SOURCEMODE
To generate a diff of this commit:
cvs rdiff -u -r1.228 -r1.229 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.228 src/usr.sbin/postinstall/postinstall:1.229
--- src/usr.sbin/postinstall/postinstall:1.228 Wed Jun 12 17:08:33 2019
+++ src/usr.sbin/postinstall/postinstall Wed Jun 12 20:24:43 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.228 2019/06/12 21:08:33 christos Exp $
+# $NetBSD: postinstall,v 1.229 2019/06/13 00:24:43 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1412,6 +1412,12 @@ do_rc()
local op="$1"
local failed=0
local generated_scripts=""
+ local etcsets=
+ if $SOURCEMODE; then
+ etcsets="${SRC_DIR}/distrib/sets/lists/etc/mi"
+ else
+ etcsets="${SRC_DIR}/etc/mtree/set.etc"
+ fi
if [ "${MKX11}" != "no" ]; then
generated_scripts="${generated_scripts} xdm xfs"
fi
@@ -1422,18 +1428,18 @@ do_rc()
# rc* files in /etc/
local rc_444_files="$(${SED} -n -e /obsolete/d -e '/^\.\/etc\/rc\.d/d' \
-e '/^\.\/etc\/rc/s@./etc/\([^[:space:]]*\)[[:space:]].*@\1@p' \
- ${SRC_DIR}/distrib/sets/lists/etc/mi)"
+ ${etcsets})"
# no-obsolete rc files in /etc/rc.d
local rc_555_files="$(${SED} -n -e /obsolete/d \
-e 's@./etc/rc.d/\([^[:space:]]*\)[[:space:]].*@\1@p' \
- ${SRC_DIR}/distrib/sets/lists/etc/mi | \
+ ${etcsets} | \
exclude ${rc_external_files})"
# obsolete rc file in /etc/rc.d
local rc_obsolete_files="$(${SED} -n \
-e '/obsolete/s@./etc/rc.d/\([^[:space:]]*\)[[:space:]].*@\1@p' \
- ${SRC_DIR}/distrib/sets/lists/etc/mi)"
+ ${etcsets})"
compare_dir "${op}" "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \
${rc_644_files}
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Thu Jun 13 00:24:43 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: handle $SOURCEMODE To generate a diff of this commit: cvs rdiff -u -r1.228 -r1.229 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src Committed By: kamil Date: Thu Jun 13 00:07:19 UTC 2019 Modified Files: src/sys/kern: kern_sig.c Log Message: Correct inversed condition for dying process in sigswitch() If a process is exiting and it was not asked to relock proc_lock, do not free the mutex as it causes panic. This bug is a timing bug as the faulty condition is not deterministic and fires only somtimes, but is quickly triggerable when executed in an infinite loop. Detected and reported with LLDB test-suite by To generate a diff of this commit: cvs rdiff -u -r1.359 -r1.360 src/sys/kern/kern_sig.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/kern
Module Name:src
Committed By: kamil
Date: Thu Jun 13 00:07:19 UTC 2019
Modified Files:
src/sys/kern: kern_sig.c
Log Message:
Correct inversed condition for dying process in sigswitch()
If a process is exiting and it was not asked to relock proc_lock, do not
free the mutex as it causes panic. This bug is a timing bug as the faulty
condition is not deterministic and fires only somtimes, but is quickly
triggerable when executed in an infinite loop.
Detected and reported with LLDB test-suite by
To generate a diff of this commit:
cvs rdiff -u -r1.359 -r1.360 src/sys/kern/kern_sig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_sig.c
diff -u src/sys/kern/kern_sig.c:1.359 src/sys/kern/kern_sig.c:1.360
--- src/sys/kern/kern_sig.c:1.359 Tue Jun 4 11:54:03 2019
+++ src/sys/kern/kern_sig.c Thu Jun 13 00:07:19 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_sig.c,v 1.359 2019/06/04 11:54:03 kamil Exp $ */
+/* $NetBSD: kern_sig.c,v 1.360 2019/06/13 00:07:19 kamil Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.359 2019/06/04 11:54:03 kamil Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_sig.c,v 1.360 2019/06/13 00:07:19 kamil Exp $");
#include "opt_ptrace.h"
#include "opt_dtrace.h"
@@ -1654,7 +1654,7 @@ sigswitch(int ppmask, int signo, bool re
*/
if (__predict_false(ISSET(p->p_sflag, PS_WEXIT))) {
mutex_exit(p->p_lock);
- if (relock) {
+ if (!relock) {
mutex_exit(proc_lock);
}
lwp_exit(l);
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Wed Jun 12 23:17:40 UTC 2019 Modified Files: src/sys/arch/amd64/conf: NOCOMPAT Log Message: Fix typo in comment (missing 'need') To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/NOCOMPAT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/conf
Module Name:src Committed By: pgoyette Date: Wed Jun 12 23:17:40 UTC 2019 Modified Files: src/sys/arch/amd64/conf: NOCOMPAT Log Message: Fix typo in comment (missing 'need') To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/amd64/conf/NOCOMPAT Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/NOCOMPAT diff -u src/sys/arch/amd64/conf/NOCOMPAT:1.2 src/sys/arch/amd64/conf/NOCOMPAT:1.3 --- src/sys/arch/amd64/conf/NOCOMPAT:1.2 Sun Jan 27 02:08:37 2019 +++ src/sys/arch/amd64/conf/NOCOMPAT Wed Jun 12 23:17:40 2019 @@ -1,6 +1,6 @@ include "arch/amd64/conf/GENERIC" -#ident "NOCOMPAT-$Revision: 1.2 $" +#ident "NOCOMPAT-$Revision: 1.3 $" no options SYSVMSG # System V-like message queues no options SYSVSEM # System V-like semaphores @@ -10,8 +10,8 @@ no options COMPAT_43 no options COMPAT_44 no options COMPAT_BSDPTY -# We only to use ``no options COMPAT_15'' because only COMPAT_15 is -# explicitly enabled. (The others are pulled in by statements in +# We only need to use ``no options COMPAT_15'' because only COMPAT_15 +# is explicitly enabled. (The others are pulled in by statements in # sys/conf/files) #no options COMPAT_09
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: jmcneill Date: Wed Jun 12 22:47:03 UTC 2019 Modified Files: src/sys/arch/arm/fdt: pcihost_fdt.c Log Message: Support configuring ranges where only prefetchable memory is defined To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/pcihost_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 22:47:03 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: pcihost_fdt.c
Log Message:
Support configuring ranges where only prefetchable memory is defined
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/fdt/pcihost_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.9 src/sys/arch/arm/fdt/pcihost_fdt.c:1.10
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.9 Wed Jun 12 10:13:44 2019
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Wed Jun 12 22:47:03 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.10 2019/06/12 22:47:03 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.10 2019/06/12 22:47:03 jmcneill Exp $");
#include
#include
@@ -347,6 +347,11 @@ pcihost_config(struct pcihost_softc *sc)
}
}
+ if (memext == NULL && pmemext != NULL) {
+ memext = pmemext;
+ pmemext = NULL;
+ }
+
error = pci_configure_bus(&sc->sc_pc, ioext, memext, pmemext, sc->sc_bus_min, PCIHOST_CACHELINE_SIZE);
if (ioext)
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Wed Jun 12 22:44:54 UTC 2019 Modified Files: src/sys/arch/arm/rockchip: rk3399_pcie.c Log Message: Use ranges from the device tree. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk3399_pcie.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/rockchip
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 22:44:54 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk3399_pcie.c
Log Message:
Use ranges from the device tree.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rk3399_pcie.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk3399_pcie.c
diff -u src/sys/arch/arm/rockchip/rk3399_pcie.c:1.2 src/sys/arch/arm/rockchip/rk3399_pcie.c:1.3
--- src/sys/arch/arm/rockchip/rk3399_pcie.c:1.2 Wed Jun 12 10:13:44 2019
+++ src/sys/arch/arm/rockchip/rk3399_pcie.c Wed Jun 12 22:44:53 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399_pcie.c,v 1.2 2019/06/12 10:13:44 jmcneill Exp $ */
+/* $NetBSD: rk3399_pcie.c,v 1.3 2019/06/12 22:44:53 jmcneill Exp $ */
/*
* Copyright (c) 2018 Mark Kettenis
*
@@ -17,7 +17,7 @@
#include
-__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.2 2019/06/12 10:13:44 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: rk3399_pcie.c,v 1.3 2019/06/12 22:44:53 jmcneill Exp $");
#include
#include
@@ -126,24 +126,11 @@ struct rkpcie_softc {
struct pcihost_softc sc_phsc;
bus_space_tag_t sc_iot;
bus_space_handle_t sc_ioh;
- bus_space_handle_t sc_bus_cfgh[32];
+ bus_space_handle_t sc_axi_ioh;
bus_addr_t sc_axi_addr;
bus_addr_t sc_apb_addr;
bus_size_t sc_axi_size;
bus_size_t sc_apb_size;
-
- struct extent *sc_regionex;
-};
-
-/*
- * XXX ignore DT ranges and use our own for now
- */
-static const uint32_t rk3399_pcie_bus_range[] = { 0, 3 };
-static const uint32_t rk3399_pcie_ranges[] = {
- 0xc300, 0x0, 0xf800, 0x0, 0xf800, 0x0, 0x200, /* 32M region 0, prefmem */
- 0x8200, 0x0, 0xfa00, 0x0, 0xfa00, 0x0, 0x1c0, /* 28M regions 1-28, mem */
- 0x8100, 0x0, 0x, 0x0, 0xfbc0, 0x0, 0x010, /* 1M region 29, i/o */
- 0x0001, 0x0, 0x, 0x0, 0xfbd0, 0x0, 0x030, /* 3M regions 30-32, config */
};
static int rkpcie_match(device_t, cfdata_t, void *);
@@ -225,7 +212,8 @@ rkpcie_attach(device_t parent, device_t
struct fdt_attach_args *faa = aux;
//struct pcibus_attach_args pba;
struct fdtbus_gpio_pin *ep_gpio;
- uint32_t bus_range[2];
+ const u_int *bus_range;
+ int len;
uint32_t status;
bool retry = false;
int timo;
@@ -247,8 +235,8 @@ rkpcie_attach(device_t parent, device_t
return;
}
- if (bus_space_map(sc->sc_iot, sc->sc_apb_addr,
- sc->sc_apb_size, 0, &sc->sc_ioh)) {
+ if (bus_space_map(sc->sc_iot, sc->sc_apb_addr, sc->sc_apb_size, 0, &sc->sc_ioh) != 0 ||
+ bus_space_map(sc->sc_iot, sc->sc_axi_addr, sc->sc_axi_size, 0, &sc->sc_axi_ioh) != 0) {
printf(": can't map registers\n");
sc->sc_axi_size = 0;
sc->sc_apb_size = 0;
@@ -420,37 +408,22 @@ again:
status |= __SHIFTIN(1, PCIE_DCSR_MAX_PAYLOAD);
HWRITE4(sc, PCIE_RC_CONFIG_DCSR, status);
- /* Create extents for our address space. */
- sc->sc_regionex = extent_create("rkpcie", sc->sc_axi_addr,
- sc->sc_axi_addr - 1 + 64 * 1048576, NULL, 0, EX_WAITOK);
- if (sc->sc_regionex == NULL) {
- aprint_error_dev(self, "extent_create failed\n");
- return;
+ /* Default bus ranges */
+ sc->sc_phsc.sc_bus_min = 0;
+ sc->sc_phsc.sc_bus_max = 31;
+
+ /* Override bus range from DT */
+ bus_range = fdtbus_get_prop(phandle, "bus-range", &len);
+ if (len == 8) {
+ sc->sc_phsc.sc_bus_min = be32dec(&bus_range[0]);
+ sc->sc_phsc.sc_bus_max = be32dec(&bus_range[1]);
}
- /* Set up bus range. */
-#if notyet
- if (OF_getpropintarray(phandle, "bus-range", bus_range,
- sizeof(bus_range)) != sizeof(bus_range) ||
- bus_range[0] >= 32 || bus_range[1] >= 32) {
- bus_range[0] = 0;
- bus_range[1] = 31;
- }
-#else
- bus_range[0] = rk3399_pcie_bus_range[0];
- bus_range[1] = rk3399_pcie_bus_range[1];
-#endif
- sc->sc_phsc.sc_bus_min = bus_range[0];
- sc->sc_phsc.sc_bus_max = bus_range[1];
-
if (sc->sc_phsc.sc_bus_min != 0) {
aprint_error_dev(self, "bus-range doesn't start at 0\n");
return;
}
- sc->sc_phsc.sc_pci_ranges = rk3399_pcie_ranges;
- sc->sc_phsc.sc_pci_ranges_cells = __arraycount(rk3399_pcie_ranges);
-
/* Configure Address Translation. */
rkpcie_atr_init(sc);
@@ -474,25 +447,28 @@ again:
static void
rkpcie_atr_init(struct rkpcie_softc *sc)
{
- struct extent * const ex = sc->sc_regionex;
+ const u_int *ranges;
bus_addr_t aaddr;
bus_addr_t addr;
bus_size_t size, offset;
uint32_t type;
- int region, i;
-
- /* get root bus's config space out of the APB space */
- bus_space_subregion(sc->sc_iot, sc->sc_ioh, PCIE_RC_NORMAL_BASE, PCI_EXTCONF_SIZE * 8, &sc->sc_bus_cfgh[0]);
+ int region, i, ranges_len;
- const uint32_t *ranges = sc->sc_phsc.sc_pci_ranges;
- const int ranges_cells = sc->sc_phsc.sc_pci_ranges_cells;
+ /* Use region 0 to map PCI configuration space */
+ HWRITE4(sc, PCIE_ATR_OB_ADDR0(0), 25 - 1);
+ HWRITE4(sc, PCIE_ATR_OB_ADDR1(0), 0);
+ HWRITE4(sc, PCIE_ATR_OB_DESC0(0),
+
CVS commit: src/sys/netipsec
Module Name:src Committed By: christos Date: Wed Jun 12 22:23:50 UTC 2019 Modified Files: src/sys/netipsec: ipsec.h keysock.c xform_ah.c xform_esp.c xform_ipcomp.c xform_ipip.c xform_tcp.c Log Message: make DPRINTF use varyadic cpp macros, and merge with IPSECLOG. To generate a diff of this commit: cvs rdiff -u -r1.87 -r1.88 src/sys/netipsec/ipsec.h cvs rdiff -u -r1.69 -r1.70 src/sys/netipsec/keysock.c cvs rdiff -u -r1.107 -r1.108 src/sys/netipsec/xform_ah.c cvs rdiff -u -r1.97 -r1.98 src/sys/netipsec/xform_esp.c cvs rdiff -u -r1.67 -r1.68 src/sys/netipsec/xform_ipcomp.c cvs rdiff -u -r1.75 -r1.76 src/sys/netipsec/xform_ipip.c cvs rdiff -u -r1.22 -r1.23 src/sys/netipsec/xform_tcp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netipsec
Module Name:src
Committed By: christos
Date: Wed Jun 12 22:23:50 UTC 2019
Modified Files:
src/sys/netipsec: ipsec.h keysock.c xform_ah.c xform_esp.c
xform_ipcomp.c xform_ipip.c xform_tcp.c
Log Message:
make DPRINTF use varyadic cpp macros, and merge with IPSECLOG.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/netipsec/ipsec.h
cvs rdiff -u -r1.69 -r1.70 src/sys/netipsec/keysock.c
cvs rdiff -u -r1.107 -r1.108 src/sys/netipsec/xform_ah.c
cvs rdiff -u -r1.97 -r1.98 src/sys/netipsec/xform_esp.c
cvs rdiff -u -r1.67 -r1.68 src/sys/netipsec/xform_ipcomp.c
cvs rdiff -u -r1.75 -r1.76 src/sys/netipsec/xform_ipip.c
cvs rdiff -u -r1.22 -r1.23 src/sys/netipsec/xform_tcp.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/netipsec/ipsec.h
diff -u src/sys/netipsec/ipsec.h:1.87 src/sys/netipsec/ipsec.h:1.88
--- src/sys/netipsec/ipsec.h:1.87 Wed Jan 16 21:47:15 2019
+++ src/sys/netipsec/ipsec.h Wed Jun 12 18:23:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: ipsec.h,v 1.87 2019/01/17 02:47:15 knakahara Exp $ */
+/* $NetBSD: ipsec.h,v 1.88 2019/06/12 22:23:50 christos Exp $ */
/* $FreeBSD: ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $ */
@@ -237,13 +237,17 @@ extern int crypto_support;
#include
-#define DPRINTF(x) do { if (ipsec_debug) printf x; } while (0)
+#define DPRINTF(fmt, args...) \
+ do {\
+ if (ipsec_debug) \
+ log(LOG_DEBUG, "%s: " fmt, __func__, ##args); \
+ } while (/*CONSTCOND*/0)
#define IPSECLOG(level, fmt, args...) \
do {\
if (ipsec_debug) \
log(level, "%s: " fmt, __func__, ##args); \
- } while (0)
+ } while (/*CONSTCOND*/0)
#define ipsec_indone(m) \
((m->m_flags & M_AUTHIPHDR) || (m->m_flags & M_DECRYPTED))
Index: src/sys/netipsec/keysock.c
diff -u src/sys/netipsec/keysock.c:1.69 src/sys/netipsec/keysock.c:1.70
--- src/sys/netipsec/keysock.c:1.69 Tue Feb 26 01:52:34 2019
+++ src/sys/netipsec/keysock.c Wed Jun 12 18:23:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: keysock.c,v 1.69 2019/02/26 06:52:34 maxv Exp $ */
+/* $NetBSD: keysock.c,v 1.70 2019/06/12 22:23:50 christos Exp $ */
/* $FreeBSD: keysock.c,v 1.3.2.1 2003/01/24 05:11:36 sam Exp $ */
/* $KAME: keysock.c,v 1.25 2001/08/13 20:07:41 itojun Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.69 2019/02/26 06:52:34 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: keysock.c,v 1.70 2019/06/12 22:23:50 christos Exp $");
/* This code has derived from sys/net/rtsock.c on FreeBSD2.2.5 */
@@ -437,7 +437,7 @@ key_accept(struct socket *so, struct soc
{
KASSERT(solocked(so));
- panic("key_accept");
+ panic("%s: unsupported", __func__);
return EOPNOTSUPP;
}
@@ -513,7 +513,7 @@ key_abort(struct socket *so)
{
KASSERT(solocked(so));
- panic("key_abort");
+ panic("%s: unsupported", __func__);
return EOPNOTSUPP;
}
@@ -612,7 +612,7 @@ static int
key_purgeif(struct socket *so, struct ifnet *ifa)
{
- panic("key_purgeif");
+ panic("%s: unsupported", __func__);
return EOPNOTSUPP;
}
Index: src/sys/netipsec/xform_ah.c
diff -u src/sys/netipsec/xform_ah.c:1.107 src/sys/netipsec/xform_ah.c:1.108
--- src/sys/netipsec/xform_ah.c:1.107 Sat Jan 26 21:08:48 2019
+++ src/sys/netipsec/xform_ah.c Wed Jun 12 18:23:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: xform_ah.c,v 1.107 2019/01/27 02:08:48 pgoyette Exp $ */
+/* $NetBSD: xform_ah.c,v 1.108 2019/06/12 22:23:50 christos Exp $ */
/* $FreeBSD: xform_ah.c,v 1.1.4.1 2003/01/24 05:11:36 sam Exp $ */
/* $OpenBSD: ip_ah.c,v 1.63 2001/06/26 06:18:58 angelos Exp $ */
/*
@@ -39,7 +39,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.107 2019/01/27 02:08:48 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: xform_ah.c,v 1.108 2019/06/12 22:23:50 christos Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -201,8 +201,8 @@ ah_init0(struct secasvar *sav, const str
thash = ah_algorithm_lookup(sav->alg_auth);
if (thash == NULL) {
- DPRINTF(("%s: unsupported authentication algorithm %u\n",
- __func__, sav->alg_auth));
+ DPRINTF("unsupported authentication algorithm %u\n",
+ sav->alg_auth);
return EINVAL;
}
/*
@@ -212,22 +212,22 @@ ah_init0(struct secasvar *sav, const str
*/
/* NB: replay state is setup elsewhere (sigh) */
if (((sav->flags&SADB_X_EXT_OLD) == 0) ^ (sav->replay != NULL)) {
- DPRINTF(("%s: replay state block inconsistency, "
- "%s algorithm %s replay state\n", __func__,
- (sav->flags & SADB_X_EXT_OLD) ? "old" : "new",
- sav->replay == NULL ? "without" : "with"));
+ DPRINTF("replay state block inconsistency, "
+ "%s algorithm %s replay state\n",
+ (sav->flags & SADB_X_EXT_OLD) ? "old" : "new",
+ sav->replay == NULL ? "without" : "with");
return EINVAL;
}
if (sav->key_auth == NULL) {
- DPRINTF(("%s: no authentication key for %s a
CVS commit: src/sys/netipsec
Module Name:src
Committed By: christos
Date: Wed Jun 12 22:23:07 UTC 2019
Modified Files:
src/sys/netipsec: key.c
Log Message:
fix typo in comment, improve error message, add default case handling to
set error.
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 src/sys/netipsec/key.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/netipsec/key.c
diff -u src/sys/netipsec/key.c:1.262 src/sys/netipsec/key.c:1.263
--- src/sys/netipsec/key.c:1.262 Tue Jun 11 21:32:30 2019
+++ src/sys/netipsec/key.c Wed Jun 12 18:23:06 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: key.c,v 1.262 2019/06/12 01:32:30 christos Exp $ */
+/* $NetBSD: key.c,v 1.263 2019/06/12 22:23:06 christos Exp $ */
/* $FreeBSD: key.c,v 1.3.2.3 2004/02/14 22:23:23 bms Exp $ */
/* $KAME: key.c,v 1.191 2001/06/27 10:46:49 sakane Exp $ */
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.262 2019/06/12 01:32:30 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: key.c,v 1.263 2019/06/12 22:23:06 christos Exp $");
/*
* This code is referred to RFC 2367
@@ -3276,7 +3276,7 @@ key_destroy_sah(struct secashead *sah)
* When SAD message type is GETSPI:
* to set sequence number from acq_seq++,
* to set zero to SPI.
- * not to call key_setsava().
+ * not to call key_setsaval().
* OUT: NULL : fail
* others : pointer to new secasvar.
*
@@ -3700,10 +3700,13 @@ key_setsaval(struct secasvar *sav, struc
case SADB_X_SATYPE_TCPSIGNATURE:
error = xform_init(sav, XF_TCPSIGNATURE);
break;
+ default:
+ error = EOPNOTSUPP;
+ break;
}
if (error) {
- IPSECLOG(LOG_DEBUG, "unable to initialize SA type %u.\n",
- mhp->msg->sadb_msg_satype);
+ IPSECLOG(LOG_DEBUG, "unable to initialize SA type %u (%d)\n",
+ mhp->msg->sadb_msg_satype, error);
goto fail;
}
CVS commit: src/sys/netipsec
Module Name:src Committed By: christos Date: Wed Jun 12 22:23:07 UTC 2019 Modified Files: src/sys/netipsec: key.c Log Message: fix typo in comment, improve error message, add default case handling to set error. To generate a diff of this commit: cvs rdiff -u -r1.262 -r1.263 src/sys/netipsec/key.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Wed Jun 12 21:08:33 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Add missing npf.boot.conf
To generate a diff of this commit:
cvs rdiff -u -r1.227 -r1.228 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.227 src/usr.sbin/postinstall/postinstall:1.228
--- src/usr.sbin/postinstall/postinstall:1.227 Wed Jun 12 13:45:23 2019
+++ src/usr.sbin/postinstall/postinstall Wed Jun 12 17:08:33 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.227 2019/06/12 17:45:23 christos Exp $
+# $NetBSD: postinstall,v 1.228 2019/06/12 21:08:33 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -874,8 +874,8 @@ do_defaults()
compare_dir "$op" "${SRC_DIR}/etc/defaults" "${DEST_DIR}/etc/defaults" \
444 \
- daily.conf monthly.conf pkgpath.conf security.conf \
- weekly.conf ${extra_scripts}
+ daily.conf monthly.conf npf.boot.conf pkgpath.conf \
+ security.conf weekly.conf ${extra_scripts}
failed=$(( ${failed} + $? ))
find_file_in_dirlist pf.boot.conf "pf.boot.conf" \
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Wed Jun 12 21:08:33 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Add missing npf.boot.conf To generate a diff of this commit: cvs rdiff -u -r1.227 -r1.228 src/usr.sbin/postinstall/postinstall 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/cortex
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 21:02:07 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3_its.c gicv3_its.h
Log Message:
Allow set_affinity calls before PEs are brought online. We store the
desired target PE if set_affinity is called early and restore the routes
when the PE comes alive.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/gicv3_its.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/cortex/gicv3_its.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3_its.c
diff -u src/sys/arch/arm/cortex/gicv3_its.c:1.11 src/sys/arch/arm/cortex/gicv3_its.c:1.12
--- src/sys/arch/arm/cortex/gicv3_its.c:1.11 Wed Jun 12 10:00:09 2019
+++ src/sys/arch/arm/cortex/gicv3_its.c Wed Jun 12 21:02:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.11 2019/06/12 10:00:09 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.12 2019/06/12 21:02:07 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.11 2019/06/12 10:00:09 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.12 2019/06/12 21:02:07 jmcneill Exp $");
#include
#include
@@ -260,11 +260,14 @@ static int
gicv3_its_msi_alloc_lpi(struct gicv3_its *its,
const struct pci_attach_args *pa)
{
+ struct pci_attach_args *new_pa;
int n;
for (n = 0; n < its->its_pic->pic_maxsources; n++) {
if (its->its_pa[n] == NULL) {
- its->its_pa[n] = pa;
+ new_pa = kmem_alloc(sizeof(*new_pa), KM_SLEEP);
+ memcpy(new_pa, pa, sizeof(*new_pa));
+ its->its_pa[n] = new_pa;
return n + its->its_pic->pic_irqbase;
}
}
@@ -275,8 +278,13 @@ gicv3_its_msi_alloc_lpi(struct gicv3_its
static void
gicv3_its_msi_free_lpi(struct gicv3_its *its, int lpi)
{
+ struct pci_attach_args *pa;
+
KASSERT(lpi >= its->its_pic->pic_irqbase);
+
+ pa = its->its_pa[lpi - its->its_pic->pic_irqbase];
its->its_pa[lpi - its->its_pic->pic_irqbase] = NULL;
+ kmem_free(pa, sizeof(*pa));
}
static uint32_t
@@ -702,7 +710,9 @@ gicv3_its_cpu_init(void *priv, struct cp
{
struct gicv3_its * const its = priv;
struct gicv3_softc * const sc = its->its_gic;
+ const struct pci_attach_args *pa;
uint64_t rdbase;
+ size_t irq;
const uint64_t typer = bus_space_read_8(sc->sc_bst, its->its_bsh, GITS_TYPER);
if (typer & GITS_TYPER_PTA) {
@@ -720,6 +730,20 @@ gicv3_its_cpu_init(void *priv, struct cp
gits_command_invall(its, cpu_index(ci));
gits_wait(its);
+ /*
+ * Update routing for LPIs targetting this CPU
+ */
+ for (irq = 0; irq < its->its_pic->pic_maxsources; irq++) {
+ if (its->its_targets[irq] != ci)
+ continue;
+ pa = its->its_pa[irq];
+ KASSERT(pa != NULL);
+
+ const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
+ gits_command_movi(its, devid, devid, cpu_index(ci));
+ gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
+ }
+
its->its_cpuonline[cpu_index(ci)] = true;
}
@@ -751,15 +775,14 @@ gicv3_its_set_affinity(void *priv, size_
return EINVAL;
ci = cpu_lookup(kcpuset_ffs(affinity) - 1);
- if (its->its_cpuonline[cpu_index(ci)] == false)
- return ENXIO;
-
- const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
- gits_command_movi(its, devid, devid, cpu_index(ci));
- gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
-
its->its_targets[irq] = ci;
+ if (its->its_cpuonline[cpu_index(ci)] == true) {
+ const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
+ gits_command_movi(its, devid, devid, cpu_index(ci));
+ gits_command_sync(its, its->its_rdbase[cpu_index(ci)]);
+ }
+
return 0;
}
Index: src/sys/arch/arm/cortex/gicv3_its.h
diff -u src/sys/arch/arm/cortex/gicv3_its.h:1.5 src/sys/arch/arm/cortex/gicv3_its.h:1.6
--- src/sys/arch/arm/cortex/gicv3_its.h:1.5 Wed Jun 12 10:00:09 2019
+++ src/sys/arch/arm/cortex/gicv3_its.h Wed Jun 12 21:02:07 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.h,v 1.5 2019/06/12 10:00:09 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.h,v 1.6 2019/06/12 21:02:07 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -59,7 +59,7 @@ struct gicv3_its {
struct gicv3_lpi_callback its_cb;
struct pic_softc *its_pic;
- const struct pci_attach_args **its_pa;
+ struct pci_attach_args **its_pa;
struct cpu_info **its_targets;
LIST_HEAD(, gicv3_its_device) its_devices;
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Wed Jun 12 21:02:07 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3_its.c gicv3_its.h Log Message: Allow set_affinity calls before PEs are brought online. We store the desired target PE if set_affinity is called early and restore the routes when the PE comes alive. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arm/cortex/gicv3_its.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/cortex/gicv3_its.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/postinstall
Module Name:src
Committed By: christos
Date: Wed Jun 12 17:45:24 UTC 2019
Modified Files:
src/usr.sbin/postinstall: postinstall
Log Message:
Remove hard-coded lists of rc files and generate them dynamically from the
sets. Fixes issues with automount, npf_boot etc. that were never updated here!
To generate a diff of this commit:
cvs rdiff -u -r1.226 -r1.227 src/usr.sbin/postinstall/postinstall
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.226 src/usr.sbin/postinstall/postinstall:1.227
--- src/usr.sbin/postinstall/postinstall:1.226 Sat May 11 15:31:03 2019
+++ src/usr.sbin/postinstall/postinstall Wed Jun 12 13:45:23 2019
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: postinstall,v 1.226 2019/05/11 19:31:03 maxv Exp $
+# $NetBSD: postinstall,v 1.227 2019/06/12 17:45:23 christos Exp $
#
# Copyright (c) 2002-2015 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -1367,157 +1367,6 @@ do_pwd_mkdb()
# rc
#
-# XXX Generate these from ../../distrib/sets/lists
-rc_644_files="
-rc
-rc.subr
-rc.shutdown
-"
-rc_555_files="
-DAEMON
-DISKS
-LOGIN
-NETWORKING
-SERVERS
-accounting
-altqd
-amd
-apmd
-bluetooth
-bootconf.sh
-bootparams
-ccd
-cgd
-cleartmp
-cron
-devpubd
-dhcpcd
-dhcpd
-dhcpd6
-dhcrelay
-dmesg
-downinterfaces
-envsys
-fsck
-fsck_root
-ftp_proxy
-ftpd
-gpio
-hostapd
-httpd
-identd
-ifwatchd
-inetd
-ip6addrctl
-ipfilter
-ipfs
-ipmon
-ipnat
-ipsec
-irdaattach
-iscsi_target
-iscsid
-isibootd
-kdc
-ldconfig
-ldpd
-local
-lpd
-lvm
-makemandb
-mdnsd
-mixerctl
-modules
-mopd
-motd
-mountall
-mountcritlocal
-mountcritremote
-mountd
-moused
-mrouted
-named
-ndbootd
-network
-newsyslog
-nfsd
-nfslocking
-npf
-npfd
-ntpd
-ntpdate
-perusertmp
-pf
-pf_boot
-pflogd
-postfix
-powerd
-ppp
-pwcheck
-quota
-racoon
-raidframe
-raidframeparity
-random_seed
-rarpd
-rbootd
-resize_root
-rndctl
-root
-route6d
-routed
-rpcbind
-rtadvd
-rtclocaltime
-rwho
-savecore
-screenblank
-securelevel
-smtoff
-sshd
-staticroute
-swap1
-swap2
-sysctl
-sysdb
-syslogd
-timed
-tpctl
-ttys
-veriexec
-virecover
-wdogctl
-wpa_supplicant
-wscons
-wsmoused
-ypbind
-yppasswdd
-ypserv
-"
-rc_obsolete_files="
-NETWORK
-btattach
-btconfig
-btcontrol
-btdevctl
-bthcid
-btuartd
-daemon
-fsck.sh
-gated
-isdnd
-kerberos
-login
-nfsiod
-poffd
-portmap
-rtsold
-sdpd
-servers
-sunndd
-systemfs
-xntpd
-"
rc_obsolete_vars="
amd amd_master
btcontrol btcontrol_devices
@@ -1551,21 +1400,46 @@ update_rc()
return $?
}
+exclude()
+{
+ eval ${GREP} -v -E "'($(echo $* | sed -e 's/ /|/'g))'"
+}
+
additem rc "/etc/rc* and /etc/rc.d/ being up to date"
do_rc()
{
[ -n "$1" ] || err 3 "USAGE: do_rc fix|check"
- op="$1"
- failed=0
- generated_scripts=""
+ local op="$1"
+ local failed=0
+ local generated_scripts=""
if [ "${MKX11}" != "no" ]; then
generated_scripts="${generated_scripts} xdm xfs"
fi
+ # Directories of external programs that have rc files (in bsd)
+ local rc_external_files="blacklist nsd unbound"
+
+ # rc* files in /etc/
+ local rc_444_files="$(${SED} -n -e /obsolete/d -e '/^\.\/etc\/rc\.d/d' \
+ -e '/^\.\/etc\/rc/s@./etc/\([^[:space:]]*\)[[:space:]].*@\1@p' \
+ ${SRC_DIR}/distrib/sets/lists/etc/mi)"
+
+ # no-obsolete rc files in /etc/rc.d
+ local rc_555_files="$(${SED} -n -e /obsolete/d \
+ -e 's@./etc/rc.d/\([^[:space:]]*\)[[:space:]].*@\1@p' \
+ ${SRC_DIR}/distrib/sets/lists/etc/mi | \
+ exclude ${rc_external_files})"
+
+ # obsolete rc file in /etc/rc.d
+ local rc_obsolete_files="$(${SED} -n \
+ -e '/obsolete/s@./etc/rc.d/\([^[:space:]]*\)[[:space:]].*@\1@p' \
+ ${SRC_DIR}/distrib/sets/lists/etc/mi)"
+
compare_dir "${op}" "${SRC_DIR}/etc" "${DEST_DIR}/etc" 644 \
${rc_644_files}
failed=$(( ${failed} + $? ))
+ local extra_scripts
if ! $SOURCEMODE; then
extra_scripts="${generated_scripts}"
else
@@ -1577,17 +1451,17 @@ do_rc()
${extra_scripts}
failed=$(( ${failed} + $? ))
- update_rc "${op}" "${dir}" blacklistd /sbin \
- "${SRC_DIR}/external/bsd/blacklist/etc/rc.d"
- failed=$(( ${failed} + $? ))
-
- update_rc "${op}" "${dir}" unbound /usr/sbin \
- "${SRC_DIR}/external/bsd/unbound/etc/rc.d"
- failed=$(( ${failed} + $? ))
-
- update_rc "${op}" "${dir}" nsd /usr/sbin \
- "${SRC_DIR}/external/bsd/nsd/etc/rc.d"
- failed=$(( ${failed} + $? ))
+ for i in ${rc_external_files}; do
+ local rc_file
+ case $i in
+ *d) rc_file=${i};;
+ *) rc_file=${i}d;;
+ esac
+
+ update_rc "${op}" "${dir}" ${rc_file} /sbin \
+ "${SRC_DIR}/external/bsd/$i/etc/rc.d"
+ failed=$(( ${failed} + $? ))
+ done
if $SOURCEMODE && [ -n "${generated_scripts}" ]; then
# generate scripts
@@ -1605,7 +1479,7 @@ do_rc()
# check for obsolete rc.d files
for f in ${rc_obsolete_files}; do
- fd="/etc/rc.d/${f}"
+ local fd="/etc/rc.d/${f}"
[ -e "${DEST_DIR}${fd}" ] && echo "${fd}"
CVS commit: src/usr.sbin/postinstall
Module Name:src Committed By: christos Date: Wed Jun 12 17:45:24 UTC 2019 Modified Files: src/usr.sbin/postinstall: postinstall Log Message: Remove hard-coded lists of rc files and generate them dynamically from the sets. Fixes issues with automount, npf_boot etc. that were never updated here! To generate a diff of this commit: cvs rdiff -u -r1.226 -r1.227 src/usr.sbin/postinstall/postinstall Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/sys
Module Name:src
Committed By: kamil
Date: Wed Jun 12 17:07:11 UTC 2019
Modified Files:
src/tests/lib/libc/sys: t_ptrace_wait.c
Log Message:
Add new ATF ptrace(2) tests for posix_spawn, reusing tests for fork/vfork
New tests:
- posix_spawn_detach_spawner
- posix_spawn_kill_spawner
- posix_spawn_singalmasked
- posix_spawn_singalignored
All test pass.
To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 src/tests/lib/libc/sys/t_ptrace_wait.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/lib/libc/sys/t_ptrace_wait.c
diff -u src/tests/lib/libc/sys/t_ptrace_wait.c:1.125 src/tests/lib/libc/sys/t_ptrace_wait.c:1.126
--- src/tests/lib/libc/sys/t_ptrace_wait.c:1.125 Tue Jun 11 23:30:05 2019
+++ src/tests/lib/libc/sys/t_ptrace_wait.c Wed Jun 12 17:07:11 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: t_ptrace_wait.c,v 1.125 2019/06/11 23:30:05 kamil Exp $ */
+/* $NetBSD: t_ptrace_wait.c,v 1.126 2019/06/12 17:07:11 kamil Exp $ */
/*-
* Copyright (c) 2016, 2017, 2018, 2019 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__RCSID("$NetBSD: t_ptrace_wait.c,v 1.125 2019/06/11 23:30:05 kamil Exp $");
+__RCSID("$NetBSD: t_ptrace_wait.c,v 1.126 2019/06/12 17:07:11 kamil Exp $");
#include
#include
@@ -3195,7 +3195,7 @@ ATF_TC_HEAD(name, tc) \
{ \
atf_tc_set_md_var(tc, "descr", "Verify " fun "() " \
"called with 0%s%s%s%s in EVENT_MASK", \
- tspawn ? "|PTRACE_FORK" : "",\
+ tspawn ? "|PTRACE_POSIX_SPAWN" : "", \
tfork ? "|PTRACE_FORK" : "",\
tvfork ? "|PTRACE_VFORK" : "",\
tvforkdone ? "|PTRACE_VFORK_DONE" : ""); \
@@ -3282,11 +3282,10 @@ FORK_TEST(posix_spawn16, "spawn", true,
#if defined(TWAIT_HAVE_PID)
static void
-fork_detach_forker_body(bool detachfork, bool detachvfork,
-bool detachvforkdone, bool kill_process)
+fork_detach_forker_body(const char *fn, bool kill_process)
{
const int exitval = 5;
- const int exitval2 = 15;
+ const int exitval2 = 0; /* Matches exit value from /bin/echo */
const int sigval = SIGSTOP;
pid_t child, child2 = 0, wpid;
#if defined(TWAIT_HAVE_STATUS)
@@ -3297,17 +3296,9 @@ fork_detach_forker_body(bool detachfork,
ptrace_event_t event;
const int elen = sizeof(event);
- pid_t (*fn)(void);
int op;
- ATF_REQUIRE((detachfork && !detachvfork && !detachvforkdone) ||
- (!detachfork && detachvfork && !detachvforkdone) ||
- (!detachfork && !detachvfork && detachvforkdone));
-
- if (detachfork)
- fn = fork;
- else
- fn = vfork;
+ char * const arg[] = { __UNCONST("/bin/echo"), NULL };
DPRINTF("Before forking process PID=%d\n", getpid());
SYSCALL_REQUIRE((child = fork()) != -1);
@@ -3318,10 +3309,19 @@ fork_detach_forker_body(bool detachfork,
DPRINTF("Before raising %s from child\n", strsignal(sigval));
FORKEE_ASSERT(raise(sigval) == 0);
- FORKEE_ASSERT((child2 = (fn)()) != -1);
+ if (strcmp(fn, "spawn") == 0) {
+ FORKEE_ASSERT_EQ(posix_spawn(&child2,
+ arg[0], NULL, NULL, arg, NULL), 0);
+ } else {
+ if (strcmp(fn, "fork") == 0) {
+FORKEE_ASSERT((child2 = fork()) != -1);
+ } else {
+FORKEE_ASSERT((child2 = vfork()) != -1);
+ }
- if (child2 == 0)
- _exit(exitval2);
+ if (child2 == 0)
+_exit(exitval2);
+ }
FORKEE_REQUIRE_SUCCESS
(wpid = TWAIT_GENERIC(child2, &status, 0), child2);
@@ -3339,7 +3339,8 @@ fork_detach_forker_body(bool detachfork,
validate_status_stopped(status, sigval);
DPRINTF("Set EVENT_MASK for the child %d\n", child);
- event.pe_set_event = PTRACE_FORK | PTRACE_VFORK | PTRACE_VFORK_DONE;
+ event.pe_set_event = PTRACE_POSIX_SPAWN | PTRACE_FORK | PTRACE_VFORK
+ | PTRACE_VFORK_DONE;
SYSCALL_REQUIRE(ptrace(PT_SET_EVENT_MASK, child, &event, elen) != -1);
DPRINTF("Before resuming the child process where it left off and "
@@ -3353,13 +3354,21 @@ fork_detach_forker_body(bool detachfork,
SYSCALL_REQUIRE(
ptrace(PT_GET_PROCESS_STATE, child, &state, slen) != -1);
- op = (fn == fork) ? PTRACE_FORK : PTRACE_VFORK;
+
+ if (strcmp(fn, "spawn") == 0)
+ op = PTRACE_POSIX_SPAWN;
+ else if (strcmp(fn, "fork") == 0)
+ op = PTRACE_FORK;
+ else
+ op = PTRACE_VFORK;
+
ATF_REQUIRE_EQ(state.pe_report_event & op, op);
child2 = state.pe_other_pid;
DPRINTF("Reported ptrace event with forkee %d\n", child2);
- if (detachfork || detachvfork)
+ if (strcmp(fn, "spawn") == 0 || strcmp(fn, "fork") == 0 ||
+ strcmp(fn, "vfork") == 0)
op = kill_process ? PT_KILL : PT_DETACH;
else
op = PT_CONTINUE;
@@ -3373,7 +3382,13 @@ fork_detach_forker_body(bool detachfork,
SYSCALL_REQUIRE(
ptrace(PT_GET_PROCESS_STATE, child2, &state, slen) != -1);
- op = (fn == fork) ? PTRACE_FORK : PTRACE_VFORK;
+ if (strcmp(fn, "spawn") == 0)
+ op = PTRACE_POSIX_SPAWN;
+ else if (strcmp(fn, "fork") == 0)
+ op = PTRACE_FORK;
+ else
+ op = PTRACE_VFORK;
+
ATF_R
CVS commit: src/tests/lib/libc/sys
Module Name:src Committed By: kamil Date: Wed Jun 12 17:07:11 UTC 2019 Modified Files: src/tests/lib/libc/sys: t_ptrace_wait.c Log Message: Add new ATF ptrace(2) tests for posix_spawn, reusing tests for fork/vfork New tests: - posix_spawn_detach_spawner - posix_spawn_kill_spawner - posix_spawn_singalmasked - posix_spawn_singalignored All test pass. To generate a diff of this commit: cvs rdiff -u -r1.125 -r1.126 src/tests/lib/libc/sys/t_ptrace_wait.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: maya Date: Wed Jun 12 17:04:35 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-elf.h Log Message: Remove unused macro To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: maya Date: Wed Jun 12 17:04:35 UTC 2019 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-elf.h Log Message: Remove unused macro To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 \ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.13 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.14 --- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h:1.13 Sat Jan 19 12:10:05 2019 +++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-elf.h Wed Jun 12 17:04:35 2019 @@ -170,9 +170,3 @@ while (0) #undef FPUTYPE_DEFAULT #define FPUTYPE_DEFAULT "vfp" - -/* Ensure that libgcc does not attempt to define __[CD]TOR_LIST__[] for APCS, - which belongs in crtbegin on NetBSD. */ -#ifndef __ARM_EABI__ -#define CTOR_LISTS_DEFINED_EXTERNALLY -#endif
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Jun 12 16:49:48 UTC 2019
Modified Files:
src/share/misc: acronyms.comp
Log Message:
APFS ASR CLI CLS VES XSLT
To generate a diff of this commit:
cvs rdiff -u -r1.264 -r1.265 src/share/misc/acronyms.comp
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms.comp
diff -u src/share/misc/acronyms.comp:1.264 src/share/misc/acronyms.comp:1.265
--- src/share/misc/acronyms.comp:1.264 Tue Jun 11 17:26:09 2019
+++ src/share/misc/acronyms.comp Wed Jun 12 16:49:48 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms.comp,v 1.264 2019/06/11 17:26:09 sevan Exp $
+$NetBSD: acronyms.comp,v 1.265 2019/06/12 16:49:48 sevan Exp $
3WHS three-way handshake
8VSB 8-state vestigial side band modulation
AA anti-aliasing
@@ -61,6 +61,7 @@ AOL Alert-on-LAN
AOS add or subtract
AP access point
AP application processor
+APFS Apple file system
API application programming interface
APEI ACPI platform error interface
APIC advanced programmable interrupt controller
@@ -97,6 +98,7 @@ ASP auxiliary storage pool
ASPM active state power management
ASQ automated software quality
ASR address space register
+ASR Apple software restore
AST abstract syntax tree
AST asynchronous system trap
AT access time
@@ -239,7 +241,9 @@ CISC complex instruction set {computer,c
CJK Chinese, Japanese, [and] Korean
CLF common log format
CLI command line interface
+CLI common language infrastructure
CLR common language runtime
+CLS common language specification
CLTT closed loop thermal throttling
CLUT color look-up table
CLV constant linear velocity
@@ -309,6 +313,7 @@ CTF compact c type format
CTM close to metal
CTR counter [mode]
CTS clear to send
+CTS common type system
CUA common user access
CUT coordinated universal time
CV control voltage
@@ -1601,6 +1606,7 @@ VCM virtual channel memory
VCO voltage-controlled oscillator
VCP virtual chassis port
VCS version control system
+VES virtual execution system
VESA Video Electronics Standards Association
VFO variable-frequency oscillator
VFS virtual file system
@@ -1681,6 +1687,7 @@ XOR exclusive or
XP extreme programming
XSI X/Open System Interface
XSL extensible stylesheet language
+XSLT extensible stylesheet language transformations
XSS cross site scripting
XT extended technology
XTI X/Open transport interface
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jun 12 16:49:48 UTC 2019 Modified Files: src/share/misc: acronyms.comp Log Message: APFS ASR CLI CLS VES XSLT To generate a diff of this commit: cvs rdiff -u -r1.264 -r1.265 src/share/misc/acronyms.comp Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/misc
Module Name:src
Committed By: sevan
Date: Wed Jun 12 16:49:10 UTC 2019
Modified Files:
src/share/misc: acronyms
Log Message:
FRAND RAND
To generate a diff of this commit:
cvs rdiff -u -r1.284 -r1.285 src/share/misc/acronyms
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/misc/acronyms
diff -u src/share/misc/acronyms:1.284 src/share/misc/acronyms:1.285
--- src/share/misc/acronyms:1.284 Fri Jun 7 13:37:35 2019
+++ src/share/misc/acronyms Wed Jun 12 16:49:10 2019
@@ -1,4 +1,4 @@
-$NetBSD: acronyms,v 1.284 2019/06/07 13:37:35 sevan Exp $
+$NetBSD: acronyms,v 1.285 2019/06/12 16:49:10 sevan Exp $
10Q thank you
10X thanks
1337 elite ("leet")
@@ -164,6 +164,7 @@ FNO from now on
FOC free of charge
FPS first person shooter
FPS frames per second
+FRAND fair, reasonable, and non-discriminatory
FSDO for some definition of
FSVO for some value of
FTBFS fails to build from source
@@ -461,6 +462,7 @@ PTV parental tunnel vision
QED quod erat demonstrandum
QFT quoted for truth
RA residential advisor
+RAND reasonable and non-discriminatory
RFC request for comments
RFD request for discussion
RFE request for enhancements
CVS commit: src/share/misc
Module Name:src Committed By: sevan Date: Wed Jun 12 16:49:10 UTC 2019 Modified Files: src/share/misc: acronyms Log Message: FRAND RAND To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/share/misc/acronyms Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net/npf
Module Name:src Committed By: christos Date: Wed Jun 12 14:36:32 UTC 2019 Modified Files: src/sys/net/npf: lpm.c lpm.h npf_tableset.c Log Message: Avoid LOCKDEBUG pserialize panic by implementing suggestion #1 from http://mail-index.netbsd.org/current-users/2019/02/24/msg035220.html: Convert the mutex to spin-lock at IPL_NET (but it is excessive) and convert the memory allocations in that code path to KM_NOSLEEP. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/net/npf/lpm.c cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/lpm.h cvs rdiff -u -r1.29 -r1.30 src/sys/net/npf/npf_tableset.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/net/npf
Module Name:src
Committed By: christos
Date: Wed Jun 12 14:36:32 UTC 2019
Modified Files:
src/sys/net/npf: lpm.c lpm.h npf_tableset.c
Log Message:
Avoid LOCKDEBUG pserialize panic by implementing suggestion #1 from
http://mail-index.netbsd.org/current-users/2019/02/24/msg035220.html:
Convert the mutex to spin-lock at IPL_NET (but it is excessive) and
convert the memory allocations in that code path to KM_NOSLEEP.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/net/npf/lpm.c
cvs rdiff -u -r1.2 -r1.3 src/sys/net/npf/lpm.h
cvs rdiff -u -r1.29 -r1.30 src/sys/net/npf/npf_tableset.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/lpm.c
diff -u src/sys/net/npf/lpm.c:1.5 src/sys/net/npf/lpm.c:1.6
--- src/sys/net/npf/lpm.c:1.5 Sat Sep 29 10:41:36 2018
+++ src/sys/net/npf/lpm.c Wed Jun 12 10:36:32 2019
@@ -38,7 +38,7 @@
#if defined(_KERNEL)
#include
-__KERNEL_RCSID(0, "$NetBSD: lpm.c,v 1.5 2018/09/29 14:41:36 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lpm.c,v 1.6 2019/06/12 14:36:32 christos Exp $");
#include
#include
@@ -90,6 +90,7 @@ typedef struct {
struct lpm {
uint32_t bitmask[LPM_MAX_WORDS];
+ int flags;
void * defvals[2];
lpm_hmap_t prefix[LPM_MAX_PREFIX + 1];
};
@@ -97,9 +98,11 @@ struct lpm {
static const uint32_t zero_address[LPM_MAX_WORDS];
lpm_t *
-lpm_create(void)
+lpm_create(int flags)
{
- return kmem_zalloc(sizeof(lpm_t), KM_SLEEP);
+ lpm_t *lpm = kmem_zalloc(sizeof(*lpm), KM_SLEEP);
+ lpm->flags = flags;
+ return lpm;
}
void
@@ -164,7 +167,7 @@ fnv1a_hash(const void *buf, size_t len)
}
static bool
-hashmap_rehash(lpm_hmap_t *hmap, unsigned size)
+hashmap_rehash(lpm_hmap_t *hmap, unsigned size, int flags)
{
lpm_ent_t **bucket;
unsigned hashsize;
@@ -172,7 +175,9 @@ hashmap_rehash(lpm_hmap_t *hmap, unsigne
for (hashsize = 1; hashsize < size; hashsize <<= 1) {
continue;
}
- bucket = kmem_zalloc(hashsize * sizeof(lpm_ent_t *), KM_SLEEP);
+ bucket = kmem_zalloc(hashsize * sizeof(lpm_ent_t *), flags);
+ if (bucket == NULL)
+ return false;
for (unsigned n = 0; n < hmap->hashsize; n++) {
lpm_ent_t *list = hmap->bucket[n];
@@ -194,14 +199,14 @@ hashmap_rehash(lpm_hmap_t *hmap, unsigne
}
static lpm_ent_t *
-hashmap_insert(lpm_hmap_t *hmap, const void *key, size_t len)
+hashmap_insert(lpm_hmap_t *hmap, const void *key, size_t len, int flags)
{
const unsigned target = hmap->nitems + LPM_HASH_STEP;
const size_t entlen = offsetof(lpm_ent_t, key[len]);
uint32_t hash, i;
lpm_ent_t *entry;
- if (hmap->hashsize < target && !hashmap_rehash(hmap, target)) {
+ if (hmap->hashsize < target && !hashmap_rehash(hmap, target, flags)) {
return NULL;
}
@@ -215,7 +220,7 @@ hashmap_insert(lpm_hmap_t *hmap, const v
entry = entry->next;
}
- if ((entry = kmem_alloc(entlen, KM_SLEEP)) != NULL) {
+ if ((entry = kmem_alloc(entlen, flags)) != NULL) {
memcpy(entry->key, key, len);
entry->next = hmap->bucket[i];
entry->len = len;
@@ -326,7 +331,7 @@ lpm_insert(lpm_t *lpm, const void *addr,
return 0;
}
compute_prefix(nwords, addr, preflen, prefix);
- entry = hashmap_insert(&lpm->prefix[preflen], prefix, len);
+ entry = hashmap_insert(&lpm->prefix[preflen], prefix, len, lpm->flags);
if (entry) {
const unsigned n = --preflen >> 5;
lpm->bitmask[n] |= 0x8000U >> (preflen & 31);
Index: src/sys/net/npf/lpm.h
diff -u src/sys/net/npf/lpm.h:1.2 src/sys/net/npf/lpm.h:1.3
--- src/sys/net/npf/lpm.h:1.2 Sat Sep 29 10:41:36 2018
+++ src/sys/net/npf/lpm.h Wed Jun 12 10:36:32 2019
@@ -32,7 +32,7 @@ __BEGIN_DECLS
typedef struct lpm lpm_t;
typedef void (*lpm_dtor_t)(void *, const void *, size_t, void *);
-lpm_t * lpm_create(void);
+lpm_t * lpm_create(int);
void lpm_destroy(lpm_t *);
void lpm_clear(lpm_t *, lpm_dtor_t, void *);
Index: src/sys/net/npf/npf_tableset.c
diff -u src/sys/net/npf/npf_tableset.c:1.29 src/sys/net/npf/npf_tableset.c:1.30
--- src/sys/net/npf/npf_tableset.c:1.29 Sat Jan 19 16:19:32 2019
+++ src/sys/net/npf/npf_tableset.c Wed Jun 12 10:36:32 2019
@@ -39,7 +39,7 @@
#ifdef _KERNEL
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.29 2019/01/19 21:19:32 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_tableset.c,v 1.30 2019/06/12 14:36:32 christos Exp $");
#include
#include
@@ -365,7 +365,7 @@ npf_table_create(const char *name, u_int
switch (type) {
case NPF_TABLE_LPM:
- t->t_lpm = lpm_create();
+ t->t_lpm = lpm_create(KM_NOSLEEP);
if (t->t_lpm == NULL) {
goto out;
}
@@ -398,7 +398,7 @@ npf_table_create(const char *name, u_int
default:
KASSERT(false);
}
- mutex_init(&t->t_lock, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(&t->t_lock, MUTEX_DEFAULT, IPL_NET);
t->t_type = type;
t->t_id = tid;
return t;
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: christos Date: Wed Jun 12 14:28:38 UTC 2019 Modified Files: src/sys/arch/amd64/amd64: machdep.c Log Message: Add missing address check. This broke things like: crash -w w /l ipsec_debug 1 with an invalid address, because it found the first readonly segment and returned EFAULT. I guess this never worked properly, but this got exposed when maxv made text and rodata actually R/O? To generate a diff of this commit: cvs rdiff -u -r1.331 -r1.332 src/sys/arch/amd64/amd64/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/amd64/amd64
Module Name:src
Committed By: christos
Date: Wed Jun 12 14:28:38 UTC 2019
Modified Files:
src/sys/arch/amd64/amd64: machdep.c
Log Message:
Add missing address check. This broke things like:
crash -w
w /l ipsec_debug 1
with an invalid address, because it found the first readonly segment and
returned EFAULT. I guess this never worked properly, but this got exposed
when maxv made text and rodata actually R/O?
To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 src/sys/arch/amd64/amd64/machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/amd64/machdep.c
diff -u src/sys/arch/amd64/amd64/machdep.c:1.331 src/sys/arch/amd64/amd64/machdep.c:1.332
--- src/sys/arch/amd64/amd64/machdep.c:1.331 Sun May 19 04:46:15 2019
+++ src/sys/arch/amd64/amd64/machdep.c Wed Jun 12 10:28:38 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.331 2019/05/19 08:46:15 maxv Exp $ */
+/* $NetBSD: machdep.c,v 1.332 2019/06/12 14:28:38 christos Exp $ */
/*
* Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011
@@ -110,7 +110,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.331 2019/05/19 08:46:15 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.332 2019/06/12 14:28:38 christos Exp $");
#include "opt_modular.h"
#include "opt_user_ldt.h"
@@ -2161,6 +2161,8 @@ mm_md_kernacc(void *ptr, vm_prot_t prot,
for (i = 0; i < BTSPACE_NSEGS; i++) {
kva = bootspace.segs[i].va;
kva_end = kva + bootspace.segs[i].sz;
+ if (v < kva || v >= kva_end)
+ continue;
*handled = true;
if (bootspace.segs[i].type == BTSEG_TEXT ||
bootspace.segs[i].type == BTSEG_RODATA) {
@@ -2180,8 +2182,9 @@ mm_md_kernacc(void *ptr, vm_prot_t prot,
if (v >= bootspace.smodule && v < bootspace.emodule) {
*handled = true;
- if (!uvm_map_checkprot(module_map, v, v + 1, prot))
+ if (!uvm_map_checkprot(module_map, v, v + 1, prot)) {
return EFAULT;
+ }
} else {
*handled = false;
}
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Wed Jun 12 13:53:25 UTC 2019 Modified Files: src/share/man/man9: audio.9 Log Message: Remove superfluous Pp. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/share/man/man9/audio.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/audio.9 diff -u src/share/man/man9/audio.9:1.55 src/share/man/man9/audio.9:1.56 --- src/share/man/man9/audio.9:1.55 Wed Jun 12 13:14:31 2019 +++ src/share/man/man9/audio.9 Wed Jun 12 13:53:25 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.9,v 1.55 2019/06/12 13:14:31 isaki Exp $ +.\" $NetBSD: audio.9,v 1.56 2019/06/12 13:53:25 wiz Exp $ .\" .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -514,7 +514,6 @@ Don't set it if the device is unidirecti is handled in the upper layer, so new drivers should not return this property. .El It is called in the Attach phase. -.Pp .It Dv int trigger_output(void *hdl, void *start, void *end, .Dv "int blksize, void (*intr)(void*), void *intrarg," .Pp
CVS commit: src/sys/dev/audio
Module Name:src
Committed By: isaki
Date: Wed Jun 12 13:53:25 UTC 2019
Modified Files:
src/sys/dev/audio: audio.c
Log Message:
Fill silence if the last block of the first track is not filled.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/dev/audio/audio.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/audio/audio.c
diff -u src/sys/dev/audio/audio.c:1.16 src/sys/dev/audio/audio.c:1.17
--- src/sys/dev/audio/audio.c:1.16 Mon Jun 10 13:49:39 2019
+++ src/sys/dev/audio/audio.c Wed Jun 12 13:53:25 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: audio.c,v 1.16 2019/06/10 13:49:39 isaki Exp $ */
+/* $NetBSD: audio.c,v 1.17 2019/06/12 13:53:25 isaki Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -142,7 +142,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.16 2019/06/10 13:49:39 isaki Exp $");
+__KERNEL_RCSID(0, "$NetBSD: audio.c,v 1.17 2019/06/12 13:53:25 isaki Exp $");
#ifdef _KERNEL_OPT
#include "audio.h"
@@ -5140,6 +5140,9 @@ audio_pmixer_mix_track(audio_trackmixer_
*d++ = ((aint2_t)*s++);
}
}
+ /* Fill silence if the first track is not filled. */
+ for (; i < mixer->frames_per_block * mixer->mixfmt.channels; i++)
+ *d++ = 0;
} else {
/* If this is the second or later, add it. */
#if defined(AUDIO_SUPPORT_TRACK_VOLUME)
CVS commit: src/share/man/man9
Module Name:src Committed By: wiz Date: Wed Jun 12 13:53:25 UTC 2019 Modified Files: src/share/man/man9: audio.9 Log Message: Remove superfluous Pp. To generate a diff of this commit: cvs rdiff -u -r1.55 -r1.56 src/share/man/man9/audio.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/audio
Module Name:src Committed By: isaki Date: Wed Jun 12 13:53:25 UTC 2019 Modified Files: src/sys/dev/audio: audio.c Log Message: Fill silence if the last block of the first track is not filled. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/audio/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man9
Module Name:src Committed By: isaki Date: Wed Jun 12 13:14:32 UTC 2019 Modified Files: src/share/man/man9: audio.9 Log Message: Describe about get_props() properties. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/share/man/man9/audio.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/audio.9 diff -u src/share/man/man9/audio.9:1.54 src/share/man/man9/audio.9:1.55 --- src/share/man/man9/audio.9:1.54 Thu May 9 09:35:18 2019 +++ src/share/man/man9/audio.9 Wed Jun 12 13:14:31 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: audio.9,v 1.54 2019/05/09 09:35:18 wiz Exp $ +.\" $NetBSD: audio.9,v 1.55 2019/06/12 13:14:31 isaki Exp $ .\" .\" Copyright (c) 1999, 2000 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -496,12 +496,25 @@ which the hardware driver can then chang E.g., DMA on the ISA bus cannot exceed 65536 bytes. It is called in the Attached or Closed phases. .It Dv int get_props(void *hdl) -Should return the device properties; i.e., a combination of -AUDIO_PROP_xxx. -It is called at any time. +Should return the device properties in a combination of following flags: +.Pp +.Bl -tag -width AUDIO_PROP_INDEPENDENT -compact +.It Dv AUDIO_PROP_PLAYBACK +the device is capable of audio playback. +.It Dv AUDIO_PROP_CAPTURE +the device is capable of audio capture. +.It Dv AUDIO_PROP_FULLDUPLEX +the device admits full duplex operation. +Don't set it if the device is unidirectional. +.It Dv AUDIO_PROP_INDEPENDENT +the device can set the playing and recording encoding parameters +independently. +Don't set it if the device is unidirectional. +.It Dv AUDIO_PROP_MMAP +is handled in the upper layer, so new drivers should not return this property. +.El +It is called in the Attach phase. .Pp -.Dv AUDIO_PROP_MMAP -is acceptable but obsolete, so new drivers should not return this property. .It Dv int trigger_output(void *hdl, void *start, void *end, .Dv "int blksize, void (*intr)(void*), void *intrarg," .Pp
CVS commit: src/share/man/man9
Module Name:src Committed By: isaki Date: Wed Jun 12 13:14:32 UTC 2019 Modified Files: src/share/man/man9: audio.9 Log Message: Describe about get_props() properties. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.55 src/share/man/man9/audio.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Jun 12 12:33:42 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Jun 12 12:33:42 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/lib/libc/sys/ptrace.2 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/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.73 src/lib/libc/sys/ptrace.2:1.74 --- src/lib/libc/sys/ptrace.2:1.73 Wed Jun 12 12:30:42 2019 +++ src/lib/libc/sys/ptrace.2 Wed Jun 12 12:33:42 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptrace.2,v 1.73 2019/06/12 12:30:42 kamil Exp $ +.\" $NetBSD: ptrace.2,v 1.74 2019/06/12 12:33:42 wiz Exp $ .\" .\" This file is in the public domain. .Dd June 12, 2019 @@ -492,7 +492,7 @@ event can be used to report unblocking o .Fn posix_spawn on .Nx -directly creates the child process without intermediant fork. +directly creates the child process without intermediate fork. The .Dv PTRACE_POSIX_SPAWN event semantics are the same as
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Wed Jun 12 12:32:54 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/posix_spawn.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: wiz Date: Wed Jun 12 12:32:54 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libc/gen/posix_spawn.3 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/gen/posix_spawn.3 diff -u src/lib/libc/gen/posix_spawn.3:1.10 src/lib/libc/gen/posix_spawn.3:1.11 --- src/lib/libc/gen/posix_spawn.3:1.10 Wed Jun 12 12:26:24 2019 +++ src/lib/libc/gen/posix_spawn.3 Wed Jun 12 12:32:54 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: posix_spawn.3,v 1.10 2019/06/12 12:26:24 kamil Exp $ +.\" $NetBSD: posix_spawn.3,v 1.11 2019/06/12 12:32:54 wiz Exp $ .\" .\" Copyright (c) 2008 Ed Schouten .\" All rights reserved. @@ -318,7 +318,7 @@ callbacks. .Fn posix_spawn on .Nx -directly creates the child process without intermediant fork. +directly creates the child process without intermediate fork. .Sh RETURN VALUES Upon successful completion, .Fn posix_spawn
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Wed Jun 12 12:30:42 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Try to make posix_spawn(3) note in ptrace(2) less confusing To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/lib/libc/sys/ptrace.2 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/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.72 src/lib/libc/sys/ptrace.2:1.73 --- src/lib/libc/sys/ptrace.2:1.72 Wed Jun 12 10:09:26 2019 +++ src/lib/libc/sys/ptrace.2 Wed Jun 12 12:30:42 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptrace.2,v 1.72 2019/06/12 10:09:26 wiz Exp $ +.\" $NetBSD: ptrace.2,v 1.73 2019/06/12 12:30:42 kamil Exp $ .\" .\" This file is in the public domain. .Dd June 12, 2019 @@ -489,20 +489,15 @@ The .Dv PTRACE_VFORK_DONE event can be used to report unblocking of the parent. .Pp -The -.Xr posix_spawn 3 -operation implements -.Xr vfork 2 -and -.Xr exec 3 -as a single syscall in the kernel. +.Fn posix_spawn +on +.Nx +directly creates the child process without intermediant fork. The .Dv PTRACE_POSIX_SPAWN event semantics are the same as .Dv PTRACE_FORK , -but the child is reported with implied -.Xr exec 3 -operation. +but the child is reported with implied execution of a file. .Pp A pointer to this structure is passed in .Fa addr .
CVS commit: src/lib/libc/sys
Module Name:src Committed By: kamil Date: Wed Jun 12 12:30:42 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Try to make posix_spawn(3) note in ptrace(2) less confusing To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/lib/libc/sys/ptrace.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kamil Date: Wed Jun 12 12:26:24 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Rephrase sentence about vfork+exec in posix_spawn(3) Try to make it less confusing. Requested by To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/posix_spawn.3 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/gen/posix_spawn.3 diff -u src/lib/libc/gen/posix_spawn.3:1.9 src/lib/libc/gen/posix_spawn.3:1.10 --- src/lib/libc/gen/posix_spawn.3:1.9 Wed Jun 12 00:05:48 2019 +++ src/lib/libc/gen/posix_spawn.3 Wed Jun 12 12:26:24 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: posix_spawn.3,v 1.9 2019/06/12 00:05:48 kamil Exp $ +.\" $NetBSD: posix_spawn.3,v 1.10 2019/06/12 12:26:24 kamil Exp $ .\" .\" Copyright (c) 2008 Ed Schouten .\" All rights reserved. @@ -315,11 +315,10 @@ had been called by the child process to This implementation does not run .Xr pthread_atfork 3 callbacks. -The -.Xr vfork 2 -and -.Xr exec 3 -operations are implemented as a single syscall. +.Fn posix_spawn +on +.Nx +directly creates the child process without intermediant fork. .Sh RETURN VALUES Upon successful completion, .Fn posix_spawn
CVS commit: src/lib/libc/gen
Module Name:src Committed By: kamil Date: Wed Jun 12 12:26:24 UTC 2019 Modified Files: src/lib/libc/gen: posix_spawn.3 Log Message: Rephrase sentence about vfork+exec in posix_spawn(3) Try to make it less confusing. Requested by To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/lib/libc/gen/posix_spawn.3 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
Module Name:src
Committed By: martin
Date: Wed Jun 12 11:35:41 UTC 2019
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h
src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c
hvkbdvar.h
Log Message:
Missing files from commit for ticket #1280:
sys/arch/x86/x86/hypervvar.h: revision 1.1
sys/dev/hyperv/genfb_vmbus.c: revision 1.1
sys/dev/hyperv/genfb_vmbusvar.h: revision 1.1
sys/dev/hyperv/hvkbd.c: revision 1.1
sys/dev/hyperv/hvkbdvar.h: revision 1.1
Added drivers for Hyper-V Synthetic Keyboard and Video device.
Avoid undefined reference to `hyperv_guid_video' without vmbus(4).
Avoid undefined reference to `hyperv_is_gen1' without hyperv(4).
Use efi_probe().
To generate a diff of this commit:
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/arch/x86/x86/hypervvar.h
cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/dev/hyperv/genfb_vmbus.c \
src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c \
src/sys/dev/hyperv/hvkbdvar.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/x86/x86/hypervvar.h
diff -u src/sys/arch/x86/x86/hypervvar.h:1.1.4.2 src/sys/arch/x86/x86/hypervvar.h:1.1.4.3
--- src/sys/arch/x86/x86/hypervvar.h:1.1.4.2 Wed Jun 12 10:17:32 2019
+++ src/sys/arch/x86/x86/hypervvar.h Wed Jun 12 11:35:40 2019
@@ -1,4 +1,41 @@
-/* $NetBSD: hypervvar.h,v 1.1.4.2 2019/06/12 10:17:32 martin Exp $ */
+/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
+
+/*-
+ * Copyright (c) 2009-2012,2016 Microsoft Corp.
+ * Copyright (c) 2012 NetApp Inc.
+ * Copyright (c) 2012 Citrix 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 unmodified, this list of conditions, and the following
+ *disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef _X86_HYPERVVAR_H_
+#define _X86_HYPERVVAR_H_
+
+void hyperv_early_init(void);
+device_t device_hyperv_register(device_t, void *);
+
+#endif /* _X86_HYPERVVAR_H_ */
+/* $NetBSD: hypervvar.h,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
/*-
* Copyright (c) 2009-2012,2016 Microsoft Corp.
Index: src/sys/dev/hyperv/genfb_vmbus.c
diff -u src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.2 src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.3
--- src/sys/dev/hyperv/genfb_vmbus.c:1.1.4.2 Wed Jun 12 10:17:32 2019
+++ src/sys/dev/hyperv/genfb_vmbus.c Wed Jun 12 11:35:40 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: genfb_vmbus.c,v 1.1.4.2 2019/06/12 10:17:32 martin Exp $ */
+/* $NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $ */
/*-
* Copyright (c) 2007 Michael Lorenz
@@ -27,7 +27,165 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.1.4.2 2019/06/12 10:17:32 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: genfb_vmbus.c,v 1.1.4.3 2019/06/12 11:35:40 martin Exp $");
+
+#include "opt_wsfb.h"
+#include "opt_genfb.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+
+static int genfb_vmbus_match(device_t, cfdata_t, void *);
+static void genfb_vmbus_attach(device_t, device_t, void *);
+static int genfb_vmbus_ioctl(void *, void *, u_long, void *, int,
+ struct lwp *);
+static paddr_t genfb_vmbus_mmap(void *, void *, off_t, int);
+static int genfb_vmbus_drm_print(void *, const char *);
+static bool genfb_vmbus_shutdown(device_t, int);
+
+CFATTACH_DECL_NEW(genfb_vmbus, sizeof(struct genfb_vmbus_softc),
+genfb_vmbus_match, genfb_vmbus_attach, NULL, NULL);
+
+static int
+genfb_vmbus_match(device_t parent, cfdata_t match, void *aux)
+{
+ struct vmbus_attach_args *aa = aux;
+
+ if (memcmp(aa->aa_type, &hyperv_guid_video, sizeof(*aa->aa_type)) != 0)
+ return 0;
+
+ if (!genfb_is_enabled())
+ return 0; /* explicitly di
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: mrg Date: Wed Jun 12 11:35:18 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: revert rev 1.4: >Adjust priority mappings, NFCI it has some unintended change that makes nvme hangy. ok @jmcneill. To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/cortex/gicv3.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
Module Name:src Committed By: martin Date: Wed Jun 12 11:35:41 UTC 2019 Modified Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c hvkbdvar.h Log Message: Missing files from commit for ticket #1280: sys/arch/x86/x86/hypervvar.h: revision 1.1 sys/dev/hyperv/genfb_vmbus.c: revision 1.1 sys/dev/hyperv/genfb_vmbusvar.h: revision 1.1 sys/dev/hyperv/hvkbd.c: revision 1.1 sys/dev/hyperv/hvkbdvar.h: revision 1.1 Added drivers for Hyper-V Synthetic Keyboard and Video device. Avoid undefined reference to `hyperv_guid_video' without vmbus(4). Avoid undefined reference to `hyperv_is_gen1' without hyperv(4). Use efi_probe(). To generate a diff of this commit: cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/arch/x86/x86/hypervvar.h cvs rdiff -u -r1.1.4.2 -r1.1.4.3 src/sys/dev/hyperv/genfb_vmbus.c \ src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c \ src/sys/dev/hyperv/hvkbdvar.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/arm/cortex
Module Name:src
Committed By: mrg
Date: Wed Jun 12 11:35:18 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
revert rev 1.4:
>Adjust priority mappings, NFCI
it has some unintended change that makes nvme hangy. ok @jmcneill.
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.16 src/sys/arch/arm/cortex/gicv3.c:1.17
--- src/sys/arch/arm/cortex/gicv3.c:1.16 Wed Jun 12 10:27:59 2019
+++ src/sys/arch/arm/cortex/gicv3.c Wed Jun 12 11:35:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.17 2019/06/12 11:35:17 mrg Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.17 2019/06/12 11:35:17 mrg Exp $");
#include
#include
@@ -155,7 +155,7 @@ gicv3_establish_irq(struct pic_softc *pi
uint64_t irouter;
u_int n;
- const u_int ipriority_val = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1);
+ const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl);
const u_int ipriority_shift = (is->is_irq & 0x3) * 8;
const u_int icfg_shift = (is->is_irq & 0xf) * 2;
@@ -206,7 +206,7 @@ gicv3_establish_irq(struct pic_softc *pi
static void
gicv3_set_priority(struct pic_softc *pic, int ipl)
{
- icc_pmr_write(IPL_TO_PRIORITY(ipl));
+ icc_pmr_write(IPL_TO_PRIORITY(ipl) << 1);
}
static void
@@ -271,7 +271,7 @@ gicv3_redist_enable(struct gicv3_softc *
if (is == NULL)
priority |= 0xff << byte_shift;
else {
-const u_int ipriority_val = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1);
+const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl);
priority |= ipriority_val << byte_shift;
}
}
@@ -545,7 +545,7 @@ gicv3_lpi_establish_irq(struct pic_softc
{
struct gicv3_softc * const sc = LPITOSOFTC(pic);
- sc->sc_lpiconf.base[is->is_irq] = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1) | GIC_LPICONF_Res1;
+ sc->sc_lpiconf.base[is->is_irq] = 0x80 | IPL_TO_PRIORITY(is->is_ipl) | GIC_LPICONF_Res1;
bus_dmamap_sync(sc->sc_dmat, sc->sc_lpiconf.map, is->is_irq, 1, BUS_DMASYNC_PREWRITE);
}
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Wed Jun 12 10:40:13 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1280 and #1281 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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-8] src/doc
Module Name:src Committed By: martin Date: Wed Jun 12 10:40:13 UTC 2019 Modified Files: src/doc [netbsd-8]: CHANGES-8.2 Log Message: Tickets #1280 and #1281 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 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.2 src/doc/CHANGES-8.2:1.1.2.3 --- src/doc/CHANGES-8.2:1.1.2.2 Sun Jun 2 08:30:16 2019 +++ src/doc/CHANGES-8.2 Wed Jun 12 10:40:13 2019 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.2,v 1.1.2.2 2019/06/02 08:30:16 martin Exp $ +# $NetBSD: CHANGES-8.2,v 1.1.2.3 2019/06/12 10:40:13 martin Exp $ A complete list of changes from the NetBSD 8.1 release to the NetBSD 8.2 release: @@ -14,3 +14,58 @@ sys/arch/x86/x86/spectre.c 1.29 Fix boot on old CPUs. [maxv, ticket #1279] +sys/arch/amd64/conf/GENERIC 1.528 +sys/arch/i386/conf/GENERIC 1.1207 +sys/arch/x86/include/autoconf.h 1.6 +sys/arch/x86/pci/pci_machdep.c 1.86 +sys/arch/x86/x86/consinit.c 1.29 +sys/arch/x86/x86/hyperv.c 1.2-1.4 +sys/arch/x86/x86/hypervvar.h 1.1 +sys/arch/x86/x86/identcpu.c 1.91 +sys/arch/x86/x86/x86_autoconf.c 1.78 +sys/arch/xen/x86/autoconf.c 1.23 +sys/dev/acpi/vmbus_acpi.c 1.2 +sys/dev/hyperv/files.hyperv 1.2 +sys/dev/hyperv/genfb_vmbus.c 1.1 +sys/dev/hyperv/genfb_vmbusvar.h 1.1 +sys/dev/hyperv/hvkbd.c1.1 +sys/dev/hyperv/hvkbdvar.h 1.1 +sys/dev/hyperv/hyperv_common.c 1.2 +sys/dev/hyperv/hypervvar.h 1.2 +sys/dev/hyperv/vmbus.c1.3 +sys/dev/hyperv/vmbusvar.h 1.2 +sys/dev/wscons/wsconsio.h 1.123 + + Add Hyper-V Gen.2 VM framebuffer console support. + [nonaka, ticket #1280] + +libexec/httpd/CHANGES1.31-1.40 +libexec/httpd/Makefile1.28 +libexec/httpd/auth-bozo.c 1.23-1.24 +libexec/httpd/bozohttpd.8 1.75-1.79 +libexec/httpd/bozohttpd.c 1.100-1.113 +libexec/httpd/bozohttpd.h 1.58-1.60 +libexec/httpd/cgi-bozo.c 1.46-1.48 +libexec/httpd/daemon-bozo.c 1.20-1.21 +libexec/httpd/dir-index-bozo.c 1.29-1.32 +libexec/httpd/ssl-bozo.c 1.26 +libexec/httpd/testsuite/Makefile 1.12-1.13 +libexec/httpd/testsuite/t11.out 1.2 +libexec/httpd/testsuite/test-bigfile 1.6 +libexec/httpd/testsuite/test-simple 1.6 + + Don't display special files in the directory index. + Use html tables for directory index. + Don't include "index.html" in html headers. + Fix CGI '+' param and error handling. + Remove unused parameter to daemon_poll_err(). + Avoid sign extension in % handling + Fix a few problems pointed out by clang static analyzer. + Add ssl specific timeout value (30s).--- + Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing). + Avoid .htpasswd exposure to authenticated users when .htpasswd is + in the slashdir too. + Avoid possible NULL dereference when sending a big request that timeout. + Avoid an assertion failure when using cgihandler (-C option). + [mrg, ticket #1281} +
CVS commit: [netbsd-8] src/libexec/httpd
Module Name:src Committed By: martin Date: Wed Jun 12 10:32:00 UTC 2019 Modified Files: src/libexec/httpd [netbsd-8]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-8]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1281: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/libexec/httpd/CHANGES cvs rdiff -u -r1.27 -r1.27.2.1 src/libexec/httpd/Makefile cvs rdiff -u -r1.18.8.1 -r1.18.8.2 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.65.4.1 -r1.65.4.2 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.86.4.3 -r1.86.4.4 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.47.4.2 -r1.47.4.3 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.37.4.3 -r1.37.4.4 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.17.8.1 -r1.17.8.2 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.22.8.1 -r1.22.8.2 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1 -r1.1.20.1 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/libexec/httpd/testsuite/test-simple Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/libexec/httpd/CHANGES diff -u src/libexec/httpd/CHANGES:1.25.4.2 src/libexec/httpd/CHANGES:1.25.4.3 --- src/libexec/httpd/CHANGES:1.25.4.2 Wed Nov 28 19:50:37 2018 +++ src/libexec/httpd/CHANGES Wed Jun 12 10:32:00 2019 @@ -1,4 +1,24 @@ -$NetBSD: CHANGES,v 1.25.4.2 2018/11/28 19:50:37 martin Exp $ +$NetBSD: CHANGES,v 1.25.4.3 2019/06/12 10:32:00 martin Exp $ + +changes in bozohttpd 20190228: + o extend timeout facility to ssl and stop servers hanging forever + if the client never sends anything. reported by Steffen in netbsd + PR#50655. + o don't display special files in the directory index. they aren't + served, but links to them are generated. + o fix CGI '+' parameter handling, some error checking, and a double + free. from rajeev_v_pil...@yahoo.com + o more directory indexing clean up. from rajeev_v_pil...@yahoo.com + +changes in bozohttpd 20181215: + o fix .htpasswd bypass for authenticated users. reported by JP, + from l...@netbsd.org + o avoid possible null dereference when receiving a big request that + timeout. reported by m...@netbsd.org, from l...@netbsd.org
CVS commit: [netbsd-8] src/libexec/httpd
Module Name:src Committed By: martin Date: Wed Jun 12 10:32:00 UTC 2019 Modified Files: src/libexec/httpd [netbsd-8]: CHANGES Makefile auth-bozo.c bozohttpd.8 bozohttpd.c bozohttpd.h cgi-bozo.c daemon-bozo.c dir-index-bozo.c ssl-bozo.c src/libexec/httpd/testsuite [netbsd-8]: Makefile t11.out test-bigfile test-simple Log Message: Pull up the following revisions (via patch) requested by mrg in ticket #1281: libexec/httpd/CHANGES 1.31-1.40 libexec/httpd/Makefile 1.28 libexec/httpd/auth-bozo.c 1.23-1.24 libexec/httpd/bozohttpd.8 1.75-1.79 libexec/httpd/bozohttpd.c 1.100-1.113 libexec/httpd/bozohttpd.h 1.58-1.60 libexec/httpd/cgi-bozo.c1.46-1.48 libexec/httpd/daemon-bozo.c 1.20-1.21 libexec/httpd/dir-index-bozo.c 1.29-1.32 libexec/httpd/ssl-bozo.c1.26 libexec/httpd/testsuite/Makefile1.12-1.13 libexec/httpd/testsuite/t11.out 1.2 libexec/httpd/testsuite/test-bigfile1.6 libexec/httpd/testsuite/test-simple 1.6 Don't display special files in the directory index. They aren't served, but links to them are generated. --- All from "Rajeev V. Pillai" : - use html tables for directory index. - don't include "index.html" in html headers - additional escaping of names - re-add top/bottom borders - adds an aquamarine table header - Zebra-stripes table rows using CSS instead of code - fix CGI '+' param and error handling. - remove unused parameter to daemon_poll_err(). - avoid sign extension in % handling fix a few problems pointed out by clang static analyzer: - bozostrnsep() may return with "in = NULL", so check for it. - nul terminating in bozo_escape_rfc3986() can be simpler - don't use uniinit variables in check_remap() - don't use re-used freed data in check_virtual(). - fix bozoprefs->size setting when increasing the size (new total was being added to the prior total.) however, bozostrdup() may reference request->hr_file. --- Add ssl specific timeout value (30s). If SSL_accept() doesn't work with in this timeout value, ssl setup now fails. --- Fix handling of bozo_set_timeout() timeouts (and `-T' option parsing) --- Avoid .htpasswd exposure to authenticated users when .htpasswd is in the slashdir too. --- Avoid possible NULL dereference when sending a big request that timeout. --- Use strings.h for strcasecmp (on linux) --- Account for cgihandler being set when counting the number of CGI environment headers we are about to set. Avoids an assertion failure (and overruninng the array) later. To generate a diff of this commit: cvs rdiff -u -r1.25.4.2 -r1.25.4.3 src/libexec/httpd/CHANGES cvs rdiff -u -r1.27 -r1.27.2.1 src/libexec/httpd/Makefile cvs rdiff -u -r1.18.8.1 -r1.18.8.2 src/libexec/httpd/auth-bozo.c cvs rdiff -u -r1.65.4.1 -r1.65.4.2 src/libexec/httpd/bozohttpd.8 cvs rdiff -u -r1.86.4.3 -r1.86.4.4 src/libexec/httpd/bozohttpd.c cvs rdiff -u -r1.47.4.2 -r1.47.4.3 src/libexec/httpd/bozohttpd.h cvs rdiff -u -r1.37.4.3 -r1.37.4.4 src/libexec/httpd/cgi-bozo.c cvs rdiff -u -r1.17.8.1 -r1.17.8.2 src/libexec/httpd/daemon-bozo.c cvs rdiff -u -r1.25.8.1 -r1.25.8.2 src/libexec/httpd/dir-index-bozo.c cvs rdiff -u -r1.22.8.1 -r1.22.8.2 src/libexec/httpd/ssl-bozo.c cvs rdiff -u -r1.7.4.1 -r1.7.4.2 src/libexec/httpd/testsuite/Makefile cvs rdiff -u -r1.1 -r1.1.20.1 src/libexec/httpd/testsuite/t11.out cvs rdiff -u -r1.4.4.1 -r1.4.4.2 src/libexec/httpd/testsuite/test-bigfile cvs rdiff -u -r1.4.10.1 -r1.4.10.2 src/libexec/httpd/testsuite/test-simple 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/cortex
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 10:27:59 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
Revert "Route all interrupts to the primary PE by default"
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.15 src/sys/arch/arm/cortex/gicv3.c:1.16
--- src/sys/arch/arm/cortex/gicv3.c:1.15 Wed Jun 12 10:03:28 2019
+++ src/sys/arch/arm/cortex/gicv3.c Wed Jun 12 10:27:59 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.16 2019/06/12 10:27:59 jmcneill Exp $");
#include
#include
@@ -178,7 +178,6 @@ gicv3_establish_irq(struct pic_softc *pi
gicr_write_4(sc, n, GICR_IPRIORITYRn(is->is_irq / 4), ipriority);
}
} else {
-#if notyet
if (is->is_mpsafe) {
/* Route MP-safe interrupts to all participating PEs */
irouter = GICD_IROUTER_Interrupt_Routing_mode;
@@ -186,10 +185,6 @@ gicv3_establish_irq(struct pic_softc *pi
/* Route non-MP-safe interrupts to the primary PE only */
irouter = sc->sc_irouter[0];
}
-#else
- /* Route interrupts to the primary PE by default */
- irouter = sc->sc_irouter[0];
-#endif
gicd_write_8(sc, GICD_IROUTER(is->is_irq), irouter);
/* Update interrupt configuration */
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:27:59 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Revert "Route all interrupts to the primary PE by default" To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/cortex/gicv3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src Committed By: skrll Date: Wed Jun 12 10:19:27 UTC 2019 Modified Files: src/sys/arch/arm/fdt: plmmc_fdt.c Log Message: Print interrupt details To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/plmmc_fdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/fdt
Module Name:src
Committed By: skrll
Date: Wed Jun 12 10:19:27 UTC 2019
Modified Files:
src/sys/arch/arm/fdt: plmmc_fdt.c
Log Message:
Print interrupt details
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/plmmc_fdt.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/fdt/plmmc_fdt.c
diff -u src/sys/arch/arm/fdt/plmmc_fdt.c:1.1 src/sys/arch/arm/fdt/plmmc_fdt.c:1.2
--- src/sys/arch/arm/fdt/plmmc_fdt.c:1.1 Fri Jun 2 11:04:01 2017
+++ src/sys/arch/arm/fdt/plmmc_fdt.c Wed Jun 12 10:19:27 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: plmmc_fdt.c,v 1.1 2017/06/02 11:04:01 jmcneill Exp $ */
+/* $NetBSD: plmmc_fdt.c,v 1.2 2019/06/12 10:19:27 skrll Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: plmmc_fdt.c,v 1.1 2017/06/02 11:04:01 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: plmmc_fdt.c,v 1.2 2019/06/12 10:19:27 skrll Exp $");
#include
#include
@@ -87,6 +87,12 @@ plmmc_fdt_attach(device_t parent, device
return;
}
+ char intrstr[128];
+ if (!fdtbus_intr_str(phandle, 0, intrstr, sizeof(intrstr))) {
+ aprint_error(": failed to decode interrupt\n");
+ return;
+ }
+
sc->sc_dev = self;
sc->sc_clock_freq = clk_get_rate(clk);
of_getprop_uint32(phandle, "max-frequency", &sc->sc_max_freq);
@@ -104,6 +110,7 @@ plmmc_fdt_attach(device_t parent, device
aprint_error_dev(self, "couldn't install interrupt handler\n");
return;
}
+ aprint_normal_dev(self, "interrupting on %s\n", intrstr);
plmmc_init(sc);
}
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Wed Jun 12 10:17:33 UTC 2019 Modified Files: src/sys/arch/amd64/conf [netbsd-8]: GENERIC src/sys/arch/i386/conf [netbsd-8]: GENERIC src/sys/arch/x86/include [netbsd-8]: autoconf.h src/sys/arch/x86/pci [netbsd-8]: pci_machdep.c src/sys/arch/x86/x86 [netbsd-8]: consinit.c hyperv.c identcpu.c x86_autoconf.c src/sys/arch/xen/x86 [netbsd-8]: autoconf.c src/sys/dev/acpi [netbsd-8]: vmbus_acpi.c src/sys/dev/hyperv [netbsd-8]: files.hyperv hyperv_common.c hypervvar.h vmbus.c vmbusvar.h src/sys/dev/wscons [netbsd-8]: wsconsio.h Added Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c hvkbdvar.h Log Message: Pull up following revision(s) (requested by nonaka in ticket #1280): sys/arch/x86/x86/consinit.c: revision 1.29 sys/dev/hyperv/vmbusvar.h: revision 1.2 sys/dev/hyperv/genfb_vmbusvar.h: revision 1.1 sys/arch/x86/x86/x86_autoconf.c: revision 1.78 sys/arch/x86/x86/identcpu.c: revision 1.91 sys/arch/x86/x86/hyperv.c: revision 1.2 sys/arch/x86/x86/hyperv.c: revision 1.3 sys/arch/x86/x86/hyperv.c: revision 1.4 sys/arch/i386/conf/GENERIC: revision 1.1207 sys/dev/wscons/wsconsio.h: revision 1.123 sys/arch/x86/x86/hypervvar.h: revision 1.1 sys/arch/amd64/conf/GENERIC: revision 1.528 sys/dev/hyperv/files.hyperv: revision 1.2 sys/arch/x86/include/autoconf.h: revision 1.6 sys/dev/hyperv/hyperv_common.c: revision 1.2 sys/arch/xen/x86/autoconf.c: revision 1.23 sys/arch/x86/pci/pci_machdep.c: revision 1.86 sys/dev/hyperv/hvkbd.c: revision 1.1 sys/dev/hyperv/hypervvar.h: revision 1.2 sys/dev/acpi/vmbus_acpi.c: revision 1.2 sys/dev/hyperv/vmbus.c: revision 1.3 sys/dev/hyperv/hvkbdvar.h: revision 1.1 sys/dev/hyperv/genfb_vmbus.c: revision 1.1 Added drivers for Hyper-V Synthetic Keyboard and Video device. Avoid undefined reference to `hyperv_guid_video' without vmbus(4). Avoid undefined reference to `hyperv_is_gen1' without hyperv(4). Use efi_probe(). To generate a diff of this commit: cvs rdiff -u -r1.459.2.14 -r1.459.2.15 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1156.2.14 -r1.1156.2.15 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/include/autoconf.h cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sys/arch/x86/pci/pci_machdep.c cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/x86/x86/consinit.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/x86/x86/hyperv.c cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/x86/x86/hypervvar.h cvs rdiff -u -r1.55.2.6 -r1.55.2.7 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/x86/x86/x86_autoconf.c cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/xen/x86/autoconf.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/acpi/vmbus_acpi.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/hyperv/files.hyperv \ src/sys/dev/hyperv/hyperv_common.c src/sys/dev/hyperv/hypervvar.h \ src/sys/dev/hyperv/vmbusvar.h cvs rdiff -u -r0 -r1.1.4.2 src/sys/dev/hyperv/genfb_vmbus.c \ src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c \ src/sys/dev/hyperv/hvkbdvar.h cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/hyperv/vmbus.c cvs rdiff -u -r1.118 -r1.118.2.1 src/sys/dev/wscons/wsconsio.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
Module Name:src Committed By: martin Date: Wed Jun 12 10:17:33 UTC 2019 Modified Files: src/sys/arch/amd64/conf [netbsd-8]: GENERIC src/sys/arch/i386/conf [netbsd-8]: GENERIC src/sys/arch/x86/include [netbsd-8]: autoconf.h src/sys/arch/x86/pci [netbsd-8]: pci_machdep.c src/sys/arch/x86/x86 [netbsd-8]: consinit.c hyperv.c identcpu.c x86_autoconf.c src/sys/arch/xen/x86 [netbsd-8]: autoconf.c src/sys/dev/acpi [netbsd-8]: vmbus_acpi.c src/sys/dev/hyperv [netbsd-8]: files.hyperv hyperv_common.c hypervvar.h vmbus.c vmbusvar.h src/sys/dev/wscons [netbsd-8]: wsconsio.h Added Files: src/sys/arch/x86/x86 [netbsd-8]: hypervvar.h src/sys/dev/hyperv [netbsd-8]: genfb_vmbus.c genfb_vmbusvar.h hvkbd.c hvkbdvar.h Log Message: Pull up following revision(s) (requested by nonaka in ticket #1280): sys/arch/x86/x86/consinit.c: revision 1.29 sys/dev/hyperv/vmbusvar.h: revision 1.2 sys/dev/hyperv/genfb_vmbusvar.h: revision 1.1 sys/arch/x86/x86/x86_autoconf.c: revision 1.78 sys/arch/x86/x86/identcpu.c: revision 1.91 sys/arch/x86/x86/hyperv.c: revision 1.2 sys/arch/x86/x86/hyperv.c: revision 1.3 sys/arch/x86/x86/hyperv.c: revision 1.4 sys/arch/i386/conf/GENERIC: revision 1.1207 sys/dev/wscons/wsconsio.h: revision 1.123 sys/arch/x86/x86/hypervvar.h: revision 1.1 sys/arch/amd64/conf/GENERIC: revision 1.528 sys/dev/hyperv/files.hyperv: revision 1.2 sys/arch/x86/include/autoconf.h: revision 1.6 sys/dev/hyperv/hyperv_common.c: revision 1.2 sys/arch/xen/x86/autoconf.c: revision 1.23 sys/arch/x86/pci/pci_machdep.c: revision 1.86 sys/dev/hyperv/hvkbd.c: revision 1.1 sys/dev/hyperv/hypervvar.h: revision 1.2 sys/dev/acpi/vmbus_acpi.c: revision 1.2 sys/dev/hyperv/vmbus.c: revision 1.3 sys/dev/hyperv/hvkbdvar.h: revision 1.1 sys/dev/hyperv/genfb_vmbus.c: revision 1.1 Added drivers for Hyper-V Synthetic Keyboard and Video device. Avoid undefined reference to `hyperv_guid_video' without vmbus(4). Avoid undefined reference to `hyperv_is_gen1' without hyperv(4). Use efi_probe(). To generate a diff of this commit: cvs rdiff -u -r1.459.2.14 -r1.459.2.15 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.1156.2.14 -r1.1156.2.15 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.4 -r1.4.8.1 src/sys/arch/x86/include/autoconf.h cvs rdiff -u -r1.79.2.1 -r1.79.2.2 src/sys/arch/x86/pci/pci_machdep.c cvs rdiff -u -r1.28 -r1.28.10.1 src/sys/arch/x86/x86/consinit.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/arch/x86/x86/hyperv.c cvs rdiff -u -r0 -r1.1.4.2 src/sys/arch/x86/x86/hypervvar.h cvs rdiff -u -r1.55.2.6 -r1.55.2.7 src/sys/arch/x86/x86/identcpu.c cvs rdiff -u -r1.75 -r1.75.8.1 src/sys/arch/x86/x86/x86_autoconf.c cvs rdiff -u -r1.18.2.1 -r1.18.2.2 src/sys/arch/xen/x86/autoconf.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/acpi/vmbus_acpi.c cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/hyperv/files.hyperv \ src/sys/dev/hyperv/hyperv_common.c src/sys/dev/hyperv/hypervvar.h \ src/sys/dev/hyperv/vmbusvar.h cvs rdiff -u -r0 -r1.1.4.2 src/sys/dev/hyperv/genfb_vmbus.c \ src/sys/dev/hyperv/genfb_vmbusvar.h src/sys/dev/hyperv/hvkbd.c \ src/sys/dev/hyperv/hvkbdvar.h cvs rdiff -u -r1.2.2.2 -r1.2.2.3 src/sys/dev/hyperv/vmbus.c cvs rdiff -u -r1.118 -r1.118.2.1 src/sys/dev/wscons/wsconsio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/amd64/conf/GENERIC diff -u src/sys/arch/amd64/conf/GENERIC:1.459.2.14 src/sys/arch/amd64/conf/GENERIC:1.459.2.15 --- src/sys/arch/amd64/conf/GENERIC:1.459.2.14 Sat Mar 9 17:10:20 2019 +++ src/sys/arch/amd64/conf/GENERIC Wed Jun 12 10:17:33 2019 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.459.2.14 2019/03/09 17:10:20 martin Exp $ +# $NetBSD: GENERIC,v 1.459.2.15 2019/06/12 10:17:33 martin Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/amd64/conf/std.amd64" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.459.2.14 $" +#ident "GENERIC-$Revision: 1.459.2.15 $" maxusers 64 # estimated number of users @@ -1059,6 +1059,9 @@ vioscsi* at virtio? # Virtio SCSI devi # Hyper-V devices vmbus* at acpi? # Hyper-V VMBus +genfb* at vmbus? # Hyper-V Synthetic Video Framebuffer +hvkbd* at vmbus? # Hyper-V Synthetic Keyboard +wskbd* at hvkbd? console ? mux 1 hvn* at vmbus? # Hyper-V NetVSC hvs* at vmbus? # Hyper-V StorVSC hvheartbeat* at vmbus? # Hyper-V Heartbeat Service Index: src/sys/arch/i386/conf/GENERIC diff -u src/sys/arch/i386/conf/GENERIC:1.1156.2.14 src/sys/arch/i386/conf/GENERIC:1.1156.2.15 --- src/sys/arch/i386/conf/GENERIC:1.1156.2.14 Sat Mar 9 17:10:20 2019 +++ src/sys/arch/i386/conf/GENERIC
CVS commit: src/sys/dev/ic
Module Name:src Committed By: skrll Date: Wed Jun 12 10:16:52 UTC 2019 Modified Files: src/sys/dev/ic: pl181.c Log Message: Trailing whitespace To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/pl181.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: skrll
Date: Wed Jun 12 10:16:52 UTC 2019
Modified Files:
src/sys/dev/ic: pl181.c
Log Message:
Trailing whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/ic/pl181.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/pl181.c
diff -u src/sys/dev/ic/pl181.c:1.6 src/sys/dev/ic/pl181.c:1.7
--- src/sys/dev/ic/pl181.c:1.6 Mon Sep 3 16:29:31 2018
+++ src/sys/dev/ic/pl181.c Wed Jun 12 10:16:52 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pl181.c,v 1.6 2018/09/03 16:29:31 riastradh Exp $ */
+/* $NetBSD: pl181.c,v 1.7 2019/06/12 10:16:52 skrll Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.6 2018/09/03 16:29:31 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pl181.c,v 1.7 2019/06/12 10:16:52 skrll Exp $");
#include
#include
@@ -290,7 +290,7 @@ plmmc_pio_transfer(struct plmmc_softc *s
return error;
}
-
+
static int
plmmc_host_reset(sdmmc_chipset_handle_t sch)
{
CVS commit: src/sys/arch/arm
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:13:45 UTC 2019 Modified Files: src/sys/arch/arm/dts: rk3399-rockpro64.dts src/sys/arch/arm/fdt: pcihost_fdt.c pcihost_fdtvar.h src/sys/arch/arm/rockchip: rk3399_pcie.c Log Message: Enable RK3399 PCIe. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/rk3399-rockpro64.dts cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/fdt/pcihost_fdt.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/pcihost_fdtvar.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk3399_pcie.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/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:14:05 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add rkpcie, rkpciephy To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:14:05 UTC 2019 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add rkpcie, rkpciephy To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.96 src/sys/arch/evbarm/conf/GENERIC64:1.97 --- src/sys/arch/evbarm/conf/GENERIC64:1.96 Thu Jun 6 22:41:02 2019 +++ src/sys/arch/evbarm/conf/GENERIC64 Wed Jun 12 10:14:05 2019 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.96 2019/06/06 22:41:02 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.97 2019/06/12 10:14:05 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -272,6 +272,8 @@ tegra210xphy* at tegra210xpad? # PCIE pcihost* at fdt? # Generic PCI host controller acpipchb* at acpi? # ACPI PCIe host bridge +rkpcie* at fdt? # Rockchip AXI PCIE +rkpciephy* at fdt? pass 9 # Rockchip AXI PCIE PHY tegrapcie0 at fdt? # NVIDIA Tegra PCIE pci* at pcibus? ppb* at pci? dev ? function ?
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 10:13:45 UTC 2019
Modified Files:
src/sys/arch/arm/dts: rk3399-rockpro64.dts
src/sys/arch/arm/fdt: pcihost_fdt.c pcihost_fdtvar.h
src/sys/arch/arm/rockchip: rk3399_pcie.c
Log Message:
Enable RK3399 PCIe.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/dts/rk3399-rockpro64.dts
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/fdt/pcihost_fdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/fdt/pcihost_fdtvar.h
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/rockchip/rk3399_pcie.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/dts/rk3399-rockpro64.dts
diff -u src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.5 src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.6
--- src/sys/arch/arm/dts/rk3399-rockpro64.dts:1.5 Wed May 1 10:43:55 2019
+++ src/sys/arch/arm/dts/rk3399-rockpro64.dts Wed Jun 12 10:13:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk3399-rockpro64.dts,v 1.5 2019/05/01 10:43:55 jmcneill Exp $ */
+/* $NetBSD: rk3399-rockpro64.dts,v 1.6 2019/06/12 10:13:44 jmcneill Exp $ */
/*-
* Copyright (c) 2019 Jared McNeill
@@ -35,8 +35,50 @@
pwms = <&pwm1 0 4 0>;
cooling-levels = <0 150 195 240>;
};
+
+ vcc3v3_pcie: vcc3v3-pcie-regulator {
+ compatible = "regulator-fixed";
+ regulator-min-microvolt = <330>;
+ regulator-max-microvolt = <330>;
+ enable-active-high;
+ gpio = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie_pwr_en>;
+ regulator-name = "vcc3v3_pcie";
+ };
+};
+
+&pinctrl {
+ pcie {
+ pcie_pwr_en: pcie-pwr-en {
+ rockchip,pins =
+<1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
+
+ pcie_clkreqn: pci-clkreqn {
+ rockchip,pins =
+<2 RK_PD2 RK_FUNC_2 &pcfg_pull_none>;
+ };
+ };
};
&pwm1 {
status = "okay";
};
+
+&pcie_phy {
+ status = "okay";
+};
+
+&pcie0 {
+ assigned-clocks = <&cru SCLK_PCIEPHY_REF>;
+ assigned-clock-parents = <&cru SCLK_PCIEPHY_REF100M>;
+ assigned-clock-rates = <1>;
+
+ ep-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>;
+ num-lanes = <4>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pcie_clkreqn>;
+ vpcie3v3-supply = <&vcc3v3_pcie>;
+ status = "okay";
+};
Index: src/sys/arch/arm/fdt/pcihost_fdt.c
diff -u src/sys/arch/arm/fdt/pcihost_fdt.c:1.8 src/sys/arch/arm/fdt/pcihost_fdt.c:1.9
--- src/sys/arch/arm/fdt/pcihost_fdt.c:1.8 Thu Feb 28 00:47:10 2019
+++ src/sys/arch/arm/fdt/pcihost_fdt.c Wed Jun 12 10:13:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: pcihost_fdt.c,v 1.8 2019/02/28 00:47:10 jakllsch Exp $ */
+/* $NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared D. McNeill
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.8 2019/02/28 00:47:10 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pcihost_fdt.c,v 1.9 2019/06/12 10:13:44 jmcneill Exp $");
#include
#include
@@ -136,6 +136,13 @@ pcihost_attach(device_t parent, device_t
}
sc->sc_type = of_search_compatible(sc->sc_phandle, compat_data)->data;
+#ifdef __HAVE_PCI_MSI_MSIX
+ if (sc->sc_type == PCIHOST_ECAM) {
+ sc->sc_pci_flags |= PCI_FLAGS_MSI_OKAY;
+ sc->sc_pci_flags |= PCI_FLAGS_MSIX_OKAY;
+ }
+#endif
+
aprint_naive("\n");
aprint_normal(": Generic PCI host controller\n");
@@ -178,14 +185,7 @@ pcihost_init2(struct pcihost_softc *sc)
pba.pba_flags = PCI_FLAGS_MRL_OKAY |
PCI_FLAGS_MRM_OKAY |
PCI_FLAGS_MWI_OKAY |
- PCI_FLAGS_IO_OKAY |
- PCI_FLAGS_MEM_OKAY;
-#ifdef __HAVE_PCI_MSI_MSIX
- if (sc->sc_type == PCIHOST_ECAM) {
- pba.pba_flags |= PCI_FLAGS_MSI_OKAY |
- PCI_FLAGS_MSIX_OKAY;
- }
-#endif
+ sc->sc_pci_flags;
pba.pba_iot = &sc->sc_io.bst;
pba.pba_memt = &sc->sc_mem.bst;
pba.pba_dmat = sc->sc_dmat;
@@ -228,6 +228,7 @@ pcihost_config(struct pcihost_softc *sc)
const u_int *ranges;
u_int probe_only;
int error, len;
+ bool swap;
struct pcih_bus_space * const pibs = &sc->sc_io;
pibs->bst = *sc->sc_bst;
@@ -249,10 +250,17 @@ pcihost_config(struct pcihost_softc *sc)
if (probe_only)
return 0;
- ranges = fdtbus_get_prop(sc->sc_phandle, "ranges", &len);
- if (ranges == NULL) {
- aprint_error_dev(sc->sc_dev, "missing 'ranges' property\n");
- return EINVAL;
+ if (sc->sc_pci_ranges != NULL) {
+ ranges = sc->sc_pci_ranges;
+ len = sc->sc_pci_ranges_cells * 4;
+ swap = false;
+ } else {
+ ranges = fdtbus_get_prop(sc->sc_phandle, "ranges", &len);
+ if (ranges == NULL) {
+ aprint_error_dev(sc->sc_dev, "missing 'ranges' property\n");
+ return EINVAL;
+ }
+ swap = true;
}
/*
@@ -263,10 +271,14 @@ pcihost_config(struct pcihost_softc *sc)
* Total size for each entry is 28 bytes (7 cells).
*/
while (len >= 28) {
- const uint32_t phys_hi = be32dec(&ranges[0]);
- const uint64_t bus_phys = be64dec(&ranges[1]);
- const uint64_t cpu_phys = be64dec(&ranges[3]);
- const uint64_t size = be64dec(&ranges[5]);
+#d
re: CVS commit: src
> Log Message: > move creds_msdos.8 into the normal place and install it. > > To generate a diff of this commit: > cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/wizd.8 oops - this wasn't meant to be part of the same commit, but all it does is add "Leaves laptop at home sometimes." to the BUGS, so i'll just leave it as is :-) .mrg.
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Jun 12 10:09:26 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Use Xr. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/lib/libc/sys/ptrace.2 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/sys/ptrace.2 diff -u src/lib/libc/sys/ptrace.2:1.71 src/lib/libc/sys/ptrace.2:1.72 --- src/lib/libc/sys/ptrace.2:1.71 Tue Jun 11 23:27:46 2019 +++ src/lib/libc/sys/ptrace.2 Wed Jun 12 10:09:26 2019 @@ -1,4 +1,4 @@ -.\" $NetBSD: ptrace.2,v 1.71 2019/06/11 23:27:46 kamil Exp $ +.\" $NetBSD: ptrace.2,v 1.72 2019/06/12 10:09:26 wiz Exp $ .\" .\" This file is in the public domain. .Dd June 12, 2019 @@ -459,7 +459,8 @@ Report thread birth. .It PTRACE_LWP_EXIT Report thread termination. .It PTRACE_POSIX_SPAWN -Report posix_spawn(3). +Report +.Xr posix_spawn 3 . .El .Pp The
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Wed Jun 12 10:09:26 UTC 2019 Modified Files: src/lib/libc/sys: ptrace.2 Log Message: Use Xr. To generate a diff of this commit: cvs rdiff -u -r1.71 -r1.72 src/lib/libc/sys/ptrace.2 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/cortex
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:03:28 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Route all interrupts to the primary PE by default To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/cortex/gicv3.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/cortex
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 10:03:28 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
Route all interrupts to the primary PE by default
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.14 src/sys/arch/arm/cortex/gicv3.c:1.15
--- src/sys/arch/arm/cortex/gicv3.c:1.14 Wed Jun 12 10:02:17 2019
+++ src/sys/arch/arm/cortex/gicv3.c Wed Jun 12 10:03:28 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.14 2019/06/12 10:02:17 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.14 2019/06/12 10:02:17 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.15 2019/06/12 10:03:28 jmcneill Exp $");
#include
#include
@@ -178,6 +178,7 @@ gicv3_establish_irq(struct pic_softc *pi
gicr_write_4(sc, n, GICR_IPRIORITYRn(is->is_irq / 4), ipriority);
}
} else {
+#if notyet
if (is->is_mpsafe) {
/* Route MP-safe interrupts to all participating PEs */
irouter = GICD_IROUTER_Interrupt_Routing_mode;
@@ -185,6 +186,10 @@ gicv3_establish_irq(struct pic_softc *pi
/* Route non-MP-safe interrupts to the primary PE only */
irouter = sc->sc_irouter[0];
}
+#else
+ /* Route interrupts to the primary PE by default */
+ irouter = sc->sc_irouter[0];
+#endif
gicd_write_8(sc, GICD_IROUTER(is->is_irq), irouter);
/* Update interrupt configuration */
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:02:17 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Adjust priority mappings, NFCI To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/gicv3.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/cortex
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 10:02:17 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3.c
Log Message:
Adjust priority mappings, NFCI
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/cortex/gicv3.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3.c
diff -u src/sys/arch/arm/cortex/gicv3.c:1.13 src/sys/arch/arm/cortex/gicv3.c:1.14
--- src/sys/arch/arm/cortex/gicv3.c:1.13 Fri Nov 23 11:49:04 2018
+++ src/sys/arch/arm/cortex/gicv3.c Wed Jun 12 10:02:17 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3.c,v 1.13 2018/11/23 11:49:04 jmcneill Exp $ */
+/* $NetBSD: gicv3.c,v 1.14 2019/06/12 10:02:17 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,7 +31,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.13 2018/11/23 11:49:04 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.14 2019/06/12 10:02:17 jmcneill Exp $");
#include
#include
@@ -155,7 +155,7 @@ gicv3_establish_irq(struct pic_softc *pi
uint64_t irouter;
u_int n;
- const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl);
+ const u_int ipriority_val = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1);
const u_int ipriority_shift = (is->is_irq & 0x3) * 8;
const u_int icfg_shift = (is->is_irq & 0xf) * 2;
@@ -206,7 +206,7 @@ gicv3_establish_irq(struct pic_softc *pi
static void
gicv3_set_priority(struct pic_softc *pic, int ipl)
{
- icc_pmr_write(IPL_TO_PRIORITY(ipl) << 1);
+ icc_pmr_write(IPL_TO_PRIORITY(ipl));
}
static void
@@ -271,7 +271,7 @@ gicv3_redist_enable(struct gicv3_softc *
if (is == NULL)
priority |= 0xff << byte_shift;
else {
-const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl);
+const u_int ipriority_val = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1);
priority |= ipriority_val << byte_shift;
}
}
@@ -545,7 +545,7 @@ gicv3_lpi_establish_irq(struct pic_softc
{
struct gicv3_softc * const sc = LPITOSOFTC(pic);
- sc->sc_lpiconf.base[is->is_irq] = 0x80 | IPL_TO_PRIORITY(is->is_ipl) | GIC_LPICONF_Res1;
+ sc->sc_lpiconf.base[is->is_irq] = 0x80 | (IPL_TO_PRIORITY(is->is_ipl) >> 1) | GIC_LPICONF_Res1;
bus_dmamap_sync(sc->sc_dmat, sc->sc_lpiconf.map, is->is_irq, 1, BUS_DMASYNC_PREWRITE);
}
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Wed Jun 12 10:00:09 UTC 2019 Modified Files: src/sys/arch/arm/cortex: gicv3_its.c gicv3_its.h Log Message: Fail gracefully if gicv3_its_set_affinity is called before a cpu is brought online. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/gicv3_its.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/cortex/gicv3_its.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/arm/cortex
Module Name:src
Committed By: jmcneill
Date: Wed Jun 12 10:00:09 UTC 2019
Modified Files:
src/sys/arch/arm/cortex: gicv3_its.c gicv3_its.h
Log Message:
Fail gracefully if gicv3_its_set_affinity is called before a cpu is
brought online.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/cortex/gicv3_its.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/cortex/gicv3_its.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/cortex/gicv3_its.c
diff -u src/sys/arch/arm/cortex/gicv3_its.c:1.10 src/sys/arch/arm/cortex/gicv3_its.c:1.11
--- src/sys/arch/arm/cortex/gicv3_its.c:1.10 Sat Dec 8 15:04:40 2018
+++ src/sys/arch/arm/cortex/gicv3_its.c Wed Jun 12 10:00:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.c,v 1.10 2018/12/08 15:04:40 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.c,v 1.11 2019/06/12 10:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#define _INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.10 2018/12/08 15:04:40 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: gicv3_its.c,v 1.11 2019/06/12 10:00:09 jmcneill Exp $");
#include
#include
@@ -719,6 +719,8 @@ gicv3_its_cpu_init(void *priv, struct cp
gits_command_mapc(its, cpu_index(ci), rdbase, true);
gits_command_invall(its, cpu_index(ci));
gits_wait(its);
+
+ its->its_cpuonline[cpu_index(ci)] = true;
}
static void
@@ -749,6 +751,8 @@ gicv3_its_set_affinity(void *priv, size_
return EINVAL;
ci = cpu_lookup(kcpuset_ffs(affinity) - 1);
+ if (its->its_cpuonline[cpu_index(ci)] == false)
+ return ENXIO;
const uint32_t devid = gicv3_its_devid(pa->pa_pc, pa->pa_tag);
gits_command_movi(its, devid, devid, cpu_index(ci));
Index: src/sys/arch/arm/cortex/gicv3_its.h
diff -u src/sys/arch/arm/cortex/gicv3_its.h:1.4 src/sys/arch/arm/cortex/gicv3_its.h:1.5
--- src/sys/arch/arm/cortex/gicv3_its.h:1.4 Wed Nov 28 22:54:11 2018
+++ src/sys/arch/arm/cortex/gicv3_its.h Wed Jun 12 10:00:09 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: gicv3_its.h,v 1.4 2018/11/28 22:54:11 jmcneill Exp $ */
+/* $NetBSD: gicv3_its.h,v 1.5 2019/06/12 10:00:09 jmcneill Exp $ */
/*-
* Copyright (c) 2018 The NetBSD Foundation, Inc.
@@ -53,6 +53,7 @@ struct gicv3_its {
uint32_t its_id;
uint64_t its_base;
uint64_t its_rdbase[MAXCPUS];
+ bool its_cpuonline[MAXCPUS];
struct gicv3_softc *its_gic;
struct gicv3_lpi_callback its_cb;
CVS commit: src
Module Name:src Committed By: mrg Date: Wed Jun 12 09:03:32 UTC 2019 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man8: Makefile wizd.8 Added Files: src/share/man/man8: creds_msdos.8 Removed Files: src/distrib/utils/embedded/files: creds_msdos.8 Log Message: move creds_msdos.8 into the normal place and install it. To generate a diff of this commit: cvs rdiff -u -r1.1647 -r1.1648 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.2 -r0 src/distrib/utils/embedded/files/creds_msdos.8 cvs rdiff -u -r1.108 -r1.109 src/share/man/man8/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man8/creds_msdos.8 cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/wizd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1647 src/distrib/sets/lists/man/mi:1.1648 --- src/distrib/sets/lists/man/mi:1.1647 Thu Jun 6 05:32:29 2019 +++ src/distrib/sets/lists/man/mi Wed Jun 12 09:03:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1647 2019/06/06 05:32:29 mrg Exp $ +# $NetBSD: mi,v 1.1648 2019/06/12 09:03:32 mrg Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -1131,9 +1131,9 @@ ./usr/share/man/cat4/gpib.0 man-sys-catman .cat ./usr/share/man/cat4/gpio.0 man-sys-catman .cat ./usr/share/man/cat4/gpioiic.0 man-sys-catman .cat +./usr/share/man/cat4/gpioirq.0 man-sys-catman .cat ./usr/share/man/cat4/gpiolock.0 man-sys-catman .cat ./usr/share/man/cat4/gpioow.0 man-sys-catman .cat -./usr/share/man/cat4/gpioirq.0 man-sys-catman .cat ./usr/share/man/cat4/gpiopps.0 man-sys-catman .cat ./usr/share/man/cat4/gpiopwm.0 man-sys-catman .cat ./usr/share/man/cat4/gpiosim.0 man-sys-catman .cat @@ -2290,8 +2290,8 @@ ./usr/share/man/cat5/wtmpx.0 man-sys-catman .cat ./usr/share/man/cat5/ypserv.acl.0 man-obsolete obsolete ./usr/share/man/cat7/ascii.0 man-reference-catman .cat -./usr/share/man/cat7/audio.0 man-obsolete obsolete ./usr/share/man/cat7/atf.0 man-atf-catman .cat,atf +./usr/share/man/cat7/audio.0 man-obsolete obsolete ./usr/share/man/cat7/c.0 man-reference-catman .cat ./usr/share/man/cat7/c78.0 man-reference-catman .cat ./usr/share/man/cat7/c89.0 man-reference-catman .cat @@ -2468,6 +2468,7 @@ ./usr/share/man/cat8/comsat.0 man-man-catman .cat ./usr/share/man/cat8/cpuctl.0 man-sysutil-catman .cat ./usr/share/man/cat8/crash.0 man-sysutil-catman .cat +./usr/share/man/cat8/creds_msdos.0 man-sysutil-catman .cat ./usr/share/man/cat8/cron.0 man-cron-catman .cat ./usr/share/man/cat8/dbsym.0 man-sysutil-catman binutils,.cat ./usr/share/man/cat8/ddns-confgen.0 man-bind-catman .cat @@ -4297,9 +4298,9 @@ ./usr/share/man/html4/gpib.html man-sys-htmlman html ./usr/share/man/html4/gpio.html man-sys-htmlman html ./usr/share/man/html4/gpioiic.html man-sys-htmlman html +./usr/share/man/html4/gpioirq.html man-sys-htmlman html ./usr/share/man/html4/gpiolock.html man-sys-htmlman html ./usr/share/man/html4/gpioow.html man-sys-htmlman html -./usr/share/man/html4/gpioirq.html man-sys-htmlman html ./usr/share/man/html4/gpiopps.html man-sys-htmlman html ./usr/share/man/html4/gpiopwm.html man-sys-htmlman html ./usr/share/man/html4/gpiosim.html man-sys-htmlman html @@ -5358,8 +5359,8 @@ ./usr/share/man/html5/wtmp.html man-sys-htmlman html ./usr/share/man/html5/wtmpx.html man-sys-htmlman html ./usr/share/man/html7/ascii.html man-reference-htmlman html -./usr/share/man/html7/audio.html man-obsolete obsolete ./usr/share/man/html7/atf.html man-atf-htmlman html,atf +./usr/share/man/html7/audio.html man-obsolete obsolete ./usr/share/man/html7/c.html man-reference-htmlman html ./usr/share/man/html7/c78.html man-reference-htmlman html ./usr/share/man/html7/c89.html man-reference-htmlman html @@ -5494,6 +5495,7 @@ ./usr/share/man/html8/comsat.html man-man-htmlman html ./usr/share/man/html8/cpuctl.html man-sysutil-htmlman html ./usr/share/man/html8/crash.html man-sysutil-htmlman html +./usr/share/man/html8/creds_msdos.html man-sysutil-htmlman html ./usr/share/man/html8/cron.html man-cron-htmlman html ./usr/share/man/html8/dbsym.html man-sysutil-htmlman binutils,html ./usr/share/man/html8/ddns-confgen.html man-bind-htmlman html @@ -6746,7 +6748,6 @@ ./usr/share/man/man1/xmlwf.1 man-util-man .man ./usr/share/man/man1/xz.1 man-util-man .man ./usr/share/man/man1/xzcat.1 man-util-man .man -./usr/share/man/man1/ztest.1 man-zfs-man zfs,.man ./usr/share/man/man1/yes.1 man-util-man .man ./usr/share/man/man1/ypcat.1 man-nis-man yp,.man ./usr/share/man/man1/ypmatch.1 man-nis-man yp,.man @@ -6762,6 +6763,7 @@ ./usr/share/man/man1/zless.1 man-util-man .man ./usr/share/man/man1/zmore.1 man-util-man .man ./usr/share/man/man1/znew.1 man-util-man .man +./usr/sha
CVS commit: src
Module Name:src Committed By: mrg Date: Wed Jun 12 09:03:32 UTC 2019 Modified Files: src/distrib/sets/lists/man: mi src/share/man/man8: Makefile wizd.8 Added Files: src/share/man/man8: creds_msdos.8 Removed Files: src/distrib/utils/embedded/files: creds_msdos.8 Log Message: move creds_msdos.8 into the normal place and install it. To generate a diff of this commit: cvs rdiff -u -r1.1647 -r1.1648 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.2 -r0 src/distrib/utils/embedded/files/creds_msdos.8 cvs rdiff -u -r1.108 -r1.109 src/share/man/man8/Makefile cvs rdiff -u -r0 -r1.1 src/share/man/man8/creds_msdos.8 cvs rdiff -u -r1.10 -r1.11 src/share/man/man8/wizd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
