CVS commit: [pgoyette-compat] src/sys/compat/common
Module Name:src Committed By: pgoyette Date: Sun Sep 30 21:32:48 UTC 2018 Modified Files: src/sys/compat/common [pgoyette-compat]: if43_20.c Log Message: atm is gone To generate a diff of this commit: cvs rdiff -u -r1.1.2.3 -r1.1.2.4 src/sys/compat/common/if43_20.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/common/if43_20.c diff -u src/sys/compat/common/if43_20.c:1.1.2.3 src/sys/compat/common/if43_20.c:1.1.2.4 --- src/sys/compat/common/if43_20.c:1.1.2.3 Sat Sep 22 04:56:28 2018 +++ src/sys/compat/common/if43_20.c Sun Sep 30 21:32:48 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if43_20.c,v 1.1.2.3 2018/09/22 04:56:28 pgoyette Exp $ */ +/* $NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $ */ /*- * Copyright (c) 2018 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.3 2018/09/22 04:56:28 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if43_20.c,v 1.1.2.4 2018/09/30 21:32:48 pgoyette Exp $"); #if defined(_KERNEL_OPT) #include "opt_compat_netbsd.h" @@ -61,7 +61,6 @@ __KERNEL_RCSID(0, "$NetBSD: if43_20.c,v #include #include #include -#include #include #include
CVS commit: src/crypto/external/bsd/openssl/dist/test/testutil
Module Name:src
Committed By: christos
Date: Sun Sep 30 19:23:13 UTC 2018
Modified Files:
src/crypto/external/bsd/openssl/dist/test/testutil: format_output.c
main.c output.h
Log Message:
Annotate format functions and fix format errors.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/crypto/external/bsd/openssl/dist/test/testutil/main.c \
src/crypto/external/bsd/openssl/dist/test/testutil/output.h
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/test/testutil/format_output.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.2 src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.3
--- src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c:1.2 Sun Sep 23 09:33:03 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/format_output.c Sun Sep 30 15:23:13 2018
@@ -31,9 +31,9 @@ static void test_diff_header(const char
static void test_string_null_empty(const char *m, char c)
{
if (m == NULL)
-test_printf_stderr("% 4s %c NULL\n", "", c);
+test_printf_stderr("%4s %c NULL\n", "", c);
else
-test_printf_stderr("% 4u:%c ''\n", 0u, c);
+test_printf_stderr("%4u:%c ''\n", 0u, c);
}
static void test_fail_string_common(const char *prefix, const char *file,
@@ -94,18 +94,18 @@ static void test_fail_string_common(cons
bdiff[i] = '\0';
}
if (n1 == n2 && !diff) {
-test_printf_stderr("% 4u: '%s'\n", cnt, n2 > n1 ? b2 : b1);
+test_printf_stderr("%4u: '%s'\n", cnt, n2 > n1 ? b2 : b1);
} else {
if (cnt == 0 && (m1 == NULL || *m1 == '\0'))
test_string_null_empty(m1, '-');
else if (n1 > 0)
-test_printf_stderr("% 4u:- '%s'\n", cnt, b1);
+test_printf_stderr("%4u:- '%s'\n", cnt, b1);
if (cnt == 0 && (m2 == NULL || *m2 == '\0'))
test_string_null_empty(m2, '+');
else if (n2 > 0)
-test_printf_stderr("% 4u:+ '%s'\n", cnt, b2);
+test_printf_stderr("%4u:+ '%s'\n", cnt, b2);
if (diff && i > 0)
-test_printf_stderr("% 4s%s\n", "", bdiff);
+test_printf_stderr("%4s%s\n", "", bdiff);
}
m1 += n1;
m2 += n2;
@@ -410,7 +410,7 @@ void test_output_bignum(const char *name
static void test_memory_null_empty(const unsigned char *m, char c)
{
if (m == NULL)
-test_printf_stderr("% 4s %c%s\n", "", c, "NULL");
+test_printf_stderr("%4s %c%s\n", "", c, "NULL");
else
test_printf_stderr("%04x %c%s\n", 0u, c, "empty");
}
@@ -494,7 +494,7 @@ static void test_fail_memory_common(cons
else if (n2 > 0)
test_printf_stderr("%04x:+%s\n", cnt, b2);
if (diff && i > 0)
-test_printf_stderr("% 4s %s\n", "", bdiff);
+test_printf_stderr("%4s %s\n", "", bdiff);
}
m1 += n1;
m2 += n2;
Index: src/crypto/external/bsd/openssl/dist/test/testutil/main.c
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.1.1.1 src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.2
--- src/crypto/external/bsd/openssl/dist/test/testutil/main.c:1.1.1.1 Sun Sep 23 09:17:35 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/main.c Sun Sep 30 15:23:13 2018
@@ -25,7 +25,7 @@ static void check_arg_usage(void)
for (i = 0; i < n; i++)
if (!arg_used[i+1])
-test_printf_stderr("Warning ignored command-line argument %d: %s\n",
+test_printf_stderr("Warning ignored command-line argument %zu: %s\n",
i, args[i+1]);
if (i < arg_count)
test_printf_stderr("Warning arguments %zu and later unchecked\n", i);
Index: src/crypto/external/bsd/openssl/dist/test/testutil/output.h
diff -u src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.1.1.1 src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.2
--- src/crypto/external/bsd/openssl/dist/test/testutil/output.h:1.1.1.1 Sun Sep 23 09:17:35 2018
+++ src/crypto/external/bsd/openssl/dist/test/testutil/output.h Sun Sep 30 15:23:13 2018
@@ -10,8 +10,25 @@
#ifndef HEADER_TU_OUTPUT_H
# define HEADER_TU_OUTPUT_H
-#include
+# include
+# define ossl_test__attr__(x)
+# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+&& !defined(__APPLE__)
+/*
+ * Because we support the 'z' modifier, which made its appearance in C99,
+ * we can't use __attribute__ with pre C99 dialects.
+ */
+# if __STDC_VERSION__ >= 199901L
+# undef ossl_test__attr__
+# define ossl_test__attr__ __attribute__
+# if __GNUC__*10 +
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Sep 30 16:06:02 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add qemufwcfg To generate a diff of this commit: cvs rdiff -u -r1.40 -r1.41 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.40 src/sys/arch/evbarm/conf/GENERIC64:1.41 --- src/sys/arch/evbarm/conf/GENERIC64:1.40 Sun Sep 30 15:31:05 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Sun Sep 30 16:06:02 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.40 2018/09/30 15:31:05 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.41 2018/09/30 16:06:02 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -140,6 +140,7 @@ tegramc* at fdt? pass 4 # NVIDIA Tegra # Firmware devices bcmmbox* at fdt? # Broadcom VideoCore IV mailbox vcmbox* at bcmmbox? +qemufwcfg* at fdt? # QEMU Firmware Configuration device # DMA controller bcmdmac* at fdt? # Broadcom BCM283x DMA controller
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Sun Sep 30 16:01:09 UTC 2018 Modified Files: src/etc/etc.evbarm: MAKEDEV.conf Log Message: Make more ld device nodes. To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/etc/etc.evbarm/MAKEDEV.conf Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/etc.evbarm/MAKEDEV.conf diff -u src/etc/etc.evbarm/MAKEDEV.conf:1.18 src/etc/etc.evbarm/MAKEDEV.conf:1.19 --- src/etc/etc.evbarm/MAKEDEV.conf:1.18 Sun Sep 23 09:20:58 2018 +++ src/etc/etc.evbarm/MAKEDEV.conf Sun Sep 30 16:01:08 2018 @@ -1,8 +1,8 @@ -# $NetBSD: MAKEDEV.conf,v 1.18 2018/09/23 09:20:58 maxv Exp $ +# $NetBSD: MAKEDEV.conf,v 1.19 2018/09/30 16:01:08 jmcneill Exp $ all_md) makedev wscons fd0 fd1 wd0 wd1 wd2 wd3 sd0 sd1 sd2 sd3 - makedev ld0 ld1 ld2 ld3 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 + makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 makedev tty0 tty1 tty2 tty3 plcom0 makedev st0 st1 ch0 cd0 cd1 @@ -25,7 +25,7 @@ all_md) ramdisk|floppy) makedev std bpf fd0 fd1 wd0 wd1 wd2 wd3 md0 md1 sd0 sd1 sd2 sd3 - makedev ld0 ld1 ld2 ld3 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 + makedev ld0 ld1 ld2 ld3 ld4 ld5 ld6 ld7 dk0 dk1 dk2 dk3 dk4 dk5 dk6 dk7 makedev flash0 flash1 flash2 flash3 flash4 flash5 flash6 flash7 makedev tty0 tty1 opty makedev st0 st1 cd0 cd1
CVS commit: src
Module Name:src Committed By: jmcneill Date: Sun Sep 30 15:56:47 UTC 2018 Modified Files: src/distrib/sets/lists/base: md.amd64 md.i386 mi src/distrib/sets/lists/man: mi src/sbin: Makefile Log Message: Install mount_qemufwcfg everywhere instead of just x86. To generate a diff of this commit: cvs rdiff -u -r1.275 -r1.276 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.151 -r1.152 src/distrib/sets/lists/base/md.i386 cvs rdiff -u -r1.1190 -r1.1191 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.1626 -r1.1627 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.133 -r1.134 src/sbin/Makefile 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/base/md.amd64 diff -u src/distrib/sets/lists/base/md.amd64:1.275 src/distrib/sets/lists/base/md.amd64:1.276 --- src/distrib/sets/lists/base/md.amd64:1.275 Fri Jul 13 09:15:55 2018 +++ src/distrib/sets/lists/base/md.amd64 Sun Sep 30 15:56:47 2018 @@ -1,7 +1,6 @@ -# $NetBSD: md.amd64,v 1.275 2018/07/13 09:15:55 maxv Exp $ +# $NetBSD: md.amd64,v 1.276 2018/09/30 15:56:47 jmcneill Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete -./sbin/mount_qemufwcfgbase-sysutil-root ./libexec/ld.elf_so-i386 base-sys-shlib compat,pic ./usr/bin/fdformatbase-util-bin ./usr/bin/iasl base-util-bin @@ -69,6 +68,3 @@ ./usr/mdec/pxeboot_ia32_com0.bin base-obsolete obsolete ./usr/sbin/acpidumpbase-sysutil-bin ./usr/sbin/amldbbase-sysutil-bin -./usr/share/man/cat8/mount_qemufwcfg.0 man-sysutil-catman .cat -./usr/share/man/html8/mount_qemufwcfg.html man-sysutil-htmlman html -./usr/share/man/man8/mount_qemufwcfg.8 man-sysutil-man .man Index: src/distrib/sets/lists/base/md.i386 diff -u src/distrib/sets/lists/base/md.i386:1.151 src/distrib/sets/lists/base/md.i386:1.152 --- src/distrib/sets/lists/base/md.i386:1.151 Sat Aug 25 11:10:52 2018 +++ src/distrib/sets/lists/base/md.i386 Sun Sep 30 15:56:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: md.i386,v 1.151 2018/08/25 11:10:52 martin Exp $ +# $NetBSD: md.i386,v 1.152 2018/09/30 15:56:47 jmcneill Exp $ ./dev/lms0 base-obsolete obsolete ./dev/mms0 base-obsolete obsolete ./dev/pms0 base-obsolete obsolete @@ -14,7 +14,6 @@ ./lib/libm387.so.0base-sys-shlib dynamicroot,pic ./lib/libm387.so.0.1base-sys-shlib dynamicroot,pic ./sbin/ldconfig base-sysutil-root pic -./sbin/mount_qemufwcfgbase-sysutil-root ./usr/bin/fdformatbase-util-bin ./usr/bin/fonteditbase-obsolete obsolete ./usr/bin/iasl base-util-bin @@ -105,9 +104,6 @@ ./usr/sbin/ipwctlbase-sysutil-bin ./usr/sbin/ndiscvtbase-sysutil-bin obsolete ./usr/sbin/zzz base-sysutil-bin -./usr/share/man/cat8/mount_qemufwcfg.0 man-sysutil-catman .cat -./usr/share/man/html8/mount_qemufwcfg.html man-sysutil-htmlman html -./usr/share/man/man8/mount_qemufwcfg.8 man-sysutil-man .man ./usr/share/pcvtbase-obsolete obsolete ./usr/share/pcvt/fontsbase-obsolete obsolete ./usr/share/pcvt/fonts/vt220h.808 base-obsolete obsolete Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1190 src/distrib/sets/lists/base/mi:1.1191 --- src/distrib/sets/lists/base/mi:1.1190 Sun Sep 23 09:20:57 2018 +++ src/distrib/sets/lists/base/mi Sun Sep 30 15:56:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1190 2018/09/23 09:20:57 maxv Exp $ +# $NetBSD: mi,v 1.1191 2018/09/30 15:56:47 jmcneill Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -546,6 +546,7 @@ ./sbin/mount_procfsbase-sysutil-root ./sbin/mount_ptyfsbase-miscfs-root ./sbin/mount_puffsbase-sysutil-root +./sbin/mount_qemufwcfgbase-sysutil-root ./sbin/mount_smbfsbase-smbfs-root ./sbin/mount_sysvbfsbase-sysutil-root ./sbin/mount_tmpfsbase-miscfs-root Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1626 src/distrib/sets/lists/man/mi:1.1627 --- src/distrib/sets/lists/man/mi:1.1626 Sun Sep 23 13:36:04 2018 +++ src/distrib/sets/lists/man/mi Sun Sep 30 15:56:47 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1626 2018/09/23 13:36:04 christos Exp $ +# $NetBSD: mi,v 1.1627 2018/09/30 15:56:47 jmcneill Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2766,6 +2766,7 @@ ./usr/share/man/cat8/mount_psshfs.0 man-puffs-catman .cat ./usr/share/man/cat8/mount_ptyfs.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_puffs.0 man-sysutil-catman .cat +./usr/share/man/cat8/mount_qemufwcfg.0 man-sysutil-catman .cat ./usr/share/man/cat8/mount_smbfs.0 man-smbfs-catman .cat ./usr/share/man/cat8/mount_sysctlfs.0 man-puffs-catman .cat ./usr/share/man/cat8/mount_sysvbfs.0 man-sysutil-catman .cat @@ -5712,6 +5713,7 @@ ./usr/share/man/html8/mount_psshfs.html man-puffs-htmlman html ./usr/share/man/html8/mount_ptyfs.html
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jmcneill
Date: Sun Sep 30 15:44:22 UTC 2018
Modified Files:
src/sys/dev/pci: virtio.c
Log Message:
Suppress "not configured" message when no device is present
To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/pci/virtio.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/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.35 src/sys/dev/pci/virtio.c:1.36
--- src/sys/dev/pci/virtio.c:1.35 Fri Jun 15 17:13:43 2018
+++ src/sys/dev/pci/virtio.c Sun Sep 30 15:44:22 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.35 2018/06/15 17:13:43 jakllsch Exp $ */
+/* $NetBSD: virtio.c,v 1.36 2018/09/30 15:44:22 jmcneill Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.35 2018/06/15 17:13:43 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: virtio.c,v 1.36 2018/09/30 15:44:22 jmcneill Exp $");
#include
#include
@@ -933,6 +933,9 @@ virtiobusprint(void *aux, const char *pn
{
struct virtio_attach_args * const va = aux;
+ if (va->sc_childdevid == 0)
+ return QUIET; /* No device present */
+
if (pnp)
aprint_normal("Device ID %d at %s", va->sc_childdevid, pnp);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Sun Sep 30 15:31:05 UTC 2018 Modified Files: src/sys/arch/evbarm/conf: GENERIC64 Log Message: Add plrtc To generate a diff of this commit: cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/GENERIC64 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/GENERIC64 diff -u src/sys/arch/evbarm/conf/GENERIC64:1.39 src/sys/arch/evbarm/conf/GENERIC64:1.40 --- src/sys/arch/evbarm/conf/GENERIC64:1.39 Sat Sep 29 16:02:09 2018 +++ src/sys/arch/evbarm/conf/GENERIC64 Sun Sep 30 15:31:05 2018 @@ -1,5 +1,5 @@ # -# $NetBSD: GENERIC64,v 1.39 2018/09/29 16:02:09 jmcneill Exp $ +# $NetBSD: GENERIC64,v 1.40 2018/09/30 15:31:05 jmcneill Exp $ # # GENERIC ARM (aarch64) kernel # @@ -264,6 +264,7 @@ tcagpio* at iic? bcmrng* at fdt? # Broadcom BCM283x RNG # RTC +plrtc* at fdt? # ARM PrimeCell RTC sunxirtc* at fdt? # Allwinner RTC tegrartc* at fdt? # NVIDIA Tegra RTC
CVS commit: src/sys/arch/newsmips/apbus
Module Name:src Committed By: tsutsui Date: Sun Sep 30 14:23:24 UTC 2018 Modified Files: src/sys/arch/newsmips/apbus: if_sn_ap.c if_tlp_ap.c kb_ap.c ms_ap.c spifi.c zs_ap.c Log Message: Avoid reference of APbus workarea that can't be read via kvm(3). To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/newsmips/apbus/if_sn_ap.c \ src/sys/arch/newsmips/apbus/ms_ap.c cvs rdiff -u -r1.13 -r1.14 src/sys/arch/newsmips/apbus/if_tlp_ap.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/newsmips/apbus/kb_ap.c cvs rdiff -u -r1.18 -r1.19 src/sys/arch/newsmips/apbus/spifi.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/newsmips/apbus/zs_ap.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/newsmips/apbus/if_sn_ap.c diff -u src/sys/arch/newsmips/apbus/if_sn_ap.c:1.11 src/sys/arch/newsmips/apbus/if_sn_ap.c:1.12 --- src/sys/arch/newsmips/apbus/if_sn_ap.c:1.11 Wed Apr 9 15:40:30 2008 +++ src/sys/arch/newsmips/apbus/if_sn_ap.c Sun Sep 30 14:23:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_sn_ap.c,v 1.11 2008/04/09 15:40:30 tsutsui Exp $ */ +/* $NetBSD: if_sn_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $ */ /* * Copyright (C) 1997 Allen Briggs @@ -31,7 +31,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_sn_ap.c,v 1.11 2008/04/09 15:40:30 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_sn_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $"); #include "opt_inet.h" @@ -117,7 +117,7 @@ sn_ap_attach(device_t parent, device_t s apbus_intr_establish(0, /* interrupt level (0 or 1) */ intrmask, 0, /* priority */ - snintr, sc, apa->apa_name, apa->apa_ctlnum); + snintr, sc, device_xname(self), apa->apa_ctlnum); } int Index: src/sys/arch/newsmips/apbus/ms_ap.c diff -u src/sys/arch/newsmips/apbus/ms_ap.c:1.11 src/sys/arch/newsmips/apbus/ms_ap.c:1.12 --- src/sys/arch/newsmips/apbus/ms_ap.c:1.11 Sat Oct 13 06:25:20 2012 +++ src/sys/arch/newsmips/apbus/ms_ap.c Sun Sep 30 14:23:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $ */ +/* $NetBSD: ms_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.11 2012/10/13 06:25:20 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ms_ap.c,v 1.12 2018/09/30 14:23:24 tsutsui Exp $"); #include #include @@ -101,7 +101,7 @@ ms_ap_attach(device_t parent, device_t s reg->ms_intr_en = 0; apbus_intr_establish(1, NEWS5000_INT1_KBD, 0, ms_ap_intr, sc, - "", apa->apa_ctlnum); + device_xname(self), apa->apa_ctlnum); aa.accessops = _ap_accessops; aa.accesscookie = sc; Index: src/sys/arch/newsmips/apbus/if_tlp_ap.c diff -u src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.13 src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.14 --- src/sys/arch/newsmips/apbus/if_tlp_ap.c:1.13 Fri Jul 15 07:49:20 2011 +++ src/sys/arch/newsmips/apbus/if_tlp_ap.c Sun Sep 30 14:23:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_tlp_ap.c,v 1.13 2011/07/15 07:49:20 he Exp $ */ +/* $NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $ */ /* * Copyright (c) 2000 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.13 2011/07/15 07:49:20 he Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_tlp_ap.c,v 1.14 2018/09/30 14:23:24 tsutsui Exp $"); #include #include @@ -222,7 +222,7 @@ tlp_ap_attach(device_t parent, device_t apbus_intr_establish(0, /* interrupt level (0 or 1) */ intrmask, 0, /* priority */ - tlp_intr, sc, apa->apa_name, apa->apa_ctlnum); + tlp_intr, sc, device_xname(self), apa->apa_ctlnum); } static void Index: src/sys/arch/newsmips/apbus/kb_ap.c diff -u src/sys/arch/newsmips/apbus/kb_ap.c:1.10 src/sys/arch/newsmips/apbus/kb_ap.c:1.11 --- src/sys/arch/newsmips/apbus/kb_ap.c:1.10 Sat Oct 13 06:25:20 2012 +++ src/sys/arch/newsmips/apbus/kb_ap.c Sun Sep 30 14:23:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $ */ +/* $NetBSD: kb_ap.c,v 1.11 2018/09/30 14:23:24 tsutsui Exp $ */ /*- * Copyright (c) 2000 Tsubai Masanari. All rights reserved. @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.10 2012/10/13 06:25:20 tsutsui Exp $"); +__KERNEL_RCSID(0, "$NetBSD: kb_ap.c,v 1.11 2018/09/30 14:23:24 tsutsui Exp $"); #include #include @@ -144,7 +144,7 @@ kb_ap_attach(device_t parent, device_t s reg->kb_tx_intr_en = 0; apbus_intr_establish(1, NEWS5000_INT1_KBD, 0, kb_ap_intr, sc, - "", apa->apa_ctlnum); + device_xname(self), apa->apa_ctlnum); waa.console = cons; waa.keymap = _ap_keymapdata; Index: src/sys/arch/newsmips/apbus/spifi.c diff -u src/sys/arch/newsmips/apbus/spifi.c:1.18 src/sys/arch/newsmips/apbus/spifi.c:1.19 --- src/sys/arch/newsmips/apbus/spifi.c:1.18 Fri Mar 31 08:38:13 2017 +++
CVS commit: src/sys/arch/newsmips/apbus
Module Name:src
Committed By: tsutsui
Date: Sun Sep 30 14:09:35 UTC 2018
Modified Files:
src/sys/arch/newsmips/apbus: apbus.c
Log Message:
Account APbus interrupts by evcnt(9).
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/sys/arch/newsmips/apbus/apbus.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/newsmips/apbus/apbus.c
diff -u src/sys/arch/newsmips/apbus/apbus.c:1.23 src/sys/arch/newsmips/apbus/apbus.c:1.24
--- src/sys/arch/newsmips/apbus/apbus.c:1.23 Sun Sep 30 06:14:23 2018
+++ src/sys/arch/newsmips/apbus/apbus.c Sun Sep 30 14:09:35 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.23 2018/09/30 06:14:23 tsutsui Exp $ */
+/* $NetBSD: apbus.c,v 1.24 2018/09/30 14:09:35 tsutsui Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.23 2018/09/30 06:14:23 tsutsui Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.24 2018/09/30 14:09:35 tsutsui Exp $");
#define __INTR_PRIVATE
@@ -201,8 +201,10 @@ apbus_intr_dispatch(int level, int stat)
nintr = 0;
LIST_FOREACH(ih, >intr_q, ih_q) {
- if (ih->ih_mask & stat)
+ if (ih->ih_mask & stat) {
nintr += (*ih->ih_func)(ih->ih_arg);
+ ih->intr_count.ev_count++;
+ }
}
return nintr;
}
@@ -227,6 +229,8 @@ apbus_intr_establish(int level, int mask
ih->ih_priority = priority;
ih->ih_func = func;
ih->ih_arg = arg;
+ evcnt_attach_dynamic(>intr_count, EVCNT_TYPE_INTR,
+ NULL, "apbus", name);
if (LIST_EMPTY(>intr_q)) {
LIST_INSERT_HEAD(>intr_q, ih, ih_q);
CVS commit: src/sys/arch/newsmips/conf
Module Name:src Committed By: tsutsui Date: Sun Sep 30 14:04:51 UTC 2018 Modified Files: src/sys/arch/newsmips/conf: GENERIC Log Message: Enable DHCP boot for modern servers rather than ancient BOOTPARAM. To generate a diff of this commit: cvs rdiff -u -r1.134 -r1.135 src/sys/arch/newsmips/conf/GENERIC Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/newsmips/conf/GENERIC diff -u src/sys/arch/newsmips/conf/GENERIC:1.134 src/sys/arch/newsmips/conf/GENERIC:1.135 --- src/sys/arch/newsmips/conf/GENERIC:1.134 Wed Aug 1 20:04:13 2018 +++ src/sys/arch/newsmips/conf/GENERIC Sun Sep 30 14:04:51 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.134 2018/08/01 20:04:13 maxv Exp $ +# $NetBSD: GENERIC,v 1.135 2018/09/30 14:04:51 tsutsui Exp $ # # GENERIC machine description file # @@ -22,7 +22,7 @@ include "arch/newsmips/conf/std.newsmip options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.134 $" +#ident "GENERIC-$Revision: 1.135 $" maxusers 16 @@ -113,7 +113,8 @@ options PPP_FILTER # Active filter supp #options ALTQ_RIO # RED with IN/OUT #options ALTQ_WFQ # Weighted Fair Queueing -options NFS_BOOT_BOOTPARAM +#options NFS_BOOT_BOOTPARAM +options NFS_BOOT_DHCP # JIT compiler for bpfilter #options SLJIT
CVS commit: src/sys/arch/newsmips/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sun Sep 30 14:02:06 UTC 2018
Modified Files:
src/sys/arch/newsmips/stand/boot: Makefile net.c version
Log Message:
Switch bootloader to using DHCP rather than BOOTPARAM.
Also bump version.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/newsmips/stand/boot/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/newsmips/stand/boot/net.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/newsmips/stand/boot/version
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/newsmips/stand/boot/Makefile
diff -u src/sys/arch/newsmips/stand/boot/Makefile:1.22 src/sys/arch/newsmips/stand/boot/Makefile:1.23
--- src/sys/arch/newsmips/stand/boot/Makefile:1.22 Thu Dec 17 05:29:56 2009
+++ src/sys/arch/newsmips/stand/boot/Makefile Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2009/12/17 05:29:56 matt Exp $
+# $NetBSD: Makefile,v 1.23 2018/09/30 14:02:06 tsutsui Exp $
S!= cd ${.CURDIR}/../../../..; pwd
@@ -21,7 +21,8 @@ CFLAGS= -Os -ffreestanding -mmemcpy -mno
CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
CPPFLAGS+= -DSUPPORT_USTARFS -DHAVE_CHANGEDISK_HOOK
-CPPFLAGS+= -DSUN_BOOTPARAMS
+#CPPFLAGS+= -DSUN_BOOTPARAMS
+CPPFLAGS+= -DSUPPORT_DHCP -DSUPPORT_BOOTP
CPPFLAGS+= -D_STANDALONE #-DBOOT_DEBUG
CPPFLAGS+= -I${.CURDIR} -I. -I${S}
CPPFLAGS+= -D__daddr_t=int32_t
Index: src/sys/arch/newsmips/stand/boot/net.c
diff -u src/sys/arch/newsmips/stand/boot/net.c:1.5 src/sys/arch/newsmips/stand/boot/net.c:1.6
--- src/sys/arch/newsmips/stand/boot/net.c:1.5 Wed Oct 21 23:12:09 2009
+++ src/sys/arch/newsmips/stand/boot/net.c Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: net.c,v 1.5 2009/10/21 23:12:09 snj Exp $ */
+/* $NetBSD: net.c,v 1.6 2018/09/30 14:02:06 tsutsui Exp $ */
/*
* Copyright (c) 1995 Gordon W. Ross
@@ -52,6 +52,7 @@
#include
#include
#include
+#include
#include
#include
@@ -144,7 +145,7 @@ net_mountroot(void)
printf("Using IP address: %s\n", inet_ntoa(myip));
printf("myip: %s (%s)", hostname, inet_ntoa(myip));
- if (gateip)
+ if (gateip.s_addr)
printf(", gateip: %s", inet_ntoa(gateip));
if (netmask)
printf(", netmask: %s", intoa(netmask));
Index: src/sys/arch/newsmips/stand/boot/version
diff -u src/sys/arch/newsmips/stand/boot/version:1.1 src/sys/arch/newsmips/stand/boot/version:1.2
--- src/sys/arch/newsmips/stand/boot/version:1.1 Thu Apr 18 14:54:39 2002
+++ src/sys/arch/newsmips/stand/boot/version Sun Sep 30 14:02:06 2018
@@ -1,4 +1,4 @@
-$NetBSD: version,v 1.1 2002/04/18 14:54:39 tsutsui Exp $
+$NetBSD: version,v 1.2 2018/09/30 14:02:06 tsutsui Exp $
NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this
file is important - make sure the entries are appended on end, last item
@@ -11,3 +11,4 @@ is taken as the current.
1.5: loadfile() update to avoid backwards seeks for ELF Program Headers.
1.6: Add ustarfs support
1.7: Use newvers_stand.sh and print version strings
+1.8: Switch to DHCP rather than BOOTPARAM
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: jmcneill Date: Sun Sep 30 13:53:26 UTC 2018 Modified Files: src/sys/arch/arm/cortex: gicv3.c Log Message: Set NS access bit when writing ICC_PMR_EL1 To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/cortex/gicv3.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/gicv3.c diff -u src/sys/arch/arm/cortex/gicv3.c:1.2 src/sys/arch/arm/cortex/gicv3.c:1.3 --- src/sys/arch/arm/cortex/gicv3.c:1.2 Sat Aug 11 00:32:17 2018 +++ src/sys/arch/arm/cortex/gicv3.c Sun Sep 30 13:53:26 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: gicv3.c,v 1.2 2018/08/11 00:32:17 jmcneill Exp $ */ +/* $NetBSD: gicv3.c,v 1.3 2018/09/30 13:53:26 jmcneill Exp $ */ /*- * Copyright (c) 2018 Jared McNeill @@ -31,7 +31,7 @@ #define _INTR_PRIVATE #include -__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.2 2018/08/11 00:32:17 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1.3 2018/09/30 13:53:26 jmcneill Exp $"); #include #include @@ -50,7 +50,7 @@ __KERNEL_RCSID(0, "$NetBSD: gicv3.c,v 1. #define PICTOSOFTC(pic) \ ((void *)((uintptr_t)(pic) - offsetof(struct gicv3_softc, sc_pic))) -#define IPL_TO_PRIORITY(ipl) ((IPL_HIGH - (ipl)) << 4) +#define IPL_TO_PRIORITY(ipl) (0x80 | ((IPL_HIGH - (ipl)) << 4)) static struct gicv3_softc *gicv3_softc; @@ -147,7 +147,7 @@ gicv3_establish_irq(struct pic_softc *pi uint64_t irouter; u_int n; - const u_int ipriority_val = 0x80 | IPL_TO_PRIORITY(is->is_ipl); + const u_int ipriority_val = IPL_TO_PRIORITY(is->is_ipl); const u_int ipriority_shift = (is->is_irq & 0x3) * 8; const u_int icfg_shift = (is->is_irq & 0xf) * 2;
CVS commit: src/lib/libcurses
Module Name:src Committed By: kamil Date: Sun Sep 30 10:55:00 UTC 2018 Modified Files: src/lib/libcurses: curses.h Log Message: curses.h: Fix typo in a comment of the word 'handling' No functional change intended. To generate a diff of this commit: cvs rdiff -u -r1.122 -r1.123 src/lib/libcurses/curses.h 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/curses.h diff -u src/lib/libcurses/curses.h:1.122 src/lib/libcurses/curses.h:1.123 --- src/lib/libcurses/curses.h:1.122 Sun Sep 30 10:08:13 2018 +++ src/lib/libcurses/curses.h Sun Sep 30 10:55:00 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: curses.h,v 1.122 2018/09/30 10:08:13 kamil Exp $ */ +/* $NetBSD: curses.h,v 1.123 2018/09/30 10:55:00 kamil Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -945,7 +945,7 @@ int mvwinwstr(WINDOW *, int, int, wchar_ int winnwstr(WINDOW *, wchar_t *, int); int winwstr(WINDOW *, wchar_t *); -/* cchar handlgin */ +/* cchar handling */ int setcchar(cchar_t *, const wchar_t *, const attr_t, short, const void *); int getcchar(const cchar_t *, wchar_t *, attr_t *, short *, void *);
CVS commit: src
Module Name:src
Committed By: martin
Date: Sun Sep 30 10:38:05 UTC 2018
Modified Files:
src/etc/rc.d: cleartmp
src/share/man/man5: rc.conf.5
Log Message:
Discussed some years ago but never commited: add an option to have a
single tmpfs (on /tmp) and use that for /var/shm as well (via a symlink
created after the tmpfs on /tmp has been mounted)
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/etc/rc.d/cleartmp
cvs rdiff -u -r1.174 -r1.175 src/share/man/man5/rc.conf.5
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/rc.d/cleartmp
diff -u src/etc/rc.d/cleartmp:1.12 src/etc/rc.d/cleartmp:1.13
--- src/etc/rc.d/cleartmp:1.12 Fri Jul 3 18:36:54 2015
+++ src/etc/rc.d/cleartmp Sun Sep 30 10:38:05 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: cleartmp,v 1.12 2015/07/03 18:36:54 dholland Exp $
+# $NetBSD: cleartmp,v 1.13 2018/09/30 10:38:05 martin Exp $
#
# PROVIDE: cleartmp
@@ -45,6 +45,13 @@ cleartmp_start()
(cd ${tmp_dir} &&
find -x . ! -name . ! -name lost+found ! -name quota.user \
! -name quota.group -exec rm -rf -- {} \+ -type d -prune)
+
+ # if requested, create symlink for /var/shm
+ if [ -n "${var_shm_symlink}" ]; then
+ /bin/rm -rf /var/shm
+ /bin/mkdir -m 1777 "${var_shm_symlink}"
+ /bin/ln -s "${var_shm_symlink}" /var/shm
+ fi
}
load_rc_config $name
Index: src/share/man/man5/rc.conf.5
diff -u src/share/man/man5/rc.conf.5:1.174 src/share/man/man5/rc.conf.5:1.175
--- src/share/man/man5/rc.conf.5:1.174 Sun Sep 23 09:21:00 2018
+++ src/share/man/man5/rc.conf.5 Sun Sep 30 10:38:05 2018
@@ -1,4 +1,4 @@
-.\" $NetBSD: rc.conf.5,v 1.174 2018/09/23 09:21:00 maxv Exp $
+.\" $NetBSD: rc.conf.5,v 1.175 2018/09/30 10:38:05 martin Exp $
.\"
.\" Copyright (c) 1996 Matthew R. Green
.\" All rights reserved.
@@ -351,6 +351,13 @@ Defaults to false.
Boolean value.
Remove block-type swap devices at shutdown time.
Useful if swapping onto RAIDframe devices.
+.It Sy var_shm_symlink
+A path.
+If set, names a path that /var/shm will be symlinked to.
+.Pp
+The path needs to live on a tmpfs file system.
+A typical value (assuming /tmp is mounted on tmpfs) would be
+.Pa /tmp/.shm .
.El
.Ss Block device subsystems
.Bl -tag -width net_interfaces
CVS commit: src/sys/arch/arm/cortex
Module Name:src Committed By: skrll Date: Sun Sep 30 10:34:38 UTC 2018 Modified Files: src/sys/arch/arm/cortex: gtmr.c Log Message: If we're going to allow pl0 to access virtual and physical counters then we should allow it from all CPUs. kern/53630 (openssl fallout on arm) To generate a diff of this commit: cvs rdiff -u -r1.35 -r1.36 src/sys/arch/arm/cortex/gtmr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/cortex/gtmr.c diff -u src/sys/arch/arm/cortex/gtmr.c:1.35 src/sys/arch/arm/cortex/gtmr.c:1.36 --- src/sys/arch/arm/cortex/gtmr.c:1.35 Sun Sep 16 13:21:36 2018 +++ src/sys/arch/arm/cortex/gtmr.c Sun Sep 30 10:34:38 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $ */ +/* $NetBSD: gtmr.c,v 1.36 2018/09/30 10:34:38 skrll Exp $ */ /*- * Copyright (c) 2012 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.35 2018/09/16 13:21:36 jmcneill Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gtmr.c,v 1.36 2018/09/30 10:34:38 skrll Exp $"); #include #include @@ -120,12 +120,6 @@ gtmr_attach(device_t parent, device_t se aprint_debug_dev(self, "enabling Allwinner A64 timer workaround\n"); } - /* - * Enable the virtual counter to be accessed from usermode. - */ - gtmr_cntk_ctl_write(gtmr_cntk_ctl_read() | - CNTKCTL_PL0VCTEN | CNTKCTL_PL0PCTEN); - self->dv_private = sc; sc->sc_dev = self; @@ -195,6 +189,13 @@ gtmr_init_cpu_clock(struct cpu_info *ci) int s = splsched(); /* + * Allow the virtual and physical counters to be accessed from + * usermode. (PL0) + */ + gtmr_cntk_ctl_write(gtmr_cntk_ctl_read() | + CNTKCTL_PL0VCTEN | CNTKCTL_PL0PCTEN); + + /* * enable timer and stop masking the timer. */ gtmr_cntv_ctl_write(CNTCTL_ENABLE);
CVS commit: src/lib/libcurses
Module Name:src Committed By: kamil Date: Sun Sep 30 10:08:13 UTC 2018 Modified Files: src/lib/libcurses: curses.h Log Message: Fix addchnstr() macro in curses.h Add a missing argument 'n'. To generate a diff of this commit: cvs rdiff -u -r1.121 -r1.122 src/lib/libcurses/curses.h 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/curses.h diff -u src/lib/libcurses/curses.h:1.121 src/lib/libcurses/curses.h:1.122 --- src/lib/libcurses/curses.h:1.121 Tue Jan 24 17:27:30 2017 +++ src/lib/libcurses/curses.h Sun Sep 30 10:08:13 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: curses.h,v 1.121 2017/01/24 17:27:30 roy Exp $ */ +/* $NetBSD: curses.h,v 1.122 2018/09/30 10:08:13 kamil Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -431,7 +431,7 @@ __END_DECLS /* Standard screen pseudo functions. */ #define addbytes(s, n) __waddbytes(stdscr, s, n, 0) #define addch(ch) waddch(stdscr, ch) -#define addchnstr(s) waddchnstr(stdscr, s, n) +#define addchnstr(s, n) waddchnstr(stdscr, s, n) #define addchstr(s) waddchnstr(stdscr, s, -1) #define addnstr(s, n) waddnstr(stdscr, s, n) #define addstr(s) waddnstr(stdscr, s, -1)
CVS commit: src/sys/net
Module Name:src
Committed By: maxv
Date: Sun Sep 30 10:00:25 UTC 2018
Modified Files:
src/sys/net: if_pppoe.c
Log Message:
remove hardcoded bullshit, probably fixes PR/53644
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/sys/net/if_pppoe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/if_pppoe.c
diff -u src/sys/net/if_pppoe.c:1.143 src/sys/net/if_pppoe.c:1.144
--- src/sys/net/if_pppoe.c:1.143 Fri Aug 24 17:06:29 2018
+++ src/sys/net/if_pppoe.c Sun Sep 30 10:00:24 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_pppoe.c,v 1.143 2018/08/24 17:06:29 maxv Exp $ */
+/* $NetBSD: if_pppoe.c,v 1.144 2018/09/30 10:00:24 maxv Exp $ */
/*-
* Copyright (c) 2002, 2008 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.143 2018/08/24 17:06:29 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_pppoe.c,v 1.144 2018/09/30 10:00:24 maxv Exp $");
#ifdef _KERNEL_OPT
#include "pppoe.h"
@@ -1743,16 +1743,16 @@ pppoe_send_pado(struct pppoe_softc *sc)
if (sc->sc_state != PPPOE_STATE_PADO_SENT)
return EIO;
- /* calc length */
- len = 0;
- /* include ac_cookie */
- len += 2 + 2 + sizeof(sc);
- /* include hunique */
- len += 2 + 2 + sc->sc_hunique_len;
+ /* Include AC cookie. */
+ len = sizeof(struct pppoetag) + sizeof(sc->sc_id);
+ /* Include hunique. */
+ len += sizeof(struct pppoetag) + sc->sc_hunique_len;
+
m0 = pppoe_get_mbuf(len + PPPOE_HEADERLEN);
if (!m0)
return EIO;
p = mtod(m0, uint8_t *);
+
PPPOE_ADD_HEADER(p, PPPOE_CODE_PADO, 0, len);
PPPOE_ADD_16(p, PPPOE_TAG_ACCOOKIE);
PPPOE_ADD_16(p, sizeof(sc->sc_id));
@@ -1779,18 +1779,21 @@ pppoe_send_pads(struct pppoe_softc *sc)
getbinuptime();
sc->sc_session = bt.sec % 0xff + 1;
- /* calc length */
- len = 0;
- /* include hunique */
- len += 2 + 2 + 2 + 2 + sc->sc_hunique_len; /* service name, host unique*/
- if (sc->sc_service_name != NULL) { /* service name tag maybe empty */
+
+ /* Include service name. */
+ len = sizeof(struct pppoetag);
+ if (sc->sc_service_name != NULL) {
l1 = strlen(sc->sc_service_name);
len += l1;
}
+ /* Include hunique. */
+ len += sizeof(struct pppoetag) + sc->sc_hunique_len;
+
m0 = pppoe_get_mbuf(len + PPPOE_HEADERLEN);
if (!m0)
return ENOBUFS;
p = mtod(m0, uint8_t *);
+
PPPOE_ADD_HEADER(p, PPPOE_CODE_PADS, sc->sc_session, len);
PPPOE_ADD_16(p, PPPOE_TAG_SNAME);
if (sc->sc_service_name != NULL) {
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src Committed By: martin Date: Sun Sep 30 09:46:41 UTC 2018 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: arm_asm.h Log Message: Newer gcc seems to use __ARM_ARCH_ISA_THUMB to tell use we have thumb instructions available To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_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/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.1 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.2 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h:1.1 Tue Mar 10 13:28:47 2015 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/arm_asm.h Sun Sep 30 09:46:41 2018 @@ -1,4 +1,4 @@ -#if defined (_ARM_ARCH_4T) +#if defined (_ARM_ARCH_4T) || defined(__ARM_ARCH_ISA_THUMB) # define RET bx lr #else # define RET mov pc, lr
CVS commit: src/sys/arch/newsmips
Module Name:src
Committed By: tsutsui
Date: Sun Sep 30 06:14:23 UTC 2018
Modified Files:
src/sys/arch/newsmips/apbus: apbus.c apbus_subr.c apbusvar.h
src/sys/arch/newsmips/conf: std.newsmips
Log Message:
Fix news5000 panic during boot on APbus attach. PR port-newsmips/53626
Discussed with ryo@ (the original author of news5000 support).
Should be pulled up to netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/sys/arch/newsmips/apbus/apbus.c
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/newsmips/apbus/apbus_subr.c \
src/sys/arch/newsmips/apbus/apbusvar.h
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/newsmips/conf/std.newsmips
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/newsmips/apbus/apbus.c
diff -u src/sys/arch/newsmips/apbus/apbus.c:1.22 src/sys/arch/newsmips/apbus/apbus.c:1.23
--- src/sys/arch/newsmips/apbus/apbus.c:1.22 Sun Feb 20 07:56:31 2011
+++ src/sys/arch/newsmips/apbus/apbus.c Sun Sep 30 06:14:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus.c,v 1.22 2011/02/20 07:56:31 matt Exp $ */
+/* $NetBSD: apbus.c,v 1.23 2018/09/30 06:14:23 tsutsui Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.22 2011/02/20 07:56:31 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus.c,v 1.23 2018/09/30 06:14:23 tsutsui Exp $");
#define __INTR_PRIVATE
@@ -99,6 +99,7 @@ apbusattach(device_t parent, device_t se
struct newsmips_intr *ip;
int i;
+ apbus_map_romwork();
mips_set_wbflush(apbus_wbflush);
*(volatile uint32_t *)(NEWS5000_APBUS_INTST) = 0x;
Index: src/sys/arch/newsmips/apbus/apbus_subr.c
diff -u src/sys/arch/newsmips/apbus/apbus_subr.c:1.9 src/sys/arch/newsmips/apbus/apbus_subr.c:1.10
--- src/sys/arch/newsmips/apbus/apbus_subr.c:1.9 Mon Mar 24 20:05:20 2014
+++ src/sys/arch/newsmips/apbus/apbus_subr.c Sun Sep 30 06:14:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: apbus_subr.c,v 1.9 2014/03/24 20:05:20 christos Exp $ */
+/* $NetBSD: apbus_subr.c,v 1.10 2018/09/30 06:14:23 tsutsui Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -27,15 +27,47 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: apbus_subr.c,v 1.9 2014/03/24 20:05:20 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: apbus_subr.c,v 1.10 2018/09/30 06:14:23 tsutsui Exp $");
#include
#include
+#include
+
+#include
+#include
+
+#include
+
#include
static void apctl_dump(struct apbus_ctl *);
+#define APBUS_ROMWORK_VA 0xfff0
+
+void
+apbus_map_romwork(void)
+{
+ static bool mapped = false;
+ vaddr_t apbd_work_va;
+ vsize_t apbd_work_sz;
+ paddr_t apbd_work_pa;
+
+ if (!mapped) {
+ /* map PROM work RAM into VA 0xFFF0 - 0x */
+ apbd_work_va = APBUS_ROMWORK_VA;
+ apbd_work_sz = MIPS3_PG_SIZE_MASK_TO_SIZE(MIPS3_PG_SIZE_1M);
+ apbd_work_pa = ctob(physmem);
+
+ mapped = mips3_wired_enter_page(apbd_work_va, apbd_work_pa,
+ apbd_work_sz);
+ if (!mapped) {
+ printf("%s: cannot allocate APbus PROM work\n",
+ __func__);
+ }
+ }
+}
+
void *
apbus_device_to_hwaddr(struct apbus_dev *apbus_dev)
{
Index: src/sys/arch/newsmips/apbus/apbusvar.h
diff -u src/sys/arch/newsmips/apbus/apbusvar.h:1.9 src/sys/arch/newsmips/apbus/apbusvar.h:1.10
--- src/sys/arch/newsmips/apbus/apbusvar.h:1.9 Wed Oct 17 19:55:54 2007
+++ src/sys/arch/newsmips/apbus/apbusvar.h Sun Sep 30 06:14:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: apbusvar.h,v 1.9 2007/10/17 19:55:54 garbled Exp $ */
+/* $NetBSD: apbusvar.h,v 1.10 2018/09/30 06:14:23 tsutsui Exp $ */
/*-
* Copyright (C) 1999 SHIMIZU Ryo. All rights reserved.
@@ -39,6 +39,7 @@ struct apbus_attach_args {
u_long apa_hwbase; /* hardware I/O address */
};
+void apbus_map_romwork(void);
void *apbus_device_to_hwaddr(struct apbus_dev *);
struct apbus_dev *apbus_lookupdev(char *);
void apdevice_dump(struct apbus_dev *);
Index: src/sys/arch/newsmips/conf/std.newsmips
diff -u src/sys/arch/newsmips/conf/std.newsmips:1.17 src/sys/arch/newsmips/conf/std.newsmips:1.18
--- src/sys/arch/newsmips/conf/std.newsmips:1.17 Sun Dec 11 12:18:24 2005
+++ src/sys/arch/newsmips/conf/std.newsmips Sun Sep 30 06:14:23 2018
@@ -1,4 +1,4 @@
-# $NetBSD: std.newsmips,v 1.17 2005/12/11 12:18:24 christos Exp $
+# $NetBSD: std.newsmips,v 1.18 2018/09/30 06:14:23 tsutsui Exp $
machine newsmips mips
include "conf/std" # MI standard options
@@ -7,5 +7,7 @@ makeoptions MACHINE_ARCH="mipseb"
options EXEC_ELF32 # exec ELF32 binaries
options EXEC_SCRIPT # exec #! scripts
+options ENABLE_MIPS3_WIRED_MAP
+
makeoptions DEFTEXTADDR="0x80001000"
makeoptions LINKFORMAT="-N"
