CVS commit: src/sys
Module Name:src Committed By: thorpej Date: Tue Jul 7 03:38:49 UTC 2020 Modified Files: src/sys/arch/algor/dev: mainbus.c src/sys/arch/amiga/pci: em4k.c empb.c empbreg.h mppb.c p5pb.c src/sys/arch/arc/include: pci_machdep.h src/sys/arch/arc/pci: necpb.c src/sys/arch/arm/broadcom: bcm53xx_pax.c src/sys/arch/arm/fdt: pcihost_fdt.c src/sys/arch/arm/gemini: gemini_pci.c src/sys/arch/arm/imx: imx6_pcie.c src/sys/arch/arm/imx/fdt: imx6_pcie.c src/sys/arch/arm/ixp12x0: ixp12x0_pci.c src/sys/arch/arm/nvidia: tegra_pcie.c src/sys/arch/arm/s3c2xx0: s3c2800_pci.c src/sys/arch/arm/xscale: becc_pci.c i80312_pci.c i80321_pci.c ixp425_pci.c src/sys/arch/bebox/bebox: mainbus.c src/sys/arch/cobalt/dev: gt.c src/sys/arch/cobalt/include: pci_machdep.h src/sys/arch/evbarm/ifpga: ifpga.c src/sys/arch/evbmips/gdium: mainbus.c src/sys/arch/evbmips/loongson: mainbus.c src/sys/arch/evbmips/malta/dev: mainbus.c src/sys/arch/evbppc/walnut/pci: pchb.c src/sys/arch/ibmnws/ibmnws: mainbus.c src/sys/arch/mips/adm5120/dev: admpci.c src/sys/arch/mips/alchemy/dev: aupci.c src/sys/arch/mips/rmi: rmixl_pcie.c rmixl_pcix.c src/sys/arch/mvmeppc/mvmeppc: mainbus.c src/sys/arch/ofppc/pci: ofwpci.c src/sys/arch/powerpc/booke/pci: pq3pci.c src/sys/arch/powerpc/ibm4xx/pci: pchb.c src/sys/arch/prep/prep: mainbus.c src/sys/arch/sandpoint/sandpoint: mainbus.c src/sys/arch/sgimips/gio: pci_gio.c src/sys/arch/sgimips/include: pci_machdep.h src/sys/arch/sgimips/mace: pci_mace.c src/sys/arch/sh3/dev: shpcic.c src/sys/dev/acpi: acpi_mcfg.c src/sys/dev/ic: cpc700.c src/sys/dev/marvell: gtpci.c mvpex.c src/sys/dev/pci: pciconf.c pciconf.h Log Message: Overhaul the interface to pci_configure_bus(): - Don't expose how PCI bus configuration resource management is implemented. Provide a new resource provider API: ==> pciconf_resource_init() -- Initialize a PCI configuration resources container. ==> pciconf_resource_add() -- Add a PCI configuration resource to the container (I/O, MEM, or prefetchable MEM). Multiple resources of each type may be added. ==> pciconf_resource_fini() -- Tear down the PCI configurtation resources container once the bus has been configured. This is much easier to use than the previous method of providing an extent map for each kind of resource, and works better for e.g. ACPI platforms that provide potentially multiple PCI resources in tables provided by firmware. - Re-implement PCI configuration resource management using vmem arenas, rather than extent maps. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/sys/arch/algor/dev/mainbus.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/amiga/pci/em4k.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/amiga/pci/empb.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/amiga/pci/empbreg.h cvs rdiff -u -r1.9 -r1.10 src/sys/arch/amiga/pci/mppb.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/amiga/pci/p5pb.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/arc/include/pci_machdep.h cvs rdiff -u -r1.44 -r1.45 src/sys/arch/arc/pci/necpb.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/broadcom/bcm53xx_pax.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/fdt/pcihost_fdt.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/arm/gemini/gemini_pci.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/imx/imx6_pcie.c cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/imx/fdt/imx6_pcie.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/arm/ixp12x0/ixp12x0_pci.c cvs rdiff -u -r1.30 -r1.31 src/sys/arch/arm/nvidia/tegra_pcie.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/arm/s3c2xx0/s3c2800_pci.c cvs rdiff -u -r1.20 -r1.21 src/sys/arch/arm/xscale/becc_pci.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/xscale/i80312_pci.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/arm/xscale/i80321_pci.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/xscale/ixp425_pci.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/bebox/bebox/mainbus.c cvs rdiff -u -r1.31 -r1.32 src/sys/arch/cobalt/dev/gt.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/cobalt/include/pci_machdep.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/evbarm/ifpga/ifpga.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbmips/gdium/mainbus.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbmips/loongson/mainbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbmips/malta/dev/mainbus.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/evbppc/walnut/pci/pchb.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/ibmnws/ibmnws/mainbus.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/adm5120/dev/admpci.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/mips/alchemy/dev/aupci.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/mips/rmi/rmixl_pcie.c cvs rdiff -u -r1.14 -r1.15 src/sys/arch/mips/rmi/rmixl_pcix.c cvs rdiff -u -r1.18 -r1.19
CVS commit: src/sys/sys
Module Name:src Committed By: thorpej Date: Tue Jul 7 03:23:33 UTC 2020 Modified Files: src/sys/sys: vmem_impl.h Log Message: Explicitly include here; don't rely on it being included by the includer. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/sys/vmem_impl.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/sys/vmem_impl.h diff -u src/sys/sys/vmem_impl.h:1.4 src/sys/sys/vmem_impl.h:1.5 --- src/sys/sys/vmem_impl.h:1.4 Sun Apr 19 21:11:42 2020 +++ src/sys/sys/vmem_impl.h Tue Jul 7 03:23:33 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmem_impl.h,v 1.4 2020/04/19 21:11:42 ad Exp $ */ +/* $NetBSD: vmem_impl.h,v 1.5 2020/07/07 03:23:33 thorpej Exp $ */ /*- * Copyright (c)2006 YAMAMOTO Takashi, @@ -37,6 +37,7 @@ #if defined(_KERNEL) #define QCACHE +#include #include #define LOCK_DECL(name) \
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: rin Date: Tue Jul 7 02:39:59 UTC 2020 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: Enable COPY_SYMTAB in case of directly booted from Open Firmware with ofwboot being skipped. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 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/macppc/conf/POWERMAC_G5_11_2 diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.19 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.20 --- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.19 Tue Jul 7 02:37:27 2020 +++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Tue Jul 7 02:39:59 2020 @@ -42,6 +42,7 @@ options DDB_ONPANIC=1 # don't go into d options DDB_HISTORY_SIZE=512 # enable history editing in DDB options TRAP_PANICWAIT +makeoptions COPY_SYMTAB=1 # in case of directly booted from ofw makeoptions DEBUG="-g" # compile full symbol table # Compatibility options
CVS commit: src/sys/arch/macppc/conf
Module Name:src Committed By: rin Date: Tue Jul 7 02:37:27 UTC 2020 Modified Files: src/sys/arch/macppc/conf: POWERMAC_G5_11_2 Log Message: Sync wscons colors with GENERIC; now it works fine! To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/macppc/conf/POWERMAC_G5_11_2 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/macppc/conf/POWERMAC_G5_11_2 diff -u src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.18 src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.19 --- src/sys/arch/macppc/conf/POWERMAC_G5_11_2:1.18 Sat Jul 4 12:04:15 2020 +++ src/sys/arch/macppc/conf/POWERMAC_G5_11_2 Tue Jul 7 02:37:27 2020 @@ -83,6 +83,12 @@ options MIIVERBOSE # verbose PHY autoco #options WSEMUL_SUN # sun terminal emulation options WSEMUL_VT100 # VT100 / VT220 emulation options WSDISPLAY_COMPAT_USL # wsconscfg VT handling + +options WS_DEFAULT_FG=WSCOL_BLACK +options WS_DEFAULT_BG=WSCOL_LIGHT_WHITE +options WS_KERNEL_FG=WSCOL_GREEN +options WS_KERNEL_BG=WSCOL_LIGHT_WHITE + #options WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes options FONT_GALLANT12x22
CVS commit: src/sys/arch
Module Name:src
Committed By: rin
Date: Tue Jul 7 02:33:55 UTC 2020
Modified Files:
src/sys/arch/macppc/include: autoconf.h
src/sys/arch/macppc/macppc: machdep.c
src/sys/arch/ofppc/include: autoconf.h
src/sys/arch/powerpc/oea: ofw_rascons.c ofwoea_machdep.c
Log Message:
It turned out that using some Open Firmware routines causes the system
freeze after calling OF_quiesce().
This is why setting color palette crash the system for some Power Mac G5
models, like PowerMac11,2.
Therefore, stop using color-palette and backlight callbacks for genfb(4)
in this case.
Also, postpone OF_quiesce() after rascons_init_rasops(), and initialize
color palette there if OF is going to be quiesced and color depth is 8.
Now, color palette for wscons is initialized correctly for PowerMac11,2.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/macppc/include/autoconf.h
cvs rdiff -u -r1.169 -r1.170 src/sys/arch/macppc/macppc/machdep.c
cvs rdiff -u -r1.16 -r1.17 src/sys/arch/ofppc/include/autoconf.h
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/oea/ofw_rascons.c
cvs rdiff -u -r1.49 -r1.50 src/sys/arch/powerpc/oea/ofwoea_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/macppc/include/autoconf.h
diff -u src/sys/arch/macppc/include/autoconf.h:1.19 src/sys/arch/macppc/include/autoconf.h:1.20
--- src/sys/arch/macppc/include/autoconf.h:1.19 Tue Jan 8 07:46:10 2019
+++ src/sys/arch/macppc/include/autoconf.h Tue Jul 7 02:33:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.19 2019/01/08 07:46:10 mrg Exp $ */
+/* $NetBSD: autoconf.h,v 1.20 2020/07/07 02:33:54 rin Exp $ */
/*-
* Copyright (C) 1998 Internet Research Institute, Inc.
@@ -82,6 +82,7 @@ int rascons_cnattach(void);
extern int console_node;
extern int console_instance;
+extern int ofw_quiesce;
extern char model_name[64];
#endif /* _MACHINE_AUTOCONF_H_ */
Index: src/sys/arch/macppc/macppc/machdep.c
diff -u src/sys/arch/macppc/macppc/machdep.c:1.169 src/sys/arch/macppc/macppc/machdep.c:1.170
--- src/sys/arch/macppc/macppc/machdep.c:1.169 Mon Jan 28 02:25:01 2019
+++ src/sys/arch/macppc/macppc/machdep.c Tue Jul 7 02:33:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.169 2019/01/28 02:25:01 sevan Exp $ */
+/* $NetBSD: machdep.c,v 1.170 2020/07/07 02:33:54 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -32,7 +32,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.169 2019/01/28 02:25:01 sevan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.170 2020/07/07 02:33:54 rin Exp $");
#include "opt_compat_netbsd.h"
#include "opt_ddb.h"
@@ -277,11 +277,8 @@ copy_disp_props(device_t dev, int node,
uint32_t temp;
uint64_t cmap_cb, backlight_cb, brightness_cb;
int have_backlight = 0;
-#ifdef PMAC_G5
- int have_palette = 0;
-#else
int have_palette = 1;
-#endif
+
if (node != console_node) {
/*
* see if any child matches since OF attaches nodes for
@@ -349,6 +346,12 @@ copy_disp_props(device_t dev, int node,
if (temp != 0)
prop_dictionary_set_uint32(dict, "refclk", temp / 10);
+ if (have_palette && ofw_quiesce) {
+ aprint_debug(
+ "OFW has been quiesced - disabling palette callback\n");
+ have_palette = 0;
+ }
+
if (have_palette) {
gfb_cb.gcc_cookie = (void *)console_instance;
gfb_cb.gcc_set_mapreg = of_set_palette;
@@ -364,6 +367,13 @@ copy_disp_props(device_t dev, int node,
sizeof(temp)) == 4) {
have_backlight = 1;
}
+
+ if (have_backlight && ofw_quiesce) {
+ aprint_debug(
+ "OFW has been quiesced - disabling backlight callbacks\n");
+ have_palette = 0;
+ }
+
if (have_backlight) {
gpc_backlight.gpc_cookie = (void *)console_instance;
Index: src/sys/arch/ofppc/include/autoconf.h
diff -u src/sys/arch/ofppc/include/autoconf.h:1.16 src/sys/arch/ofppc/include/autoconf.h:1.17
--- src/sys/arch/ofppc/include/autoconf.h:1.16 Tue Jan 8 07:46:10 2019
+++ src/sys/arch/ofppc/include/autoconf.h Tue Jul 7 02:33:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.h,v 1.16 2019/01/08 07:46:10 mrg Exp $ */
+/* $NetBSD: autoconf.h,v 1.17 2020/07/07 02:33:54 rin Exp $ */
#ifndef _OFPPC_AUTOCONF_H_
#define _OFPPC_AUTOCONF_H_
@@ -32,6 +32,7 @@ struct model_data {
};
extern int console_node;
+extern int ofw_quiesce; /* XXX not used at the moment */
extern char model_name[64];
#ifdef _KERNEL
Index: src/sys/arch/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.15 src/sys/arch/powerpc/oea/ofw_rascons.c:1.16
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.15 Tue Jul 7 02:10:20 2020
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Tue Jul 7 02:33:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.16 2020/07/07 02:33:54 rin Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7
CVS commit: src/sys/arch/powerpc/oea
Module Name:src
Committed By: rin
Date: Tue Jul 7 02:10:21 UTC 2020
Modified Files:
src/sys/arch/powerpc/oea: ofw_rascons.c
Log Message:
Fix boot failure for PowerMac11,2 when ``auto-boot?'' is true.
For some machines like PowerMac11,2, Open Firmware does not correctly
initialize console-related variables, like font-adr and line#, when
``auto-boot?'' is true; -1 is returned instead of correct values.
Fall back to wsfont embedded in kernel in this case. Also, do not use
line# if it is negative.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/oea/ofw_rascons.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/powerpc/oea/ofw_rascons.c
diff -u src/sys/arch/powerpc/oea/ofw_rascons.c:1.14 src/sys/arch/powerpc/oea/ofw_rascons.c:1.15
--- src/sys/arch/powerpc/oea/ofw_rascons.c:1.14 Mon Mar 16 22:02:37 2020
+++ src/sys/arch/powerpc/oea/ofw_rascons.c Tue Jul 7 02:10:20 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $ */
+/* $NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.14 2020/03/16 22:02:37 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ofw_rascons.c,v 1.15 2020/07/07 02:10:20 rin Exp $");
#include "wsdisplay.h"
@@ -87,6 +87,8 @@ rascons_cnattach(void)
/* get current cursor position */
OF_interpret("line#", 0, 1, );
+ if (crow < 0)
+ crow = 0;
/* move (rom monitor) cursor to the lowest line - 1 */
/* - Why? */
@@ -165,7 +167,11 @@ rascons_finalize(void)
if (needs_finalize == 0) return;
/* get current cursor position */
- if (romfont_loaded) OF_interpret("line#", 0, 1, );
+ if (romfont_loaded) {
+ OF_interpret("line#", 0, 1, );
+ if (crow < 0)
+ crow = 0;
+ }
ri->ri_ops.allocattr(ri, 0, 0, 0, );
wsdisplay_preattach(_stdscreen, ri, 0, uimax(0,
@@ -179,9 +185,16 @@ copy_rom_font(void)
int char_width, char_height, stride;
int chosen, mmu, m, e, size;
- /* Get ROM FONT address. */
+ /*
+ * Get ROM FONT address.
+ *
+ * For some machines like ``PowerMac11,2'', Open Firmware does not
+ * initialize console-related variables when auto-boot? is true;
+ * -1 is returned instead of correct value. Fall back to wsfont
+ * embedded in kernel in this case.
+ */
OF_interpret("font-adr", 0, 1, );
- if (romfont == NULL)
+ if (romfont == NULL || romfont == (u_char *)-1)
return -1;
chosen = OF_finddevice("/chosen");
CVS commit: src/crypto/external/bsd/openssl/dist/crypto
Module Name:src
Committed By: rin
Date: Tue Jul 7 01:47:47 UTC 2020
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: ppccap.c
Log Message:
Part of PR port-powerpc/55425
openssl fails on FPU emulation for powerpc
When machdep.fpu_present sysctl variable can be retrieved, and
its value is zero, avoid using FPU arithmetic.
FPU is absent and emulated by kernel in that case, and calculation
results are not correct in bit-to-bit precision.
This behavior should be useful even if we could fix FPU emulation;
it is much faster to skip FPU arithmetic in general, rather than
relying upon emulation by kernel via illegal instruction handler.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 \
src/crypto/external/bsd/openssl/dist/crypto/ppccap.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/ppccap.c
diff -u src/crypto/external/bsd/openssl/dist/crypto/ppccap.c:1.15 src/crypto/external/bsd/openssl/dist/crypto/ppccap.c:1.16
--- src/crypto/external/bsd/openssl/dist/crypto/ppccap.c:1.15 Mon Jun 22 16:25:08 2020
+++ src/crypto/external/bsd/openssl/dist/crypto/ppccap.c Tue Jul 7 01:47:47 2020
@@ -26,6 +26,10 @@
# include
# include
#endif
+#if defined(__NetBSD__)
+# include
+# include
+#endif
#include
#include
#include
@@ -365,6 +369,18 @@ void OPENSSL_cpuid_setup(void)
sigaction(SIGILL, _act, _oact);
#ifndef OSSL_IMPLEMENT_GETAUXVAL
+# ifdef __NetBSD__
+int error, val;
+size_t len = sizeof(val);
+
+/*
+ * If machdep.fpu_present == 0, FPU is absent and emulated by software.
+ * Avoid using it as calculation results may not be correct in bit-to-bit
+ * precision.
+ */
+error = sysctlbyname("machdep.fpu_present", , , NULL, 0);
+if (error != 0 || (error == 0 && val != 0))
+# endif
if (sigsetjmp(ill_jmp,1) == 0) {
OPENSSL_fpu_probe();
OPENSSL_ppccap_P |= PPC_FPU;
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Tue Jul 7 01:39:23 UTC 2020 Modified Files: src/sys/arch/powerpc/include: cpu.h src/sys/arch/powerpc/powerpc: powerpc_machdep.c Log Message: Part of PR port-powerpc/55425 openssl fails on FPU emulation for powerpc Provide machdep.fpu_present sysctl variable like other ports. Userland can get informed that FPU is absent and emulated in software (and calculation results may not be correct in bit-to-bit precision). This variable should be useful even if we could fix FPU emulation; it is much faster to skip FPU arithmetic in general, rather than relying upon emulation by kernel via illegal instruction handler. To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/arch/powerpc/include/cpu.h cvs rdiff -u -r1.78 -r1.79 src/sys/arch/powerpc/powerpc/powerpc_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/powerpc/include/cpu.h diff -u src/sys/arch/powerpc/include/cpu.h:1.113 src/sys/arch/powerpc/include/cpu.h:1.114 --- src/sys/arch/powerpc/include/cpu.h:1.113 Mon Jul 6 13:20:55 2020 +++ src/sys/arch/powerpc/include/cpu.h Tue Jul 7 01:39:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.h,v 1.113 2020/07/06 13:20:55 rin Exp $ */ +/* $NetBSD: cpu.h,v 1.114 2020/07/07 01:39:23 rin Exp $ */ /* * Copyright (C) 1999 Wolfgang Solfrank. @@ -489,5 +489,6 @@ void __syncicache(void *, size_t); #define CPU_BOOTED_DEVICE 9 /* string: device we booted from */ #define CPU_BOOTED_KERNEL 10 /* string: kernel we booted */ #define CPU_EXECPROT 11 /* bool: PROT_EXEC works */ +#define CPU_FPU 12 #endif /* _POWERPC_CPU_H_ */ Index: src/sys/arch/powerpc/powerpc/powerpc_machdep.c diff -u src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.78 src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.79 --- src/sys/arch/powerpc/powerpc/powerpc_machdep.c:1.78 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/powerpc_machdep.c Tue Jul 7 01:39:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: powerpc_machdep.c,v 1.78 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: powerpc_machdep.c,v 1.79 2020/07/07 01:39:23 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,7 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.78 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: powerpc_machdep.c,v 1.79 2020/07/07 01:39:23 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" @@ -285,6 +285,17 @@ SYSCTL_SETUP(sysctl_machdep_setup, "sysc CTLTYPE_STRING, "booted_kernel", NULL, sysctl_machdep_booted_kernel, 0, NULL, 0, CTL_MACHDEP, CPU_BOOTED_KERNEL, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_IMMEDIATE, + CTLTYPE_INT, "fpu_present", NULL, + NULL, +#if defined(PPC_HAVE_FPU) + 1, +#else + 0, +#endif + NULL, 0, + CTL_MACHDEP, CPU_FPU, CTL_EOL); } /*
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Tue Jul 7 00:59:30 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: e500_tlb.c
Log Message:
Revert previous; tmpfs should be fixed instead.
Pointed out by thorpej@, thanks!
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/booke/e500_tlb.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/powerpc/booke/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.22 src/sys/arch/powerpc/booke/e500_tlb.c:1.23
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.22 Tue Jul 7 00:28:30 2020
+++ src/sys/arch/powerpc/booke/e500_tlb.c Tue Jul 7 00:59:29 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.23 2020/07/07 00:59:29 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#define __PMAP_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.23 2020/07/07 00:59:29 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
@@ -536,13 +536,6 @@ e500_tlb_invalidate_addr(vaddr_t va, tlb
static bool
e500_tlb_update_addr(vaddr_t va, tlb_asid_t asid, pt_entry_t pte, bool insert)
{
-
- /*
- * In case where pmap_kenter_pa(9) is called for va with page offset.
- * Required for tmpfs.
- */
- va &= ~PAGE_MASK;
-
#if defined(MULTIPROCESSOR)
e500_tlb_invalidate_addr(va, asid);
return true;
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Tue Jul 7 00:49:09 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: trap.c
Log Message:
For booke, fix signo and other siginfo returned for userland by
syncing with oea and ibm4xx.
Now, tests/kernel/t_trapsignal:bus_handle and friends pass on booke.
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/booke/trap.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/powerpc/booke/trap.c
diff -u src/sys/arch/powerpc/booke/trap.c:1.31 src/sys/arch/powerpc/booke/trap.c:1.32
--- src/sys/arch/powerpc/booke/trap.c:1.31 Tue Jul 7 00:41:32 2020
+++ src/sys/arch/powerpc/booke/trap.c Tue Jul 7 00:49:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.31 2020/07/07 00:41:32 rin Exp $ */
+/* $NetBSD: trap.c,v 1.32 2020/07/07 00:49:09 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.31 2020/07/07 00:41:32 rin Exp $");
+__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.32 2020/07/07 00:49:09 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -112,15 +112,13 @@ mchk_exception(struct trapframe *tf, ksi
struct cpu_info * const ci = curcpu();
int rv = EFAULT;
- if (usertrap)
+ if (usertrap) {
ci->ci_ev_umchk.ev_count++;
-
- if (rv != 0 && usertrap) {
KSI_INIT_TRAP(ksi);
- ksi->ksi_signo = SIGSEGV;
- ksi->ksi_trap = EXC_DSI;
- ksi->ksi_code = SEGV_ACCERR;
+ ksi->ksi_signo = SIGBUS;
+ ksi->ksi_trap = EXC_MCHK;
ksi->ksi_addr = (void *)faultva;
+ ksi->ksi_code = BUS_OBJERR;
}
return rv;
@@ -169,8 +167,6 @@ pagefault(struct vm_map *map, vaddr_t va
rv = uvm_fault(map, trunc_page(va), ftype);
if (rv == 0)
uvm_grow(l->l_proc, trunc_page(va));
- if (rv == EACCES)
- rv = EFAULT;
} else {
if (cpu_intr_p())
return EFAULT;
@@ -184,12 +180,33 @@ pagefault(struct vm_map *map, vaddr_t va
if (rv == 0)
uvm_grow(l->l_proc, trunc_page(va));
}
- if (rv == EACCES)
- rv = EFAULT;
}
return rv;
}
+static void
+vm_signal(int error, int trap, vaddr_t addr, ksiginfo_t *ksi)
+{
+
+ KSI_INIT_TRAP(ksi);
+ switch (error) {
+ case EINVAL:
+ ksi->ksi_signo = SIGBUS;
+ ksi->ksi_code = BUS_ADRERR;
+ break;
+ case EACCES:
+ ksi->ksi_signo = SIGSEGV;
+ ksi->ksi_code = SEGV_ACCERR;
+ break;
+ default:
+ ksi->ksi_signo = SIGSEGV;
+ ksi->ksi_code = SEGV_MAPERR;
+ break;
+ }
+ ksi->ksi_trap = trap;
+ ksi->ksi_addr = (void *)addr;
+}
+
static int
dsi_exception(struct trapframe *tf, ksiginfo_t *ksi)
{
@@ -236,16 +253,9 @@ dsi_exception(struct trapframe *tf, ksig
int rv = pagefault(faultmap, faultva, ftype, usertrap);
- /*
- * We can't get a MAPERR here since that's a different exception.
- */
if (__predict_false(rv != 0 && usertrap)) {
ci->ci_ev_udsi_fatal.ev_count++;
- KSI_INIT_TRAP(ksi);
- ksi->ksi_signo = SIGSEGV;
- ksi->ksi_trap = EXC_DSI;
- ksi->ksi_code = SEGV_ACCERR;
- ksi->ksi_addr = (void *)faultva;
+ vm_signal(rv, EXC_DSI, faultva, ksi);
}
return rv;
}
@@ -313,16 +323,8 @@ isi_exception(struct trapframe *tf, ksig
usertrap);
if (__predict_false(rv != 0 && usertrap)) {
- /*
- * We can't get a MAPERR here since
- * that's a different exception.
- */
ci->ci_ev_isi_fatal.ev_count++;
- KSI_INIT_TRAP(ksi);
- ksi->ksi_signo = SIGSEGV;
- ksi->ksi_trap = EXC_ISI;
- ksi->ksi_code = SEGV_ACCERR;
- ksi->ksi_addr = (void *)tf->tf_srr0; /* not truncated */
+ vm_signal(rv, EXC_ISI, tf->tf_srr0, ksi);
}
UVMHIST_LOG(pmapexechist, "<- %d", rv, 0,0,0);
return rv;
@@ -358,11 +360,7 @@ dtlb_exception(struct trapframe *tf, ksi
if (__predict_false(rv != 0 && usertrap)) {
ci->ci_ev_udsi_fatal.ev_count++;
- KSI_INIT_TRAP(ksi);
- ksi->ksi_signo = SIGSEGV;
- ksi->ksi_trap = EXC_DSI;
- ksi->ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
- ksi->ksi_addr = (void *)faultva;
+ vm_signal(rv, EXC_DSI, faultva, ksi);
}
return rv;
}
@@ -382,11 +380,7 @@ itlb_exception(struct trapframe *tf, ksi
if (__predict_false(rv != 0 && usertrap)) {
ci->ci_ev_isi_fatal.ev_count++;
- KSI_INIT_TRAP(ksi);
- ksi->ksi_signo = SIGSEGV;
- ksi->ksi_trap = EXC_ISI;
- ksi->ksi_code = (rv == EACCES ? SEGV_ACCERR : SEGV_MAPERR);
- ksi->ksi_addr = (void *)tf->tf_srr0;
+ vm_signal(rv, EXC_ISI, tf->tf_srr0, ksi);
}
return rv;
}
@@ -880,6 +874,7 @@ trap(enum ppc_booke_exceptions trap_code
p->p_pid, l->l_lid, p->p_comm,
l->l_cred ? kauth_cred_geteuid(l->l_cred) : -1);
ksi.ksi_signo = SIGKILL;
+ ksi.ksi_code = 0;
}
if (rv != 0) {
/*
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Tue Jul 7 00:41:32 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: trap.c Log Message: Do not clear pcb_onfault for error path of setfault(). This is caller's responsibility, and all the callers actually do so. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/booke/trap.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/powerpc/booke/trap.c diff -u src/sys/arch/powerpc/booke/trap.c:1.30 src/sys/arch/powerpc/booke/trap.c:1.31 --- src/sys/arch/powerpc/booke/trap.c:1.30 Tue Jul 7 00:37:46 2020 +++ src/sys/arch/powerpc/booke/trap.c Tue Jul 7 00:41:32 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.30 2020/07/07 00:37:46 rin Exp $ */ +/* $NetBSD: trap.c,v 1.31 2020/07/07 00:41:32 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.30 2020/07/07 00:37:46 rin Exp $"); +__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.31 2020/07/07 00:41:32 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" @@ -691,7 +691,6 @@ onfaulted(struct trapframe *tf, register tf->tf_fixreg[2] = fb->fb_r2; tf->tf_fixreg[3] = rv; memcpy(>tf_fixreg[13], fb->fb_fixreg, sizeof(fb->fb_fixreg)); - pcb->pcb_onfault = NULL; return true; }
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Tue Jul 7 00:37:46 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: trap.c Log Message: For booke, restore callee saved registers when recovery for page fault fails for kernel. OOPS! How on the earth we had overlooked this error so far... To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/booke/trap.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/powerpc/booke/trap.c diff -u src/sys/arch/powerpc/booke/trap.c:1.29 src/sys/arch/powerpc/booke/trap.c:1.30 --- src/sys/arch/powerpc/booke/trap.c:1.29 Mon Jul 6 10:13:02 2020 +++ src/sys/arch/powerpc/booke/trap.c Tue Jul 7 00:37:46 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.29 2020/07/06 10:13:02 rin Exp $ */ +/* $NetBSD: trap.c,v 1.30 2020/07/07 00:37:46 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,7 +35,7 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.29 2020/07/06 10:13:02 rin Exp $"); +__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.30 2020/07/07 00:37:46 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" @@ -690,6 +690,7 @@ onfaulted(struct trapframe *tf, register tf->tf_fixreg[1] = fb->fb_sp; tf->tf_fixreg[2] = fb->fb_r2; tf->tf_fixreg[3] = rv; + memcpy(>tf_fixreg[13], fb->fb_fixreg, sizeof(fb->fb_fixreg)); pcb->pcb_onfault = NULL; return true; }
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Tue Jul 7 00:28:31 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: e500_tlb.c
Log Message:
Fix kernel panic due to tmpfs.
pmap for booke assumes that the ``va'' argument for pmap_kenter_pa(9) is
page-aligned. However, by recent changes, tmpfs became to use ``va'' with
page offset via ubc_uiomove(9). So, truncate it to page boundary.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/booke/e500_tlb.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/powerpc/booke/e500_tlb.c
diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.21 src/sys/arch/powerpc/booke/e500_tlb.c:1.22
--- src/sys/arch/powerpc/booke/e500_tlb.c:1.21 Mon Jul 6 10:12:04 2020
+++ src/sys/arch/powerpc/booke/e500_tlb.c Tue Jul 7 00:28:30 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $ */
+/* $NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -37,7 +37,7 @@
#define __PMAP_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.22 2020/07/07 00:28:30 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_multiprocessor.h"
@@ -536,6 +536,13 @@ e500_tlb_invalidate_addr(vaddr_t va, tlb
static bool
e500_tlb_update_addr(vaddr_t va, tlb_asid_t asid, pt_entry_t pte, bool insert)
{
+
+ /*
+ * In case where pmap_kenter_pa(9) is called for va with page offset.
+ * Required for tmpfs.
+ */
+ va &= ~PAGE_MASK;
+
#if defined(MULTIPROCESSOR)
e500_tlb_invalidate_addr(va, asid);
return true;
CVS commit: src/lib/libcurses
Module Name:src
Committed By: uwe
Date: Mon Jul 6 23:33:38 UTC 2020
Modified Files:
src/lib/libcurses: get_wch.c getch.c
Log Message:
Pads are not to be automatically refreshed on input.
X/Open Curses says in the documentation for newpad():
Automatic refreshes of pads (e.g., from scrolling or echoing of
input) do not occur.
And in the documentation for get*():
If the current or specified window is not a pad, and it has been
moved or modified since the last refresh operation, then it will be
refreshed before another character is read.
>From Michael Forney in PR lib/55457
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libcurses/get_wch.c
cvs rdiff -u -r1.74 -r1.75 src/lib/libcurses/getch.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/get_wch.c
diff -u src/lib/libcurses/get_wch.c:1.23 src/lib/libcurses/get_wch.c:1.24
--- src/lib/libcurses/get_wch.c:1.23 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/get_wch.c Mon Jul 6 23:33:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: get_wch.c,v 1.23 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: get_wch.c,v 1.24 2020/07/06 23:33:38 uwe Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: get_wch.c,v 1.23 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: get_wch.c,v 1.24 2020/07/06 23:33:38 uwe Exp $");
#endif /* not lint */
#include
@@ -499,7 +499,7 @@ wget_wch(WINDOW *win, wint_t *ch)
&& __echoit)
return ERR;
- if (is_wintouched(win))
+ if (!(win->flags & __ISPAD) && is_wintouched(win))
wrefresh(win);
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "wget_wch: __echoit = %d, "
Index: src/lib/libcurses/getch.c
diff -u src/lib/libcurses/getch.c:1.74 src/lib/libcurses/getch.c:1.75
--- src/lib/libcurses/getch.c:1.74 Thu May 14 11:50:04 2020
+++ src/lib/libcurses/getch.c Mon Jul 6 23:33:38 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: getch.c,v 1.74 2020/05/14 11:50:04 simonb Exp $ */
+/* $NetBSD: getch.c,v 1.75 2020/07/06 23:33:38 uwe Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)getch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: getch.c,v 1.74 2020/05/14 11:50:04 simonb Exp $");
+__RCSID("$NetBSD: getch.c,v 1.75 2020/07/06 23:33:38 uwe Exp $");
#endif
#endif /* not lint */
@@ -818,11 +818,11 @@ wgetch(WINDOW *win)
&& __echoit)
return ERR;
- if (is_wintouched(win))
- wrefresh(win);
- else {
- if ((_cursesi_screen->curscr->cury != (win->begy + win->cury))
- || (_cursesi_screen->curscr->curx != (win->begx + win->curx))) {
+ if (!(win->flags & __ISPAD)) {
+ if (is_wintouched(win))
+ wrefresh(win);
+ else if ((_cursesi_screen->curscr->cury != (win->begy + win->cury))
+ || (_cursesi_screen->curscr->curx != (win->begx + win->curx))) {
#ifdef DEBUG
__CTRACE(__CTRACE_INPUT, "wgetch: curscr cury %d cury %d curscr curx %d curx %d\n",
_cursesi_screen->curscr->cury, win->begy + win->cury,
CVS commit: src/libexec/httpd
Module Name:src
Committed By: jmcneill
Date: Mon Jul 6 23:31:36 UTC 2020
Modified Files:
src/libexec/httpd: bozohttpd.8 bozohttpd.c bozohttpd.h dir-index-bozo.c
main.c
Log Message:
Add -R flag to specify a README file to add at the bottom of directory
autoindex listings.
To generate a diff of this commit:
cvs rdiff -u -r1.79 -r1.80 src/libexec/httpd/bozohttpd.8
cvs rdiff -u -r1.114 -r1.115 src/libexec/httpd/bozohttpd.c
cvs rdiff -u -r1.60 -r1.61 src/libexec/httpd/bozohttpd.h
cvs rdiff -u -r1.32 -r1.33 src/libexec/httpd/dir-index-bozo.c
cvs rdiff -u -r1.22 -r1.23 src/libexec/httpd/main.c
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/bozohttpd.8
diff -u src/libexec/httpd/bozohttpd.8:1.79 src/libexec/httpd/bozohttpd.8:1.80
--- src/libexec/httpd/bozohttpd.8:1.79 Thu Feb 28 08:28:21 2019
+++ src/libexec/httpd/bozohttpd.8 Mon Jul 6 23:31:36 2020
@@ -1,4 +1,4 @@
-.\" $NetBSD: bozohttpd.8,v 1.79 2019/02/28 08:28:21 mrg Exp $
+.\" $NetBSD: bozohttpd.8,v 1.80 2020/07/06 23:31:36 jmcneill Exp $
.\"
.\" $eterna: bozohttpd.8,v 1.101 2011/11/18 01:25:11 mrg Exp $
.\"
@@ -26,7 +26,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.Dd February 27, 2019
+.Dd July 6, 2020
.Dt BOZOHTTPD 8
.Os
.Sh NAME
@@ -40,6 +40,7 @@
.Op Fl L Ar prefix script
.Op Fl M Ar suffix type encoding encoding11
.Op Fl P Ar pidfile
+.Op Fl R Ar readme
.Op Fl S Ar server_software
.Op Fl T Ar type timeout
.Op Fl U Ar username
@@ -232,6 +233,10 @@ translations from
.Dq public_html
to
.Ar pubdir .
+.It Fl R Ar readme
+When directory indexing is enabled, include the contents of the file
+.Ar readme
+in the footer of the directory index.
.It Fl S Ar server_software
Sets the internal server version to
.Ar server_software .
Index: src/libexec/httpd/bozohttpd.c
diff -u src/libexec/httpd/bozohttpd.c:1.114 src/libexec/httpd/bozohttpd.c:1.115
--- src/libexec/httpd/bozohttpd.c:1.114 Sun Jun 7 23:33:02 2020
+++ src/libexec/httpd/bozohttpd.c Mon Jul 6 23:31:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.c,v 1.114 2020/06/07 23:33:02 fox Exp $ */
+/* $NetBSD: bozohttpd.c,v 1.115 2020/07/06 23:31:36 jmcneill Exp $ */
/* $eterna: bozohttpd.c,v 1.178 2011/11/18 09:21:15 mrg Exp $ */
@@ -2570,6 +2570,9 @@ bozo_setup(bozohttpd_t *httpd, bozoprefs
strcmp(cp, "true") == 0) {
httpd->dir_indexing = 1;
}
+ if ((cp = bozo_get_pref(prefs, "directory index readme")) != NULL) {
+ httpd->dir_readme = bozostrdup(httpd, NULL, cp);
+ }
if ((cp = bozo_get_pref(prefs, "public_html")) != NULL) {
httpd->public_html = bozostrdup(httpd, NULL, cp);
}
Index: src/libexec/httpd/bozohttpd.h
diff -u src/libexec/httpd/bozohttpd.h:1.60 src/libexec/httpd/bozohttpd.h:1.61
--- src/libexec/httpd/bozohttpd.h:1.60 Fri Mar 8 03:12:28 2019
+++ src/libexec/httpd/bozohttpd.h Mon Jul 6 23:31:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: bozohttpd.h,v 1.60 2019/03/08 03:12:28 mrg Exp $ */
+/* $NetBSD: bozohttpd.h,v 1.61 2020/07/06 23:31:36 jmcneill Exp $ */
/* $eterna: bozohttpd.h,v 1.39 2011/11/18 09:21:15 mrg Exp $ */
@@ -117,6 +117,7 @@ typedef struct bozohttpd_t {
struct pollfd *fds; /* current poll fd set */
int request_times; /* # times a request was processed */
int dir_indexing; /* handle directories */
+ const char *dir_readme; /* include README footer in indexes */
int hide_dots; /* hide .* */
int process_cgi; /* use the cgi handler */
char *cgibin; /* cgi-bin directory */
Index: src/libexec/httpd/dir-index-bozo.c
diff -u src/libexec/httpd/dir-index-bozo.c:1.32 src/libexec/httpd/dir-index-bozo.c:1.33
--- src/libexec/httpd/dir-index-bozo.c:1.32 Thu Feb 28 08:28:21 2019
+++ src/libexec/httpd/dir-index-bozo.c Mon Jul 6 23:31:36 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: dir-index-bozo.c,v 1.32 2019/02/28 08:28:21 mrg Exp $ */
+/* $NetBSD: dir-index-bozo.c,v 1.33 2020/07/06 23:31:36 jmcneill Exp $ */
/* $eterna: dir-index-bozo.c,v 1.20 2011/11/18 09:21:15 mrg Exp $ */
@@ -38,9 +38,11 @@
#include
#include
+#include
#include
#include
#include
+#include
#include
#include "bozohttpd.h"
@@ -57,7 +59,8 @@ bozo_dir_index(bozo_httpreq_t *request,
DIR *dp;
char buf[MAXPATHLEN];
char *file = NULL, *printname = NULL, *p;
- int k, j;
+ int k, j, fd;
+ ssize_t rlen;
if (!isindex || !httpd->dir_indexing)
return 0;
@@ -197,6 +200,23 @@ bozo_dir_index(bozo_httpreq_t *request,
free(deo[k]);
free(deo);
bozo_printf(httpd, "\r\n");
+ if (httpd->dir_readme != NULL) {
+ if (httpd->dir_readme[0] == '/')
+ snprintf(buf, sizeof buf, "%s", httpd->dir_readme);
+ else
+ snprintf(buf, sizeof buf, "%s/%s", dirpath, httpd->dir_readme);
+ fd = open(buf, O_RDONLY);
+ if (fd != -1) {
+ bozo_flush(httpd, stdout);
+ do {
+rlen = read(fd, buf, sizeof buf);
+if (rlen <= 0)
+ break;
+
CVS commit: src/lib/libcurses
Module Name:src
Committed By: uwe
Date: Mon Jul 6 22:46:50 UTC 2020
Modified Files:
src/lib/libcurses: ins_wch.c ins_wstr.c insch.c insstr.c
Log Message:
mvwins*(WINDOW *win, ...) functions - call wins* on win, not stdscr.
>From Naman Jain in PR lib/55460.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/lib/libcurses/ins_wch.c \
src/lib/libcurses/ins_wstr.c
cvs rdiff -u -r1.25 -r1.26 src/lib/libcurses/insch.c
cvs rdiff -u -r1.7 -r1.8 src/lib/libcurses/insstr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libcurses/ins_wch.c
diff -u src/lib/libcurses/ins_wch.c:1.14 src/lib/libcurses/ins_wch.c:1.15
--- src/lib/libcurses/ins_wch.c:1.14 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/ins_wch.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wch.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: ins_wch.c,v 1.15 2020/07/06 22:46:50 uwe Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ins_wch.c,v 1.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wch.c,v 1.15 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include
@@ -75,7 +75,7 @@ mvwins_wch(WINDOW *win, int y, int x, co
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wch(stdscr, wch);
+ return wins_wch(win, wch);
}
/*
Index: src/lib/libcurses/ins_wstr.c
diff -u src/lib/libcurses/ins_wstr.c:1.14 src/lib/libcurses/ins_wstr.c:1.15
--- src/lib/libcurses/ins_wstr.c:1.14 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/ins_wstr.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: ins_wstr.c,v 1.14 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: ins_wstr.c,v 1.15 2020/07/06 22:46:50 uwe Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: ins_wstr.c,v 1.14 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: ins_wstr.c,v 1.15 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include
@@ -96,7 +96,7 @@ mvwins_wstr(WINDOW *win, int y, int x, c
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_wstr(stdscr, wstr);
+ return wins_wstr(win, wstr);
}
/*
@@ -109,7 +109,7 @@ mvwins_nwstr(WINDOW *win, int y, int x,
if (wmove(win, y, x) == ERR)
return ERR;
- return wins_nwstr(stdscr, wstr, n);
+ return wins_nwstr(win, wstr, n);
}
Index: src/lib/libcurses/insch.c
diff -u src/lib/libcurses/insch.c:1.25 src/lib/libcurses/insch.c:1.26
--- src/lib/libcurses/insch.c:1.25 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/insch.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: insch.c,v 1.25 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: insch.c,v 1.26 2020/07/06 22:46:50 uwe Exp $ */
/*
* Copyright (c) 1981, 1993, 1994
@@ -34,7 +34,7 @@
#if 0
static char sccsid[] = "@(#)insch.c 8.2 (Berkeley) 5/4/94";
#else
-__RCSID("$NetBSD: insch.c,v 1.25 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insch.c,v 1.26 2020/07/06 22:46:50 uwe Exp $");
#endif
#endif/* not lint */
@@ -79,7 +79,7 @@ mvwinsch(WINDOW *win, int y, int x, chty
if (wmove(win, y, x) == ERR)
return ERR;
- return winsch(stdscr, ch);
+ return winsch(win, ch);
}
#endif
Index: src/lib/libcurses/insstr.c
diff -u src/lib/libcurses/insstr.c:1.7 src/lib/libcurses/insstr.c:1.8
--- src/lib/libcurses/insstr.c:1.7 Sun Jun 9 07:40:14 2019
+++ src/lib/libcurses/insstr.c Mon Jul 6 22:46:50 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $ */
+/* $NetBSD: insstr.c,v 1.8 2020/07/06 22:46:50 uwe Exp $ */
/*
* Copyright (c) 2005 The NetBSD Foundation Inc.
@@ -36,7 +36,7 @@
#include
#ifndef lint
-__RCSID("$NetBSD: insstr.c,v 1.7 2019/06/09 07:40:14 blymn Exp $");
+__RCSID("$NetBSD: insstr.c,v 1.8 2020/07/06 22:46:50 uwe Exp $");
#endif /* not lint */
#include
@@ -103,7 +103,7 @@ mvwinsstr(WINDOW *win, int y, int x, con
if (wmove(win, y, x) == ERR)
return ERR;
- return winsstr(stdscr, str);
+ return winsstr(win, str);
}
/*
@@ -117,7 +117,7 @@ mvwinsnstr(WINDOW *win, int y, int x, co
if (wmove(win, y, x) == ERR)
return ERR;
- return winsnstr(stdscr, str, n);
+ return winsnstr(win, str, n);
}
#endif
CVS commit: src/sys/sys
Module Name:src Committed By: rin Date: Mon Jul 6 22:32:22 UTC 2020 Modified Files: src/sys/sys: lock.h Log Message: Include missing opt_lockdebug.h. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/sys/lock.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/sys/lock.h diff -u src/sys/sys/lock.h:1.89 src/sys/sys/lock.h:1.90 --- src/sys/sys/lock.h:1.89 Sun Mar 8 15:05:18 2020 +++ src/sys/sys/lock.h Mon Jul 6 22:32:22 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: lock.h,v 1.89 2020/03/08 15:05:18 ad Exp $ */ +/* $NetBSD: lock.h,v 1.90 2020/07/06 22:32:22 rin Exp $ */ /*- * Copyright (c) 1999, 2000, 2006, 2007 The NetBSD Foundation, Inc. @@ -75,6 +75,10 @@ #ifdef _KERNEL +#ifdef _KERNEL_OPT +#include "opt_lockdebug.h" +#endif + /* * From . */
CVS commit: src/sys/dev/wsfont
Module Name:src
Committed By: fcambus
Date: Mon Jul 6 20:19:14 UTC 2020
Modified Files:
src/sys/dev/wsfont: spleen12x24.h spleen16x32.h spleen32x64.h
spleen5x8.h spleen8x16.h
Log Message:
Use C99 initializers in wsdisplay_font struct definitions for
Spleen kernel fonts.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/dev/wsfont/spleen12x24.h \
src/sys/dev/wsfont/spleen32x64.h src/sys/dev/wsfont/spleen5x8.h
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/wsfont/spleen16x32.h
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/wsfont/spleen8x16.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wsfont/spleen12x24.h
diff -u src/sys/dev/wsfont/spleen12x24.h:1.5 src/sys/dev/wsfont/spleen12x24.h:1.6
--- src/sys/dev/wsfont/spleen12x24.h:1.5 Sun Jun 21 15:48:17 2020
+++ src/sys/dev/wsfont/spleen12x24.h Mon Jul 6 20:19:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen12x24.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */
+/* $NetBSD: spleen12x24.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
/* $OpenBSD: spleen12x24.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -30,16 +30,16 @@
static u_char spleen12x24_data[];
struct wsdisplay_font spleen12x24 = {
- "Spleen 12x24", /* typeface name */
- ' ',/* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 12,/* width */
- 24,/* height */
- 2,/* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- spleen12x24_data /* data */
+ .name = "Spleen 12x24",
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 12,
+ .fontheight = 24,
+ .stride = 2,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .data = spleen12x24_data
};
static u_char spleen12x24_data[] = {
Index: src/sys/dev/wsfont/spleen32x64.h
diff -u src/sys/dev/wsfont/spleen32x64.h:1.5 src/sys/dev/wsfont/spleen32x64.h:1.6
--- src/sys/dev/wsfont/spleen32x64.h:1.5 Sun Jun 21 15:48:17 2020
+++ src/sys/dev/wsfont/spleen32x64.h Mon Jul 6 20:19:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen32x64.h,v 1.5 2020/06/21 15:48:17 fcambus Exp $ */
+/* $NetBSD: spleen32x64.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
/* $OpenBSD: spleen32x64.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -30,16 +30,16 @@
static u_char spleen32x64_data[];
struct wsdisplay_font spleen32x64 = {
- "Spleen 32x64", /* typeface name */
- ' ',/* firstchar */
- 256 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 32,/* width */
- 64,/* height */
- 4,/* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- spleen32x64_data /* data */
+ .name = "Spleen 32x64",
+ .firstchar = ' ',
+ .numchars = 256 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 32,
+ .fontheight = 64,
+ .stride = 4,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .data = spleen32x64_data
};
static u_char spleen32x64_data[] = {
Index: src/sys/dev/wsfont/spleen5x8.h
diff -u src/sys/dev/wsfont/spleen5x8.h:1.5 src/sys/dev/wsfont/spleen5x8.h:1.6
--- src/sys/dev/wsfont/spleen5x8.h:1.5 Mon Jun 29 09:45:35 2020
+++ src/sys/dev/wsfont/spleen5x8.h Mon Jul 6 20:19:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen5x8.h,v 1.5 2020/06/29 09:45:35 fcambus Exp $ */
+/* $NetBSD: spleen5x8.h,v 1.6 2020/07/06 20:19:14 fcambus Exp $ */
/* $OpenBSD: spleen5x8.h,v 1.2 2018/12/02 14:47:23 fcambus Exp $ */
/*
@@ -30,16 +30,16 @@
static u_char spleen5x8_data[];
struct wsdisplay_font spleen5x8 = {
- "Spleen 5x8", /* typeface name */
- ' ',/* firstchar */
- 128 - ' ', /* numchars */
- WSDISPLAY_FONTENC_ISO, /* encoding */
- 5,/* width */
- 8,/* height */
- 1,/* stride */
- WSDISPLAY_FONTORDER_L2R, /* bit order */
- WSDISPLAY_FONTORDER_L2R, /* byte order */
- spleen5x8_data /* data */
+ .name = "Spleen 5x8",
+ .firstchar = ' ',
+ .numchars = 128 - ' ',
+ .encoding = WSDISPLAY_FONTENC_ISO,
+ .fontwidth = 5,
+ .fontheight = 8,
+ .stride = 1,
+ .bitorder = WSDISPLAY_FONTORDER_L2R,
+ .byteorder = WSDISPLAY_FONTORDER_L2R,
+ .data = spleen5x8_data
};
static u_char spleen5x8_data[] = {
Index: src/sys/dev/wsfont/spleen16x32.h
diff -u src/sys/dev/wsfont/spleen16x32.h:1.4 src/sys/dev/wsfont/spleen16x32.h:1.5
--- src/sys/dev/wsfont/spleen16x32.h:1.4 Sun Jun 21 15:48:17 2020
+++ src/sys/dev/wsfont/spleen16x32.h Mon Jul 6 20:19:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: spleen16x32.h,v 1.4 2020/06/21 15:48:17 fcambus Exp $ */
+/* $NetBSD: spleen16x32.h,v 1.5 2020/07/06 20:19:14 fcambus Exp $ */
/* $OpenBSD: spleen16x32.h,v 1.2 2019/03/08 10:53:59 fcambus Exp $ */
/*
@@ -30,16 +30,16 @@
static u_char spleen16x32_data[];
struct wsdisplay_font spleen16x32 = {
- "Spleen 16x32", /* typeface name */
- ' ',/* firstchar */
- 256 - ' ', /* numchars
CVS commit: src/sys/netinet
Module Name:src
Committed By: christos
Date: Mon Jul 6 18:49:12 UTC 2020
Modified Files:
src/sys/netinet: tcp_input.c
Log Message:
- always set both ip and ip6, otherwise a kernel assertion can be triggered
- move alignment early so that we do less work
To generate a diff of this commit:
cvs rdiff -u -r1.417 -r1.418 src/sys/netinet/tcp_input.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/netinet/tcp_input.c
diff -u src/sys/netinet/tcp_input.c:1.417 src/sys/netinet/tcp_input.c:1.418
--- src/sys/netinet/tcp_input.c:1.417 Sat Nov 16 05:15:10 2019
+++ src/sys/netinet/tcp_input.c Mon Jul 6 14:49:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: tcp_input.c,v 1.417 2019/11/16 10:15:10 maxv Exp $ */
+/* $NetBSD: tcp_input.c,v 1.418 2020/07/06 18:49:12 christos Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -148,7 +148,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.417 2019/11/16 10:15:10 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tcp_input.c,v 1.418 2020/07/06 18:49:12 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1240,15 +1240,29 @@ tcp_input(struct mbuf *m, int off, int p
}
/*
+ * Enforce alignment requirements that are violated in
+ * some cases, see kern/50766 for details.
+ */
+ if (TCP_HDR_ALIGNED_P(th) == 0) {
+ m = m_copyup(m, off + sizeof(struct tcphdr), 0);
+ if (m == NULL) {
+ TCP_STATINC(TCP_STAT_RCVSHORT);
+ return;
+ }
+ th = (struct tcphdr *)(mtod(m, char *) + off);
+ }
+ KASSERT(TCP_HDR_ALIGNED_P(th));
+
+ /*
* Get IP and TCP header.
* Note: IP leaves IP header in first mbuf.
*/
ip = mtod(m, struct ip *);
- switch (ip->ip_v) {
- case 4:
#ifdef INET6
- ip6 = NULL;
+ ip6 = mtod(m, struct ip6_hdr *);
#endif
+ switch (ip->ip_v) {
+ case 4:
af = AF_INET;
iphlen = sizeof(struct ip);
@@ -1263,10 +1277,8 @@ tcp_input(struct mbuf *m, int off, int p
break;
#ifdef INET6
case 6:
- ip = NULL;
iphlen = sizeof(struct ip6_hdr);
af = AF_INET6;
- ip6 = mtod(m, struct ip6_hdr *);
/*
* Be proactive about unspecified IPv6 address in source.
@@ -1301,23 +1313,6 @@ tcp_input(struct mbuf *m, int off, int p
return;
}
- /*
- * Enforce alignment requirements that are violated in
- * some cases, see kern/50766 for details.
- */
- if (TCP_HDR_ALIGNED_P(th) == 0) {
- m = m_copyup(m, off + sizeof(struct tcphdr), 0);
- if (m == NULL) {
- TCP_STATINC(TCP_STAT_RCVSHORT);
- return;
- }
- ip = mtod(m, struct ip *);
-#ifdef INET6
- ip6 = mtod(m, struct ip6_hdr *);
-#endif
- th = (struct tcphdr *)(mtod(m, char *) + off);
- }
- KASSERT(TCP_HDR_ALIGNED_P(th));
/*
* Check that TCP offset makes sense, pull out TCP options and
@@ -1515,7 +1510,6 @@ findpcb:
m_freem(in6p->in6p_options);
in6p->in6p_options = NULL;
}
- KASSERT(ip6 != NULL);
ip6_savecontrol(in6p, >in6p_options, ip6, m);
}
#endif
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jul 6 18:47:02 UTC 2020 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: new mapped test. To generate a diff of this commit: cvs rdiff -u -r1.323 -r1.324 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.872 -r1.873 src/distrib/sets/lists/tests/mi 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/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.323 src/distrib/sets/lists/debug/mi:1.324 --- src/distrib/sets/lists/debug/mi:1.323 Wed Jul 1 03:16:38 2020 +++ src/distrib/sets/lists/debug/mi Mon Jul 6 14:47:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.323 2020/07/01 07:16:38 jruoho Exp $ +# $NetBSD: mi,v 1.324 2020/07/06 18:47:02 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib comp-sys-usr compatdir ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib,compatfile @@ -2376,6 +2376,7 @@ ./usr/libdata/debug/usr/tests/net/ipsec/natt_terminator.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/mcast/mcast.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/mcast/t_mcast.debug tests-obsolete debug,atf,rump,obsolete +./usr/libdata/debug/usr/tests/net/net/t_mapped.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug tests-net-debug debug,atf,compattestfile ./usr/libdata/debug/usr/tests/net/net/t_pktinfo_send.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/net/t_raw.debug tests-net-debug debug,atf,rump Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.872 src/distrib/sets/lists/tests/mi:1.873 --- src/distrib/sets/lists/tests/mi:1.872 Fri Jul 3 00:25:28 2020 +++ src/distrib/sets/lists/tests/mi Mon Jul 6 14:47:02 2020 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.872 2020/07/03 04:25:28 jruoho Exp $ +# $NetBSD: mi,v 1.873 2020/07/06 18:47:02 christos Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -3910,6 +3910,7 @@ ./usr/tests/net/net/t_ipaddress tests-net-tests atf,rump ./usr/tests/net/net/t_ipv6_lifetime tests-net-tests atf,rump ./usr/tests/net/net/t_ipv6address tests-net-tests atf,rump +./usr/tests/net/net/t_mapped tests-net-tests atf ./usr/tests/net/net/t_mtudisc tests-net-tests atf,rump ./usr/tests/net/net/t_mtudisc6 tests-net-tests atf,rump ./usr/tests/net/net/t_ping6_opts tests-net-tests atf,rump
CVS commit: src/tests/net/net
Module Name:src
Committed By: christos
Date: Mon Jul 6 18:45:26 UTC 2020
Modified Files:
src/tests/net/net: Makefile
Added Files:
src/tests/net/net: t_mapped.c
Log Message:
add a test for v4 mapped addresses
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tests/net/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/net/t_mapped.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/net/net/Makefile
diff -u src/tests/net/net/Makefile:1.23 src/tests/net/net/Makefile:1.24
--- src/tests/net/net/Makefile:1.23 Sun Mar 1 13:08:16 2020
+++ src/tests/net/net/Makefile Mon Jul 6 14:45:25 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2020/03/01 18:08:16 christos Exp $
+# $NetBSD: Makefile,v 1.24 2020/07/06 18:45:25 christos Exp $
#
.include
@@ -6,6 +6,7 @@
TESTSDIR= ${TESTSBASE}/net/net
TESTS_C= t_unix
+TESTS_C+= t_mapped
TESTS_C+= t_tcp
TESTS_C+= t_udp
TESTS_C+= t_pktinfo
@@ -26,4 +27,6 @@ LDADD.t_pktinfo_send+= ${LIBRUMPBASE}
LDADD.t_raw+= -lrumpnet_local -lrumpnet_netinet -lrumpnet_net
LDADD.t_raw+= -lrumpnet ${LIBRUMPBASE}
+LDADD.t_mapped+= -lutil
+
.include
Added files:
Index: src/tests/net/net/t_mapped.c
diff -u /dev/null src/tests/net/net/t_mapped.c:1.1
--- /dev/null Mon Jul 6 14:45:26 2020
+++ src/tests/net/net/t_mapped.c Mon Jul 6 14:45:25 2020
@@ -0,0 +1,320 @@
+/* $NetBSD: t_mapped.c,v 1.1 2020/07/06 18:45:25 christos Exp $ */
+
+/*-
+ * Copyright (c) 2020 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#define _GNU_SOURCE
+
+#include
+#ifdef __RCSID
+__RCSID("$Id: t_mapped.c,v 1.1 2020/07/06 18:45:25 christos Exp $");
+#endif
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include "util.h"
+
+#include "test.h"
+
+static char mymsg[] = "hi mom!";
+
+static void
+print(const char *msg, const struct sockaddr *addr)
+{
+ char buf[1024];
+
+ sockaddr_snprintf(buf, sizeof(buf), "%a:%p", addr);
+ printf("%s: %s\n", msg, buf);
+}
+
+static int
+mksocket(int sfam)
+{
+ int fd = socket(sfam, SOCK_STREAM, 0);
+ if (fd == -1)
+ FAIL("socket");
+ if (sfam != AF_INET6)
+ return fd;
+ int f = 0;
+#if 0
+ /* crashes the kernel, should not be allowed kernel only? */
+ if (setsockopt(fd, IPPROTO_IPV6, 24 /* IPV6_2292RTHDR */,
+ , sizeof(f)) == -1)
+ FAIL("setsockopt");
+#endif
+ if (setsockopt(fd, IPPROTO_IPV6, IPV6_V6ONLY, , sizeof(f)) == -1)
+ FAIL("setsockopt");
+ return fd;
+fail:
+ return -1;
+}
+
+static socklen_t
+mkserver(int sfam, struct sockaddr_storage *ss)
+{
+ struct sockaddr_in *sin;
+ struct sockaddr_in6 *sin6;
+
+ memset(ss, 0, sizeof(*ss));
+ ss->ss_family = sfam;
+ switch (sfam) {
+ case AF_INET:
+ sin = (struct sockaddr_in *)ss;
+ sin->sin_port = htons(12345);
+#ifdef BSD4_4
+ sin->sin_len = sizeof(*sin);
+#endif
+ return sizeof(*sin);
+ case AF_INET6:
+ sin6 = (struct sockaddr_in6 *)ss;
+ sin6->sin6_port = htons(12345);
+#ifdef BSD4_4
+ sin6->sin6_len = sizeof(*sin6);
+#endif
+ return sizeof(*sin6);
+ default:
+ FAIL("bad family");
+ }
+fail:
+ return -1;
+}
+
+#if 0
+static const struct in6_addr in6addr_loopback = IN6ADDR_LOOPBACK_INIT;
+#endif
+static socklen_t
+mkclient(int sfam, struct sockaddr_storage *ss)
+{
+ struct sockaddr_in *sin;
+ struct sockaddr_in6 *sin6;
+
+ memset(ss, 0, sizeof(*ss));
+ ss->ss_family = sfam;
+ switch (sfam) {
+ case AF_INET:
+ sin =
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: riastradh
Date: Mon Jul 6 18:30:48 UTC 2020
Modified Files:
src/sys/arch/x86/x86: fpu.c
Log Message:
Restore the lwp's fpu state, not zeros, and leave with fpu enabled.
We need to clear the fpu state anyway because it is likely to contain
secrets at this point. Previously we set it to zeros, and then issued
stts to disable the fpu in order to detect the mistake of further use
of the fpu in kernel. But there must be some path I haven't identified
yet that doesn't do fpu_handle_deferred, leading to fpudna panics.
In any case, there's no benefit to restoring the fpu state twice
(once with zeros and once with the real data). The downside is,
although this avoids spurious fpudna traps, using fpu_kern_enter in a
softint has the side effect that -- until the next userland context
switch triggering stts -- we no longer detect misuse of fpu in the
kernel in that lwp. This will serve for now, but we should find
another way to issue clts/stts judiciously to detect such misuse.
May improve the continued symptoms of
https://mail-index.netbsd.org/current-users/2020/07/02/msg039051.html
although may not fix everything.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/x86/x86/fpu.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/fpu.c
diff -u src/sys/arch/x86/x86/fpu.c:1.66 src/sys/arch/x86/x86/fpu.c:1.67
--- src/sys/arch/x86/x86/fpu.c:1.66 Mon Jul 6 01:08:15 2020
+++ src/sys/arch/x86/x86/fpu.c Mon Jul 6 18:30:48 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: fpu.c,v 1.66 2020/07/06 01:08:15 riastradh Exp $ */
+/* $NetBSD: fpu.c,v 1.67 2020/07/06 18:30:48 riastradh Exp $ */
/*
* Copyright (c) 2008, 2019 The NetBSD Foundation, Inc. All
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.66 2020/07/06 01:08:15 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.67 2020/07/06 18:30:48 riastradh Exp $");
#include "opt_multiprocessor.h"
@@ -417,6 +417,9 @@ void
fpu_kern_leave(void)
{
static const union savefpu zero_fpu __aligned(64);
+ const union savefpu *savefpu;
+ struct lwp *l = curlwp;
+ struct pcb *pcb;
struct cpu_info *ci = curcpu();
int s;
@@ -424,17 +427,18 @@ fpu_kern_leave(void)
KASSERT(ci->ci_kfpu_spl != -1);
/*
- * Zero the fpu registers; otherwise we might leak secrets
- * through Spectre-class attacks to userland, even if there are
- * no bugs in fpu state management.
- */
- fpu_area_restore(_fpu, x86_xsave_features);
-
- /*
- * Set CR0_TS again so that the kernel can't accidentally use
- * the FPU.
+ * Restore the FPU state immediately to avoid leaking any
+ * kernel secrets, or zero it if this is a kthread.
*/
- stts();
+ if ((l->l_pflag & LP_INTR) && (l->l_switchto != NULL))
+ l = l->l_switchto;
+ if (l->l_flag & LW_SYSTEM) {
+ savefpu = _fpu;
+ } else {
+ pcb = lwp_getpcb(l);
+ savefpu = >pcb_savefpu;
+ }
+ fpu_area_restore(savefpu, x86_xsave_features);
s = ci->ci_kfpu_spl;
ci->ci_kfpu_spl = -1;
CVS commit: src/tests/net/net
Module Name:src
Committed By: christos
Date: Mon Jul 6 16:24:06 UTC 2020
Modified Files:
src/tests/net/net: t_unix.c
Log Message:
don't open the socket twice.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/tests/net/net/t_unix.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/net/net/t_unix.c
diff -u src/tests/net/net/t_unix.c:1.18 src/tests/net/net/t_unix.c:1.19
--- src/tests/net/net/t_unix.c:1.18 Sat Apr 13 21:45:30 2019
+++ src/tests/net/net/t_unix.c Mon Jul 6 12:24:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: t_unix.c,v 1.18 2019/04/14 01:45:30 christos Exp $ */
+/* $NetBSD: t_unix.c,v 1.19 2020/07/06 16:24:06 christos Exp $ */
/*-
* Copyright (c) 2011 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
#include
#ifdef __RCSID
-__RCSID("$Id: t_unix.c,v 1.18 2019/04/14 01:45:30 christos Exp $");
+__RCSID("$Id: t_unix.c,v 1.19 2020/07/06 16:24:06 christos Exp $");
#else
#define getprogname() argv[0]
#endif
@@ -162,17 +162,13 @@ test(bool forkit, bool closeit, size_t l
srvrpid = clntpid = getpid();
srvr = socket(AF_UNIX, SOCK_STREAM, 0);
if (srvr == -1)
- FAIL("socket(srvrer)");
+ FAIL("socket(server)");
slen = len + OF + 1;
if ((sun = calloc(1, slen)) == NULL)
FAIL("calloc");
- srvr = socket(AF_UNIX, SOCK_STREAM, 0);
- if (srvr == -1)
- FAIL("socket");
-
memset(sun->sun_path, 'a', len);
sun->sun_path[len] = '\0';
(void)unlink(sun->sun_path);
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: rin
Date: Mon Jul 6 13:20:55 UTC 2020
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
Use (CI_SAVEMAX*CPUSAVE_LEN) as CPUSAVE_SIZE for MODULAR || _MODULE,
since it exceeds 128 (256 for now).
XXX
We should use CTASSERT here, but it conflicts with genassym...
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/arch/powerpc/include/cpu.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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.112 src/sys/arch/powerpc/include/cpu.h:1.113
--- src/sys/arch/powerpc/include/cpu.h:1.112 Mon Jul 6 10:50:32 2020
+++ src/sys/arch/powerpc/include/cpu.h Mon Jul 6 13:20:55 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.112 2020/07/06 10:50:32 rin Exp $ */
+/* $NetBSD: cpu.h,v 1.113 2020/07/06 13:20:55 rin Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -98,10 +98,11 @@ struct cpu_info {
#define CI_SAVEMMU (3*CPUSAVE_LEN)
#define CI_SAVEMAX (4*CPUSAVE_LEN)
#define CPUSAVE_LEN 8
-#if !defined(PPC_BOOKE) && !defined(MODULAR) && !defined(_MODULE)
-#define CPUSAVE_SIZE (CI_SAVEMAX*CPUSAVE_LEN)
-#else
+#if defined(PPC_BOOKE) && !defined(MODULAR) && !defined(_MODULE)
#define CPUSAVE_SIZE 128
+#else
+#define CPUSAVE_SIZE (CI_SAVEMAX*CPUSAVE_LEN)
+// XXX CTASSERT(CPUSAVE_SIZE >= 128);
#endif
#define CPUSAVE_R28 0 /* where r28 gets saved */
#define CPUSAVE_R29 1 /* where r29 gets saved */
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Mon Jul 6 13:10:19 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c Log Message: Set cpu_psluserset, cpu_pslusermod, cpu_pslusermask for MODULAR. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/ibm4xx/ibm4xx_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/powerpc/ibm4xx/ibm4xx_machdep.c diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.31 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.32 --- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.31 Mon Jul 6 10:34:23 2020 +++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Mon Jul 6 13:10:19 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ibm4xx_machdep.c,v 1.31 2020/07/06 10:34:23 rin Exp $ */ +/* $NetBSD: ibm4xx_machdep.c,v 1.32 2020/07/06 13:10:19 rin Exp $ */ /* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */ /* @@ -68,7 +68,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.31 2020/07/06 10:34:23 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.32 2020/07/06 13:10:19 rin Exp $"); #include "ksyms.h" @@ -115,6 +115,12 @@ char msgbuf[MSGBUFSIZE]; void *startsym, *endsym; #endif +#ifdef MODULAR +register_t cpu_psluserset = PSL_USERSET; +register_t cpu_pslusermod = PSL_USERMOD; +register_t cpu_pslusermask = PSL_USERMASK; +#endif + /* * Trap vectors */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: rin
Date: Mon Jul 6 11:24:57 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: trap.c
Log Message:
Stop using DDBX which is defined nowhere.
To generate a diff of this commit:
cvs rdiff -u -r1.160 -r1.161 src/sys/arch/powerpc/powerpc/trap.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/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.160 src/sys/arch/powerpc/powerpc/trap.c:1.161
--- src/sys/arch/powerpc/powerpc/trap.c:1.160 Mon Jul 6 11:23:59 2020
+++ src/sys/arch/powerpc/powerpc/trap.c Mon Jul 6 11:24:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.160 2020/07/06 11:23:59 rin Exp $ */
+/* $NetBSD: trap.c,v 1.161 2020/07/06 11:24:57 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,7 +35,7 @@
#define __UCAS_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.160 2020/07/06 11:23:59 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.161 2020/07/06 11:24:57 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -486,7 +486,7 @@ vm_signal:
default:
printf("trap type %x at %lx\n", type, tf->tf_srr0);
brain_damage2:
-#ifdef DDBX
+#if defined(DDB) && 0 /* XXX */
if (kdb_trap(type, tf))
return;
#endif
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: rin
Date: Mon Jul 6 11:23:59 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: trap.c
Log Message:
This file is not used for ibm4xx.
To generate a diff of this commit:
cvs rdiff -u -r1.159 -r1.160 src/sys/arch/powerpc/powerpc/trap.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/powerpc/powerpc/trap.c
diff -u src/sys/arch/powerpc/powerpc/trap.c:1.159 src/sys/arch/powerpc/powerpc/trap.c:1.160
--- src/sys/arch/powerpc/powerpc/trap.c:1.159 Mon Jul 6 11:08:21 2020
+++ src/sys/arch/powerpc/powerpc/trap.c Mon Jul 6 11:23:59 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.159 2020/07/06 11:08:21 rin Exp $ */
+/* $NetBSD: trap.c,v 1.160 2020/07/06 11:23:59 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -35,7 +35,7 @@
#define __UCAS_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.159 2020/07/06 11:08:21 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.160 2020/07/06 11:23:59 rin Exp $");
#ifdef _KERNEL_OPT
#include "opt_altivec.h"
@@ -160,7 +160,7 @@ trap(struct trapframe *tf)
trunc_page(va), false)) {
return;
}
-#if defined(DIAGNOSTIC) && !defined(PPC_OEA64) && !defined (PPC_IBM4XX)
+#if defined(DIAGNOSTIC) && !defined(PPC_OEA64)
} else if ((va >> ADDR_SR_SHFT) == USER_SR) {
printf("trap: kernel %s DSI trap @ %#lx by %#lx"
" (DSISR %#x): USER_SR unset\n",
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:09:15 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: trap_subr.S Log Message: Include required opt_*.h for sure. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/powerpc/trap_subr.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/powerpc/powerpc/trap_subr.S diff -u src/sys/arch/powerpc/powerpc/trap_subr.S:1.82 src/sys/arch/powerpc/powerpc/trap_subr.S:1.83 --- src/sys/arch/powerpc/powerpc/trap_subr.S:1.82 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/trap_subr.S Mon Jul 6 11:09:15 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.S,v 1.82 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: trap_subr.S,v 1.83 2020/07/06 11:09:15 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -40,6 +40,9 @@ #ifdef _KERNEL_OPT #include "opt_altivec.h" +#include "opt_ddb.h" +#include "opt_kgdb.h" +#include "opt_ppcarch.h" #endif /* LINTSTUB: include */
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:08:22 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: trap.c Log Message: - Drop unused opt_multiprocessor.h. - Include missing opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.158 -r1.159 src/sys/arch/powerpc/powerpc/trap.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/powerpc/powerpc/trap.c diff -u src/sys/arch/powerpc/powerpc/trap.c:1.158 src/sys/arch/powerpc/powerpc/trap.c:1.159 --- src/sys/arch/powerpc/powerpc/trap.c:1.158 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/trap.c Mon Jul 6 11:08:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.158 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: trap.c,v 1.159 2020/07/06 11:08:21 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -35,12 +35,12 @@ #define __UCAS_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.158 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.159 2020/07/06 11:08:21 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" #include "opt_ddb.h" -#include "opt_multiprocessor.h" +#include "opt_ppcarch.h" #endif #include
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:07:39 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: syscall.c Log Message: Drop unused opt_altivec.h and opt_multiprocessor.h. To generate a diff of this commit: cvs rdiff -u -r1.56 -r1.57 src/sys/arch/powerpc/powerpc/syscall.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/powerpc/powerpc/syscall.c diff -u src/sys/arch/powerpc/powerpc/syscall.c:1.56 src/sys/arch/powerpc/powerpc/syscall.c:1.57 --- src/sys/arch/powerpc/powerpc/syscall.c:1.56 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/syscall.c Mon Jul 6 11:07:39 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: syscall.c,v 1.56 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: syscall.c,v 1.57 2020/07/06 11:07:39 rin Exp $ */ /* * Copyright (C) 2002 Matt Thomas @@ -35,11 +35,6 @@ /* DO NOT INCLUDE opt_compat_XXX.h */ /* If needed, they will be included by file that includes this one */ -#ifdef _KERNEL_OPT -#include "opt_altivec.h" -#include "opt_multiprocessor.h" -#endif - #include #include #include @@ -64,7 +59,7 @@ #define EMULNAME(x) (x) #define EMULNAMEU(x) (x) -__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.56 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: syscall.c,v 1.57 2020/07/06 11:07:39 rin Exp $"); void md_child_return(struct lwp *l)
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:06:52 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: locore_subr.S Log Message: Drop unused opt_lockdebug.h. To generate a diff of this commit: cvs rdiff -u -r1.62 -r1.63 src/sys/arch/powerpc/powerpc/locore_subr.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/powerpc/powerpc/locore_subr.S diff -u src/sys/arch/powerpc/powerpc/locore_subr.S:1.62 src/sys/arch/powerpc/powerpc/locore_subr.S:1.63 --- src/sys/arch/powerpc/powerpc/locore_subr.S:1.62 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/locore_subr.S Mon Jul 6 11:06:52 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.62 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: locore_subr.S,v 1.63 2020/07/06 11:06:52 rin Exp $ */ /* * Copyright (c) 2001 Wasabi Systems, Inc. @@ -75,7 +75,6 @@ #ifdef _KERNEL_OPT #include "opt_ddb.h" -#include "opt_lockdebug.h" #include "opt_modular.h" #include "opt_multiprocessor.h" #include "opt_ppcarch.h"
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:05:54 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: kgdb_machdep.c Log Message: - Drop unused opt_ddb.h. - Include missing opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/powerpc/kgdb_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/powerpc/powerpc/kgdb_machdep.c diff -u src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.23 src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.24 --- src/sys/arch/powerpc/powerpc/kgdb_machdep.c:1.23 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/kgdb_machdep.c Mon Jul 6 11:05:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: kgdb_machdep.c,v 1.23 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: kgdb_machdep.c,v 1.24 2020/07/06 11:05:54 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -36,10 +36,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.23 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kgdb_machdep.c,v 1.24 2020/07/06 11:05:54 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_ddb.h" +#include "opt_ppcarch.h" #endif /*
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 11:05:05 UTC 2020 Modified Files: src/sys/arch/powerpc/powerpc: core_machdep.c Log Message: Drop unused opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/powerpc/core_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/powerpc/powerpc/core_machdep.c diff -u src/sys/arch/powerpc/powerpc/core_machdep.c:1.10 src/sys/arch/powerpc/powerpc/core_machdep.c:1.11 --- src/sys/arch/powerpc/powerpc/core_machdep.c:1.10 Wed Nov 20 19:37:52 2019 +++ src/sys/arch/powerpc/powerpc/core_machdep.c Mon Jul 6 11:05:05 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: core_machdep.c,v 1.10 2019/11/20 19:37:52 pgoyette Exp $ */ +/* $NetBSD: core_machdep.c,v 1.11 2020/07/06 11:05:05 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,11 +32,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.10 2019/11/20 19:37:52 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: core_machdep.c,v 1.11 2020/07/06 11:05:05 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" -#include "opt_ppcarch.h" #endif #include
CVS commit: src/sys/arch/powerpc/pic
Module Name:src Committed By: rin Date: Mon Jul 6 11:02:44 UTC 2020 Modified Files: src/sys/arch/powerpc/pic: openpic_common.c pic_distopenpic.c Log Message: Drop unused opt_interrupt.h. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/pic/openpic_common.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/pic/pic_distopenpic.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/powerpc/pic/openpic_common.c diff -u src/sys/arch/powerpc/pic/openpic_common.c:1.8 src/sys/arch/powerpc/pic/openpic_common.c:1.9 --- src/sys/arch/powerpc/pic/openpic_common.c:1.8 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/pic/openpic_common.c Mon Jul 6 11:02:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: openpic_common.c,v 1.8 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: openpic_common.c,v 1.9 2020/07/06 11:02:44 rin Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,10 +27,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.8 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: openpic_common.c,v 1.9 2020/07/06 11:02:44 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_interrupt.h" #include "opt_openpic.h" #endif Index: src/sys/arch/powerpc/pic/pic_distopenpic.c diff -u src/sys/arch/powerpc/pic/pic_distopenpic.c:1.12 src/sys/arch/powerpc/pic/pic_distopenpic.c:1.13 --- src/sys/arch/powerpc/pic/pic_distopenpic.c:1.12 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/pic/pic_distopenpic.c Mon Jul 6 11:02:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pic_distopenpic.c,v 1.12 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: pic_distopenpic.c,v 1.13 2020/07/06 11:02:44 rin Exp $ */ /*- * Copyright (c) 2008 Tim Rightnour @@ -30,10 +30,9 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.12 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pic_distopenpic.c,v 1.13 2020/07/06 11:02:44 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_interrupt.h" #include "opt_openpic.h" #endif
CVS commit: src/sys/arch/powerpc/pic
Module Name:src Committed By: rin Date: Mon Jul 6 11:01:24 UTC 2020 Modified Files: src/sys/arch/powerpc/pic: ipi.c Log Message: Drop unused opt_altivec.h, opt_interrupt.h, opt_ipi.h, and opt_pic.h. To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/arch/powerpc/pic/ipi.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/powerpc/pic/ipi.c diff -u src/sys/arch/powerpc/pic/ipi.c:1.15 src/sys/arch/powerpc/pic/ipi.c:1.16 --- src/sys/arch/powerpc/pic/ipi.c:1.15 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/pic/ipi.c Mon Jul 6 11:01:24 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ipi.c,v 1.15 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: ipi.c,v 1.16 2020/07/06 11:01:24 rin Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. * All rights reserved. @@ -29,14 +29,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.15 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ipi.c,v 1.16 2020/07/06 11:01:24 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_altivec.h" -#include "opt_interrupt.h" -#include "opt_ipi.h" #include "opt_multiprocessor.h" -#include "opt_pic.h" #endif #include
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: rin Date: Mon Jul 6 10:59:37 UTC 2020 Modified Files: src/sys/arch/powerpc/oea: ofwoea_machdep.c Log Message: - Drop unused opt_compat_netbsd.h. - Include missing opt_multiprocessor.h. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/sys/arch/powerpc/oea/ofwoea_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/powerpc/oea/ofwoea_machdep.c diff -u src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.48 src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.49 --- src/sys/arch/powerpc/oea/ofwoea_machdep.c:1.48 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/oea/ofwoea_machdep.c Mon Jul 6 10:59:37 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ofwoea_machdep.c,v 1.48 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: ofwoea_machdep.c,v 1.49 2020/07/06 10:59:37 rin Exp $ */ /*- * Copyright (c) 2007 The NetBSD Foundation, Inc. @@ -30,16 +30,16 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.48 2020/07/06 09:34:17 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ofwoea_machdep.c,v 1.49 2020/07/06 10:59:37 rin Exp $"); #include "ksyms.h" #include "wsdisplay.h" #ifdef _KERNEL_OPT #include "opt_ddb.h" -#include "opt_compat_netbsd.h" #include "opt_kgdb.h" #include "opt_modular.h" +#include "opt_multiprocessor.h" #include "opt_oea.h" #include "opt_ofwoea.h" #include "opt_ppcarch.h"
CVS commit: src/sys/arch/powerpc/oea
Module Name:src Committed By: rin Date: Mon Jul 6 10:58:06 UTC 2020 Modified Files: src/sys/arch/powerpc/oea: cpu_speedctl.c Log Message: Drop unused opt_ppcparam.h. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/oea/cpu_speedctl.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/powerpc/oea/cpu_speedctl.c diff -u src/sys/arch/powerpc/oea/cpu_speedctl.c:1.2 src/sys/arch/powerpc/oea/cpu_speedctl.c:1.3 --- src/sys/arch/powerpc/oea/cpu_speedctl.c:1.2 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/oea/cpu_speedctl.c Mon Jul 6 10:58:06 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_speedctl.c,v 1.2 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: cpu_speedctl.c,v 1.3 2020/07/06 10:58:06 rin Exp $ */ /*- * Copyright (c) 2006 Michael Lorenz @@ -27,11 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: cpu_speedctl.c,v 1.2 2020/07/06 09:34:17 rin Exp $"); - -#ifdef _KERNEL_OPT -#include "opt_ppcparam.h" -#endif +__KERNEL_RCSID(0, "$NetBSD: cpu_speedctl.c,v 1.3 2020/07/06 10:58:06 rin Exp $"); #include #include
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 10:57:03 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: Include missing opt_modular.h so that struct vm_page_md is compatible to that for booke. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/include/oea/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.31 src/sys/arch/powerpc/include/oea/pmap.h:1.32 --- src/sys/arch/powerpc/include/oea/pmap.h:1.31 Mon Jul 6 09:10:02 2020 +++ src/sys/arch/powerpc/include/oea/pmap.h Mon Jul 6 10:57:03 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.31 2020/07/06 09:10:02 rin Exp $ */ +/* $NetBSD: pmap.h,v 1.32 2020/07/06 10:57:03 rin Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -44,6 +44,7 @@ #ifdef _KERNEL_OPT #include "opt_ppcarch.h" +#include "opt_modular.h" #endif #include
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 10:54:56 UTC 2020 Modified Files: src/sys/arch/powerpc/include/booke: cpuvar.h src/sys/arch/powerpc/pic: pic_openpic.c Log Message: Include missing opt_multiprocessor.h. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/booke/cpuvar.h cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/pic/pic_openpic.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/powerpc/include/booke/cpuvar.h diff -u src/sys/arch/powerpc/include/booke/cpuvar.h:1.20 src/sys/arch/powerpc/include/booke/cpuvar.h:1.21 --- src/sys/arch/powerpc/include/booke/cpuvar.h:1.20 Sun Apr 7 05:25:55 2019 +++ src/sys/arch/powerpc/include/booke/cpuvar.h Mon Jul 6 10:54:56 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuvar.h,v 1.20 2019/04/07 05:25:55 thorpej Exp $ */ +/* $NetBSD: cpuvar.h,v 1.21 2020/07/06 10:54:56 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,6 +37,10 @@ #ifndef _POWERPC_BOOKE_CPUVAR_H_ #define _POWERPC_BOOKE_CPUVAR_H_ +#ifdef _KERNEL_OPT +#include "opt_multiprocessor.h" +#endif + #include #include #include Index: src/sys/arch/powerpc/pic/pic_openpic.c diff -u src/sys/arch/powerpc/pic/pic_openpic.c:1.16 src/sys/arch/powerpc/pic/pic_openpic.c:1.17 --- src/sys/arch/powerpc/pic/pic_openpic.c:1.16 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/pic/pic_openpic.c Mon Jul 6 10:54:56 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pic_openpic.c,v 1.16 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: pic_openpic.c,v 1.17 2020/07/06 10:54:56 rin Exp $ */ /*- * Copyright (c) 2007 Michael Lorenz @@ -27,12 +27,16 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.16 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pic_openpic.c,v 1.17 2020/07/06 10:54:56 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_interrupt.h" #endif +#ifdef _KERNEL_OPT +#include "opt_multiprocessor.h" +#endif + #include #include #include
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 10:52:12 UTC 2020 Modified Files: src/sys/arch/powerpc/include: fpu.h src/sys/arch/powerpc/oea: altivec.c src/sys/arch/powerpc/powerpc: fpu.c vm_machdep.c Log Message: Drop unused opt_multiprocessor.h includes. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/include/fpu.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/oea/altivec.c cvs rdiff -u -r1.40 -r1.41 src/sys/arch/powerpc/powerpc/fpu.c cvs rdiff -u -r1.103 -r1.104 src/sys/arch/powerpc/powerpc/vm_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/powerpc/include/fpu.h diff -u src/sys/arch/powerpc/include/fpu.h:1.23 src/sys/arch/powerpc/include/fpu.h:1.24 --- src/sys/arch/powerpc/include/fpu.h:1.23 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/include/fpu.h Mon Jul 6 10:52:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.h,v 1.23 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: fpu.h,v 1.24 2020/07/06 10:52:12 rin Exp $ */ /*- * Copyright (C) 1996 Wolfgang Solfrank. @@ -70,7 +70,6 @@ #ifdef _KERNEL #ifdef _KERNEL_OPT -#include "opt_multiprocessor.h" #include "opt_ppcarch.h" #endif Index: src/sys/arch/powerpc/oea/altivec.c diff -u src/sys/arch/powerpc/oea/altivec.c:1.32 src/sys/arch/powerpc/oea/altivec.c:1.33 --- src/sys/arch/powerpc/oea/altivec.c:1.32 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/oea/altivec.c Mon Jul 6 10:52:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: altivec.c,v 1.33 2020/07/06 10:52:12 rin Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -32,11 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.32 2020/07/06 09:34:17 rin Exp $"); - -#ifdef _KERNEL_OPT -#include "opt_multiprocessor.h" -#endif +__KERNEL_RCSID(0, "$NetBSD: altivec.c,v 1.33 2020/07/06 10:52:12 rin Exp $"); #include #include Index: src/sys/arch/powerpc/powerpc/fpu.c diff -u src/sys/arch/powerpc/powerpc/fpu.c:1.40 src/sys/arch/powerpc/powerpc/fpu.c:1.41 --- src/sys/arch/powerpc/powerpc/fpu.c:1.40 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/fpu.c Mon Jul 6 10:52:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $ */ /* * Copyright (C) 1996 Wolfgang Solfrank. @@ -32,11 +32,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.40 2020/07/06 09:34:18 rin Exp $"); - -#ifdef _KERNEL_OPT -#include "opt_multiprocessor.h" -#endif +__KERNEL_RCSID(0, "$NetBSD: fpu.c,v 1.41 2020/07/06 10:52:12 rin Exp $"); #include #include Index: src/sys/arch/powerpc/powerpc/vm_machdep.c diff -u src/sys/arch/powerpc/powerpc/vm_machdep.c:1.103 src/sys/arch/powerpc/powerpc/vm_machdep.c:1.104 --- src/sys/arch/powerpc/powerpc/vm_machdep.c:1.103 Mon Jul 6 09:34:18 2020 +++ src/sys/arch/powerpc/powerpc/vm_machdep.c Mon Jul 6 10:52:12 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $ */ +/* $NetBSD: vm_machdep.c,v 1.104 2020/07/06 10:52:12 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -32,11 +32,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.103 2020/07/06 09:34:18 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: vm_machdep.c,v 1.104 2020/07/06 10:52:12 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" -#include "opt_multiprocessor.h" #include "opt_ppcarch.h" #include "opt_ppccache.h" #endif
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: rin
Date: Mon Jul 6 10:50:32 UTC 2020
Modified Files:
src/sys/arch/powerpc/include: cpu.h
Log Message:
Drop unused opt_lockdebug.h.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/sys/arch/powerpc/include/cpu.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/powerpc/include/cpu.h
diff -u src/sys/arch/powerpc/include/cpu.h:1.111 src/sys/arch/powerpc/include/cpu.h:1.112
--- src/sys/arch/powerpc/include/cpu.h:1.111 Sat Jun 27 07:33:51 2020
+++ src/sys/arch/powerpc/include/cpu.h Mon Jul 6 10:50:32 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpu.h,v 1.111 2020/06/27 07:33:51 macallan Exp $ */
+/* $NetBSD: cpu.h,v 1.112 2020/07/06 10:50:32 rin Exp $ */
/*
* Copyright (C) 1999 Wolfgang Solfrank.
@@ -45,7 +45,6 @@ struct cache_info {
#if defined(_KERNEL) || defined(_KMEMUSER)
#if defined(_KERNEL_OPT)
-#include "opt_lockdebug.h"
#include "opt_modular.h"
#include "opt_multiprocessor.h"
#include "opt_ppcarch.h"
CVS commit: src/sys/arch/powerpc/ibm4xx/pci
Module Name:src Committed By: rin Date: Mon Jul 6 10:49:41 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx/pci: pci_machdep.c Log Message: Include missing opt_pci.h To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/ibm4xx/pci/pci_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/powerpc/ibm4xx/pci/pci_machdep.c diff -u src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.11 src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.12 --- src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c:1.11 Fri Oct 2 05:22:51 2015 +++ src/sys/arch/powerpc/ibm4xx/pci/pci_machdep.c Mon Jul 6 10:49:41 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_machdep.c,v 1.11 2015/10/02 05:22:51 msaitoh Exp $ */ +/* $NetBSD: pci_machdep.c,v 1.12 2020/07/06 10:49:41 rin Exp $ */ /* * Copyright (c) 1996 Christopher G. Demetriou. All rights reserved. @@ -43,7 +43,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.11 2015/10/02 05:22:51 msaitoh Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_machdep.c,v 1.12 2020/07/06 10:49:41 rin Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_pci.h" +#endif #include #include
CVS commit: src/sys/arch/powerpc/ibm4xx/openbios
Module Name:src Committed By: rin Date: Mon Jul 6 10:48:54 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx/openbios: locore.S Log Message: Do not silently #undef PPC_4XX_NOCACHE, which results in terrible confusion. Raise #error instead. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/powerpc/ibm4xx/openbios/locore.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/powerpc/ibm4xx/openbios/locore.S diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.14 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.15 --- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.14 Mon Jul 6 10:44:38 2020 +++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Mon Jul 6 10:48:54 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.14 2020/07/06 10:44:38 rin Exp $ */ +/* $NetBSD: locore.S,v 1.15 2020/07/06 10:48:54 rin Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -67,7 +67,9 @@ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#undef PPC_4XX_NOCACHE +#ifdef PPC_4XX_NOCACHE +#error "Fix me" +#endif #include "assym.h" #include "ksyms.h"
CVS commit: src/sys/arch/powerpc/ibm4xx/openbios
Module Name:src Committed By: rin Date: Mon Jul 6 10:44:38 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx/openbios: locore.S Log Message: Drop unused opt_lockdebug.h, opt_multiprocessor.h, and opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/ibm4xx/openbios/locore.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/powerpc/ibm4xx/openbios/locore.S diff -u src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.13 src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.14 --- src/sys/arch/powerpc/ibm4xx/openbios/locore.S:1.13 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/ibm4xx/openbios/locore.S Mon Jul 6 10:44:38 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.13 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: locore.S,v 1.14 2020/07/06 10:44:38 rin Exp $ */ /* $OpenBSD: locore.S,v 1.4 1997/01/26 09:06:38 rahnds Exp $ */ /* @@ -74,10 +74,7 @@ #ifdef _KERNEL_OPT #include "opt_ddb.h" -#include "opt_lockdebug.h" #include "opt_modular.h" -#include "opt_multiprocessor.h" -#include "opt_ppcarch.h" #include "opt_ppcparam.h" #endif
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Mon Jul 6 10:42:21 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: trap_subr.S Log Message: Include required opt_*.h for sure. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/ibm4xx/trap_subr.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/powerpc/ibm4xx/trap_subr.S diff -u src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.28 src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.29 --- src/sys/arch/powerpc/ibm4xx/trap_subr.S:1.28 Sun Mar 1 23:23:36 2020 +++ src/sys/arch/powerpc/ibm4xx/trap_subr.S Mon Jul 6 10:42:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap_subr.S,v 1.28 2020/03/01 23:23:36 rin Exp $ */ +/* $NetBSD: trap_subr.S,v 1.29 2020/07/06 10:42:21 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -73,6 +73,11 @@ * #include */ +#ifdef _KERNEL_OPT +#include "opt_ddb.h" +#include "opt_kgdb.h" +#endif + /* * XXX Interrupt and spill stacks need to be per-CPU. */
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Mon Jul 6 10:41:43 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: trap.c Log Message: - Drop unused opt_altivec.h. - Include missing opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.82 -r1.83 src/sys/arch/powerpc/ibm4xx/trap.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/powerpc/ibm4xx/trap.c diff -u src/sys/arch/powerpc/ibm4xx/trap.c:1.82 src/sys/arch/powerpc/ibm4xx/trap.c:1.83 --- src/sys/arch/powerpc/ibm4xx/trap.c:1.82 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/ibm4xx/trap.c Mon Jul 6 10:41:43 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.82 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: trap.c,v 1.83 2020/07/06 10:41:43 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -69,12 +69,12 @@ #define __UFETCHSTORE_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.82 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: trap.c,v 1.83 2020/07/06 10:41:43 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_altivec.h" #include "opt_ddb.h" #include "opt_kgdb.h" +#include "opt_ppcarch.h" #endif #include
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Mon Jul 6 10:40:21 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: pmap.c Log Message: Include missing opt_ddb.h. To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/sys/arch/powerpc/ibm4xx/pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/ibm4xx/pmap.c diff -u src/sys/arch/powerpc/ibm4xx/pmap.c:1.89 src/sys/arch/powerpc/ibm4xx/pmap.c:1.90 --- src/sys/arch/powerpc/ibm4xx/pmap.c:1.89 Mon Jun 29 06:51:32 2020 +++ src/sys/arch/powerpc/ibm4xx/pmap.c Mon Jul 6 10:40:21 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.c,v 1.89 2020/06/29 06:51:32 rin Exp $ */ +/* $NetBSD: pmap.c,v 1.90 2020/07/06 10:40:21 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.89 2020/06/29 06:51:32 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pmap.c,v 1.90 2020/07/06 10:40:21 rin Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_ddb.h" +#endif #include #include
CVS commit: src/sys/arch/evbppc/conf
Module Name:src
Committed By: rin
Date: Mon Jul 6 10:38:46 UTC 2020
Modified Files:
src/sys/arch/evbppc/conf: files.explora
Log Message:
Now, sys/arch/powerpc/ibm4xx/pic_uic.c requires opt_uic.h.
XXX
Switch to powerpc/conf/files.ibm4xx.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbppc/conf/files.explora
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/evbppc/conf/files.explora
diff -u src/sys/arch/evbppc/conf/files.explora:1.9 src/sys/arch/evbppc/conf/files.explora:1.10
--- src/sys/arch/evbppc/conf/files.explora:1.9 Mon Jun 20 17:44:33 2011
+++ src/sys/arch/evbppc/conf/files.explora Mon Jul 6 10:38:46 2020
@@ -1,4 +1,4 @@
-# $NetBSD: files.explora,v 1.9 2011/06/20 17:44:33 matt Exp $
+# $NetBSD: files.explora,v 1.10 2020/07/06 10:38:46 rin Exp $
# maxpartitions must be first item in files.${ARCH}
@@ -16,6 +16,7 @@ file arch/evbppc/explora/autoconf.c
file arch/evbppc/explora/consinit.c
file arch/evbppc/explora/machdep.c
file arch/powerpc/ibm4xx/ibm4xx_machdep.c
+defflag opt_uic.h MULTIUIC
file arch/powerpc/ibm4xx/pic_uic.c
file dev/md_root.cmemory_disk_hooks
CVS commit: src/sys/arch/powerpc/ibm4xx
Module Name:src Committed By: rin Date: Mon Jul 6 10:35:29 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: pic_uic.c Log Message: Include missing opt_ppcarch.h and opt_uic.h. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/ibm4xx/pic_uic.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/powerpc/ibm4xx/pic_uic.c diff -u src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.6 src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.7 --- src/sys/arch/powerpc/ibm4xx/pic_uic.c:1.6 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/ibm4xx/pic_uic.c Mon Jul 6 10:35:28 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pic_uic.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: pic_uic.c,v 1.7 2020/07/06 10:35:28 rin Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -36,7 +36,12 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.6 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pic_uic.c,v 1.7 2020/07/06 10:35:28 rin Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_ppcarch.h" +#include "opt_uic.h" +#endif #include #include
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 10:34:23 UTC 2020 Modified Files: src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c src/sys/arch/powerpc/oea: oea_machdep.c Log Message: Drop unused opt_compat_netbsd.h include. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c cvs rdiff -u -r1.80 -r1.81 src/sys/arch/powerpc/oea/oea_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/powerpc/ibm4xx/ibm4xx_machdep.c diff -u src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.30 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.31 --- src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c:1.30 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c Mon Jul 6 10:34:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ibm4xx_machdep.c,v 1.30 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: ibm4xx_machdep.c,v 1.31 2020/07/06 10:34:23 rin Exp $ */ /* Original: ibm40x_machdep.c,v 1.3 2005/01/17 17:19:36 shige Exp $ */ /* @@ -68,12 +68,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.30 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ibm4xx_machdep.c,v 1.31 2020/07/06 10:34:23 rin Exp $"); #include "ksyms.h" #ifdef _KERNEL_OPT -#include "opt_compat_netbsd.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_modular.h" Index: src/sys/arch/powerpc/oea/oea_machdep.c diff -u src/sys/arch/powerpc/oea/oea_machdep.c:1.80 src/sys/arch/powerpc/oea/oea_machdep.c:1.81 --- src/sys/arch/powerpc/oea/oea_machdep.c:1.80 Mon Jul 6 09:34:17 2020 +++ src/sys/arch/powerpc/oea/oea_machdep.c Mon Jul 6 10:34:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: oea_machdep.c,v 1.80 2020/07/06 09:34:17 rin Exp $ */ +/* $NetBSD: oea_machdep.c,v 1.81 2020/07/06 10:34:23 rin Exp $ */ /* * Copyright (C) 2002 Matt Thomas @@ -33,11 +33,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.80 2020/07/06 09:34:17 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: oea_machdep.c,v 1.81 2020/07/06 10:34:23 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_altivec.h" -#include "opt_compat_netbsd.h" #include "opt_ddb.h" #include "opt_kgdb.h" #include "opt_multiprocessor.h"
CVS commit: src/tests/sbin/ifconfig
Module Name:src
Committed By: jruoho
Date: Mon Jul 6 10:35:01 UTC 2020
Modified Files:
src/tests/sbin/ifconfig: t_repeated_link_addr.sh
Log Message:
Remove the expected timeout; there is something more sinister behind the
timeouts seen on the Qemu/evbarm-aarch64 runs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/sbin/ifconfig/t_repeated_link_addr.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/sbin/ifconfig/t_repeated_link_addr.sh
diff -u src/tests/sbin/ifconfig/t_repeated_link_addr.sh:1.2 src/tests/sbin/ifconfig/t_repeated_link_addr.sh:1.3
--- src/tests/sbin/ifconfig/t_repeated_link_addr.sh:1.2 Fri Jul 3 02:51:13 2020
+++ src/tests/sbin/ifconfig/t_repeated_link_addr.sh Mon Jul 6 10:35:00 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_repeated_link_addr.sh,v 1.2 2020/07/03 02:51:13 jruoho Exp $
+# $NetBSD: t_repeated_link_addr.sh,v 1.3 2020/07/06 10:35:00 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,12 +37,6 @@ repeated_link_addr_head() {
repeated_link_addr_body() {
- case $(uname -m) in
- evbarm)
- atf_expect_timeout "reason for timeout unknown"
- ;;
- esac
-
fail=0
addrs="00:11:00:00:00:00 \
00:11:11:00:00:00 \
CVS commit: src/tests/usr.sbin
Module Name:src
Committed By: jruoho
Date: Mon Jul 6 10:32:18 UTC 2020
Modified Files:
src/tests/usr.sbin/execsnoop: t_execsnoop.sh
src/tests/usr.sbin/opensnoop: t_opensnoop.sh
Log Message:
Sleep more.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/execsnoop/t_execsnoop.sh
cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/opensnoop/t_opensnoop.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.sbin/execsnoop/t_execsnoop.sh
diff -u src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.1 src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.2
--- src/tests/usr.sbin/execsnoop/t_execsnoop.sh:1.1 Tue Jun 30 14:30:49 2020
+++ src/tests/usr.sbin/execsnoop/t_execsnoop.sh Mon Jul 6 10:32:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_execsnoop.sh,v 1.1 2020/06/30 14:30:49 jruoho Exp $
+# $NetBSD: t_execsnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,7 +47,7 @@ basic_body() {
n=$(expr $n - 1)
done
- sleep 1
+ sleep 3
pkill -9 execsnoop
if [ ! $(cat $tmp | grep "whoami" | wc -l) -eq 10 ]; then
Index: src/tests/usr.sbin/opensnoop/t_opensnoop.sh
diff -u src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.1 src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.2
--- src/tests/usr.sbin/opensnoop/t_opensnoop.sh:1.1 Tue Jun 30 14:30:50 2020
+++ src/tests/usr.sbin/opensnoop/t_opensnoop.sh Mon Jul 6 10:32:18 2020
@@ -1,4 +1,4 @@
-# $NetBSD: t_opensnoop.sh,v 1.1 2020/06/30 14:30:50 jruoho Exp $
+# $NetBSD: t_opensnoop.sh,v 1.2 2020/07/06 10:32:18 jruoho Exp $
#
# Copyright (c) 2020 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -47,7 +47,7 @@ basic_body() {
n=$(expr $n - 1)
done
- sleep 1
+ sleep 3
pkill -9 opensnoop
if [ ! $(cat $tmp | grep "/etc/spwd.db" | wc -l) -eq 10 ]; then
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 10:31:24 UTC 2020 Modified Files: src/sys/arch/powerpc/fpu: fpu_emu.c src/sys/arch/powerpc/ibm4xx: clock.c src/sys/arch/powerpc/include: cpu_counter.h pio.h spr.h src/sys/arch/powerpc/include/oea: bat.h hid.h spr.h src/sys/arch/powerpc/oea: cpu_subr.c ofw_subr.S src/sys/arch/powerpc/pic: intr.c src/sys/arch/powerpc/powerpc: bus_dma.c bus_space.c clock.c db_disasm.c fixup.c pio_subr.S pmap_subr.c Log Message: Include missing opt_ppcarch.h. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/fpu/fpu_emu.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/ibm4xx/clock.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/include/cpu_counter.h \ src/sys/arch/powerpc/include/pio.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/include/spr.h cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/include/oea/bat.h cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/include/oea/hid.h cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/include/oea/spr.h cvs rdiff -u -r1.103 -r1.104 src/sys/arch/powerpc/oea/cpu_subr.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/oea/ofw_subr.S cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/pic/intr.c cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/powerpc/bus_dma.c cvs rdiff -u -r1.37 -r1.38 src/sys/arch/powerpc/powerpc/bus_space.c cvs rdiff -u -r1.16 -r1.17 src/sys/arch/powerpc/powerpc/clock.c cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/powerpc/db_disasm.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/powerpc/fixup.c cvs rdiff -u -r1.17 -r1.18 src/sys/arch/powerpc/powerpc/pio_subr.S cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/powerpc/pmap_subr.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/powerpc/fpu/fpu_emu.c diff -u src/sys/arch/powerpc/fpu/fpu_emu.c:1.23 src/sys/arch/powerpc/fpu/fpu_emu.c:1.24 --- src/sys/arch/powerpc/fpu/fpu_emu.c:1.23 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/fpu/fpu_emu.c Mon Jul 6 10:31:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: fpu_emu.c,v 1.24 2020/07/06 10:31:23 rin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -76,10 +76,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.23 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: fpu_emu.c,v 1.24 2020/07/06 10:31:23 rin Exp $"); #ifdef _KERNEL_OPT #include "opt_ddb.h" +#include "opt_ppcarch.h" #endif #include Index: src/sys/arch/powerpc/ibm4xx/clock.c diff -u src/sys/arch/powerpc/ibm4xx/clock.c:1.28 src/sys/arch/powerpc/ibm4xx/clock.c:1.29 --- src/sys/arch/powerpc/ibm4xx/clock.c:1.28 Fri May 29 12:30:40 2020 +++ src/sys/arch/powerpc/ibm4xx/clock.c Mon Jul 6 10:31:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $ */ +/* $NetBSD: clock.c,v 1.29 2020/07/06 10:31:23 rin Exp $ */ /* $OpenBSD: clock.c,v 1.3 1997/10/13 13:42:53 pefo Exp $ */ /* @@ -33,7 +33,11 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.28 2020/05/29 12:30:40 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: clock.c,v 1.29 2020/07/06 10:31:23 rin Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_ppcarch.h" +#endif #include #include Index: src/sys/arch/powerpc/include/cpu_counter.h diff -u src/sys/arch/powerpc/include/cpu_counter.h:1.8 src/sys/arch/powerpc/include/cpu_counter.h:1.9 --- src/sys/arch/powerpc/include/cpu_counter.h:1.8 Tue Jan 18 01:02:54 2011 +++ src/sys/arch/powerpc/include/cpu_counter.h Mon Jul 6 10:31:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_counter.h,v 1.8 2011/01/18 01:02:54 matt Exp $ */ +/* $NetBSD: cpu_counter.h,v 1.9 2020/07/06 10:31:23 rin Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -35,6 +35,10 @@ #ifdef _KERNEL +#ifdef _KERNEL_OPT +#include "opt_ppcarch.h" +#endif + #include #ifdef PPC_OEA601 #include Index: src/sys/arch/powerpc/include/pio.h diff -u src/sys/arch/powerpc/include/pio.h:1.8 src/sys/arch/powerpc/include/pio.h:1.9 --- src/sys/arch/powerpc/include/pio.h:1.8 Thu Feb 20 05:10:01 2020 +++ src/sys/arch/powerpc/include/pio.h Mon Jul 6 10:31:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pio.h,v 1.8 2020/02/20 05:10:01 rin Exp $ */ +/* $NetBSD: pio.h,v 1.9 2020/07/06 10:31:23 rin Exp $ */ /* $OpenBSD: pio.h,v 1.1 1997/10/13 10:53:47 pefo Exp $ */ /* @@ -35,6 +35,11 @@ #ifndef _POWERPC_PIO_H_ #define _POWERPC_PIO_H_ + +#ifdef _KERNEL_OPT +#include "opt_ppcarch.h" +#endif + /* * I/O macros. */ Index: src/sys/arch/powerpc/include/spr.h diff -u src/sys/arch/powerpc/include/spr.h:1.52 src/sys/arch/powerpc/include/spr.h:1.53 --- src/sys/arch/powerpc/include/spr.h:1.52 Thu Apr 19 21:50:07 2018 +++ src/sys/arch/powerpc/include/spr.h Mon Jul 6 10:31:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: spr.h,v 1.52 2018/04/19 21:50:07 christos Exp $ */ +/*
CVS commit: src/sys/arch/powerpc/booke/dev
Module Name:src Committed By: rin Date: Mon Jul 6 10:22:44 UTC 2020 Modified Files: src/sys/arch/powerpc/booke/dev: pq3cfi.c pq3nandfcm.c Log Message: Drop unused opt_flash.h. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/powerpc/booke/dev/pq3cfi.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/booke/dev/pq3nandfcm.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/powerpc/booke/dev/pq3cfi.c diff -u src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.6 src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.7 --- src/sys/arch/powerpc/booke/dev/pq3cfi.c:1.6 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/dev/pq3cfi.c Mon Jul 6 10:22:44 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $ */ /*- * Copyright (c) 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -33,14 +33,10 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.6 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pq3cfi.c,v 1.7 2020/07/06 10:22:44 rin Exp $"); #include "locators.h" -#ifdef _KERNEL_OPT -#include "opt_flash.h" -#endif - #include #include #include Index: src/sys/arch/powerpc/booke/dev/pq3nandfcm.c diff -u src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.3 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.4 --- src/sys/arch/powerpc/booke/dev/pq3nandfcm.c:1.3 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/dev/pq3nandfcm.c Mon Jul 6 10:22:44 2020 @@ -30,11 +30,7 @@ #define LBC_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.3 2020/07/06 09:34:16 rin Exp $"); - -#ifdef _KERNEL_OPT -#include "opt_flash.h" -#endif +__KERNEL_RCSID(0, "$NetBSD: pq3nandfcm.c,v 1.4 2020/07/06 10:22:44 rin Exp $"); #include #include
CVS commit: src/sys/dev/nand
Module Name:src Committed By: rin Date: Mon Jul 6 10:22:07 UTC 2020 Modified Files: src/sys/dev/nand: nand.h Log Message: Include opt_nand.h for NAND_DEBUG. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/dev/nand/nand.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/nand/nand.h diff -u src/sys/dev/nand/nand.h:1.19 src/sys/dev/nand/nand.h:1.20 --- src/sys/dev/nand/nand.h:1.19 Thu Apr 19 21:50:09 2018 +++ src/sys/dev/nand/nand.h Mon Jul 6 10:22:07 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: nand.h,v 1.19 2018/04/19 21:50:09 christos Exp $ */ +/* $NetBSD: nand.h,v 1.20 2020/07/06 10:22:07 rin Exp $ */ /*- * Copyright (c) 2010 Department of Software Engineering, @@ -37,6 +37,10 @@ #include #include +#ifdef _KERNEL_OPT +#include "opt_nand.h" +#endif + #include #include #include
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Mon Jul 6 10:16:12 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: trap_subr.S
Log Message:
Include required opt_*.h for sure.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/booke/trap_subr.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/powerpc/booke/trap_subr.S
diff -u src/sys/arch/powerpc/booke/trap_subr.S:1.12 src/sys/arch/powerpc/booke/trap_subr.S:1.13
--- src/sys/arch/powerpc/booke/trap_subr.S:1.12 Mon Jan 26 04:47:53 2015
+++ src/sys/arch/powerpc/booke/trap_subr.S Mon Jul 6 10:16:12 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: trap_subr.S,v 1.12 2015/01/26 04:47:53 nonaka Exp $ */
+/* $NetBSD: trap_subr.S,v 1.13 2020/07/06 10:16:12 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -34,7 +34,14 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
-RCSID("$NetBSD: trap_subr.S,v 1.12 2015/01/26 04:47:53 nonaka Exp $")
+RCSID("$NetBSD: trap_subr.S,v 1.13 2020/07/06 10:16:12 rin Exp $")
+
+#ifdef _KERNEL_OPT
+#include "opt_altivec.h"
+#include "opt_ddb.h"
+#include "opt_mpc85xx.h"
+#include "opt_multiprocessor.h"
+#endif
.globl _C_LABEL(sctrapexit), _C_LABEL(trapexit), _C_LABEL(intrcall)
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Mon Jul 6 10:13:02 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: trap.c Log Message: Include missing opt_altivec.h for PPC_HAVE_SPE. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/booke/trap.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/powerpc/booke/trap.c diff -u src/sys/arch/powerpc/booke/trap.c:1.28 src/sys/arch/powerpc/booke/trap.c:1.29 --- src/sys/arch/powerpc/booke/trap.c:1.28 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/trap.c Mon Jul 6 10:13:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: trap.c,v 1.28 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: trap.c,v 1.29 2020/07/06 10:13:02 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -35,9 +35,10 @@ */ #include -__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.28 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(1, "$NetBSD: trap.c,v 1.29 2020/07/06 10:13:02 rin Exp $"); #ifdef _KERNEL_OPT +#include "opt_altivec.h" #include "opt_ddb.h" #endif
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Mon Jul 6 10:12:04 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: e500_tlb.c Log Message: Include missing opt_multiprocessor.h and opt_pmap.h. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/booke/e500_tlb.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/powerpc/booke/e500_tlb.c diff -u src/sys/arch/powerpc/booke/e500_tlb.c:1.20 src/sys/arch/powerpc/booke/e500_tlb.c:1.21 --- src/sys/arch/powerpc/booke/e500_tlb.c:1.20 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/e500_tlb.c Mon Jul 6 10:12:04 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: e500_tlb.c,v 1.20 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,9 +37,11 @@ #define __PMAP_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.20 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: e500_tlb.c,v 1.21 2020/07/06 10:12:04 rin Exp $"); #ifdef _KERNEL_OPT +#include "opt_multiprocessor.h" +#include "opt_pmap.h" #include "opt_ppcparam.h" #endif
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Mon Jul 6 10:11:14 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: e500_intr.c Log Message: Drop unused opt_ddb.h. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.43 src/sys/arch/powerpc/booke/e500_intr.c:1.44 --- src/sys/arch/powerpc/booke/e500_intr.c:1.43 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/e500_intr.c Mon Jul 6 10:11:14 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: e500_intr.c,v 1.43 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: e500_intr.c,v 1.44 2020/07/06 10:11:14 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,10 +37,9 @@ #define __INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.43 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.44 2020/07/06 10:11:14 rin Exp $"); #ifdef _KERNEL_OPT -#include "opt_ddb.h" #include "opt_mpc85xx.h" #include "opt_multiprocessor.h" #endif
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Mon Jul 6 10:09:23 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: booke_pmap.c Log Message: Include missing opt_multiprocessor.h and opt_pmap.h. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/booke/booke_pmap.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/booke/booke_pmap.c diff -u src/sys/arch/powerpc/booke/booke_pmap.c:1.28 src/sys/arch/powerpc/booke/booke_pmap.c:1.29 --- src/sys/arch/powerpc/booke/booke_pmap.c:1.28 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/booke_pmap.c Mon Jul 6 10:09:23 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: booke_pmap.c,v 1.28 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: booke_pmap.c,v 1.29 2020/07/06 10:09:23 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -37,7 +37,12 @@ #define __PMAP_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.28 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: booke_pmap.c,v 1.29 2020/07/06 10:09:23 rin Exp $"); + +#ifdef _KERNEL_OPT +#include "opt_multiprocessor.h" +#include "opt_pmap.h" +#endif #include #include
CVS commit: src/sys/arch/powerpc/booke
Module Name:src Committed By: rin Date: Mon Jul 6 10:08:16 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: booke_machdep.c Log Message: Include missing ksyms.h, opt_ddb.h, and opt_multiprocessor.h. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 src/sys/arch/powerpc/booke/booke_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/powerpc/booke/booke_machdep.c diff -u src/sys/arch/powerpc/booke/booke_machdep.c:1.31 src/sys/arch/powerpc/booke/booke_machdep.c:1.32 --- src/sys/arch/powerpc/booke/booke_machdep.c:1.31 Mon Jul 6 09:34:16 2020 +++ src/sys/arch/powerpc/booke/booke_machdep.c Mon Jul 6 10:08:16 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: booke_machdep.c,v 1.31 2020/07/06 09:34:16 rin Exp $ */ +/* $NetBSD: booke_machdep.c,v 1.32 2020/07/06 10:08:16 rin Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -38,10 +38,14 @@ #define _POWERPC_BUS_DMA_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.31 2020/07/06 09:34:16 rin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: booke_machdep.c,v 1.32 2020/07/06 10:08:16 rin Exp $"); + +#include "ksyms.h" #ifdef _KERNEL_OPT +#include "opt_ddb.h" #include "opt_modular.h" +#include "opt_multiprocessor.h" #endif #include
CVS commit: src/sys/arch/powerpc
Module Name:src Committed By: rin Date: Mon Jul 6 09:34:18 UTC 2020 Modified Files: src/sys/arch/powerpc/booke: booke_cache.c booke_machdep.c booke_pmap.c booke_stubs.c copyin.c copyout.c e500_intr.c e500_tlb.c kcopy.c spe.c spe_subr.S trap.c src/sys/arch/powerpc/booke/dev: cpunode.c e500wdog.c pq3cfi.c pq3ddrc.c pq3diic.c pq3duart.c pq3ehci.c pq3etsec.c pq3gpio.c pq3nandfcm.c pq3obio.c src/sys/arch/powerpc/booke/pci: pq3pci.c src/sys/arch/powerpc/fpu: fpu_emu.c src/sys/arch/powerpc/ibm4xx: ibm4xx_machdep.c pic_uic.c trap.c src/sys/arch/powerpc/ibm4xx/dev: com_opb.c emacreg.h if_emac.c opb.c plb.c rgmii.c src/sys/arch/powerpc/ibm4xx/openbios: locore.S src/sys/arch/powerpc/ibm4xx/pci: pchb.c src/sys/arch/powerpc/include: aout_machdep.h bus_defs.h db_machdep.h fpu.h frame.h param.h psl.h reloc.h signal.h trap.h userret.h src/sys/arch/powerpc/include/booke: e500var.h pmap.h src/sys/arch/powerpc/include/oea: bat.h src/sys/arch/powerpc/marvell: marvell_intr.h src/sys/arch/powerpc/oea: altivec.c altivec_subr.S cpu_speedctl.c cpu_subr.c genassym.cf oea_machdep.c ofw_consinit.c ofwoea_machdep.c pmap.c pmap_kernel.c prep_machdep.c src/sys/arch/powerpc/pci: pchb.c pci_machdep_common.c pci_module.c pcib.c pciconf_ofmethod.c src/sys/arch/powerpc/pic: intr.c ipi.c ipi_openpic.c openpic_common.c pic_distopenpic.c pic_mpcsoc.c pic_openpic.c src/sys/arch/powerpc/powerpc: bus_dma.c bus_space.c compat_16_machdep.c db_interface.c db_trace.c fixup.c fpu.c intr_stubs.c kgdb_machdep.c linux_syscall.c lock_stubs.S locore_subr.S ofwreal.S openfirm.c pmap_subr.c powerpc_machdep.c process_machdep.c setfault.S sig_machdep.c syscall.c trap.c trap_subr.S vm_machdep.c Log Message: Style and cosmetic changes. No binary changes intended. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/booke_cache.c \ src/sys/arch/powerpc/booke/spe_subr.S cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/booke/booke_machdep.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/booke/booke_pmap.c \ src/sys/arch/powerpc/booke/trap.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/powerpc/booke/booke_stubs.c \ src/sys/arch/powerpc/booke/spe.c cvs rdiff -u -r1.8 -r1.9 src/sys/arch/powerpc/booke/copyin.c \ src/sys/arch/powerpc/booke/copyout.c cvs rdiff -u -r1.42 -r1.43 src/sys/arch/powerpc/booke/e500_intr.c cvs rdiff -u -r1.19 -r1.20 src/sys/arch/powerpc/booke/e500_tlb.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/kcopy.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/booke/dev/cpunode.c \ src/sys/arch/powerpc/booke/dev/pq3cfi.c \ src/sys/arch/powerpc/booke/dev/pq3duart.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/booke/dev/e500wdog.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/booke/dev/pq3ddrc.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/powerpc/booke/dev/pq3diic.c \ src/sys/arch/powerpc/booke/dev/pq3obio.c cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/booke/dev/pq3ehci.c cvs rdiff -u -r1.49 -r1.50 src/sys/arch/powerpc/booke/dev/pq3etsec.c cvs rdiff -u -r1.11 -r1.12 src/sys/arch/powerpc/booke/dev/pq3gpio.c cvs rdiff -u -r1.2 -r1.3 src/sys/arch/powerpc/booke/dev/pq3nandfcm.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/booke/pci/pq3pci.c cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/fpu/fpu_emu.c cvs rdiff -u -r1.29 -r1.30 src/sys/arch/powerpc/ibm4xx/ibm4xx_machdep.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/ibm4xx/pic_uic.c cvs rdiff -u -r1.81 -r1.82 src/sys/arch/powerpc/ibm4xx/trap.c cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/ibm4xx/dev/com_opb.c cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/ibm4xx/dev/emacreg.h cvs rdiff -u -r1.52 -r1.53 src/sys/arch/powerpc/ibm4xx/dev/if_emac.c cvs rdiff -u -r1.26 -r1.27 src/sys/arch/powerpc/ibm4xx/dev/opb.c cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/ibm4xx/dev/plb.c cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/ibm4xx/dev/rgmii.c cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/openbios/locore.S cvs rdiff -u -r1.12 -r1.13 src/sys/arch/powerpc/ibm4xx/pci/pchb.c cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/include/aout_machdep.h cvs rdiff -u -r1.3 -r1.4 src/sys/arch/powerpc/include/bus_defs.h cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/db_machdep.h cvs rdiff -u -r1.22 -r1.23 src/sys/arch/powerpc/include/fpu.h cvs rdiff -u -r1.28 -r1.29 src/sys/arch/powerpc/include/frame.h cvs rdiff -u -r1.32 -r1.33 src/sys/arch/powerpc/include/param.h cvs rdiff -u -r1.20 -r1.21 src/sys/arch/powerpc/include/psl.h cvs rdiff -u -r1.1 -r1.2 src/sys/arch/powerpc/include/reloc.h cvs rdiff -u -r1.21 -r1.22 src/sys/arch/powerpc/include/signal.h cvs rdiff -u -r1.13 -r1.14 src/sys/arch/powerpc/include/trap.h cvs rdiff -u -r1.30 -r1.31
CVS commit: src/sys/arch/powerpc/include/oea
Module Name:src Committed By: rin Date: Mon Jul 6 09:10:02 UTC 2020 Modified Files: src/sys/arch/powerpc/include/oea: pmap.h Log Message: LKM was gone. To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/sys/arch/powerpc/include/oea/pmap.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/powerpc/include/oea/pmap.h diff -u src/sys/arch/powerpc/include/oea/pmap.h:1.30 src/sys/arch/powerpc/include/oea/pmap.h:1.31 --- src/sys/arch/powerpc/include/oea/pmap.h:1.30 Sat Mar 14 14:05:43 2020 +++ src/sys/arch/powerpc/include/oea/pmap.h Mon Jul 6 09:10:02 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: pmap.h,v 1.30 2020/03/14 14:05:43 ad Exp $ */ +/* $NetBSD: pmap.h,v 1.31 2020/07/06 09:10:02 rin Exp $ */ /*- * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -38,7 +38,7 @@ #error use assym.h instead #endif -#if defined(_LKM) || defined(_MODULE) +#ifdef _MODULE #error this file should not be included by loadable kernel modules #endif
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:30:10 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: db_trace.c
Log Message:
db_stack_trace_print():
For ibm4xx, show fault address in dear register also for EXC_DTMISS.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/sys/arch/powerpc/powerpc/db_trace.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/powerpc/powerpc/db_trace.c
diff -u src/sys/arch/powerpc/powerpc/db_trace.c:1.58 src/sys/arch/powerpc/powerpc/db_trace.c:1.59
--- src/sys/arch/powerpc/powerpc/db_trace.c:1.58 Wed Feb 28 20:11:09 2018
+++ src/sys/arch/powerpc/powerpc/db_trace.c Mon Jul 6 08:30:10 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.58 2018/02/28 20:11:09 mrg Exp $ */
+/* $NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $ */
/* $OpenBSD: db_trace.c,v 1.3 1997/03/21 02:10:48 niklas Exp $ */
/*
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.58 2018/02/28 20:11:09 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.59 2020/07/06 08:30:10 rin Exp $");
#include "opt_ppcarch.h"
@@ -213,7 +213,9 @@ db_stack_trace_print(db_expr_t addr, boo
tf->tf_dar);
#endif
#ifdef PPC_IBM4XX
-(*pr)("DSI %s trap @ %#x by ",
+trapstr = "DSI";
+dsi:
+(*pr)("%s %s trap @ %#x by ", trapstr,
tf->tf_esr & ESR_DST ? "write" : "read",
tf->tf_dear);
#endif
@@ -241,7 +243,11 @@ db_stack_trace_print(db_expr_t addr, boo
case EXC_PERF: trapstr = "PERF"; break;
case EXC_SMI: trapstr = "SMI"; break;
case EXC_RST: trapstr = "RST"; break;
- case EXC_DTMISS: trapstr = "DTMISS"; break;
+ case EXC_DTMISS: trapstr = "DTMISS";
+#ifdef PPC_IBM4XX
+goto dsi;
+#endif
+break;
case EXC_ITMISS: trapstr = "ITMISS"; break;
case EXC_FIT: trapstr = "FIT"; break;
case EXC_PIT: trapstr = "PIT"; break;
@@ -278,7 +284,8 @@ db_stack_trace_print(db_expr_t addr, boo
#endif /* PPC_OEA601 */
#endif /* PPC_OEA */
#ifdef PPC_IBM4XX
- if (tf->tf_exc == EXC_DSI)
+ if (tf->tf_exc == EXC_DSI ||
+ tf->tf_exc == EXC_DTMISS)
(*pr)(" dear=%#x", tf->tf_dear);
(*pr)(" esr=%#x pid=%#x", tf->tf_esr, tf->tf_pid);
#endif
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: rin Date: Mon Jul 6 08:26:10 UTC 2020 Modified Files: src/sys/arch/powerpc/include: vmparam.h Log Message: Correct #ifdef; _MODULE not _MODULAR here. Now __HAVE_PMAP_PHYSSEG is defined correctly for modules, which was missing accidentally. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/sys/arch/powerpc/include/vmparam.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/powerpc/include/vmparam.h diff -u src/sys/arch/powerpc/include/vmparam.h:1.23 src/sys/arch/powerpc/include/vmparam.h:1.24 --- src/sys/arch/powerpc/include/vmparam.h:1.23 Sat Jun 27 02:51:23 2020 +++ src/sys/arch/powerpc/include/vmparam.h Mon Jul 6 08:26:10 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: vmparam.h,v 1.23 2020/06/27 02:51:23 rin Exp $ */ +/* $NetBSD: vmparam.h,v 1.24 2020/07/06 08:26:10 rin Exp $ */ #ifndef _POWERPC_VMPARAM_H_ #define _POWERPC_VMPARAM_H_ @@ -77,7 +77,7 @@ extern const char __USRSTACK; /* let th #endif /* !_MODULE */ -#if defined(MODULAR) || defined(_MODULAR) +#if defined(MODULAR) || defined(_MODULE) /* * If we are a module or support modules, we need to define a compatible * pmap_physseg since IBM4XX uses one. This will waste a tiny of space
CVS commit: src/sys/arch/powerpc/include
Module Name:src Committed By: rin Date: Mon Jul 6 08:20:40 UTC 2020 Modified Files: src/sys/arch/powerpc/include: asm.h Log Message: Consistently use _LP64 instead of __LP64__, although both are defined for powerpc64. No binary changes intended. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/powerpc/include/asm.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/powerpc/include/asm.h diff -u src/sys/arch/powerpc/include/asm.h:1.51 src/sys/arch/powerpc/include/asm.h:1.52 --- src/sys/arch/powerpc/include/asm.h:1.51 Sat Apr 18 10:37:37 2020 +++ src/sys/arch/powerpc/include/asm.h Mon Jul 6 08:20:40 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: asm.h,v 1.51 2020/04/18 10:37:37 joerg Exp $ */ +/* $NetBSD: asm.h,v 1.52 2020/07/06 08:20:40 rin Exp $ */ /* * Copyright (C) 1995, 1996 Wolfgang Solfrank. @@ -81,7 +81,7 @@ # define PIC_TOCSETUP(n, r) # endif /* __PIC__ */ -#endif /* __LP64__ */ +#endif /* _LP64 */ #define _C_LABEL(x) x #define _ASM_LABEL(x) x @@ -148,7 +148,7 @@ y: .quad .##y,.TOC.@tocbase,0; \ # define ENTRY_NOPROFILE(y) _ENTRY(_C_LABEL(y)) # define ASENTRY(y) _ENTRY(_ASM_LABEL(y)); _PROF_PROLOGUE -#endif /* __LP64__ */ +#endif /* _LP64 */ #define GLOBAL(y) _GLOBAL(_C_LABEL(y)) @@ -369,7 +369,7 @@ y: .quad .##y,.TOC.@tocbase,0; \ # define cmplongli cmplwi # define cmpregli cmplwi -#else /* __LP64__ */ +#else /* _LP64 */ # define ldlong ld /* load "C" long */ # define ldlongu ldu /* load "C" long with update */ @@ -414,7 +414,7 @@ y: .quad .##y,.TOC.@tocbase,0; \ # define cmplongli cmpldi # define cmpregli cmpldi -#endif /* __LP64__ */ +#endif /* _LP64 */ #ifdef _LOCORE .macro stmd r,dst @@ -435,7 +435,7 @@ y: .quad .##y,.TOC.@tocbase,0; \ #endif /* _LOCORE */ #if defined(IBM405_ERRATA77) || \ -((defined(_MODULE) || !defined(_KERNEL)) && !defined(__LP64__)) +((defined(_MODULE) || !defined(_KERNEL)) && !defined(_LP64)) /* * Workaround for IBM405 Errata 77 (CPU_210): interrupted stwcx. may * errantly write data to memory
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:18:57 UTC 2020
Modified Files:
src/sys/arch/powerpc/include: frame.h
Log Message:
LKM was gone. _KERNEL is always defined for module.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/powerpc/include/frame.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/powerpc/include/frame.h
diff -u src/sys/arch/powerpc/include/frame.h:1.27 src/sys/arch/powerpc/include/frame.h:1.28
--- src/sys/arch/powerpc/include/frame.h:1.27 Sun Jan 24 19:49:35 2016
+++ src/sys/arch/powerpc/include/frame.h Mon Jul 6 08:18:57 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: frame.h,v 1.27 2016/01/24 19:49:35 christos Exp $ */
+/* $NetBSD: frame.h,v 1.28 2020/07/06 08:18:57 rin Exp $ */
/*
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -159,7 +159,7 @@ struct ktrapframe {
__register_t ktf_cframe_lr; /* for DDB */
};
-#if defined(_KERNEL) || defined(_LKM)
+#if defined(_KERNEL)
#ifdef _LP64
struct utrapframe32 {
__register32_t fixreg[32];
@@ -174,7 +174,7 @@ struct utrapframe32 {
int spare;
};
#endif
-#endif /* _KERNEL || _LKM */
+#endif /* _KERNEL */
/*
* This is to ensure alignment of the stackpointer
CVS commit: src/sys/arch/powerpc/include
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:17:01 UTC 2020
Modified Files:
src/sys/arch/powerpc/include: pmap.h
src/sys/arch/powerpc/include/oea: pte.h
Log Message:
Fix comments. No binary changes.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/sys/arch/powerpc/include/pmap.h
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/powerpc/include/oea/pte.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/powerpc/include/pmap.h
diff -u src/sys/arch/powerpc/include/pmap.h:1.39 src/sys/arch/powerpc/include/pmap.h:1.40
--- src/sys/arch/powerpc/include/pmap.h:1.39 Sat Jun 27 02:40:24 2020
+++ src/sys/arch/powerpc/include/pmap.h Mon Jul 6 08:17:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap.h,v 1.39 2020/06/27 02:40:24 rin Exp $ */
+/* $NetBSD: pmap.h,v 1.40 2020/07/06 08:17:01 rin Exp $ */
#ifndef _POWERPC_PMAP_H_
#define _POWERPC_PMAP_H_
@@ -35,7 +35,7 @@
struct vm_page_md {
uintptr_t mdpg_dummy[5];
};
-#endif /* !__HVE_VM_PAGE_MD */
+#endif /* !__HAVE_VM_PAGE_MD */
__CTASSERT(sizeof(struct vm_page_md) == sizeof(uintptr_t)*5);
Index: src/sys/arch/powerpc/include/oea/pte.h
diff -u src/sys/arch/powerpc/include/oea/pte.h:1.9 src/sys/arch/powerpc/include/oea/pte.h:1.10
--- src/sys/arch/powerpc/include/oea/pte.h:1.9 Tue Feb 5 18:10:47 2008
+++ src/sys/arch/powerpc/include/oea/pte.h Mon Jul 6 08:17:01 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: pte.h,v 1.9 2008/02/05 18:10:47 garbled Exp $ */
+/* $NetBSD: pte.h,v 1.10 2020/07/06 08:17:01 rin Exp $ */
/*-
* Copyright (C) 2003 Matt Thomas
@@ -46,7 +46,7 @@ struct pte {
register64_t pte_hi;
register64_t pte_lo;
};
-#else /* PPC_OEA || PPC_OEA64 */
+#else /* PMAP_OEA */
struct pte {
register_t pte_hi;
register_t pte_lo;
CVS commit: src/sys/arch/powerpc/include/booke
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:14:54 UTC 2020
Modified Files:
src/sys/arch/powerpc/include/booke: e500var.h
Log Message:
e500_cpunode_submatch() should be declared regardless of _KERNEL_OPT.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/powerpc/include/booke/e500var.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/powerpc/include/booke/e500var.h
diff -u src/sys/arch/powerpc/include/booke/e500var.h:1.7 src/sys/arch/powerpc/include/booke/e500var.h:1.8
--- src/sys/arch/powerpc/include/booke/e500var.h:1.7 Tue Nov 27 19:24:47 2012
+++ src/sys/arch/powerpc/include/booke/e500var.h Mon Jul 6 08:14:54 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500var.h,v 1.7 2012/11/27 19:24:47 matt Exp $ */
+/* $NetBSD: e500var.h,v 1.8 2020/07/06 08:14:54 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -78,9 +78,7 @@ struct e500_truthtab {
u_int e500_truth_decode(u_int, uint32_t, const struct e500_truthtab *,
size_t, u_int);
uint16_t e500_get_svr(void);
-#ifdef _KERNEL_OPT
int e500_cpunode_submatch(device_t, cfdata_t, const char *, void *);
-#endif
/*
* Used by MP hatch code to fetch the TLB1 entries so they be setup on the
CVS commit: src/sys/arch/powerpc/booke
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:13:00 UTC 2020
Modified Files:
src/sys/arch/powerpc/booke: e500_intr.c
Log Message:
XXX
Skip KASSERT which fires when !__HAVE_FAST_SOFTINTS. Just for debug.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/powerpc/booke/e500_intr.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/powerpc/booke/e500_intr.c
diff -u src/sys/arch/powerpc/booke/e500_intr.c:1.41 src/sys/arch/powerpc/booke/e500_intr.c:1.42
--- src/sys/arch/powerpc/booke/e500_intr.c:1.41 Sat Jul 4 17:20:45 2020
+++ src/sys/arch/powerpc/booke/e500_intr.c Mon Jul 6 08:13:00 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $ */
+/* $NetBSD: e500_intr.c,v 1.42 2020/07/06 08:13:00 rin Exp $ */
/*-
* Copyright (c) 2010, 2011 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -41,7 +41,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.41 2020/07/04 17:20:45 rin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: e500_intr.c,v 1.42 2020/07/06 08:13:00 rin Exp $");
#include
#include
@@ -510,7 +510,9 @@ e500_splset(struct cpu_info *ci, int ipl
{
struct cpu_softc * const cpu = ci->ci_softc;
+#ifdef __HAVE_FAST_SOFTINTS /* XXX */
KASSERT((curlwp->l_pflag & LP_INTR) == 0 || ipl != IPL_NONE);
+#endif
const u_int ctpr = IPL2CTPR(ipl);
KASSERT(openpic_read(cpu, OPENPIC_CTPR) == IPL2CTPR(ci->ci_cpl));
openpic_write(cpu, OPENPIC_CTPR, ctpr);
CVS commit: src/sys/arch/powerpc/powerpc
Module Name:src
Committed By: rin
Date: Mon Jul 6 08:10:57 UTC 2020
Modified Files:
src/sys/arch/powerpc/powerpc: intr_stubs.c
Log Message:
Make this compile without __HAVE_FAST_SOFTINTS for debug.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/powerpc/powerpc/intr_stubs.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/powerpc/powerpc/intr_stubs.c
diff -u src/sys/arch/powerpc/powerpc/intr_stubs.c:1.5 src/sys/arch/powerpc/powerpc/intr_stubs.c:1.6
--- src/sys/arch/powerpc/powerpc/intr_stubs.c:1.5 Wed Oct 19 00:08:42 2016
+++ src/sys/arch/powerpc/powerpc/intr_stubs.c Mon Jul 6 08:10:57 2020
@@ -38,7 +38,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: intr_stubs.c,v 1.5 2016/10/19 00:08:42 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intr_stubs.c,v 1.6 2020/07/06 08:10:57 rin Exp $");
#include
#include
@@ -137,6 +137,7 @@ splx(int ipl)
return (*powerpc_intrsw->intrsw_splx)(ipl);
}
+#ifdef __HAVE_FAST_SOFTINTS
void softint_init_md(struct lwp *, u_int, uintptr_t *) __stub;
void
@@ -152,6 +153,7 @@ softint_trigger(uintptr_t machdep)
{
(*powerpc_intrsw->intrsw_softint_trigger)(machdep);
}
+#endif
void intr_cpu_attach(struct cpu_info *) __stub;
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jul 6 07:51:09 UTC 2020
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Fix a bug that the WMREG_EEARBC_I210 register is incorrectly set if the system
uses iNVM.
To generate a diff of this commit:
cvs rdiff -u -r1.679 -r1.680 src/sys/dev/pci/if_wm.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/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.679 src/sys/dev/pci/if_wm.c:1.680
--- src/sys/dev/pci/if_wm.c:1.679 Sat Jun 27 13:32:00 2020
+++ src/sys/dev/pci/if_wm.c Mon Jul 6 07:51:09 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.679 2020/06/27 13:32:00 jmcneill Exp $ */
+/* $NetBSD: if_wm.c,v 1.680 2020/07/06 07:51:09 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -82,7 +82,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.679 2020/06/27 13:32:00 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.680 2020/07/06 07:51:09 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -13582,6 +13582,13 @@ wm_nvm_read_invm(struct wm_softc *sc, in
rv = -1;
}
break;
+ case NVM_OFF_CFG1: /* == INVM_AUTOLOAD */
+ rv = wm_nvm_read_word_invm(sc, offset, data);
+ if (rv != 0) {
+*data = INVM_DEFAULT_AL;
+rv = 0;
+ }
+ break;
case NVM_OFF_CFG2:
rv = wm_nvm_read_word_invm(sc, offset, data);
if (rv != 0) {
@@ -16442,6 +16449,8 @@ wm_platform_pm_pch_lpt(struct wm_softc *
/*
* I210 Errata 25 and I211 Errata 10
* Slow System Clock.
+ *
+ * Note that this function is called on both FLASH and iNVM case on NetBSD.
*/
static int
wm_pll_workaround_i210(struct wm_softc *sc)
@@ -16467,8 +16476,13 @@ wm_pll_workaround_i210(struct wm_softc *
reg = mdicnfg & ~MDICNFG_DEST;
CSR_WRITE(sc, WMREG_MDICNFG, reg);
- if (wm_nvm_read(sc, INVM_AUTOLOAD, 1, ) != 0)
+ if (wm_nvm_read(sc, INVM_AUTOLOAD, 1, ) != 0) {
+ /*
+ * The default value of the Initialization Control Word 1
+ * is the same on both I210's FLASH_HW and I21[01]'s iNVM.
+ */
nvmword = INVM_DEFAULT_AL;
+ }
tmp_nvmword = nvmword | INVM_PLL_WO_VAL;
for (i = 0; i < WM_MAX_PLL_TRIES; i++) {
CVS commit: src/sys/arch/arm/arm32
Module Name:src
Committed By: skrll
Date: Mon Jul 6 07:36:14 UTC 2020
Modified Files:
src/sys/arch/arm/arm32: cpuswitch.S
Log Message:
Whitespace
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/sys/arch/arm/arm32/cpuswitch.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/arm/arm32/cpuswitch.S
diff -u src/sys/arch/arm/arm32/cpuswitch.S:1.99 src/sys/arch/arm/arm32/cpuswitch.S:1.100
--- src/sys/arch/arm/arm32/cpuswitch.S:1.99 Fri Jul 3 06:35:05 2020
+++ src/sys/arch/arm/arm32/cpuswitch.S Mon Jul 6 07:36:14 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: cpuswitch.S,v 1.99 2020/07/03 06:35:05 skrll Exp $ */
+/* $NetBSD: cpuswitch.S,v 1.100 2020/07/06 07:36:14 skrll Exp $ */
/*
* Copyright 2003 Wasabi Systems, Inc.
@@ -86,7 +86,7 @@
#include
#include
- RCSID("$NetBSD: cpuswitch.S,v 1.99 2020/07/03 06:35:05 skrll Exp $")
+ RCSID("$NetBSD: cpuswitch.S,v 1.100 2020/07/06 07:36:14 skrll Exp $")
/* LINTSTUB: include */
@@ -190,6 +190,7 @@ ENTRY(cpu_switchto)
/* We have a new curlwp now so make a note of it */
str r6, [r5, #(CI_CURLWP)]
+
/* Get the new pcb */
ldr r7, [r6, #(L_PCB)]
@@ -236,7 +237,6 @@ ENTRY(cpu_switchto)
/*
* Check for restartable atomic sequences (RAS).
*/
-
ldr r0, [r6, #(L_PROC)] /* fetch the proc for ras_lookup */
ldr r2, [r0, #(P_RASLIST)]
cmp r2, #0 /* p->p_nras == 0? */
