CVS commit: src/usr.bin/printf
Module Name:src
Committed By: kre
Date: Mon Sep 3 04:10:20 UTC 2018
Modified Files:
src/usr.bin/printf: printf.c
Log Message:
Tighten syntax a little (no more %*4.*2d nonsense).
Include the format collected so far in "missing format char" err message.
Minor KNF and whitespace.
To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 src/usr.bin/printf/printf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/printf/printf.c
diff -u src/usr.bin/printf/printf.c:1.43 src/usr.bin/printf/printf.c:1.44
--- src/usr.bin/printf/printf.c:1.43 Fri Aug 31 17:27:35 2018
+++ src/usr.bin/printf/printf.c Mon Sep 3 04:10:20 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: printf.c,v 1.43 2018/08/31 17:27:35 kre Exp $ */
+/* $NetBSD: printf.c,v 1.44 2018/09/03 04:10:20 kre Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -41,7 +41,7 @@ __COPYRIGHT("@(#) Copyright (c) 1989, 19
#if 0
static char sccsid[] = "@(#)printf.c 8.2 (Berkeley) 3/22/95";
#else
-__RCSID("$NetBSD: printf.c,v 1.43 2018/08/31 17:27:35 kre Exp $");
+__RCSID("$NetBSD: printf.c,v 1.44 2018/09/03 04:10:20 kre Exp $");
#endif
#endif /* not lint */
@@ -121,7 +121,9 @@ static char **gargv;
#ifdef main
int main(int, char *[]);
#endif
-int main(int argc, char *argv[])
+
+int
+main(int argc, char *argv[])
{
char *fmt, *start;
int fieldwidth, precision;
@@ -189,34 +191,39 @@ int main(int argc, char *argv[])
if (*fmt == '*') {
fmt++;
fieldwidth = getwidth();
- } else
+ } else {
fieldwidth = -1;
- /* skip to possible '.', get following precision */
- fmt += strspn(fmt, SKIP2);
+/* skip to possible '.' for precision */
+fmt += strspn(fmt, SKIP2);
+ }
+
if (*fmt == '.') {
+ /* get following precision */
fmt++;
if (*fmt == '*') {
fmt++;
precision = getwidth();
-} else
+} else {
precision = -1;
+ fmt += strspn(fmt, SKIP2);
+}
} else
precision = -1;
- fmt += strspn(fmt, SKIP2);
-
ch = *fmt;
if (!ch) {
-warnx("missing format character");
+warnx("%s: missing format character", start);
return 1;
}
+
/*
* null terminate format string to we can use it
* as an argument to printf.
*/
nextch = fmt[1];
fmt[1] = 0;
+
switch (ch) {
case 'B': {
@@ -323,6 +330,11 @@ int main(int argc, char *argv[])
goto out;
break;
}
+ case '%':
+/* Don't ask, but this is useful ... */
+if (fieldwidth == 'N' && precision == 'B')
+ return 0;
+/* FALLTHROUGH */
default:
warnx("%s: invalid directive", start);
return 1;
@@ -617,7 +629,7 @@ getwidth(void)
char *s, *ep;
s = *gargv;
- if (!*gargv)
+ if (s == NULL)
return 0;
gargv++;
CVS commit: src/usr.bin/printf
Module Name:src Committed By: kre Date: Mon Sep 3 04:10:20 UTC 2018 Modified Files: src/usr.bin/printf: printf.c Log Message: Tighten syntax a little (no more %*4.*2d nonsense). Include the format collected so far in "missing format char" err message. Minor KNF and whitespace. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/usr.bin/printf/printf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src Committed By: knakahara Date: Mon Sep 3 02:33:31 UTC 2018 Modified Files: src/sys/netinet: in_l2tp.c src/sys/netinet6: in6_l2tp.c Log Message: fix: l2tp(4) cannot receive packets after reset session without reset tunnel. Pointed out by k-goda@IIJ When the following operations are done after established session, the l2tp0 cannot receive packets until done deletetunnel && tunnel "src" "dst". ifconfig l2tp0 deletesession ifconfig l2tp0 deletecookie ifconfig l2tp0 session 200 100 XXX pullup-8 To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/in_l2tp.c cvs rdiff -u -r1.16 -r1.17 src/sys/netinet6/in6_l2tp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: knakahara
Date: Mon Sep 3 02:33:31 UTC 2018
Modified Files:
src/sys/netinet: in_l2tp.c
src/sys/netinet6: in6_l2tp.c
Log Message:
fix: l2tp(4) cannot receive packets after reset session without reset tunnel.
Pointed out by k-goda@IIJ
When the following operations are done after established session, the l2tp0
cannot receive packets until done deletetunnel && tunnel "src" "dst".
ifconfig l2tp0 deletesession
ifconfig l2tp0 deletecookie
ifconfig l2tp0 session 200 100
XXX pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/netinet/in_l2tp.c
cvs rdiff -u -r1.16 -r1.17 src/sys/netinet6/in6_l2tp.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/in_l2tp.c
diff -u src/sys/netinet/in_l2tp.c:1.15 src/sys/netinet/in_l2tp.c:1.16
--- src/sys/netinet/in_l2tp.c:1.15 Thu Jun 21 10:37:50 2018
+++ src/sys/netinet/in_l2tp.c Mon Sep 3 02:33:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in_l2tp.c,v 1.15 2018/06/21 10:37:50 knakahara Exp $ */
+/* $NetBSD: in_l2tp.c,v 1.16 2018/09/03 02:33:30 knakahara Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.15 2018/06/21 10:37:50 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in_l2tp.c,v 1.16 2018/09/03 02:33:30 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_l2tp.h"
@@ -366,16 +366,25 @@ out:
static int
in_l2tp_match(struct mbuf *m, int off, int proto, void *arg)
{
- struct l2tp_variant *var = arg;
+ struct l2tp_softc *sc = arg;
+ struct l2tp_variant *var;
+ struct psref psref;
uint32_t sess_id;
+ int rv = 0;
KASSERT(proto == IPPROTO_L2TP);
+ var = l2tp_getref_variant(sc, );
+ if (__predict_false(var == NULL))
+ return rv;
+
/*
* If the packet contains no session ID it cannot match
*/
- if (m_length(m) < off + sizeof(uint32_t))
- return 0;
+ if (m_length(m) < off + sizeof(uint32_t)) {
+ rv = 0;
+ goto out;
+ }
/* get L2TP session ID */
m_copydata(m, off, sizeof(uint32_t), (void *)_id);
@@ -385,19 +394,26 @@ in_l2tp_match(struct mbuf *m, int off, i
* L2TPv3 control packet received.
* userland daemon(l2tpd?) should process.
*/
- return 32 * 2;
+ rv = 32 * 2;
} else if (sess_id == var->lv_my_sess_id)
- return 32 * 2;
+ rv = 32 * 2;
else
- return 0;
+ rv = 0;
+
+out:
+ l2tp_putref_variant(var, );
+ return rv;
}
int
in_l2tp_attach(struct l2tp_variant *var)
{
+ struct l2tp_softc *sc = var->lv_softc;
+ if (sc == NULL)
+ return EINVAL;
var->lv_encap_cookie = encap_attach_func(AF_INET, IPPROTO_L2TP,
- in_l2tp_match, _l2tp_encapsw, var);
+ in_l2tp_match, _l2tp_encapsw, sc);
if (var->lv_encap_cookie == NULL)
return EEXIST;
Index: src/sys/netinet6/in6_l2tp.c
diff -u src/sys/netinet6/in6_l2tp.c:1.16 src/sys/netinet6/in6_l2tp.c:1.17
--- src/sys/netinet6/in6_l2tp.c:1.16 Thu Jun 21 10:37:50 2018
+++ src/sys/netinet6/in6_l2tp.c Mon Sep 3 02:33:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_l2tp.c,v 1.16 2018/06/21 10:37:50 knakahara Exp $ */
+/* $NetBSD: in6_l2tp.c,v 1.17 2018/09/03 02:33:31 knakahara Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.16 2018/06/21 10:37:50 knakahara Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6_l2tp.c,v 1.17 2018/09/03 02:33:31 knakahara Exp $");
#ifdef _KERNEL_OPT
#include "opt_l2tp.h"
@@ -361,16 +361,25 @@ out:
static int
in6_l2tp_match(struct mbuf *m, int off, int proto, void *arg)
{
- struct l2tp_variant *var = arg;
+ struct l2tp_softc *sc = arg;
+ struct l2tp_variant *var;
+ struct psref psref;
uint32_t sess_id;
+ int rv = 0;
KASSERT(proto == IPPROTO_L2TP);
+ var = l2tp_getref_variant(sc, );
+ if (__predict_false(var == NULL))
+ return rv;
+
/*
* If the packet contains no session ID it cannot match
*/
- if (m_length(m) < off + sizeof(uint32_t))
- return 0;
+ if (m_length(m) < off + sizeof(uint32_t)) {
+ rv = 0 ;
+ goto out;
+ }
/* get L2TP session ID */
m_copydata(m, off, sizeof(uint32_t), (void *)_id);
@@ -380,19 +389,26 @@ in6_l2tp_match(struct mbuf *m, int off,
* L2TPv3 control packet received.
* userland daemon(l2tpd?) should process.
*/
- return 128 * 2;
+ rv = 128 * 2;
} else if (sess_id == var->lv_my_sess_id)
- return 128 * 2;
+ rv = 128 * 2;
else
- return 0;
+ rv = 0;
+
+out:
+ l2tp_putref_variant(var, );
+ return rv;
}
int
in6_l2tp_attach(struct l2tp_variant *var)
{
+ struct l2tp_softc *sc = var->lv_softc;
+ if (sc == NULL)
+ return EINVAL;
var->lv_encap_cookie = encap_attach_func(AF_INET6, IPPROTO_L2TP,
- in6_l2tp_match, _l2tp_encapsw, var);
+ in6_l2tp_match, _l2tp_encapsw, sc);
if (var->lv_encap_cookie == NULL)
return EEXIST;
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: jmcneill Date: Mon Sep 3 00:17:00 UTC 2018 Modified Files: src/sys/stand/efiboot: boot.c efifdt.c efifdt.h Log Message: Print FDT model and compatible strings with "version" command To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/boot.c cvs rdiff -u -r1.6 -r1.7 src/sys/stand/efiboot/efifdt.c cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/efifdt.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: jmcneill
Date: Mon Sep 3 00:17:00 UTC 2018
Modified Files:
src/sys/stand/efiboot: boot.c efifdt.c efifdt.h
Log Message:
Print FDT model and compatible strings with "version" command
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/boot.c
cvs rdiff -u -r1.6 -r1.7 src/sys/stand/efiboot/efifdt.c
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/efifdt.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/stand/efiboot/boot.c
diff -u src/sys/stand/efiboot/boot.c:1.4 src/sys/stand/efiboot/boot.c:1.5
--- src/sys/stand/efiboot/boot.c:1.4 Mon Sep 3 00:04:02 2018
+++ src/sys/stand/efiboot/boot.c Mon Sep 3 00:17:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: boot.c,v 1.4 2018/09/03 00:04:02 jmcneill Exp $ */
+/* $NetBSD: boot.c,v 1.5 2018/09/03 00:17:00 jmcneill Exp $ */
/*-
* Copyright (c) 2016 Kimihiro Nonaka
@@ -29,6 +29,7 @@
#include "efiboot.h"
#include "efiblock.h"
+#include "efifdt.h"
#include
#include
@@ -131,6 +132,8 @@ command_version(char *arg)
ST->FirmwareRevision & 0x);
FreePool(ufirmware);
}
+
+ efi_fdt_show();
}
void
Index: src/sys/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.6 src/sys/stand/efiboot/efifdt.c:1.7
--- src/sys/stand/efiboot/efifdt.c:1.6 Sun Sep 2 23:54:25 2018
+++ src/sys/stand/efiboot/efifdt.c Mon Sep 3 00:17:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.6 2018/09/02 23:54:25 jmcneill Exp $ */
+/* $NetBSD: efifdt.c,v 1.7 2018/09/03 00:17:00 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -78,6 +78,27 @@ efi_fdt_size(void)
}
void
+efi_fdt_show(void)
+{
+ const char *model, *compat;
+ int n, ncompat;
+
+ if (fdt_data == NULL)
+ return;
+
+ model = fdt_getprop(fdt_data, fdt_path_offset(fdt_data, "/"), "model", NULL);
+ if (model)
+ printf("FDT: %s [", model);
+ ncompat = fdt_stringlist_count(fdt_data, fdt_path_offset(fdt_data, "/"), "compatible");
+ for (n = 0; n < ncompat; n++) {
+ compat = fdt_stringlist_get(fdt_data, fdt_path_offset(fdt_data, "/"),
+ "compatible", n, NULL);
+ printf("%s%s", n == 0 ? "" : ", ", compat);
+ }
+ printf("]\n");
+}
+
+void
efi_fdt_memory_map(void)
{
UINTN nentries = 0, mapkey, descsize;
Index: src/sys/stand/efiboot/efifdt.h
diff -u src/sys/stand/efiboot/efifdt.h:1.1 src/sys/stand/efiboot/efifdt.h:1.2
--- src/sys/stand/efiboot/efifdt.h:1.1 Fri Aug 24 02:01:06 2018
+++ src/sys/stand/efiboot/efifdt.h Mon Sep 3 00:17:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.h,v 1.1 2018/08/24 02:01:06 jmcneill Exp $ */
+/* $NetBSD: efifdt.h,v 1.2 2018/09/03 00:17:00 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -30,4 +30,5 @@ int efi_fdt_probe(void);
void efi_fdt_memory_map(void);
void *efi_fdt_data(void);
int efi_fdt_size(void);
+void efi_fdt_show(void);
void efi_fdt_bootargs(const char *);
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: jmcneill
Date: Mon Sep 3 00:04:02 UTC 2018
Modified Files:
src/sys/stand/efiboot: Makefile.efiboot boot.c conf.c devopen.c
efiboot.c efiboot.h version
Added Files:
src/sys/stand/efiboot: dev_net.c efigetsecs.c efinet.c efinet.h
efipxe.c
Log Message:
Add PXE support.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/Makefile.efiboot \
src/sys/stand/efiboot/conf.c src/sys/stand/efiboot/devopen.c \
src/sys/stand/efiboot/efiboot.h
cvs rdiff -u -r1.3 -r1.4 src/sys/stand/efiboot/boot.c
cvs rdiff -u -r0 -r1.1 src/sys/stand/efiboot/dev_net.c \
src/sys/stand/efiboot/efinet.c src/sys/stand/efiboot/efinet.h \
src/sys/stand/efiboot/efipxe.c
cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/efiboot.c
cvs rdiff -u -r0 -r1.3 src/sys/stand/efiboot/efigetsecs.c
cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/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/stand/efiboot/Makefile.efiboot
diff -u src/sys/stand/efiboot/Makefile.efiboot:1.2 src/sys/stand/efiboot/Makefile.efiboot:1.3
--- src/sys/stand/efiboot/Makefile.efiboot:1.2 Sun Aug 26 21:28:18 2018
+++ src/sys/stand/efiboot/Makefile.efiboot Mon Sep 3 00:04:02 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.efiboot,v 1.2 2018/08/26 21:28:18 jmcneill Exp $
+# $NetBSD: Makefile.efiboot,v 1.3 2018/09/03 00:04:02 jmcneill Exp $
S= ${.CURDIR}/../../..
@@ -21,8 +21,8 @@ AFLAGS.start.S= ${${ACTIVE_CC} == "clang
.PATH: ${EFIDIR}/gnuefi
SOURCES= crt0-efi-${GNUEFIARCH}.S reloc_${GNUEFIARCH}.c
-SOURCES+= boot.c conf.c console.c devopen.c exec.c panic.c prompt.c
-SOURCES+= efiboot.c efichar.c efidev.c efifdt.c efifile.c efiblock.c
+SOURCES+= boot.c conf.c console.c dev_net.c devopen.c exec.c panic.c prompt.c
+SOURCES+= efiboot.c efichar.c efidev.c efigetsecs.c efifdt.c efifile.c efiblock.c efinet.c efipxe.c
.PATH: ${S}/external/bsd/libfdt/dist
CPPFLAGS+= -I${S}/external/bsd/libfdt/dist
@@ -68,12 +68,12 @@ CPPFLAGS+= -Wno-pointer-sign
CPPFLAGS+= -DHEAP_VARIABLE
#CPPFLAGS+= -DSUPPORT_CD9660
CPPFLAGS+= -D"devb2cdb(bno)=(bno)"
-#CPPFLAGS+= -DSUPPORT_DOSFS
+CPPFLAGS+= -DSUPPORT_DOSFS
#CPPFLAGS+= -DSUPPORT_EXT2FS
-#CPPFLAGS+= -DSUPPORT_BOOTP
-#CPPFLAGS+= -DSUPPORT_DHCP
+CPPFLAGS+= -DSUPPORT_BOOTP
+CPPFLAGS+= -DSUPPORT_DHCP
#CPPFLAGS+= -DSUPPORT_NFS
-#CPPFLAGS+= -DSUPPORT_TFTP
+CPPFLAGS+= -DSUPPORT_TFTP
CPPFLAGS+= -DLIBSA_ENABLE_LS_OP
#CPPFLAGS+= -DARP_DEBUG
@@ -92,7 +92,7 @@ SAMISCCPPFLAGS+= -D"cdb2devb(bno)=(bno)"
SA_AS= library
SAMISCMAKEFLAGS+="SA_USE_LOADFILE=yes"
SAMISCMAKEFLAGS+="SA_USE_CREAD=yes"
-#SAMISCMAKEFLAGS+="SA_INCLUDE_NET=yes"
+SAMISCMAKEFLAGS+="SA_INCLUDE_NET=yes"
SAMISCMAKEFLAGS+="SA_ENABLE_LS_OP=yes"
.include "${S}/lib/libsa/Makefile.inc"
LIBSA= ${SALIB}
Index: src/sys/stand/efiboot/conf.c
diff -u src/sys/stand/efiboot/conf.c:1.2 src/sys/stand/efiboot/conf.c:1.3
--- src/sys/stand/efiboot/conf.c:1.2 Sun Aug 26 21:28:18 2018
+++ src/sys/stand/efiboot/conf.c Mon Sep 3 00:04:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: conf.c,v 1.2 2018/08/26 21:28:18 jmcneill Exp $ */
+/* $NetBSD: conf.c,v 1.3 2018/09/03 00:04:02 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -33,20 +33,29 @@
#include
#include
#include
+#include
+#include
+#include
struct devsw devsw[] = {
{ "efifile", efi_file_strategy, efi_file_open, efi_file_close, noioctl },
{ "efiblock", efi_block_strategy, efi_block_open, efi_block_close, noioctl },
+ { "net", net_strategy, net_open, net_close, noioctl },
};
int ndevs = __arraycount(devsw);
struct netif_driver *netif_drivers[] = {
+ ,
};
int n_netif_drivers = __arraycount(netif_drivers);
struct fs_ops file_system[] = {
+ FS_OPS(null),
FS_OPS(ffsv1),
FS_OPS(ffsv2),
FS_OPS(dosfs),
};
int nfsys = __arraycount(file_system);
+
+struct fs_ops null_fs_ops = FS_OPS(null);
+struct fs_ops tftp_fs_ops = FS_OPS(tftp);
Index: src/sys/stand/efiboot/devopen.c
diff -u src/sys/stand/efiboot/devopen.c:1.2 src/sys/stand/efiboot/devopen.c:1.3
--- src/sys/stand/efiboot/devopen.c:1.2 Sun Aug 26 21:28:18 2018
+++ src/sys/stand/efiboot/devopen.c Mon Sep 3 00:04:02 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: devopen.c,v 1.2 2018/08/26 21:28:18 jmcneill Exp $ */
+/* $NetBSD: devopen.c,v 1.3 2018/09/03 00:04:02 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -35,7 +35,11 @@ devopen(struct open_file *f, const char
{
int error;
- error = efi_block_open(f, fname, file);
+ error = efi_net_open(f, fname, file);
+ file_system[0] = error ? null_fs_ops : tftp_fs_ops;
+
+ if (error)
+ error = efi_block_open(f, fname, file);
if (error)
error = efi_file_open(f, fname);
Index: src/sys/stand/efiboot/efiboot.h
diff -u src/sys/stand/efiboot/efiboot.h:1.2 src/sys/stand/efiboot/efiboot.h:1.3
--- src/sys/stand/efiboot/efiboot.h:1.2 Sun Aug 26 21:28:18 2018
+++
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: jmcneill Date: Mon Sep 3 00:04:02 UTC 2018 Modified Files: src/sys/stand/efiboot: Makefile.efiboot boot.c conf.c devopen.c efiboot.c efiboot.h version Added Files: src/sys/stand/efiboot: dev_net.c efigetsecs.c efinet.c efinet.h efipxe.c Log Message: Add PXE support. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/Makefile.efiboot \ src/sys/stand/efiboot/conf.c src/sys/stand/efiboot/devopen.c \ src/sys/stand/efiboot/efiboot.h cvs rdiff -u -r1.3 -r1.4 src/sys/stand/efiboot/boot.c cvs rdiff -u -r0 -r1.1 src/sys/stand/efiboot/dev_net.c \ src/sys/stand/efiboot/efinet.c src/sys/stand/efiboot/efinet.h \ src/sys/stand/efiboot/efipxe.c cvs rdiff -u -r1.4 -r1.5 src/sys/stand/efiboot/efiboot.c cvs rdiff -u -r0 -r1.3 src/sys/stand/efiboot/efigetsecs.c cvs rdiff -u -r1.1 -r1.2 src/sys/stand/efiboot/version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/stand/efiboot
Module Name:src
Committed By: jmcneill
Date: Sun Sep 2 23:54:25 UTC 2018
Modified Files:
src/sys/stand/efiboot: efifdt.c
Log Message:
Dump memory map if EFI_MEMORY_DEBUG is defined
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/stand/efiboot/efifdt.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/stand/efiboot/efifdt.c
diff -u src/sys/stand/efiboot/efifdt.c:1.5 src/sys/stand/efiboot/efifdt.c:1.6
--- src/sys/stand/efiboot/efifdt.c:1.5 Tue Aug 28 01:24:39 2018
+++ src/sys/stand/efiboot/efifdt.c Sun Sep 2 23:54:25 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efifdt.c,v 1.5 2018/08/28 01:24:39 jmcneill Exp $ */
+/* $NetBSD: efifdt.c,v 1.6 2018/09/02 23:54:25 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -103,6 +103,12 @@ efi_fdt_memory_map(void)
memmap = LibMemoryMap(, , , );
for (n = 0, md = memmap; n < nentries; n++, md = NextMemoryDescriptor(md, descsize)) {
+#ifdef EFI_MEMORY_DEBUG
+ printf("MEM: %u: Type 0x%x Attr 0x%lx Phys 0x%lx Virt 0x%lx Size 0x%lx\n",
+ n, md->Type, md->Attribute,
+ md->PhysicalStart, md->VirtualStart,
+ (u_long)md->NumberOfPages * EFI_PAGE_SIZE);
+#endif
if ((md->Attribute & EFI_MEMORY_WB) == 0)
continue;
if (!FDT_MEMORY_USABLE(md))
CVS commit: src/sys/stand/efiboot
Module Name:src Committed By: jmcneill Date: Sun Sep 2 23:54:25 UTC 2018 Modified Files: src/sys/stand/efiboot: efifdt.c Log Message: Dump memory map if EFI_MEMORY_DEBUG is defined To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/stand/efiboot/efifdt.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys
Module Name:src
Committed By: jmcneill
Date: Sun Sep 2 23:50:23 UTC 2018
Modified Files:
src/sys/arch/evbarm/include: loadfile_machdep.h
src/sys/stand/efiboot: exec.c
Log Message:
Support loading kernels at PAs above 0x3f on arm64
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/include/loadfile_machdep.h
cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/exec.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/evbarm/include/loadfile_machdep.h
diff -u src/sys/arch/evbarm/include/loadfile_machdep.h:1.4 src/sys/arch/evbarm/include/loadfile_machdep.h:1.5
--- src/sys/arch/evbarm/include/loadfile_machdep.h:1.4 Thu Aug 23 19:01:22 2018
+++ src/sys/arch/evbarm/include/loadfile_machdep.h Sun Sep 2 23:50:23 2018
@@ -9,7 +9,8 @@
#define COUNT_KERNEL (COUNT_ALL & ~COUNT_TEXTA)
#if defined(__aarch64__)
-#define LOADADDR(a) u_long)(a)) + offset) & 0x3f)
+extern u_long load_offset;
+#define LOADADDR(a) (u_long)(a)) + offset) & 0x3f) + load_offset)
#else
#define LOADADDR(a) (((u_long)(a)))
#endif
Index: src/sys/stand/efiboot/exec.c
diff -u src/sys/stand/efiboot/exec.c:1.2 src/sys/stand/efiboot/exec.c:1.3
--- src/sys/stand/efiboot/exec.c:1.2 Mon Aug 27 09:51:32 2018
+++ src/sys/stand/efiboot/exec.c Sun Sep 2 23:50:23 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: exec.c,v 1.2 2018/08/27 09:51:32 jmcneill Exp $ */
+/* $NetBSD: exec.c,v 1.3 2018/09/02 23:50:23 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -31,6 +31,8 @@
#include
+u_long load_offset = 0;
+
int
exec_netbsd(const char *fname, const char *args)
{
@@ -65,13 +67,14 @@ exec_netbsd(const char *fname, const cha
}
memset(marks, 0, sizeof(marks));
- marks[MARK_START] = (addr + EFIBOOT_ALIGN) & ~(EFIBOOT_ALIGN - 1);
+ load_offset = (addr + EFIBOOT_ALIGN) & ~(EFIBOOT_ALIGN - 1);
fd = loadfile(fname, marks, LOAD_KERNEL);
if (fd < 0) {
printf("boot: %s: %s\n", fname, strerror(errno));
goto cleanup;
}
close(fd);
+ load_offset = 0;
if (efi_fdt_size() > 0) {
efi_fdt_bootargs(args);
CVS commit: src/sys
Module Name:src Committed By: jmcneill Date: Sun Sep 2 23:50:23 UTC 2018 Modified Files: src/sys/arch/evbarm/include: loadfile_machdep.h src/sys/stand/efiboot: exec.c Log Message: Support loading kernels at PAs above 0x3f on arm64 To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/include/loadfile_machdep.h cvs rdiff -u -r1.2 -r1.3 src/sys/stand/efiboot/exec.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: maya Date: Sun Sep 2 19:46:53 UTC 2018 Modified Files: src/sys/dev/ic: bwfm.c Log Message: Initialize if_stop so suspend won't jump to NULL. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/bwfm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/ic/bwfm.c diff -u src/sys/dev/ic/bwfm.c:1.13 src/sys/dev/ic/bwfm.c:1.14 --- src/sys/dev/ic/bwfm.c:1.13 Sat Sep 1 22:01:03 2018 +++ src/sys/dev/ic/bwfm.c Sun Sep 2 19:46:53 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: bwfm.c,v 1.13 2018/09/01 22:01:03 riastradh Exp $ */ +/* $NetBSD: bwfm.c,v 1.14 2018/09/02 19:46:53 maya Exp $ */ /* $OpenBSD: bwfm.c,v 1.5 2017/10/16 22:27:16 patrick Exp $ */ /* * Copyright (c) 2010-2016 Broadcom Corporation @@ -237,6 +237,7 @@ bwfm_attach(struct bwfm_softc *sc) ifp->if_init = bwfm_init; ifp->if_ioctl = bwfm_ioctl; ifp->if_start = bwfm_start; + ifp->if_stop = bwfm_stop; ifp->if_watchdog = bwfm_watchdog; IFQ_SET_READY(>if_snd); memcpy(ifp->if_xname, DEVNAME(sc), IFNAMSIZ);
CVS commit: src/sys/dev/ic
Module Name:src Committed By: maya Date: Sun Sep 2 19:46:53 UTC 2018 Modified Files: src/sys/dev/ic: bwfm.c Log Message: Initialize if_stop so suspend won't jump to NULL. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/ic/bwfm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: wiz Date: Sun Sep 2 18:03:23 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: New sentence, new line. Use Fn for functions. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/npf/npfctl/npf.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/usr.sbin/npf/npfctl/npf.conf.5 diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.73 src/usr.sbin/npf/npfctl/npf.conf.5:1.74 --- src/usr.sbin/npf/npfctl/npf.conf.5:1.73 Sun Sep 2 17:45:18 2018 +++ src/usr.sbin/npf/npfctl/npf.conf.5 Sun Sep 2 18:03:23 2018 @@ -1,4 +1,4 @@ -.\"$NetBSD: npf.conf.5,v 1.73 2018/09/02 17:45:18 maxv Exp $ +.\"$NetBSD: npf.conf.5,v 1.74 2018/09/02 18:03:23 wiz Exp $ .\" .\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -103,7 +103,8 @@ In the context of NPF, an interface is s that can be IPv4 or IPv6, which are configured on the actual associated interface. .Pp -Such list can be either static or dynamic. With a static list, NPF will +Such list can be either static or dynamic. +With a static list, NPF will capture the interface addresses on configuration load, whereas with a dynamic list NPF will capture the runtime list of addresses, reflecting any changes to the interface, including the attach and detach. @@ -114,11 +115,11 @@ all addresses will remain present. Three functions exist, to extract addresses from an interface with a chosen list type and IP address type: .Bl -tag -width Xifaddrs()XX -offset indent -.It inet4() +.It Fn inet4 Static list, IPv4 addresses. -.It inet6() +.It Fn inet6 Static list, IPv6 addresses. -.It ifaddrs() +.It Fn ifaddrs Dynamic list, both IPv4 and IPv6. The .Cd family @@ -126,7 +127,9 @@ keyword can be used in combination of a an IP address type. .El .Pp -By default, when no extraction function is used, ifaddrs() is assumed. +By default, when no extraction function is used, +.Fn ifaddrs +is assumed. .Pp Example of configuration with static interface lists: .Bd -literal
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: wiz Date: Sun Sep 2 18:03:23 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: New sentence, new line. Use Fn for functions. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/usr.sbin/npf/npfctl/npf.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src
Committed By: maxv
Date: Sun Sep 2 17:45:18 UTC 2018
Modified Files:
src/usr.sbin/npf/npfctl: npf.conf.5
Log Message:
Be clearer about the difference between static vs dynamic interface list,
and slightly improve wording.
My understanding is that when none of inet4/inet6/ifaddrs is passed, NPF
assumes ifaddrs.
To generate a diff of this commit:
cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/npf/npfctl/npf.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/usr.sbin/npf/npfctl/npf.conf.5
diff -u src/usr.sbin/npf/npfctl/npf.conf.5:1.72 src/usr.sbin/npf/npfctl/npf.conf.5:1.73
--- src/usr.sbin/npf/npfctl/npf.conf.5:1.72 Sat Sep 1 19:26:46 2018
+++ src/usr.sbin/npf/npfctl/npf.conf.5 Sun Sep 2 17:45:18 2018
@@ -1,4 +1,4 @@
-.\"$NetBSD: npf.conf.5,v 1.72 2018/09/01 19:26:46 wiz Exp $
+.\"$NetBSD: npf.conf.5,v 1.73 2018/09/02 17:45:18 maxv Exp $
.\"
.\" Copyright (c) 2009-2017 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -27,7 +27,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd September 1, 2018
+.Dd September 2, 2018
.Dt NPF.CONF 5
.Os
.Sh NAME
@@ -99,38 +99,52 @@ form of:
10.1.1.1
.Ed
.Ss Interfaces
-Interfaces can be specified as the values of the variables:
-.Bd -literal
-$pub_if_list = { inet4(wm0), inet4(wm1) }
-.Ed
+In the context of NPF, an interface is seen as a list of IP addresses,
+that can be IPv4 or IPv6, which are configured on the actual associated
+interface.
+.Pp
+Such list can be either static or dynamic. With a static list, NPF will
+capture the interface addresses on configuration load, whereas with a dynamic
+list NPF will capture the runtime list of addresses, reflecting any changes
+to the interface, including the attach and detach.
+.Pp
+Note that with a dynamic list, marking the interface as ``down'' has no effect,
+all addresses will remain present.
+.Pp
+Three functions exist, to extract addresses from an interface with a chosen
+list type and IP address type:
+.Bl -tag -width Xifaddrs()XX -offset indent
+.It inet4()
+Static list, IPv4 addresses.
+.It inet6()
+Static list, IPv6 addresses.
+.It ifaddrs()
+Dynamic list, both IPv4 and IPv6.
+The
+.Cd family
+keyword can be used in combination of a filtering rule to explicitly select
+an IP address type.
+.El
+.Pp
+By default, when no extraction function is used, ifaddrs() is assumed.
.Pp
-In the context of filtering, an interface provides a list of all its IP
-addresses, both IPv4 and IPv6.
-Specific addresses configured on an interface can also be selected by family,
-e.g.:
+Example of configuration with static interface lists:
.Bd -literal
$pub_if4 = inet4(wm0)
$pub_if46 = { inet4(wm0), inet6(wm0) }
.Ed
.Pp
-In the above examples, NPF will statically capture the interface
-addresses on configuration load.
+In the above example, $pub_if4 is the list of IPv4 addresses configured
+on wm0, and $pub_if46 is the list of IPv4 and IPv6 addresses configured
+on wm0.
.Pp
-The following can be used for dynamic handling of the interface addresses:
+Example of configuration with dynamic interface lists:
.Bd -literal
-$pub_if = ifaddrs(wm0)
+$pub_if_1 = ifaddrs(wm0)
+$pub_if_2 = wm0
.Ed
.Pp
-In this case, the expression will represent the runtime list of addresses,
-reflecting any changes to the interface, including the attach and detach.
-Marking the interface as ``down'' has no effect, i.e. all addresses will
-remain present.
-.Pp
-A dynamic address list represents both the IPv4 and IPv6 addresses configured on
-an interface.
-The
-.Cd family
-keyword can be used in combination of a filtering rule to be explicit.
+In the above example, $pub_if_1 and $pub_if_2 are equal.
.Ss Groups
NPF requires that all rules be defined within groups.
Groups can be thought of as higher level rules which can contain subrules.
@@ -174,7 +188,9 @@ Its parameter should be a protocol numbe
as specified in the
.Pa /etc/protocols
file.
-The protocol keyword can additionally have protocol-specific options.
+This keyword can additionally have protocol-specific options, such as
+.Cd flags .
+.Pp
The
.Cd flags
keyword can be used to match the packets against specific TCP flags,
@@ -279,7 +295,9 @@ on packets originating from the 10.1.1.0
Explicit filter criteria can be specified using "pass " as
an additional option of the mapping.
.Pp
-The dynamic NAT implies network address and port translation (NAPT).
+The
+.Cd dynamic
+NAT implies network address and port translation (NAPT).
The port translation can be controlled explicitly.
For example, the following provides "port forwarding", redirecting the
public port 9022 to the port 22 of an internal host:
@@ -287,7 +305,9 @@ public port 9022 to the port 22 of an in
map $ext_if dynamic proto tcp 10.1.1.2 port 22 <- $ext_if port 9022
.Ed
.Pp
-The static NAT can have
CVS commit: src/usr.sbin/npf/npfctl
Module Name:src Committed By: maxv Date: Sun Sep 2 17:45:18 UTC 2018 Modified Files: src/usr.sbin/npf/npfctl: npf.conf.5 Log Message: Be clearer about the difference between static vs dynamic interface list, and slightly improve wording. My understanding is that when none of inet4/inet6/ifaddrs is passed, NPF assumes ifaddrs. To generate a diff of this commit: cvs rdiff -u -r1.72 -r1.73 src/usr.sbin/npf/npfctl/npf.conf.5 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src
Committed By: riastradh
Date: Sun Sep 2 17:36:57 UTC 2018
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c intel_dp.c
Log Message:
Initialize and destroy dev_priv->drrs.mutex only once.
Not once per connector!
Candidate fix for:
https://mail-index.netbsd.org/current-users/2018/08/30/msg034155.html
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.21 src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c:1.21 Mon Aug 27 07:28:41 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c Sun Sep 2 17:36:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_display.c,v 1.21 2018/08/27 07:28:41 riastradh Exp $ */
+/* $NetBSD: intel_display.c,v 1.22 2018/09/02 17:36:57 riastradh Exp $ */
/*
* Copyright © 2006-2007 Intel Corporation
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.21 2018/08/27 07:28:41 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_display.c,v 1.22 2018/09/02 17:36:57 riastradh Exp $");
#include
#include
@@ -14775,8 +14775,10 @@ static void intel_init_display(struct dr
#ifdef __NetBSD__
linux_mutex_init(_priv->pps_mutex);
+ linux_mutex_init(_priv->drrs.mutex);
#else
mutex_init(_priv->pps_mutex);
+ mutex_init(_priv->drrs.mutex);
#endif
}
@@ -15710,10 +15712,12 @@ void intel_modeset_cleanup(struct drm_de
#ifdef __NetBSD__
linux_mutex_destroy(_priv->psr.lock);
+ linux_mutex_destroy(_priv->drrs.mutex);
linux_mutex_destroy(_priv->pps_mutex);
linux_mutex_destroy(_priv->fbc.lock);
#else
mutex_destroy(_priv->psr.lock);
+ mutex_destroy(_priv->drrs.mutex);
mutex_destroy(_priv->pps_mutex);
mutex_destroy(_priv->fbc.lock);
#endif
Index: src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.17 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.18
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c:1.17 Mon Aug 27 13:41:23 2018
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Sun Sep 2 17:36:57 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: intel_dp.c,v 1.17 2018/08/27 13:41:23 riastradh Exp $ */
+/* $NetBSD: intel_dp.c,v 1.18 2018/09/02 17:36:57 riastradh Exp $ */
/*
* Copyright © 2008 Intel Corporation
@@ -28,7 +28,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.17 2018/08/27 13:41:23 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: intel_dp.c,v 1.18 2018/09/02 17:36:57 riastradh Exp $");
#include
#include
@@ -5014,8 +5014,6 @@ static void
intel_dp_connector_destroy(struct drm_connector *connector)
{
struct intel_connector *intel_connector = to_intel_connector(connector);
- struct drm_device *dev = intel_connector->base.dev;
- struct drm_i915_private *dev_priv = dev->dev_private;
kfree(intel_connector->detect_edid);
@@ -5028,11 +5026,6 @@ intel_dp_connector_destroy(struct drm_co
intel_panel_fini(_connector->panel);
drm_connector_cleanup(connector);
-#ifdef __NetBSD__
- linux_mutex_destroy(_priv->drrs.mutex);
-#else
- mutex_destroy(_priv->drrs.mutex);
-#endif
kfree(connector);
}
@@ -6025,12 +6018,6 @@ intel_dp_init_connector(struct intel_dig
intel_dp->pps_pipe = INVALID_PIPE;
-#ifdef __NetBSD__
- linux_mutex_init(_priv->drrs.mutex);
-#else
- mutex_init(_priv->drrs.mutex);
-#endif
-
/* intel_dp vfuncs */
if (INTEL_INFO(dev)->gen >= 9)
intel_dp->get_aux_clock_divider = skl_get_aux_clock_divider;
CVS commit: src/sys/external/bsd/drm2/dist/drm/i915
Module Name:src Committed By: riastradh Date: Sun Sep 2 17:36:57 UTC 2018 Modified Files: src/sys/external/bsd/drm2/dist/drm/i915: intel_display.c intel_dp.c Log Message: Initialize and destroy dev_priv->drrs.mutex only once. Not once per connector! Candidate fix for: https://mail-index.netbsd.org/current-users/2018/08/30/msg034155.html To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 \ src/sys/external/bsd/drm2/dist/drm/i915/intel_display.c cvs rdiff -u -r1.17 -r1.18 src/sys/external/bsd/drm2/dist/drm/i915/intel_dp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: maxv Date: Sun Sep 2 17:21:28 UTC 2018 Modified Files: src/share/man/man7: sysctl.7 Log Message: well well well it's September now To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: maxv Date: Sun Sep 2 17:21:28 UTC 2018 Modified Files: src/share/man/man7: sysctl.7 Log Message: well well well it's September now To generate a diff of this commit: cvs rdiff -u -r1.129 -r1.130 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.129 src/share/man/man7/sysctl.7:1.130 --- src/share/man/man7/sysctl.7:1.129 Sun Sep 2 16:02:18 2018 +++ src/share/man/man7/sysctl.7 Sun Sep 2 17:21:28 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.129 2018/09/02 16:02:18 maxv Exp $ +.\" $NetBSD: sysctl.7,v 1.130 2018/09/02 17:21:28 maxv Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd August 2, 2018 +.Dd September 2, 2018 .Dt SYSCTL 7 .Os .Sh NAME
CVS commit: src/distrib/sgimips/instkernel
Module Name:src
Committed By: tsutsui
Date: Sun Sep 2 16:41:42 UTC 2018
Modified Files:
src/distrib/sgimips/instkernel: Makefile
Log Message:
Use elf2ecoff(1) rather than objcopy(1) to generate ecoff kernel.
Reported by Naruaki Etomi in PR port-sgimips/53518.
Should be pulled up to netbsd-7 and netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/distrib/sgimips/instkernel/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/sgimips/instkernel/Makefile
diff -u src/distrib/sgimips/instkernel/Makefile:1.12 src/distrib/sgimips/instkernel/Makefile:1.13
--- src/distrib/sgimips/instkernel/Makefile:1.12 Wed Mar 23 05:24:11 2016
+++ src/distrib/sgimips/instkernel/Makefile Sun Sep 2 16:41:42 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2016/03/23 05:24:11 mrg Exp $
+# $NetBSD: Makefile,v 1.13 2018/09/02 16:41:42 tsutsui Exp $
.include
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -30,9 +30,7 @@ MDSETTARGETS= INSTALL${NX}_IP2x ${RAMDIS
MDSET_RELEASEDIR= binary/kernel
MDSET_SUFFIXES.netbsd-INSTALL${NX}_IP2x=ecoff create-ecoff
-create-ecoff= ${OBJCOPY} --impure -O ecoff-bigmips \
- -R .pdr -R .mdebug.abi32 -R .comment -R .ident \
- ${.TARGET:R} ${.TARGET}
+create-ecoff= ${ELF2ECOFF} ${.TARGET:R} ${.TARGET}
IMAGE_RELEASEDIR= installation/diskimage
CVS commit: src/distrib/sgimips/instkernel
Module Name:src Committed By: tsutsui Date: Sun Sep 2 16:41:42 UTC 2018 Modified Files: src/distrib/sgimips/instkernel: Makefile Log Message: Use elf2ecoff(1) rather than objcopy(1) to generate ecoff kernel. Reported by Naruaki Etomi in PR port-sgimips/53518. Should be pulled up to netbsd-7 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.13 src/distrib/sgimips/instkernel/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sgimips/hpc
Module Name:src Committed By: tsutsui Date: Sun Sep 2 16:18:50 UTC 2018 Modified Files: src/sys/arch/sgimips/hpc: wdsc.c Log Message: Fix wdsc(4) probe failure on HPC1.5 machines (Indigo R3k/R4k, IP6/IP10/IP12). The alignment adjustment code was removed in rev 1.36 for common mips bus_space changes, but the code was not bus_space related but used for uint32_t register acccess during probe. Reported and tested by Naruaki Etomi in PR port-sgimips/53522. Should be pulled up to netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sgimips/hpc/wdsc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sgimips/hpc
Module Name:src Committed By: tsutsui Date: Sun Sep 2 16:18:50 UTC 2018 Modified Files: src/sys/arch/sgimips/hpc: wdsc.c Log Message: Fix wdsc(4) probe failure on HPC1.5 machines (Indigo R3k/R4k, IP6/IP10/IP12). The alignment adjustment code was removed in rev 1.36 for common mips bus_space changes, but the code was not bus_space related but used for uint32_t register acccess during probe. Reported and tested by Naruaki Etomi in PR port-sgimips/53522. Should be pulled up to netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/sys/arch/sgimips/hpc/wdsc.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/sgimips/hpc/wdsc.c diff -u src/sys/arch/sgimips/hpc/wdsc.c:1.34 src/sys/arch/sgimips/hpc/wdsc.c:1.35 --- src/sys/arch/sgimips/hpc/wdsc.c:1.34 Wed Feb 18 16:47:58 2015 +++ src/sys/arch/sgimips/hpc/wdsc.c Sun Sep 2 16:18:50 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: wdsc.c,v 1.34 2015/02/18 16:47:58 macallan Exp $ */ +/* $NetBSD: wdsc.c,v 1.35 2018/09/02 16:18:50 tsutsui Exp $ */ /* * Copyright (c) 2001 Wayne Knowles @@ -37,7 +37,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.34 2015/02/18 16:47:58 macallan Exp $"); +__KERNEL_RCSID(0, "$NetBSD: wdsc.c,v 1.35 2018/09/02 16:18:50 tsutsui Exp $"); #include #include @@ -105,6 +105,9 @@ wdsc_match(device_t parent, cfdata_t cf, haa->hpc_regs->scsi0_ctl); asr = MIPS_PHYS_TO_KSEG1(haa->ha_sh + haa->ha_devoff); + /* XXX: hpc1 offset due to SGIMIPS_BUS_SPACE_HPC brain damage */ + asr = (asr + 3) & ~0x3; + if (platform.badaddr((void *)reset, sizeof(reset))) return 0;
CVS commit: src/sys/compat/netbsd32
Module Name:src
Committed By: maxv
Date: Sun Sep 2 16:13:42 UTC 2018
Modified Files:
src/sys/compat/netbsd32: netbsd32_ioctl.h
Log Message:
remove dead references to IPF; also remove references to netccitt/, it was
removed 12 years ago.
To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 src/sys/compat/netbsd32/netbsd32_ioctl.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/netbsd32/netbsd32_ioctl.h
diff -u src/sys/compat/netbsd32/netbsd32_ioctl.h:1.59 src/sys/compat/netbsd32/netbsd32_ioctl.h:1.60
--- src/sys/compat/netbsd32/netbsd32_ioctl.h:1.59 Tue Mar 6 07:59:59 2018
+++ src/sys/compat/netbsd32/netbsd32_ioctl.h Sun Sep 2 16:13:42 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: netbsd32_ioctl.h,v 1.59 2018/03/06 07:59:59 mlelstv Exp $ */
+/* $NetBSD: netbsd32_ioctl.h,v 1.60 2018/09/02 16:13:42 maxv Exp $ */
/*
* Copyright (c) 1998, 2001 Matthew R. Green
@@ -218,36 +218,6 @@ net/if_atm.h:89:#define SIOCATMDIS _IOWR
net/if_ppp.h:105:#define PPPIOCSCOMPRESS _IOW('t', 77, struct ppp_option_data)
-netccitt/x25.h:157:#define SIOCSIFCONF_X25 _IOW('i', 12, struct ifreq_x25) /* set ifnet config */
-netccitt/x25.h:158:#define SIOCGIFCONF_X25 _IOWR('i',13, struct ifreq_x25) /* get ifnet config */
-
-netinet/ip_fil.h:46:#define SIOCGETFS _IOR('r', 64, struct friostat)
-netinet/ip_fil.h:56:#define SIOCFRZST _IOWR('r', 74, struct friostat)
-
-netinet/ip_fil.h:42:#define SIOCADAFR _IOW('r', 60, struct frentry)
-netinet/ip_fil.h:43:#define SIOCRMAFR _IOW('r', 61, struct frentry)
-netinet/ip_fil.h:49:#define SIOCADIFR _IOW('r', 67, struct frentry)
-netinet/ip_fil.h:50:#define SIOCRMIFR _IOW('r', 68, struct frentry)
-netinet/ip_fil.h:52:#define SIOCINAFR _IOW('r', 70, struct frentry)
-netinet/ip_fil.h:53:#define SIOCINIFR _IOW('r', 71, struct frentry)
-netinet/ip_fil.h:57:#define SIOCZRLST _IOWR('r', 75, struct frentry)
-
-netinet/ip_fil.h:78:#define SIOCAUTHW _IOWR(r, 76, struct fr_info)
-netinet/ip_fil.h:79:#define SIOCAUTHR _IOWR(r, 77, struct fr_info)
-
-netinet/ip_fil.h:60:#define SIOCATHST _IOWR('r', 78, struct fr_authstat)
-
-netinet/ip_nat.h:22:#define SIOCADNAT _IOW('r', 80, struct ipnat)
-netinet/ip_nat.h:23:#define SIOCRMNAT _IOW('r', 81, struct ipnat)
-
-netinet/ip_nat.h:24:#define SIOCGNATS _IOR('r', 82, struct natstat)
-
-netinet/ip_nat.h:25:#define SIOCGNATL _IOWR('r', 83, struct natlookup)
-
-netinet/ip_nat.h:26:#define SIOCGFRST _IOR('r', 84, struct ipfrstat)
-
-netinet/ip_nat.h:27:#define SIOCGIPST _IOR('r', 85, struct ips_stat)
-
sys/module.h?
sys/rnd.h:186:#define RNDGETPOOL _IOR('R', 103, u_char *) /* get whole pool */
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: maxv Date: Sun Sep 2 16:13:42 UTC 2018 Modified Files: src/sys/compat/netbsd32: netbsd32_ioctl.h Log Message: remove dead references to IPF; also remove references to netccitt/, it was removed 12 years ago. To generate a diff of this commit: cvs rdiff -u -r1.59 -r1.60 src/sys/compat/netbsd32/netbsd32_ioctl.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: maxv Date: Sun Sep 2 16:08:12 UTC 2018 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: replace ipf->npf To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/games/fortune/datfiles
Module Name:src Committed By: maxv Date: Sun Sep 2 16:08:12 UTC 2018 Modified Files: src/games/fortune/datfiles: netbsd-tips Log Message: replace ipf->npf To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/games/fortune/datfiles/netbsd-tips Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/games/fortune/datfiles/netbsd-tips diff -u src/games/fortune/datfiles/netbsd-tips:1.5 src/games/fortune/datfiles/netbsd-tips:1.6 --- src/games/fortune/datfiles/netbsd-tips:1.5 Tue Mar 25 10:50:34 2008 +++ src/games/fortune/datfiles/netbsd-tips Sun Sep 2 16:08:12 2018 @@ -73,8 +73,8 @@ as root: /etc/rc.d/sshd onestart % -Several IP Filter and ipnat examples are available in the -/usr/share/examples/ipf/ directory. +Several NPF examples are available in the /usr/share/examples/npf/ +directory. % Want to dual boot using a bluetooth mouse or keyboard? Use btkey(1) to store the link key in the hardware.
CVS commit: src/sys/netinet
Module Name:src Committed By: maxv Date: Sun Sep 2 16:05:33 UTC 2018 Modified Files: src/sys/netinet: ip_input.c Log Message: remove reference to ipnat, and duplicate comments To generate a diff of this commit: cvs rdiff -u -r1.385 -r1.386 src/sys/netinet/ip_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/ip_input.c diff -u src/sys/netinet/ip_input.c:1.385 src/sys/netinet/ip_input.c:1.386 --- src/sys/netinet/ip_input.c:1.385 Tue Jul 10 15:46:58 2018 +++ src/sys/netinet/ip_input.c Sun Sep 2 16:05:33 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_input.c,v 1.385 2018/07/10 15:46:58 maxv Exp $ */ +/* $NetBSD: ip_input.c,v 1.386 2018/09/02 16:05:33 maxv Exp $ */ /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -91,7 +91,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.385 2018/07/10 15:46:58 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ip_input.c,v 1.386 2018/09/02 16:05:33 maxv Exp $"); #ifdef _KERNEL_OPT #include "opt_inet.h" @@ -176,7 +176,7 @@ int ip_do_randomid = 0; * and transmit implementation do not implement the Strong ES model, * setting this to 1 results in an odd hybrid. * - * XXX - ip_checkinterface currently must be disabled if you use ipnat + * XXX - ip_checkinterface currently must be disabled if you use NAT * to translate the destination address to another local interface. * * XXX - ip_checkinterface must be disabled if you add IP aliases @@ -324,13 +324,6 @@ ip_match_our_address(struct ifnet *ifp, * strong ES model) if IP forwarding is disabled and the packet * is not locally generated. * - * XXX - Checking also should be disabled if the destination - * address is ipnat'ed to a different interface. - * - * XXX - Checking is incompatible with IP aliases added - * to the loopback interface instead of the interface where - * the packets are received. - * * XXX - We need to add a per ifaddr flag for this so that * we get finer grain control. */
CVS commit: src/sys/netinet
Module Name:src Committed By: maxv Date: Sun Sep 2 16:05:33 UTC 2018 Modified Files: src/sys/netinet: ip_input.c Log Message: remove reference to ipnat, and duplicate comments To generate a diff of this commit: cvs rdiff -u -r1.385 -r1.386 src/sys/netinet/ip_input.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: maxv Date: Sun Sep 2 16:02:18 UTC 2018 Modified Files: src/share/man/man7: sysctl.7 Log Message: remove reference to ipnat To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/man/man7
Module Name:src Committed By: maxv Date: Sun Sep 2 16:02:18 UTC 2018 Modified Files: src/share/man/man7: sysctl.7 Log Message: remove reference to ipnat To generate a diff of this commit: cvs rdiff -u -r1.128 -r1.129 src/share/man/man7/sysctl.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man7/sysctl.7 diff -u src/share/man/man7/sysctl.7:1.128 src/share/man/man7/sysctl.7:1.129 --- src/share/man/man7/sysctl.7:1.128 Mon Jun 18 02:57:51 2018 +++ src/share/man/man7/sysctl.7 Sun Sep 2 16:02:18 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: sysctl.7,v 1.128 2018/06/18 02:57:51 eadler Exp $ +.\" $NetBSD: sysctl.7,v 1.129 2018/09/02 16:02:18 maxv Exp $ .\" .\" Copyright (c) 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)sysctl.3 8.4 (Berkeley) 5/9/95 .\" -.Dd May 5, 2018 +.Dd August 2, 2018 .Dt SYSCTL 7 .Os .Sh NAME @@ -1492,7 +1492,7 @@ This cannot be set to less than 1024 or .It Li ip.checkinterface If set to non-zero, the host will reject packets addressed to it that arrive on an interface not bound to that address. -Currently, this must be disabled if ipnat is used to translate the +Currently, this must be disabled if NAT is used to translate the destination address to another local interface, or if addresses are added to the loopback interface instead of the interface where the packets for those packets are received.
CVS commit: src/sys/arch/sgimips/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sun Sep 2 12:06:17 UTC 2018
Modified Files:
src/sys/arch/sgimips/stand/boot: Makefile
Log Message:
Use elf2ecoff(1) rather than objcopy(1) to generat ecoff for old machines.
objcopy(1) was used instead of elf2ecoff(1) since Makefile rev 1.9:
http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/sgimips/stand/boot/Makefile#rev1.9
but it looks ELF binaries generated by recent binutils are too complicated
to convert them to ecoff for old machines by objcopy(1).
Reported by Naruaki Etomi in PR port-sgimips/53519.
Should be pulled up to at least netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/stand/boot/Makefile
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/sgimips/stand/boot/Makefile
diff -u src/sys/arch/sgimips/stand/boot/Makefile:1.19 src/sys/arch/sgimips/stand/boot/Makefile:1.20
--- src/sys/arch/sgimips/stand/boot/Makefile:1.19 Sat Feb 26 16:26:58 2011
+++ src/sys/arch/sgimips/stand/boot/Makefile Sun Sep 2 12:06:16 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2011/02/26 16:26:58 matt Exp $
+# $NetBSD: Makefile,v 1.20 2018/09/02 12:06:16 tsutsui Exp $
# Don't strip the ECOFF'ed version on install -- strip gets confused by that,
@@ -12,10 +12,7 @@ SRCS= start.S boot.c bootinfo.c conf.c d
PROG= aoutboot
${PROG}: ip2xboot ip3xboot
.if ${MACHINE_ARCH} == "mipseb"
- ${OBJCOPY} --impure -O ecoff-bigmips \
- -R .pdr -R .mdebug.nabi32 -R .mdebug.abi32 \
- -R .comment -R .ident \
- ip2xboot ${.TARGET}
+ ${ELF2ECOFF} ip2xboot ${.TARGET}
.else
touch ${.TARGET}
.endif
CVS commit: src/sys/arch/sgimips/stand/boot
Module Name:src Committed By: tsutsui Date: Sun Sep 2 12:06:17 UTC 2018 Modified Files: src/sys/arch/sgimips/stand/boot: Makefile Log Message: Use elf2ecoff(1) rather than objcopy(1) to generat ecoff for old machines. objcopy(1) was used instead of elf2ecoff(1) since Makefile rev 1.9: http://cvsweb.netbsd.org/bsdweb.cgi/src/sys/arch/sgimips/stand/boot/Makefile#rev1.9 but it looks ELF binaries generated by recent binutils are too complicated to convert them to ecoff for old machines by objcopy(1). Reported by Naruaki Etomi in PR port-sgimips/53519. Should be pulled up to at least netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/sgimips/stand/boot/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Sun Sep 2 10:07:17 UTC 2018 Modified Files: src/sys/arch/arm/rockchip: rk_i2c.c Log Message: Process assigned-clocks To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_i2c.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Sun Sep 2 10:07:17 UTC 2018
Modified Files:
src/sys/arch/arm/rockchip: rk_i2c.c
Log Message:
Process assigned-clocks
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rk_i2c.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_i2c.c
diff -u src/sys/arch/arm/rockchip/rk_i2c.c:1.3 src/sys/arch/arm/rockchip/rk_i2c.c:1.4
--- src/sys/arch/arm/rockchip/rk_i2c.c:1.3 Sun Sep 2 01:16:03 2018
+++ src/sys/arch/arm/rockchip/rk_i2c.c Sun Sep 2 10:07:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_i2c.c,v 1.3 2018/09/02 01:16:03 jmcneill Exp $ */
+/* $NetBSD: rk_i2c.c,v 1.4 2018/09/02 10:07:17 jmcneill Exp $ */
/*-
* Copyright (c) 2018 Jared McNeill
@@ -28,7 +28,7 @@
#include
-__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.3 2018/09/02 01:16:03 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_i2c.c,v 1.4 2018/09/02 10:07:17 jmcneill Exp $");
#include
#include
@@ -419,6 +419,8 @@ rk_i2c_attach(device_t parent, device_t
aprint_naive("\n");
aprint_normal(": Rockchip I2C (%u Hz)\n", sc->sc_clkfreq);
+ fdtbus_clock_assign(phandle);
+
rk_i2c_init(sc);
sc->sc_ic.ic_cookie = sc;
CVS commit: src/sys/arch/sgimips/sgimips
Module Name:src
Committed By: tsutsui
Date: Sun Sep 2 09:57:33 UTC 2018
Modified Files:
src/sys/arch/sgimips/sgimips: machdep.c
Log Message:
Fix build failure without options DDB and with pseudo-device ksyms.
There is a typo for ksyms (NKSYMS vs NKSYM).
Also use consistent "#if NKSYMS" rather than "#if NKSYMS > 0" etc.
and add comments after corresponding #endif for readability.
Fixes PR port-sgimips/53521 from Naruaki Etomi.
Should be pulled up to (at least) netbsd-8.
To generate a diff of this commit:
cvs rdiff -u -r1.145 -r1.146 src/sys/arch/sgimips/sgimips/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/sgimips/sgimips/machdep.c
diff -u src/sys/arch/sgimips/sgimips/machdep.c:1.145 src/sys/arch/sgimips/sgimips/machdep.c:1.146
--- src/sys/arch/sgimips/sgimips/machdep.c:1.145 Mon Nov 6 03:47:48 2017
+++ src/sys/arch/sgimips/sgimips/machdep.c Sun Sep 2 09:57:33 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.145 2017/11/06 03:47:48 christos Exp $ */
+/* $NetBSD: machdep.c,v 1.146 2018/09/02 09:57:33 tsutsui Exp $ */
/*
* Copyright (c) 2000 Soren S. Jorvang
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.145 2017/11/06 03:47:48 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.146 2018/09/02 09:57:33 tsutsui Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -244,12 +244,12 @@ mach_init(int argc, int32_t argv32[], ui
vaddr_t kernend;
u_int i;
int rv;
-#if NKSYMS > 0 || defined(DDB) || defined(MODULAR)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
int nsym = 0;
char *ssym = NULL;
char *esym = NULL;
struct btinfo_symtab *bi_syms;
-#endif
+#endif /* NKSYMS || defined(DDB) || defined(MODULAR) */
#ifdef _LP64
char *argv[20];
@@ -307,7 +307,7 @@ mach_init(int argc, int32_t argv32[], ui
} else
bootinfo_msg = "no bootinfo found. (old bootblocks?)\n";
-#if NKSYM > 0 || defined(DDB) || defined(MODULAR)
+#if NKSYMS || defined(DDB) || defined(MODULAR)
bi_syms = lookup_bootinfo(BTINFO_SYMTAB);
/* check whether there is valid bootinfo symtab info */
@@ -317,7 +317,7 @@ mach_init(int argc, int32_t argv32[], ui
esym = (char *)bi_syms->esym;
kernend = mips_round_page(esym);
} else
-#endif
+#endif /* NKSYMS || defined(DDB) || defined(MODULAR) */
{
kernend = mips_round_page(end);
}
CVS commit: src/sys/arch/sgimips/sgimips
Module Name:src Committed By: tsutsui Date: Sun Sep 2 09:57:33 UTC 2018 Modified Files: src/sys/arch/sgimips/sgimips: machdep.c Log Message: Fix build failure without options DDB and with pseudo-device ksyms. There is a typo for ksyms (NKSYMS vs NKSYM). Also use consistent "#if NKSYMS" rather than "#if NKSYMS > 0" etc. and add comments after corresponding #endif for readability. Fixes PR port-sgimips/53521 from Naruaki Etomi. Should be pulled up to (at least) netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.145 -r1.146 src/sys/arch/sgimips/sgimips/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: tsutsui Date: Sun Sep 2 08:51:54 UTC 2018 Modified Files: src/sys/arch/sgimips/conf: INSTALL32_IP2x Log Message: Disable misc options to shrink an INSTALL kernel for IP2x. The ARC BIOS on Indy seems to have ~8MB limit. Fixes PR port-sgimips/53378 from Naruaki Etomi. Should be pulled up to netbsd-7 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/conf/INSTALL32_IP2x 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/sgimips/conf/INSTALL32_IP2x diff -u src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.9 src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.10 --- src/sys/arch/sgimips/conf/INSTALL32_IP2x:1.9 Sat Feb 4 22:27:26 2012 +++ src/sys/arch/sgimips/conf/INSTALL32_IP2x Sun Sep 2 08:51:53 2018 @@ -5,7 +5,7 @@ # Pull in standard `install' config include "arch/sgimips/conf/GENERIC32_IP2x" -makeoptions COPTS="-Os" +makeoptions COPTS="-Os -mmemcpy" # Enable the hooks used for initializing the root memory-disk. options MEMORY_DISK_HOOKS @@ -13,3 +13,60 @@ options MEMORY_DISK_IS_ROOT options MEMORY_DISK_SERVER=0# no userspace memory disk support options MEMORY_DISK_ROOT_SIZE=6400 # size of memory disk in blocks (3200k) options MEMORY_DISK_RBFLAGS=RB_SINGLE # boot in single-user mode + +# shrink kernel since ARC BIOS seems to have 8MB limit +options FFS_NO_SNAPSHOT + +no options KTRACE +no options SYSVMSG +no options SYSVSEM +no options SYSVSHM +no options SYSCTL_INCLUDE_DESCR +no options COMPAT_15 +no options COMPAT_16 +no options COMPAT_20 +no options COMPAT_30 +no options COMPAT_40 +no options COMPAT_LINUX + +no file-system EXT2FS +no file-system LFS +no file-system NTFS +no file-system FDESC +no file-system KERNFS +no file-system NULLFS +no file-system OVERLAY +no file-system PUFFS +no file-system PROCFS +no file-system UMAPFS +no file-system UNION +no file-system CODA +no file-system TMPFS + +no options QUOTA +no options QUOTA2 +no options NFSSERVER + +no options NETATALK +no options PPP_FILTER + +no options MIIVERBOSE +no options SCSIVERBOSE + +no ch* at scsibus? +no ss* at scsibus? +no ses* at scsibus? +no uk* at scsibus? + +no ppbus* +no lpt* + +no pseudo-device ccd +no pseudo-device fss +no pseudo-device ipfilter +no pseudo-device bridge +no pseudo-device accf_data +no pseudo-device accf_http +no pseudo-device sequencer +no pseudo-device putter +no pseudo-device vcoda
CVS commit: src/sys/arch/sgimips/conf
Module Name:src Committed By: tsutsui Date: Sun Sep 2 08:51:54 UTC 2018 Modified Files: src/sys/arch/sgimips/conf: INSTALL32_IP2x Log Message: Disable misc options to shrink an INSTALL kernel for IP2x. The ARC BIOS on Indy seems to have ~8MB limit. Fixes PR port-sgimips/53378 from Naruaki Etomi. Should be pulled up to netbsd-7 and netbsd-8. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/conf/INSTALL32_IP2x Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
