CVS commit: src/usr.sbin/arp
Module Name:src
Committed By: nonaka
Date: Fri Jun 8 04:24:12 UTC 2018
Modified Files:
src/usr.sbin/arp: arp.c
Log Message:
fix usage of `arp -d'.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/usr.sbin/arp/arp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/arp/arp.c
diff -u src/usr.sbin/arp/arp.c:1.58 src/usr.sbin/arp/arp.c:1.59
--- src/usr.sbin/arp/arp.c:1.58 Wed Jun 28 08:17:50 2017
+++ src/usr.sbin/arp/arp.c Fri Jun 8 04:24:12 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: arp.c,v 1.58 2017/06/28 08:17:50 ozaki-r Exp $ */
+/* $NetBSD: arp.c,v 1.59 2018/06/08 04:24:12 nonaka Exp $ */
/*
* Copyright (c) 1984, 1993
@@ -42,7 +42,7 @@ __COPYRIGHT("@(#) Copyright (c) 1984, 19
#if 0
static char sccsid[] = "@(#)arp.c 8.3 (Berkeley) 4/28/95";
#else
-__RCSID("$NetBSD: arp.c,v 1.58 2017/06/28 08:17:50 ozaki-r Exp $");
+__RCSID("$NetBSD: arp.c,v 1.59 2018/06/08 04:24:12 nonaka Exp $");
#endif
#endif /* not lint */
@@ -597,7 +597,7 @@ usage(void)
progname = getprogname();
(void)fprintf(stderr, "Usage: %s [-n] hostname\n", progname);
(void)fprintf(stderr, " %s [-nv] -a\n", progname);
- (void)fprintf(stderr, " %s [-v] -d [-a|hostname [pub [proxy]]]\n",
+ (void)fprintf(stderr, " %s [-v] -d [-a|hostname [proxy]]\n",
progname);
(void)fprintf(stderr, " %s -s hostname ether_addr [temp] [pub [proxy]]\n",
progname);
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: jakllsch
Date: Thu Jun 7 23:32:30 UTC 2018
Modified Files:
src/sys/dev/pci: ld_virtio.c
Log Message:
Make ld_virtio aware of a possible device-side write cache.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/pci/ld_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/ld_virtio.c
diff -u src/sys/dev/pci/ld_virtio.c:1.19 src/sys/dev/pci/ld_virtio.c:1.20
--- src/sys/dev/pci/ld_virtio.c:1.19 Sun Jun 3 19:50:20 2018
+++ src/sys/dev/pci/ld_virtio.c Thu Jun 7 23:32:30 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: ld_virtio.c,v 1.19 2018/06/03 19:50:20 jakllsch Exp $ */
+/* $NetBSD: ld_virtio.c,v 1.20 2018/06/07 23:32:30 jakllsch Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.19 2018/06/03 19:50:20 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ld_virtio.c,v 1.20 2018/06/07 23:32:30 jakllsch Exp $");
#include
#include
@@ -120,6 +120,7 @@ struct virtio_blk_req {
struct virtio_blk_req_hdr vr_hdr;
uint8_tvr_status;
struct buf *vr_bp;
+#define DUMMY_VR_BP((void *)1)
bus_dmamap_t vr_cmdsts;
bus_dmamap_t vr_payload;
};
@@ -135,6 +136,13 @@ struct ld_virtio_softc {
bus_dma_segment_t sc_reqs_seg;
int sc_readonly;
+
+ enum {
+ SYNC_FREE, SYNC_BUSY, SYNC_DONE
+ } sc_sync_use;
+ kcondvar_t sc_sync_wait;
+ kmutex_t sc_sync_wait_lock;
+ uint8_t sc_sync_status;
};
static int ld_virtio_match(device_t, cfdata_t, void *);
@@ -158,6 +166,7 @@ ld_virtio_match(device_t parent, cfdata_
static int ld_virtio_vq_done(struct virtqueue *);
static int ld_virtio_dump(struct ld_softc *, void *, int, int);
static int ld_virtio_start(struct ld_softc *, struct buf *);
+static int ld_virtio_ioctl(struct ld_softc *, u_long, void *, int32_t, bool);
static int
ld_virtio_alloc_reqs(struct ld_virtio_softc *sc, int qsize)
@@ -270,7 +279,8 @@ ld_virtio_attach(device_t parent, device
virtio_child_attach_start(vsc, self, IPL_BIO, >sc_vq,
NULL, virtio_vq_intr, 0,
(VIRTIO_BLK_F_SIZE_MAX | VIRTIO_BLK_F_SEG_MAX |
- VIRTIO_BLK_F_GEOMETRY | VIRTIO_BLK_F_RO | VIRTIO_BLK_F_BLK_SIZE),
+ VIRTIO_BLK_F_GEOMETRY | VIRTIO_BLK_F_RO | VIRTIO_BLK_F_BLK_SIZE |
+ VIRTIO_BLK_F_FLUSH | VIRTIO_BLK_F_CONFIG_WCE),
VIRTIO_BLK_FLAG_BITS);
features = virtio_features(vsc);
@@ -344,13 +354,18 @@ ld_virtio_attach(device_t parent, device
ld->sc_nsectors = virtio_read_device_config_1(vsc,
VIRTIO_BLK_CONFIG_GEOMETRY_S);
}
- ld->sc_maxqueuecnt = qsize;
+ ld->sc_maxqueuecnt = qsize - 1; /* reserve slot for dumps, flushes */
if (ld_virtio_alloc_reqs(sc, qsize) < 0)
goto err;
+ cv_init(>sc_sync_wait, "vblksync");
+ mutex_init(>sc_sync_wait_lock, MUTEX_DEFAULT, IPL_BIO);
+ sc->sc_sync_use = SYNC_FREE;
+
ld->sc_dump = ld_virtio_dump;
ld->sc_start = ld_virtio_start;
+ ld->sc_ioctl = ld_virtio_ioctl;
ld->sc_flags = LDF_ENABLED | LDF_MPSAFE;
ldattach(ld, BUFQ_DISK_DEFAULT_STRAT);
@@ -443,14 +458,23 @@ ld_virtio_vq_done1(struct ld_virtio_soft
bus_dmamap_sync(virtio_dmat(vsc), vr->vr_cmdsts,
0, sizeof(struct virtio_blk_req_hdr),
BUS_DMASYNC_POSTWRITE);
+ bus_dmamap_sync(virtio_dmat(vsc), vr->vr_cmdsts,
+ sizeof(struct virtio_blk_req_hdr), sizeof(uint8_t),
+ BUS_DMASYNC_POSTREAD);
+ if (bp == DUMMY_VR_BP) {
+ mutex_enter(>sc_sync_wait_lock);
+ sc->sc_sync_status = vr->vr_status;
+ sc->sc_sync_use = SYNC_DONE;
+ cv_signal(>sc_sync_wait);
+ mutex_exit(>sc_sync_wait_lock);
+ virtio_dequeue_commit(vsc, vq, slot);
+ return;
+ }
bus_dmamap_sync(virtio_dmat(vsc), vr->vr_payload,
0, bp->b_bcount,
(bp->b_flags & B_READ)?BUS_DMASYNC_POSTREAD
:BUS_DMASYNC_POSTWRITE);
bus_dmamap_unload(virtio_dmat(vsc), vr->vr_payload);
- bus_dmamap_sync(virtio_dmat(vsc), vr->vr_cmdsts,
- sizeof(struct virtio_blk_req_hdr), sizeof(uint8_t),
- BUS_DMASYNC_POSTREAD);
if (vr->vr_status != VIRTIO_BLK_S_OK) {
bp->b_error = EIO;
@@ -609,6 +633,150 @@ ld_virtio_detach(device_t self, int flag
return 0;
}
+static int
+ld_virtio_flush(struct ld_softc *ld, bool poll)
+{
+ struct ld_virtio_softc * const sc = device_private(ld->sc_dv);
+ struct virtio_softc * const vsc = sc->sc_virtio;
+ const uint32_t features = virtio_features(vsc);
+ struct virtqueue *vq = >sc_vq;
+ struct virtio_blk_req *vr;
+ int slot;
+ int r;
+
+ if ((features & VIRTIO_BLK_F_FLUSH) == 0)
+ return 0;
+
+ mutex_enter(>sc_sync_wait_lock);
+ while (sc->sc_sync_use != SYNC_FREE) {
+ if (poll) {
+ mutex_exit(>sc_sync_wait_lock);
+ ld_virtio_vq_done(vq);
+ mutex_enter(>sc_sync_wait_lock);
+ continue;
+ }
+ cv_wait(>sc_sync_wait, >sc_sync_wait_lock);
+ }
+ sc->sc_sync_use = SYNC_BUSY;
+ mutex_exit(>sc_sync_wait_lock);
+
+ r = virtio_enqueue_prep(vsc, vq, );
+ if (r != 0) {
+ return r;
+ }
+
+ vr =
CVS commit: [netbsd-8] src/sys/dev/isa
Module Name:src
Committed By: martin
Date: Thu Jun 7 19:39:54 UTC 2018
Modified Files:
src/sys/dev/isa [netbsd-8]: isadma.c isadmareg.h isareg.h
Log Message:
Pull up following revision(s) (requested by jdolecek in ticket #841):
sys/dev/isa/isadmareg.h: revision 1.9
sys/dev/isa/isareg.h: revision 1.10
sys/dev/isa/isadma.c: revision 1.67
fix off-by-one in the mapping of the ISA DMA page registers, they actually
start at 0x81; the code used bus_space_map() starting from 0x80 but
used +1 offset for actual I/O, now it maps starting 0x81 and does I/O
without offset
the reads and writes work exactly the same as before, but this frees
0x80 for being mapped independantly
patch provided in PR kern/52468 by Jonathan Chapman; checked against the spec
and also FreeBSD sys/x86/isa/isa_dma.c
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.52.1 src/sys/dev/isa/isadma.c
cvs rdiff -u -r1.8 -r1.8.80.1 src/sys/dev/isa/isadmareg.h
cvs rdiff -u -r1.9 -r1.9.156.1 src/sys/dev/isa/isareg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/isa/isadma.c
diff -u src/sys/dev/isa/isadma.c:1.66 src/sys/dev/isa/isadma.c:1.66.52.1
--- src/sys/dev/isa/isadma.c:1.66 Sat Nov 13 13:52:03 2010
+++ src/sys/dev/isa/isadma.c Thu Jun 7 19:39:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isadma.c,v 1.66 2010/11/13 13:52:03 uebayasi Exp $ */
+/* $NetBSD: isadma.c,v 1.66.52.1 2018/06/07 19:39:54 martin Exp $ */
/*-
* Copyright (c) 1997, 1998, 2000 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.66 2010/11/13 13:52:03 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1.66.52.1 2018/06/07 19:39:54 martin Exp $");
#include
#include
@@ -53,15 +53,19 @@ __KERNEL_RCSID(0, "$NetBSD: isadma.c,v 1
struct isa_mem *isa_mem_head;
/*
- * High byte of DMA address is stored in this DMAPG register for
- * the Nth DMA channel.
+ * DMA Channel to Address Page Register offset mapping
+ *
+ * Offset from IO_DMAPG is stored in this 2D array -- first dimension is
+ * the DMA controller, second dimension is the DMA channel.
+ *
+ * e.g. dmapageport[0][1] gives us the offset for DMA ch 1 on DMA1
*/
-static int dmapageport[2][4] = {
- {0x7, 0x3, 0x1, 0x2},
- {0xf, 0xb, 0x9, 0xa}
+static const int dmapageport[2][4] = {
+ {0x6, 0x2, 0x0, 0x1},
+ {0xe, 0xa, 0x8, 0x9}
};
-static u_int8_t dmamode[] = {
+static const u_int8_t dmamode[] = {
/* write to device/read from device */
DMA37MD_READ | DMA37MD_SINGLE,
DMA37MD_WRITE | DMA37MD_SINGLE,
@@ -169,7 +173,7 @@ _isa_dmainit(struct isa_dma_state *ids,
if (bus_space_map(ids->ids_bst, IO_DMA2, DMA2_IOSIZE, 0,
>ids_dma2h))
panic("_isa_dmainit: unable to map DMA controller #2");
- if (bus_space_map(ids->ids_bst, IO_DMAPG, 0xf, 0,
+ if (bus_space_map(ids->ids_bst, IO_DMAPG, DMAPG_IOSIZE, 0,
>ids_dmapgh))
panic("_isa_dmainit: unable to map DMA page registers");
@@ -211,7 +215,7 @@ _isa_dmadestroy(struct isa_dma_state *id
/*
* Unmap the registers used by the ISA DMA controller.
*/
- bus_space_unmap(ids->ids_bst, ids->ids_dmapgh, 0xf);
+ bus_space_unmap(ids->ids_bst, ids->ids_dmapgh, DMAPG_IOSIZE);
bus_space_unmap(ids->ids_bst, ids->ids_dma2h, DMA2_IOSIZE);
bus_space_unmap(ids->ids_bst, ids->ids_dma1h, DMA1_IOSIZE);
Index: src/sys/dev/isa/isadmareg.h
diff -u src/sys/dev/isa/isadmareg.h:1.8 src/sys/dev/isa/isadmareg.h:1.8.80.1
--- src/sys/dev/isa/isadmareg.h:1.8 Mon Apr 28 20:23:52 2008
+++ src/sys/dev/isa/isadmareg.h Thu Jun 7 19:39:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isadmareg.h,v 1.8 2008/04/28 20:23:52 martin Exp $ */
+/* $NetBSD: isadmareg.h,v 1.8.80.1 2018/06/07 19:39:54 martin Exp $ */
/*-
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -47,6 +47,9 @@
#define ISA_DMA_MAXSIZE_DEFAULT(chan) \
(((chan) & 4) ? ISA_DMA_MAXSIZE_16BIT : ISA_DMA_MAXSIZE_8BIT)
+/* DMA Page Address Registers size */
+#define DMAPG_IOSIZE (1*15)
+
/*
* Register definitions for DMA controller 1 (channels 0..3):
*/
Index: src/sys/dev/isa/isareg.h
diff -u src/sys/dev/isa/isareg.h:1.9 src/sys/dev/isa/isareg.h:1.9.156.1
--- src/sys/dev/isa/isareg.h:1.9 Sun Dec 11 12:22:02 2005
+++ src/sys/dev/isa/isareg.h Thu Jun 7 19:39:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: isareg.h,v 1.9 2005/12/11 12:22:02 christos Exp $ */
+/* $NetBSD: isareg.h,v 1.9.156.1 2018/06/07 19:39:54 martin Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -55,7 +55,7 @@
#define IO_PPI 0x061 /* Programmable Peripheral Interface */
#define IO_RTC 0x070 /* RTC */
#define IO_NMI IO_RTC /* NMI Control */
-#define IO_DMAPG 0x080 /* DMA Page Registers */
+#define IO_DMAPG 0x081 /* DMA Page Registers */
#define IO_ICU2 0x0A0 /* 8259A Interrupt Controller #2 */
#define IO_DMA2 0x0C0 /* 8237A DMA Controller #2 */
#define IO_NPX 0x0F0 /*
CVS commit: [netbsd-8] src/doc
Module Name:src Committed By: martin Date: Thu Jun 7 18:37:05 UTC 2018 Modified Files: src/doc [netbsd-8]: CHANGES-8.0 Log Message: Tickets #840, #841, #842, #843, #844, #845, #846, #847, #848, #849 To generate a diff of this commit: cvs rdiff -u -r1.1.2.204 -r1.1.2.205 src/doc/CHANGES-8.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-8.0 diff -u src/doc/CHANGES-8.0:1.1.2.204 src/doc/CHANGES-8.0:1.1.2.205 --- src/doc/CHANGES-8.0:1.1.2.204 Thu Jun 7 16:25:06 2018 +++ src/doc/CHANGES-8.0 Thu Jun 7 18:37:04 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-8.0,v 1.1.2.204 2018/06/07 16:25:06 martin Exp $ +# $NetBSD: CHANGES-8.0,v 1.1.2.205 2018/06/07 18:37:04 martin Exp $ A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04 until the 8.0 release: @@ -13574,3 +13574,106 @@ sys/net/if_ipsec.c1.15,1.16 Fix a panic when ipsecif(4) adds discard policy. [knakahara, ticket #840] +sys/dev/isa/isadma.c1.67 +sys/dev/isa/isadmareg.h1.9 +sys/dev/isa/isareg.h1.10 + + Map one register less for the ISA DMA page resisters (to allow + access to that port for other drivers). + [jdolecek, ticket #841] + +sys/dev/pci/if_wm.c1.580 +sys/dev/pci/ixgbe/ixgbe.c 1.156 +sys/dev/pci/ixgbe/ixv.c1.101 +sys/net/if_bridge.c1.156 +sys/net/if_gif.c1.142 +sys/net/if_pppoe.c1.138 + + Ensure to call if_register after interface initialization is complete. + [ozaki-r, ticket #843] + +sys/netinet6/in6.c1.267,1.268 +sys/netinet6/in6_var.h1.99,1.100 +sys/netinet6/mld6.c1.93-1.99 +sys/netinet6/nd6.c1.249 + + Don't hold softnet_lock in mld_timeo. + Release in6_multilock on callout_halt of mld_timeo to avoid a deadlock. + Improve atomicity of in6_leavegroup and in6_delmulti. + Avoid NULL pointer dereference on imm->i6mm_maddr. + Make a refcount decrement and a removal from a list of an item atomic. + Make a deletion of in6m in nd6_rtrequest atomic. + Move LIST_REMOVE. Avoid double LIST_REMOVE which corrupts lists. + [ozaki-r, ticket #842] + +sys/net/if.c 1.425 + + Relax a lock check in if_mcast_op unless NET_MPSAFE. + [ozaki-r, ticket #844] + +external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata 1.4 +external/mit/xorg/lib/xkeyboard-config/rules/Makefile 1.4 + + Generate xml files properly. + [youri, ticket #845] + +sys/dev/pci/pcidevs1.1334 +sys/dev/pci/pucdata.c1.102 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + Add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card. + [jnemeth, ticket #846] + +sys/dev/usb/if_urtwn.c1.58 + + Fix support for 8192eu, notably TPLINK TL-WN823NV2. + [nat, ticket #847] + +distrib/sets/lists/comp/mi 1.2198 +distrib/sets/lists/man/mi 1.1591 +share/man/man4/audio.41.86 +share/man/man7/Makefile1.33 +share/man/man7/audio.7delete +share/man/man7/intro.71.26 +share/man/man9/Makefile1.422 +share/man/man9/audio.91.47 +share/man/man9/audio_system.9 1.1 +share/man/man9/intro.91.20 +sys/dev/audio.c 1.456,1.457 + + Fix a typo with sc_out/inports when setting the hardware recording + gain on the mix ring. + Using audioctl without the -p switch defaults to the mix ring. This + allows setting the hardware gain etc. + Update the audio spec in audio.7 to reflect these changes. + Move the audio specification to section 9 under audio_system. + [nat, ticket #848] + +external/bsd/dhcpcd/dist/Makefile up to 1.1.1.5 +external/bsd/dhcpcd/dist/src/arp.c up to 1.1.1.7 +external/bsd/dhcpcd/dist/src/auth.c up to 1.1.1.5 +external/bsd/dhcpcd/dist/src/auth.h up to 1.1.1.3 +external/bsd/dhcpcd/dist/src/bpf.c up to 1.7 +external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.13 +external/bsd/dhcpcd/dist/src/dhcp.c up to 1.11 +external/bsd/dhcpcd/dist/src/dhcp.h up to 1.1.1.6 +external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.1.1.12 +external/bsd/dhcpcd/dist/src/dhcp6.hup to 1.1.1.6 +external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf up to 1.1.1.2 +external/bsd/dhcpcd/dist/src/dhcpcd.8.inup to 1.1.1.9 +external/bsd/dhcpcd/dist/src/dhcpcd.c up to 1.12 +external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in up to 1.1.1.9 +external/bsd/dhcpcd/dist/src/if-bsd.c up to 1.1.1.8 +external/bsd/dhcpcd/dist/src/if-linux.c up to 1.1.1.9 +external/bsd/dhcpcd/dist/src/if-options.c up to 1.10 +external/bsd/dhcpcd/dist/src/ipv4ll.h up to 1.1.1.4 +external/bsd/dhcpcd/dist/src/ipv6.c up to 1.1.1.10 +external/bsd/dhcpcd/dist/src/ipv6.h up to 1.1.1.7 +external/bsd/dhcpcd/dist/src/ipv6nd.c up to 1.1.1.8 +external/bsd/dhcpcd/dist/src/ipv6nd.h up to 1.1.1.6 +external/bsd/dhcpcd/dist/src/route.cup to 1.1.1.7 +doc/3RDPARTY (manually modified) + + Import dhcpcd 7.0.5b.
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Thu Jun 7 18:34:03 UTC 2018 Modified Files: src/doc [netbsd-8]: 3RDPARTY src/external/bsd/dhcpcd/dist [netbsd-8]: Makefile src/external/bsd/dhcpcd/dist/src [netbsd-8]: arp.c auth.c auth.h bpf.c defs.h dhcp.c dhcp.h dhcp6.c dhcp6.h dhcpcd-definitions.conf dhcpcd.8.in dhcpcd.c dhcpcd.conf.5.in if-bsd.c if-linux.c if-options.c ipv4ll.h ipv6.c ipv6.h ipv6nd.c ipv6nd.h route.c Log Message: Catch up to current in src/external/bsd/dhcpcd/dist, requested by roy in ticket #849: external/bsd/dhcpcd/dist/Makefile up to 1.1.1.5 external/bsd/dhcpcd/dist/src/arp.c up to 1.1.1.7 external/bsd/dhcpcd/dist/src/auth.c up to 1.1.1.5 external/bsd/dhcpcd/dist/src/auth.h up to 1.1.1.3 external/bsd/dhcpcd/dist/src/bpf.c up to 1.7 external/bsd/dhcpcd/dist/src/defs.h up to 1.1.1.13 external/bsd/dhcpcd/dist/src/dhcp.c up to 1.11 external/bsd/dhcpcd/dist/src/dhcp.h up to 1.1.1.6 external/bsd/dhcpcd/dist/src/dhcp6.cup to 1.1.1.12 external/bsd/dhcpcd/dist/src/dhcp6.hup to 1.1.1.6 external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf up to 1.1.1.2 external/bsd/dhcpcd/dist/src/dhcpcd.8.inup to 1.1.1.9 external/bsd/dhcpcd/dist/src/dhcpcd.c up to 1.12 external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in up to 1.1.1.9 external/bsd/dhcpcd/dist/src/if-bsd.c up to 1.1.1.8 external/bsd/dhcpcd/dist/src/if-linux.c up to 1.1.1.9 external/bsd/dhcpcd/dist/src/if-options.c up to 1.10 external/bsd/dhcpcd/dist/src/ipv4ll.h up to 1.1.1.4 external/bsd/dhcpcd/dist/src/ipv6.c up to 1.1.1.10 external/bsd/dhcpcd/dist/src/ipv6.h up to 1.1.1.7 external/bsd/dhcpcd/dist/src/ipv6nd.c up to 1.1.1.8 external/bsd/dhcpcd/dist/src/ipv6nd.h up to 1.1.1.6 external/bsd/dhcpcd/dist/src/route.cup to 1.1.1.7 doc/3RDPARTY(manually modified) Import dhcpcd 7.0.5b. Changes: * Routing: Fix case when cloning route changes but needs to be replaced * DHCP6: Transpose DHCP userclass option into DHCP6 * DHCP6: Fix sending custom vendor class option * Auth: Allow zero value replay detection data * Auth: Allow different tokens for send and receive * ND6: Warn if router lifetime is set to zero * DHCP6: Softwire Address and Port-Mapped Clients, RFC7598 * dhcp: Clarified some checksumming code, style and commentary (thanks to Maxime Villard) * dhcp6: IAID is now unique per IA type rather than global * ip6: if an IA callback causes a fork, exit earlier To generate a diff of this commit: cvs rdiff -u -r1.1444.2.11 -r1.1444.2.12 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.4 -r1.1.1.4.2.1 src/external/bsd/dhcpcd/dist/Makefile cvs rdiff -u -r1.1.1.2.8.2 -r1.1.1.2.8.3 \ src/external/bsd/dhcpcd/dist/src/arp.c \ src/external/bsd/dhcpcd/dist/src/ipv6nd.c cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \ src/external/bsd/dhcpcd/dist/src/auth.c \ src/external/bsd/dhcpcd/dist/src/auth.h cvs rdiff -u -r1.3.8.1 -r1.3.8.2 src/external/bsd/dhcpcd/dist/src/bpf.c cvs rdiff -u -r1.1.1.4.2.2 -r1.1.1.4.2.3 \ src/external/bsd/dhcpcd/dist/src/defs.h \ src/external/bsd/dhcpcd/dist/src/dhcp6.c \ src/external/bsd/dhcpcd/dist/src/dhcpcd.8.in \ src/external/bsd/dhcpcd/dist/src/dhcpcd.conf.5.in cvs rdiff -u -r1.1.1.3.8.3 -r1.1.1.3.8.4 \ src/external/bsd/dhcpcd/dist/src/dhcp.c cvs rdiff -u -r1.1.1.1.8.2 -r1.1.1.1.8.3 \ src/external/bsd/dhcpcd/dist/src/dhcp.h \ src/external/bsd/dhcpcd/dist/src/dhcp6.h \ src/external/bsd/dhcpcd/dist/src/ipv6nd.h cvs rdiff -u -r1.1.1.1 -r1.1.1.1.8.1 \ src/external/bsd/dhcpcd/dist/src/dhcpcd-definitions.conf cvs rdiff -u -r1.4.2.2 -r1.4.2.3 src/external/bsd/dhcpcd/dist/src/dhcpcd.c \ src/external/bsd/dhcpcd/dist/src/if-options.c cvs rdiff -u -r1.1.1.3.2.2 -r1.1.1.3.2.3 \ src/external/bsd/dhcpcd/dist/src/if-bsd.c \ src/external/bsd/dhcpcd/dist/src/if-linux.c \ src/external/bsd/dhcpcd/dist/src/ipv6.c \ src/external/bsd/dhcpcd/dist/src/route.c cvs rdiff -u -r1.1.1.2.8.1 -r1.1.1.2.8.2 \ src/external/bsd/dhcpcd/dist/src/ipv4ll.h cvs rdiff -u -r1.1.1.2.2.2 -r1.1.1.2.2.3 \ src/external/bsd/dhcpcd/dist/src/ipv6.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.1444.2.11 src/doc/3RDPARTY:1.1444.2.12 --- src/doc/3RDPARTY:1.1444.2.11 Sun May 6 09:42:38 2018 +++ src/doc/3RDPARTY Thu Jun 7 18:34:03 2018 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1444.2.11 2018/05/06 09:42:38 martin Exp $ +# $NetBSD: 3RDPARTY,v 1.1444.2.12 2018/06/07 18:34:03 martin Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -334,8 +334,8 @@
CVS commit: [netbsd-8] src/sys/dev/usb
Module Name:src
Committed By: martin
Date: Thu Jun 7 18:16:43 UTC 2018
Modified Files:
src/sys/dev/usb [netbsd-8]: if_urtwn.c
Log Message:
Pull up following revision(s) (requested by nat in ticket #847):
sys/dev/usb/if_urtwn.c: revision 1.58
Fix support for 8192eu, notably TPLINK TL-WN823NV2, by using the right
registers when setting receiver gain.
Ok christos@.
To generate a diff of this commit:
cvs rdiff -u -r1.53.2.2 -r1.53.2.3 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.53.2.2 src/sys/dev/usb/if_urtwn.c:1.53.2.3
--- src/sys/dev/usb/if_urtwn.c:1.53.2.2 Wed Jan 31 18:01:54 2018
+++ src/sys/dev/usb/if_urtwn.c Thu Jun 7 18:16:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.53.2.2 2018/01/31 18:01:54 martin Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.53.2.3 2018/06/07 18:16:43 martin Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.42 2015/02/10 23:25:46 mpi Exp $ */
/*-
@@ -25,7 +25,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.2 2018/01/31 18:01:54 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.53.2.3 2018/06/07 18:16:43 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -3799,12 +3799,19 @@ urtwn_bb_init(struct urtwn_softc *sc)
DELAY(1);
urtwn_bb_write(sc, R92C_OFDM0_AGCCORE1(0), 0x69553420);
DELAY(1);
+ }
- if (ISSET(sc->chip, URTWN_CHIP_92EU)) {
- urtwn_write_2(sc, R92C_AFE_CTRL3, urtwn_read_2(sc,
- R92C_AFE_CTRL3));
- }
-
+ if (ISSET(sc->chip, URTWN_CHIP_92EU)) {
+ crystalcap = sc->r88e_rom[0xb9];
+ if (crystalcap == 0x00)
+ crystalcap = 0x20;
+ crystalcap &= 0x3f;
+ reg = urtwn_bb_read(sc, R92C_AFE_CTRL3);
+ urtwn_bb_write(sc, R92C_AFE_CTRL3,
+ RW(reg, R92C_AFE_XTAL_CTRL_ADDR,
+ crystalcap | crystalcap << 6));
+ urtwn_write_4(sc, R92C_AFE_XTAL_CTRL, 0xf81fb);
+ } else if (ISSET(sc->chip, URTWN_CHIP_88E)) {
crystalcap = sc->r88e_rom[0xb9];
if (crystalcap == 0xff)
crystalcap = 0x20;
CVS commit: [netbsd-8] src
Module Name:src Committed By: martin Date: Thu Jun 7 18:24:16 UTC 2018 Modified Files: src/distrib/sets/lists/comp [netbsd-8]: mi src/distrib/sets/lists/man [netbsd-8]: mi src/share/man/man4 [netbsd-8]: audio.4 src/share/man/man7 [netbsd-8]: Makefile intro.7 src/share/man/man9 [netbsd-8]: Makefile audio.9 intro.9 src/sys/dev [netbsd-8]: audio.c Added Files: src/share/man/man9 [netbsd-8]: audio_system.9 Removed Files: src/share/man/man7 [netbsd-8]: audio.7 Log Message: Pull up following revision(s) (requested by nat in ticket #848): share/man/man9/Makefile: revision 1.422 distrib/sets/lists/comp/mi: revision 1.2198 share/man/man7/Makefile: revision 1.33 share/man/man9/audio.9: revision 1.47 share/man/man7/audio.7: file removal sys/dev/audio.c: revision 1.456 sys/dev/audio.c: revision 1.457 distrib/sets/lists/man/mi: revision 1.1591 share/man/man9/intro.9: revision 1.20 share/man/man7/audio.7: revision 1.3 share/man/man9/audio_system.9: revision 1.1 share/man/man7/intro.7: revision 1.26 share/man/man4/audio.4: revision 1.86 Fix a typo with sc_out/inports when setting the hardware recording gain on the mix ring. Found by mrg@ XXX pullup-8 Using audioctl without the -p switch defaults to the mix ring. This allows setting the hardware gain etc. Update the audio spec in audio.7 to reflect these changes. Addresses PR kern/52781. Move the audio specification to section 9 under audio_system. Ok wiz@ To generate a diff of this commit: cvs rdiff -u -r1.2138.2.5 -r1.2138.2.6 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.1557.2.4 -r1.1557.2.5 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.79.2.2 -r1.79.2.3 src/share/man/man4/audio.4 cvs rdiff -u -r1.31.8.1 -r1.31.8.2 src/share/man/man7/Makefile cvs rdiff -u -r1.2.2.2 -r0 src/share/man/man7/audio.7 cvs rdiff -u -r1.23.24.1 -r1.23.24.2 src/share/man/man7/intro.7 cvs rdiff -u -r1.414 -r1.414.2.1 src/share/man/man9/Makefile cvs rdiff -u -r1.44.16.1 -r1.44.16.2 src/share/man/man9/audio.9 cvs rdiff -u -r0 -r1.1.2.2 src/share/man/man9/audio_system.9 cvs rdiff -u -r1.18 -r1.18.2.1 src/share/man/man9/intro.9 cvs rdiff -u -r1.357.2.12 -r1.357.2.13 src/sys/dev/audio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.2138.2.5 src/distrib/sets/lists/comp/mi:1.2138.2.6 --- src/distrib/sets/lists/comp/mi:1.2138.2.5 Sun Feb 11 21:17:33 2018 +++ src/distrib/sets/lists/comp/mi Thu Jun 7 18:24:15 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.2138.2.5 2018/02/11 21:17:33 snj Exp $ +# $NetBSD: mi,v 1.2138.2.6 2018/06/07 18:24:15 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. ./etc/mtree/set.compcomp-sys-root @@ -10145,6 +10145,7 @@ ./usr/share/man/cat9/arpresolve.0 comp-sys-catman .cat ./usr/share/man/cat9/atop.0 comp-sys-catman .cat ./usr/share/man/cat9/audio.0 comp-sys-catman .cat +./usr/share/man/cat9/audio_system.0 comp-sys-catman .cat ./usr/share/man/cat9/autoconf.0 comp-sys-catman .cat ./usr/share/man/cat9/bawrite.0 comp-sys-catman .cat ./usr/share/man/cat9/bcdtobin.0 comp-sys-catman .cat @@ -17631,6 +17632,7 @@ ./usr/share/man/html9/arpresolve.html comp-sys-htmlman html ./usr/share/man/html9/atop.html comp-sys-htmlman html ./usr/share/man/html9/audio.html comp-sys-htmlman html +./usr/share/man/html9/audio_system.html comp-sys-htmlman html ./usr/share/man/html9/autoconf.html comp-sys-htmlman html ./usr/share/man/html9/bawrite.html comp-sys-htmlman html ./usr/share/man/html9/bcdtobin.html comp-sys-htmlman html @@ -25221,6 +25223,7 @@ ./usr/share/man/man9/arpresolve.9 comp-sys-man .man ./usr/share/man/man9/atop.9 comp-sys-man .man ./usr/share/man/man9/audio.9 comp-sys-man .man +./usr/share/man/man9/audio_system.9 comp-sys-man .man ./usr/share/man/man9/autoconf.9 comp-sys-man .man ./usr/share/man/man9/bawrite.9 comp-sys-man .man ./usr/share/man/man9/bcdtobin.9 comp-sys-man .man Index: src/distrib/sets/lists/man/mi diff -u src/distrib/sets/lists/man/mi:1.1557.2.4 src/distrib/sets/lists/man/mi:1.1557.2.5 --- src/distrib/sets/lists/man/mi:1.1557.2.4 Tue May 15 13:42:50 2018 +++ src/distrib/sets/lists/man/mi Thu Jun 7 18:24:16 2018 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1557.2.4 2018/05/15 13:42:50 martin Exp $ +# $NetBSD: mi,v 1.1557.2.5 2018/06/07 18:24:16 martin Exp $ # # Note: don't delete entries from here - mark them as "obsolete" instead. # @@ -2251,7 +2251,7 @@ ./usr/share/man/cat5/wtmpx.0 man-sys-catman .cat ./usr/share/man/cat5/ypserv.acl.0 man-obsolete obsolete ./usr/share/man/cat7/ascii.0 man-reference-catman .cat -./usr/share/man/cat7/audio.0 man-reference-catman .cat +./usr/share/man/cat7/audio.0
CVS commit: [netbsd-8] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Thu Jun 7 18:12:18 UTC 2018
Modified Files:
src/sys/dev/pci [netbsd-8]: pcidevs pucdata.c
Log Message:
Pull up following revision(s) (requested by jnemeth in ticket #846):
sys/dev/pci/pcidevs: revision 1.1334
sys/dev/pci/pucdata.c: revision 1.102
add Oxford Semiconductor OXPCIe954 PCIe 4-port serial card
To generate a diff of this commit:
cvs rdiff -u -r1.1289.2.6 -r1.1289.2.7 src/sys/dev/pci/pcidevs
cvs rdiff -u -r1.99.8.2 -r1.99.8.3 src/sys/dev/pci/pucdata.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/pcidevs
diff -u src/sys/dev/pci/pcidevs:1.1289.2.6 src/sys/dev/pci/pcidevs:1.1289.2.7
--- src/sys/dev/pci/pcidevs:1.1289.2.6 Wed Apr 18 14:20:25 2018
+++ src/sys/dev/pci/pcidevs Thu Jun 7 18:12:17 2018
@@ -1,4 +1,4 @@
-$NetBSD: pcidevs,v 1.1289.2.6 2018/04/18 14:20:25 martin Exp $
+$NetBSD: pcidevs,v 1.1289.2.7 2018/06/07 18:12:17 martin Exp $
/*
* Copyright (c) 1995, 1996 Christopher G. Demetriou
@@ -6250,6 +6250,7 @@ product OXFORDSEMI OXPCIE952_3 0xc140 OX
product OXFORDSEMI OXPCIE952_4 0xc141 OXPCIe952
product OXFORDSEMI OXPCIE952_5 0xc144 OXPCIe952
product OXFORDSEMI OXPCIE952_6 0xc145 OXPCIe952
+product OXFORDSEMI OXPCIE954 0xc208 OXPCIe954
/* Packet Engines products */
product PACKETENGINES GNICII 0x0911 G-NIC II Ethernet
Index: src/sys/dev/pci/pucdata.c
diff -u src/sys/dev/pci/pucdata.c:1.99.8.2 src/sys/dev/pci/pucdata.c:1.99.8.3
--- src/sys/dev/pci/pucdata.c:1.99.8.2 Mon Apr 16 14:21:48 2018
+++ src/sys/dev/pci/pucdata.c Thu Jun 7 18:12:17 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pucdata.c,v 1.99.8.2 2018/04/16 14:21:48 martin Exp $ */
+/* $NetBSD: pucdata.c,v 1.99.8.3 2018/06/07 18:12:17 martin Exp $ */
/*
* Copyright (c) 1998, 1999 Christopher G. Demetriou. All rights reserved.
@@ -36,7 +36,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.99.8.2 2018/04/16 14:21:48 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pucdata.c,v 1.99.8.3 2018/06/07 18:12:17 martin Exp $");
#include
#include
@@ -1108,6 +1108,19 @@ const struct puc_device_description puc_
},
},
+ /* Oxford Semiconductor OXPCIe954 PCIe UARTs */
+ { "Oxford Semiconductor OXPCIe954 UART",
+ { PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_OXPCIE954,
+ 0, 0 },
+ { 0x, 0x, 0, 0 },
+ {
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1000, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1200, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1400, COM_FREQ * 0x22 },
+ { PUC_PORT_TYPE_COM, PCI_BAR0, 0x1600, COM_FREQ * 0x22 },
+ },
+ },
+
/* Oxford Semiconductor OXmPCI952 PCI UARTs */
{ "Oxford Semiconductor OXmPCI952 UARTs",
{ PCI_VENDOR_OXFORDSEMI, PCI_PRODUCT_OXFORDSEMI_EXSYS_EX41092,
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: martin Date: Thu Jun 7 18:07:26 UTC 2018 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.7 Log Message: Ammend ticket #1500 To generate a diff of this commit: cvs rdiff -u -r1.1.2.145 -r1.1.2.146 src/doc/CHANGES-6.0.7 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.7 diff -u src/doc/CHANGES-6.0.7:1.1.2.145 src/doc/CHANGES-6.0.7:1.1.2.146 --- src/doc/CHANGES-6.0.7:1.1.2.145 Tue May 22 14:50:06 2018 +++ src/doc/CHANGES-6.0.7 Thu Jun 7 18:07:26 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.7,v 1.1.2.145 2018/05/22 14:50:06 martin Exp $ +# $NetBSD: CHANGES-6.0.7,v 1.1.2.146 2018/06/07 18:07:26 martin Exp $ A complete list of changes from the NetBSD 6.0.6 release to the NetBSD 6.0.7 release: @@ -15487,6 +15487,8 @@ sys/arch/sparc/conf/MRCOFFEE(patch) sys/arch/sparc/conf/TADPOLE3GX(patch) sys/arch/sparc64/conf/GENERIC(patch) sys/arch/sparc64/conf/NONPLUS64(patch) +sys/arch/sparc64/conf/GENERIC32(patch) +sys/arch/sparc64/conf/NONPLUS(patch) Disable compat_svr4 and compat_svr4_32 everywhere. Disable compat_ibcs2 everywhere but on Vax.
CVS commit: [netbsd-6-0] src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Jun 7 18:06:38 UTC 2018 Modified Files: src/sys/arch/sparc64/conf [netbsd-6-0]: GENERIC32 NONPLUS Log Message: Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not disable it here again. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.140.108.1 src/sys/arch/sparc64/conf/GENERIC32 cvs rdiff -u -r1.58 -r1.58.108.1 src/sys/arch/sparc64/conf/NONPLUS 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/sparc64/conf/GENERIC32 diff -u src/sys/arch/sparc64/conf/GENERIC32:1.140 src/sys/arch/sparc64/conf/GENERIC32:1.140.108.1 --- src/sys/arch/sparc64/conf/GENERIC32:1.140 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/GENERIC32 Thu Jun 7 18:06:38 2018 @@ -1,13 +1,13 @@ -# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: GENERIC32,v 1.140.108.1 2018/06/07 18:06:38 martin Exp $ # # GENERIC machine description file for 32-bit kernel # include "arch/sparc64/conf/GENERIC" -#ident "GENERIC32-$Revision: 1.140 $" +#ident "GENERIC32-$Revision: 1.140.108.1 $" include "arch/sparc64/conf/std.sparc64-32" no options COMPAT_NETBSD32 -no options COMPAT_SVR4_32 +#no options COMPAT_SVR4_32 Index: src/sys/arch/sparc64/conf/NONPLUS diff -u src/sys/arch/sparc64/conf/NONPLUS:1.58 src/sys/arch/sparc64/conf/NONPLUS:1.58.108.1 --- src/sys/arch/sparc64/conf/NONPLUS:1.58 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/NONPLUS Thu Jun 7 18:06:38 2018 @@ -1,9 +1,9 @@ -# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: NONPLUS,v 1.58.108.1 2018/06/07 18:06:38 martin Exp $ include "arch/sparc64/conf/NONPLUS64" include "arch/sparc64/conf/std.sparc64-32" -#ident "NONPLUS-$Revision: 1.58 $" +#ident "NONPLUS-$Revision: 1.58.108.1 $" no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -no options COMPAT_SVR4_32 # 32-bit SVR4 binaries +#no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: martin Date: Thu Jun 7 18:04:56 UTC 2018 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.6 Log Message: Ammend ticket #1500 To generate a diff of this commit: cvs rdiff -u -r1.1.2.143 -r1.1.2.144 src/doc/CHANGES-6.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.6 diff -u src/doc/CHANGES-6.1.6:1.1.2.143 src/doc/CHANGES-6.1.6:1.1.2.144 --- src/doc/CHANGES-6.1.6:1.1.2.143 Tue May 22 14:45:21 2018 +++ src/doc/CHANGES-6.1.6 Thu Jun 7 18:04:56 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.6,v 1.1.2.143 2018/05/22 14:45:21 martin Exp $ +# $NetBSD: CHANGES-6.1.6,v 1.1.2.144 2018/06/07 18:04:56 martin Exp $ A complete list of changes from the NetBSD 6.1.5 release to the NetBSD 6.1.6 release: @@ -15162,6 +15162,8 @@ sys/arch/sparc/conf/MRCOFFEE(patch) sys/arch/sparc/conf/TADPOLE3GX(patch) sys/arch/sparc64/conf/GENERIC(patch) sys/arch/sparc64/conf/NONPLUS64(patch) +sys/arch/sparc64/conf/GENERIC32(patch) +sys/arch/sparc64/conf/NONPLUS(patch) Disable compat_svr4 and compat_svr4_32 everywhere. Disable compat_ibcs2 everywhere but on Vax.
CVS commit: [netbsd-6-1] src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Jun 7 18:04:12 UTC 2018 Modified Files: src/sys/arch/sparc64/conf [netbsd-6-1]: GENERIC32 NONPLUS Log Message: Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not disable it here again. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.140.118.1 src/sys/arch/sparc64/conf/GENERIC32 cvs rdiff -u -r1.58 -r1.58.118.1 src/sys/arch/sparc64/conf/NONPLUS 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/sparc64/conf/GENERIC32 diff -u src/sys/arch/sparc64/conf/GENERIC32:1.140 src/sys/arch/sparc64/conf/GENERIC32:1.140.118.1 --- src/sys/arch/sparc64/conf/GENERIC32:1.140 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/GENERIC32 Thu Jun 7 18:04:12 2018 @@ -1,13 +1,13 @@ -# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: GENERIC32,v 1.140.118.1 2018/06/07 18:04:12 martin Exp $ # # GENERIC machine description file for 32-bit kernel # include "arch/sparc64/conf/GENERIC" -#ident "GENERIC32-$Revision: 1.140 $" +#ident "GENERIC32-$Revision: 1.140.118.1 $" include "arch/sparc64/conf/std.sparc64-32" no options COMPAT_NETBSD32 -no options COMPAT_SVR4_32 +#no options COMPAT_SVR4_32 Index: src/sys/arch/sparc64/conf/NONPLUS diff -u src/sys/arch/sparc64/conf/NONPLUS:1.58 src/sys/arch/sparc64/conf/NONPLUS:1.58.118.1 --- src/sys/arch/sparc64/conf/NONPLUS:1.58 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/NONPLUS Thu Jun 7 18:04:12 2018 @@ -1,9 +1,9 @@ -# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: NONPLUS,v 1.58.118.1 2018/06/07 18:04:12 martin Exp $ include "arch/sparc64/conf/NONPLUS64" include "arch/sparc64/conf/std.sparc64-32" -#ident "NONPLUS-$Revision: 1.58 $" +#ident "NONPLUS-$Revision: 1.58.118.1 $" no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -no options COMPAT_SVR4_32 # 32-bit SVR4 binaries +#no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: martin Date: Thu Jun 7 18:03:14 UTC 2018 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ammend ticket #1500 To generate a diff of this commit: cvs rdiff -u -r1.1.2.340 -r1.1.2.341 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.340 src/doc/CHANGES-6.2:1.1.2.341 --- src/doc/CHANGES-6.2:1.1.2.340 Tue May 22 14:40:58 2018 +++ src/doc/CHANGES-6.2 Thu Jun 7 18:03:14 2018 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.340 2018/05/22 14:40:58 martin Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.341 2018/06/07 18:03:14 martin Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -21272,6 +21272,8 @@ sys/arch/sparc/conf/MRCOFFEE(patch) sys/arch/sparc/conf/TADPOLE3GX(patch) sys/arch/sparc64/conf/GENERIC(patch) sys/arch/sparc64/conf/NONPLUS64(patch) +sys/arch/sparc64/conf/GENERIC32(patch) +sys/arch/sparc64/conf/NONPLUS(patch) Disable compat_svr4 and compat_svr4_32 everywhere. Disable compat_ibcs2 everywhere but on Vax.
CVS commit: [netbsd-6] src/sys/arch/sparc64/conf
Module Name:src Committed By: martin Date: Thu Jun 7 18:01:51 UTC 2018 Modified Files: src/sys/arch/sparc64/conf [netbsd-6]: GENERIC32 NONPLUS Log Message: Fix fallout from ticket #1500: COMPAT_SVR4* has been disabled, do not disable it here again. To generate a diff of this commit: cvs rdiff -u -r1.140 -r1.140.102.1 src/sys/arch/sparc64/conf/GENERIC32 cvs rdiff -u -r1.58 -r1.58.102.1 src/sys/arch/sparc64/conf/NONPLUS 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/sparc64/conf/GENERIC32 diff -u src/sys/arch/sparc64/conf/GENERIC32:1.140 src/sys/arch/sparc64/conf/GENERIC32:1.140.102.1 --- src/sys/arch/sparc64/conf/GENERIC32:1.140 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/GENERIC32 Thu Jun 7 18:01:51 2018 @@ -1,13 +1,13 @@ -# $NetBSD: GENERIC32,v 1.140 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: GENERIC32,v 1.140.102.1 2018/06/07 18:01:51 martin Exp $ # # GENERIC machine description file for 32-bit kernel # include "arch/sparc64/conf/GENERIC" -#ident "GENERIC32-$Revision: 1.140 $" +#ident "GENERIC32-$Revision: 1.140.102.1 $" include "arch/sparc64/conf/std.sparc64-32" no options COMPAT_NETBSD32 -no options COMPAT_SVR4_32 +#no options COMPAT_SVR4_32 Index: src/sys/arch/sparc64/conf/NONPLUS diff -u src/sys/arch/sparc64/conf/NONPLUS:1.58 src/sys/arch/sparc64/conf/NONPLUS:1.58.102.1 --- src/sys/arch/sparc64/conf/NONPLUS:1.58 Fri Jun 30 10:27:48 2006 +++ src/sys/arch/sparc64/conf/NONPLUS Thu Jun 7 18:01:51 2018 @@ -1,9 +1,9 @@ -# $NetBSD: NONPLUS,v 1.58 2006/06/30 10:27:48 tsutsui Exp $ +# $NetBSD: NONPLUS,v 1.58.102.1 2018/06/07 18:01:51 martin Exp $ include "arch/sparc64/conf/NONPLUS64" include "arch/sparc64/conf/std.sparc64-32" -#ident "NONPLUS-$Revision: 1.58 $" +#ident "NONPLUS-$Revision: 1.58.102.1 $" no options COMPAT_NETBSD32 # NetBSD/sparc binary compatibility -no options COMPAT_SVR4_32 # 32-bit SVR4 binaries +#no options COMPAT_SVR4_32 # 32-bit SVR4 binaries
CVS commit: [netbsd-8] src/external/mit/xorg/lib/xkeyboard-config
Module Name:src
Committed By: martin
Date: Thu Jun 7 17:53:44 UTC 2018
Modified Files:
src/external/mit/xorg/lib/xkeyboard-config [netbsd-8]: Makefile.xkbdata
src/external/mit/xorg/lib/xkeyboard-config/rules [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by youri in ticket #845):
external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata: revision 1.4
external/mit/xorg/lib/xkeyboard-config/rules/Makefile: revision 1.4
Generate xml files properly. Noted by youri.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.4.1 \
src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
cvs rdiff -u -r1.3 -r1.3.38.1 \
src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
diff -u src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3 src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3.4.1
--- src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata:1.3 Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata Thu Jun 7 17:53:44 2018
@@ -1,7 +1,13 @@
-# $NetBSD: Makefile.xkbdata,v 1.3 2017/02/13 06:11:01 snj Exp $
+# $NetBSD: Makefile.xkbdata,v 1.3.4.1 2018/06/07 17:53:44 martin Exp $
XKBDISTDIR= ${X11SRCDIR.xkeyboard-config}/${XKBNAME}
.PATH: ${XKBDISTDIR}
+.SUFFIXES: .in
+
+.in:
+ ${TOOL_SED} -e 's,<_,<,g' -e 's, ${.TARGET}
+
+
FILESDIR= ${X11LIBDIR}/xkb/${XKBNAME}
Index: src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.3 src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.3.38.1
--- src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile:1.3 Sat May 29 07:58:24 2010
+++ src/external/mit/xorg/lib/xkeyboard-config/rules/Makefile Thu Jun 7 17:53:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/05/29 07:58:24 ghen Exp $
+# $NetBSD: Makefile,v 1.3.38.1 2018/06/07 17:53:44 martin Exp $
#
# When upgrading, re-assemble the files base, base.lst, evdev and
# evdev.lst by running ./configure && make in the dist directory,
@@ -7,14 +7,14 @@
.include
XKBNAME= rules
-FILES= README base base.lst base.extras.xml.in base.xml.in \
- evdev evdev.lst evdev.extras.xml.in evdev.xml.in \
- xfree98 xkb.dtd
-
-FILESNAME_base.xml.in= base.xml
-FILESNAME_base.extras.xml.in= base.extras.xml
-FILESNAME_evdev.xml.in= evdev.xml
-FILESNAME_evdev.extras.xml.in= evdev.extras.xml
+GENFILES= base.extras.xml base.xml evdev.extras.xml evdev.xml
+FILES= README base base.lst evdev evdev.lst xfree98 xkb.dtd
+FILES+= ${GENFILES}
+CLEAN+= ${GENFILES}
+
+.for i in ${GENFILES}
+FILESBUILD_${i}= yes
+.endfor
SYMLINKS= base ${FILESDIR}/xorg \
base.lst ${FILESDIR}/xorg.lst \
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Thu Jun 7 17:50:54 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #844):
sys/net/if.c: revision 1.425
Relax a lock check in if_mcast_op unless NET_MPSAFE
It seems that there remain some paths that don't satisfy the constraint that is
required only if NET_MPSAFE. So don't check it by default.
One known path is nd6_rtrequest => in6_addmulti => if_mcast_op, which is not
easy to address.
To generate a diff of this commit:
cvs rdiff -u -r1.394.2.10 -r1.394.2.11 src/sys/net/if.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.c
diff -u src/sys/net/if.c:1.394.2.10 src/sys/net/if.c:1.394.2.11
--- src/sys/net/if.c:1.394.2.10 Tue May 15 13:48:37 2018
+++ src/sys/net/if.c Thu Jun 7 17:50:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if.c,v 1.394.2.10 2018/05/15 13:48:37 martin Exp $ */
+/* $NetBSD: if.c,v 1.394.2.11 2018/06/07 17:50:54 martin Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2008 The NetBSD Foundation, Inc.
@@ -90,7 +90,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.10 2018/05/15 13:48:37 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if.c,v 1.394.2.11 2018/06/07 17:50:54 martin Exp $");
#if defined(_KERNEL_OPT)
#include "opt_inet.h"
@@ -3601,10 +3601,13 @@ if_mcast_op(ifnet_t *ifp, const unsigned
int rc;
struct ifreq ifr;
+ /* There remain some paths that don't hold IFNET_LOCK yet */
+#ifdef NET_MPSAFE
/* CARP and MROUTING still don't deal with the lock yet */
#if (!defined(NCARP) || (NCARP == 0)) && !defined(MROUTING)
KASSERT(IFNET_LOCKED(ifp));
#endif
+#endif
if (ifp->if_mcastop != NULL)
rc = (*ifp->if_mcastop)(ifp, cmd, sa);
else {
CVS commit: [netbsd-8] src/sys/netinet6
Module Name:src
Committed By: martin
Date: Thu Jun 7 17:48:31 UTC 2018
Modified Files:
src/sys/netinet6 [netbsd-8]: in6.c in6_var.h mld6.c nd6.c
Log Message:
Pull up following revision(s) (requested by ozaki-r in ticket #842):
sys/netinet6/mld6.c: revision 1.93-1.99
sys/netinet6/in6_var.h: revision 1.99,1.100
sys/netinet6/in6.c: revision 1.267,1.268
sys/netinet6/nd6.c: revision 1.249
Don't hold softnet_lock in mld_timeo
Then we can get rid of remaining abuses of mutex_owned(softnet_lock).
Release in6_multilock on callout_halt of mld_timeo to avoid a deadlock
Improve atomicity of in6_leavegroup and in6_delmulti
Avoid NULL pointer dereference on imm->i6mm_maddr
Make a refcount decrement and a removal from a list of an item atomic
in6m_refcount of an in6m can be incremented if the in6m is on the list
(if_multiaddrs) in in6_addmulti or mld_input. So we must avoid such an
increment when we try to destroy an in6m. To this end we must make
an in6m_refcount decrement and a removal of an in6m from if_multiaddrs
atomic.
Make a deletion of in6m in nd6_rtrequest atomic
Move LIST_REMOVE
mld_stoptimer releases in6_multilock temporarily, so we must LIST_REMOVE first.
Avoid double LIST_REMOVE which corrupts lists
Mark in6m as used for non-DIAGNOSTIC builds.
To generate a diff of this commit:
cvs rdiff -u -r1.245.2.10 -r1.245.2.11 src/sys/netinet6/in6.c
cvs rdiff -u -r1.97 -r1.97.6.1 src/sys/netinet6/in6_var.h
cvs rdiff -u -r1.89.2.1 -r1.89.2.2 src/sys/netinet6/mld6.c
cvs rdiff -u -r1.232.2.7 -r1.232.2.8 src/sys/netinet6/nd6.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/netinet6/in6.c
diff -u src/sys/netinet6/in6.c:1.245.2.10 src/sys/netinet6/in6.c:1.245.2.11
--- src/sys/netinet6/in6.c:1.245.2.10 Sun Apr 8 06:09:12 2018
+++ src/sys/netinet6/in6.c Thu Jun 7 17:48:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6.c,v 1.245.2.10 2018/04/08 06:09:12 snj Exp $ */
+/* $NetBSD: in6.c,v 1.245.2.11 2018/06/07 17:48:31 martin Exp $ */
/* $KAME: in6.c,v 1.198 2001/07/18 09:12:38 itojun Exp $ */
/*
@@ -62,7 +62,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.10 2018/04/08 06:09:12 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: in6.c,v 1.245.2.11 2018/06/07 17:48:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1407,9 +1407,11 @@ in6_purgeaddr(struct ifaddr *ifa)
again:
mutex_enter(_ifaddr_lock);
while ((imm = LIST_FIRST(>ia6_memberships)) != NULL) {
+ struct in6_multi *in6m __diagused = imm->i6mm_maddr;
+ KASSERT(in6m == NULL || in6m->in6m_ifp == ifp);
LIST_REMOVE(imm, i6mm_chain);
mutex_exit(_ifaddr_lock);
- KASSERT(imm->i6mm_maddr->in6m_ifp == ifp);
+
in6_leavegroup(imm);
goto again;
}
Index: src/sys/netinet6/in6_var.h
diff -u src/sys/netinet6/in6_var.h:1.97 src/sys/netinet6/in6_var.h:1.97.6.1
--- src/sys/netinet6/in6_var.h:1.97 Thu Mar 2 09:48:20 2017
+++ src/sys/netinet6/in6_var.h Thu Jun 7 17:48:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: in6_var.h,v 1.97 2017/03/02 09:48:20 ozaki-r Exp $ */
+/* $NetBSD: in6_var.h,v 1.97.6.1 2018/06/07 17:48:31 martin Exp $ */
/* $KAME: in6_var.h,v 1.81 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -691,6 +691,9 @@ void in6_purge_multi(struct ifnet *);
struct in6_multi *in6_addmulti(struct in6_addr *, struct ifnet *,
int *, int);
void in6_delmulti(struct in6_multi *);
+void in6_delmulti_locked(struct in6_multi *);
+void in6_lookup_and_delete_multi(const struct in6_addr *,
+ const struct ifnet *);
struct in6_multi_mship *in6_joingroup(struct ifnet *, struct in6_addr *,
int *, int);
int in6_leavegroup(struct in6_multi_mship *);
Index: src/sys/netinet6/mld6.c
diff -u src/sys/netinet6/mld6.c:1.89.2.1 src/sys/netinet6/mld6.c:1.89.2.2
--- src/sys/netinet6/mld6.c:1.89.2.1 Tue Jan 2 10:20:34 2018
+++ src/sys/netinet6/mld6.c Thu Jun 7 17:48:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: mld6.c,v 1.89.2.1 2018/01/02 10:20:34 snj Exp $ */
+/* $NetBSD: mld6.c,v 1.89.2.2 2018/06/07 17:48:31 martin Exp $ */
/* $KAME: mld6.c,v 1.25 2001/01/16 14:14:18 itojun Exp $ */
/*
@@ -102,7 +102,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.89.2.1 2018/01/02 10:20:34 snj Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mld6.c,v 1.89.2.2 2018/06/07 17:48:31 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -225,10 +225,7 @@ mld_stoptimer(struct in6_multi *in6m)
rw_exit(_multilock);
- if (mutex_owned(softnet_lock))
- callout_halt(>in6m_timer_ch, softnet_lock);
- else
- callout_halt(>in6m_timer_ch, NULL);
+ callout_halt(>in6m_timer_ch, NULL);
rw_enter(_multilock, RW_WRITER);
@@ -242,7 +239,7 @@ mld_timeo(void *arg)
KASSERT(in6m->in6m_refcount > 0);
- SOFTNET_KERNEL_LOCK_UNLESS_NET_MPSAFE();
+ KERNEL_LOCK_UNLESS_NET_MPSAFE();
rw_enter(_multilock, RW_WRITER);
if (in6m->in6m_timer == IN6M_TIMER_UNDEF)
goto out;
@@ -260,7 +257,7 @@ mld_timeo(void *arg)
CVS commit: [netbsd-8] src/sys
Module Name:src Committed By: martin Date: Thu Jun 7 17:42:25 UTC 2018 Modified Files: src/sys/dev/pci [netbsd-8]: if_wm.c src/sys/dev/pci/ixgbe [netbsd-8]: ixgbe.c ixv.c src/sys/net [netbsd-8]: if_bridge.c if_gif.c if_pppoe.c Log Message: Pull up following revision(s) (requested by ozaki-r in ticket #843): sys/dev/pci/ixgbe/ixv.c: revision 1.101 sys/net/if_bridge.c: revision 1.156 sys/net/if_pppoe.c: revision 1.138 sys/dev/pci/if_wm.c: revision 1.580 sys/dev/pci/ixgbe/ixgbe.c: revision 1.156 sys/net/if_gif.c: revision 1.142 Ensure to call if_register after interface initializations finish To generate a diff of this commit: cvs rdiff -u -r1.508.4.19 -r1.508.4.20 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.88.2.18 -r1.88.2.19 src/sys/dev/pci/ixgbe/ixgbe.c cvs rdiff -u -r1.56.2.15 -r1.56.2.16 src/sys/dev/pci/ixgbe/ixv.c cvs rdiff -u -r1.134.6.10 -r1.134.6.11 src/sys/net/if_bridge.c cvs rdiff -u -r1.126.2.10 -r1.126.2.11 src/sys/net/if_gif.c cvs rdiff -u -r1.125.6.7 -r1.125.6.8 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/dev/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.508.4.19 src/sys/dev/pci/if_wm.c:1.508.4.20 --- src/sys/dev/pci/if_wm.c:1.508.4.19 Thu May 17 13:58:07 2018 +++ src/sys/dev/pci/if_wm.c Thu Jun 7 17:42:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $ */ +/* $NetBSD: if_wm.c,v 1.508.4.20 2018/06/07 17:42:25 martin Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -83,7 +83,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.19 2018/05/17 13:58:07 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.508.4.20 2018/06/07 17:42:25 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_net_mpsafe.h" @@ -2825,8 +2825,8 @@ alloc_retry: } sc->sc_ipq = if_percpuq_create(>sc_ethercom.ec_if); ether_ifattach(ifp, enaddr); - if_register(ifp); ether_set_ifflags_cb(>sc_ethercom, wm_ifflags_cb); + if_register(ifp); rnd_attach_source(>rnd_source, xname, RND_TYPE_NET, RND_FLAG_DEFAULT); Index: src/sys/dev/pci/ixgbe/ixgbe.c diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.18 src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.19 --- src/sys/dev/pci/ixgbe/ixgbe.c:1.88.2.18 Tue Apr 17 08:20:06 2018 +++ src/sys/dev/pci/ixgbe/ixgbe.c Thu Jun 7 17:42:24 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: ixgbe.c,v 1.88.2.18 2018/04/17 08:20:06 martin Exp $ */ +/* $NetBSD: ixgbe.c,v 1.88.2.19 2018/06/07 17:42:24 martin Exp $ */ /** @@ -1311,7 +1311,6 @@ ixgbe_setup_interface(device_t dev, stru * We use per TX queue softint, so if_deferred_start_init() isn't * used. */ - if_register(ifp); ether_set_ifflags_cb(ec, ixgbe_ifflags_cb); adapter->max_frame_size = ifp->if_mtu + ETHER_HDR_LEN + ETHER_CRC_LEN; @@ -1360,6 +1359,8 @@ ixgbe_setup_interface(device_t dev, stru /* Set autoselect media by default */ ifmedia_set(>media, IFM_ETHER | IFM_AUTO); + if_register(ifp); + return (0); } /* ixgbe_setup_interface */ Index: src/sys/dev/pci/ixgbe/ixv.c diff -u src/sys/dev/pci/ixgbe/ixv.c:1.56.2.15 src/sys/dev/pci/ixgbe/ixv.c:1.56.2.16 --- src/sys/dev/pci/ixgbe/ixv.c:1.56.2.15 Tue May 15 13:37:24 2018 +++ src/sys/dev/pci/ixgbe/ixv.c Thu Jun 7 17:42:24 2018 @@ -1,4 +1,4 @@ -/*$NetBSD: ixv.c,v 1.56.2.15 2018/05/15 13:37:24 martin Exp $*/ +/*$NetBSD: ixv.c,v 1.56.2.16 2018/06/07 17:42:24 martin Exp $*/ /** @@ -1526,7 +1526,6 @@ ixv_setup_interface(device_t dev, struct * We use per TX queue softint, so if_deferred_start_init() isn't * used. */ - if_register(ifp); ether_set_ifflags_cb(ec, ixv_ifflags_cb); adapter->max_frame_size = ifp->if_mtu + IXGBE_MTU_HDR; @@ -1565,6 +1564,8 @@ ixv_setup_interface(device_t dev, struct ifmedia_add(>media, IFM_ETHER | IFM_AUTO, 0, NULL); ifmedia_set(>media, IFM_ETHER | IFM_AUTO); + if_register(ifp); + return 0; } /* ixv_setup_interface */ Index: src/sys/net/if_bridge.c diff -u src/sys/net/if_bridge.c:1.134.6.10 src/sys/net/if_bridge.c:1.134.6.11 --- src/sys/net/if_bridge.c:1.134.6.10 Tue May 15 13:48:37 2018 +++ src/sys/net/if_bridge.c Thu Jun 7 17:42:25 2018 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bridge.c,v 1.134.6.10 2018/05/15 13:48:37 martin Exp $ */ +/* $NetBSD: if_bridge.c,v 1.134.6.11 2018/06/07 17:42:25 martin Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -80,7 +80,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.10 2018/05/15 13:48:37 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: if_bridge.c,v 1.134.6.11 2018/06/07 17:42:25 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_bridge_ipf.h" @@ -470,9 +470,8 @@ bridge_clone_create(struct if_clone *ifc return
CVS commit: src/sys/arch/macppc/macppc
Module Name:src
Committed By: macallan
Date: Thu Jun 7 17:02:12 UTC 2018
Modified Files:
src/sys/arch/macppc/macppc: pic_u3_ht.c
Log Message:
reduce debug spam, use IPI_VECTOR
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/macppc/macppc/pic_u3_ht.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/macppc/macppc/pic_u3_ht.c
diff -u src/sys/arch/macppc/macppc/pic_u3_ht.c:1.5 src/sys/arch/macppc/macppc/pic_u3_ht.c:1.6
--- src/sys/arch/macppc/macppc/pic_u3_ht.c:1.5 Fri May 11 22:48:38 2018
+++ src/sys/arch/macppc/macppc/pic_u3_ht.c Thu Jun 7 17:02:12 2018
@@ -218,7 +218,7 @@ setup_u3_ht(uint32_t addr, uint32_t len,
x & 0xff, ((x & 0x1f00) >> 8) + 1, ((x & 0x07ff) >> 16) + 1);
/* up to 128 interrupt sources, plus IPI */
- pic->pic_numintrs = 129;
+ pic->pic_numintrs = IPI_VECTOR + 1;
pic->pic_cookie = (void *) addr;
pic->pic_enable_irq = u3_ht_enable_irq;
pic->pic_reenable_irq = u3_ht_enable_irq;
@@ -437,7 +437,7 @@ u3_ht_establish_irq(struct pic_ops *pic,
if (u3_ht_is_ht_irq(u3_ht, irq))
u3_ht_establish_ht_irq(u3_ht, irq, type);
- aprint_error("%s: setting IRQ %d %d to priority %d %x\n", __func__, irq,
+ DPRINTF("%s: setting IRQ %d %d to priority %d %x\n", __func__, irq,
type, realpri, x);
}
CVS commit: [netbsd-8] src/doc
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:25:06 UTC 2018
Modified Files:
src/doc [netbsd-8]: CHANGES-8.0
Log Message:
Tickets #832, #834, #836, #837, #838, #839 and #840
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.203 -r1.1.2.204 src/doc/CHANGES-8.0
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-8.0
diff -u src/doc/CHANGES-8.0:1.1.2.203 src/doc/CHANGES-8.0:1.1.2.204
--- src/doc/CHANGES-8.0:1.1.2.203 Tue Jun 5 08:14:25 2018
+++ src/doc/CHANGES-8.0 Thu Jun 7 16:25:06 2018
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-8.0,v 1.1.2.203 2018/06/05 08:14:25 bouyer Exp $
+# $NetBSD: CHANGES-8.0,v 1.1.2.204 2018/06/07 16:25:06 martin Exp $
A complete list of changes from the initial NetBSD 8.0 branch on 2017-06-04
until the 8.0 release:
@@ -13522,3 +13522,55 @@ usr.sbin/sysinst/msg.mi.pl 1.9
Auto-select the bootblock details like the current console.
[martin, ticket #860]
+sys/arch/x86/x86/efi.c1.15 (patch)
+sys/dev/pci/pci_map.c1.34,1.35
+sys/dev/pci/pcivar.h1.112
+
+ Enable the appropriate memory or I/O space decode in the PCI
+ Command/Status Register upon mapping a BAR if booted via EFI.
+ [jakllsch, ticket #832]
+
+share/mk/bsd.obj.mk1.52
+share/mk/bsd.sys.mk1.276,1.277
+share/mk/sys.mk 1.131
+usr.bin/make/var.c1.219
+usr.sbin/crash/Makefile1.40
+
+ Various fixes for reproducable builds:
+ - Prevent 'make obj' creating an objdir inside an objdir.
+ - Delete ${DESTDIR} for lint.
+ - Also substitute ${X11SRCDIR} for the random seed for reproducible
+ builds so that the random seed is consistent.
+ - Since ${MAKE} converts $$ -> $ during parsing we need to put it
+ back to preserve the original variable value with :Q.
+ - Be more selective about remapping object directories otherwise we
+ pick objdump and objcopy with the regex.
+ [christos, ticket #834]
+
+external/gpl2/gmake/dist/glob/glob.c 1.5
+
+ Fix build failure on Ubuntu 18.04.
+ [nonaka, ticket #836]
+
+sys/netinet/udp_usrreq.c 1.237
+
+ Fix bad/wrong memory deallocations and dangling pointer
+ issues in NAT-T.
+ [maxv, ticket #837]
+
+etc/rc.d/sshd 1.28
+
+ Do not show ASCII art when generating a host key, instead
+ print the key fingerprint.
+ [jmcneill, ticket #838]
+
+sys/net/if_ipsec.c1.14
+
+ Fix the port numbers when using NAT-T.
+ [knakahara, ticket #839]
+
+sys/net/if_ipsec.c1.15,1.16
+
+ Fix a panic when ipsecif(4) adds discard policy.
+ [knakahara, ticket #840]
+
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:22:43 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if_ipsec.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #840):
sys/net/if_ipsec.c: revision 1.15,1.16
Fix panic when ipsecif(4) adds discard policy. Pointed out by ohishi@IIJ,
thanks.
Reviewd by ohishi@IIJ. Sorry, I jumped the gun and committed.
Fix the following two issues.
- remove extra padding of sizeof(xisr) when adding ipsec policy
- add padding for xpl when adding discard policy
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.8 -r1.3.2.9 src/sys/net/if_ipsec.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_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.3.2.8 src/sys/net/if_ipsec.c:1.3.2.9
--- src/sys/net/if_ipsec.c:1.3.2.8 Thu Jun 7 16:19:47 2018
+++ src/sys/net/if_ipsec.c Thu Jun 7 16:22:43 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.3.2.8 2018/06/07 16:19:47 martin Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.3.2.9 2018/06/07 16:22:43 martin Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.8 2018/06/07 16:19:47 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.9 2018/06/07 16:22:43 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1591,6 +1591,7 @@ if_ipsec_add_sp0(struct sockaddr *src, i
if_ipsec_add_pad(m, padlen);
if_ipsec_add_mbuf(m, , sizeof(xpl));
+ padlen = PFKEY_UNUNIT64(xpl.sadb_x_policy_len) - sizeof(xpl);
if (policy == IPSEC_POLICY_IPSEC) {
if_ipsec_add_mbuf(m, , sizeof(xisr));
/*
@@ -1599,10 +1600,9 @@ if_ipsec_add_sp0(struct sockaddr *src, i
*/
if_ipsec_add_mbuf_addr_port(m, src, sport, false);
if_ipsec_add_mbuf_addr_port(m, dst, dport, false);
- }
- padlen = PFKEY_UNUNIT64(xpl.sadb_x_policy_len) - sizeof(xpl);
- if (src != NULL && dst != NULL)
+ padlen -= PFKEY_ALIGN8(sizeof(xisr));
padlen -= PFKEY_ALIGN8(src->sa_len + dst->sa_len);
+ }
if_ipsec_add_pad(m, padlen);
/* key_kpi_spdadd() has already done KEY_SP_REF(). */
CVS commit: [netbsd-8] src/sys/net
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:19:47 UTC 2018
Modified Files:
src/sys/net [netbsd-8]: if_ipsec.c
Log Message:
Pull up following revision(s) (requested by knakahara in ticket #839):
sys/net/if_ipsec.c: revision 1.14
ipsecif(4) must not set port number to spidx even if NAT-T. Pointed out by
ohishi@IIJ, thanks.
To generate a diff of this commit:
cvs rdiff -u -r1.3.2.7 -r1.3.2.8 src/sys/net/if_ipsec.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_ipsec.c
diff -u src/sys/net/if_ipsec.c:1.3.2.7 src/sys/net/if_ipsec.c:1.3.2.8
--- src/sys/net/if_ipsec.c:1.3.2.7 Thu May 17 14:07:03 2018
+++ src/sys/net/if_ipsec.c Thu Jun 7 16:19:47 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ipsec.c,v 1.3.2.7 2018/05/17 14:07:03 martin Exp $ */
+/* $NetBSD: if_ipsec.c,v 1.3.2.8 2018/06/07 16:19:47 martin Exp $ */
/*
* Copyright (c) 2017 Internet Initiative Japan Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.7 2018/05/17 14:07:03 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ipsec.c,v 1.3.2.8 2018/06/07 16:19:47 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -1574,13 +1574,18 @@ if_ipsec_add_sp0(struct sockaddr *src, i
m_copyback(m, 0, sizeof(msg), );
if_ipsec_add_mbuf(m, , sizeof(xsrc));
- if_ipsec_add_mbuf_addr_port(m, src, sport, true);
+ /*
+ * secpolicy.spidx.{src, dst} must not be set port number,
+ * even if it is used for NAT-T.
+ */
+ if_ipsec_add_mbuf_addr_port(m, src, 0, true);
padlen = PFKEY_UNUNIT64(xsrc.sadb_address_len)
- (sizeof(xsrc) + PFKEY_ALIGN8(src->sa_len));
if_ipsec_add_pad(m, padlen);
if_ipsec_add_mbuf(m, , sizeof(xdst));
- if_ipsec_add_mbuf_addr_port(m, dst, dport, true);
+ /* ditto */
+ if_ipsec_add_mbuf_addr_port(m, dst, 0, true);
padlen = PFKEY_UNUNIT64(xdst.sadb_address_len)
- (sizeof(xdst) + PFKEY_ALIGN8(dst->sa_len));
if_ipsec_add_pad(m, padlen);
@@ -1588,6 +1593,10 @@ if_ipsec_add_sp0(struct sockaddr *src, i
if_ipsec_add_mbuf(m, , sizeof(xpl));
if (policy == IPSEC_POLICY_IPSEC) {
if_ipsec_add_mbuf(m, , sizeof(xisr));
+ /*
+ * secpolicy.req->saidx.{src, dst} must be set port number,
+ * when it is used for NAT-T.
+ */
if_ipsec_add_mbuf_addr_port(m, src, sport, false);
if_ipsec_add_mbuf_addr_port(m, dst, dport, false);
}
CVS commit: [netbsd-8] src/etc/rc.d
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:11:49 UTC 2018
Modified Files:
src/etc/rc.d [netbsd-8]: sshd
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #838):
etc/rc.d/sshd: revision 1.28
Silence ssh-keygen output when host keys are generated. Instead, print only
key fingerprints. This replaces dozens of lines out ASCII art output with
something more reasonable:
armv7# service sshd start
ssh-keygen: 1024 SHA256:ynP4BQ2B0Fknnf9PfF4QoUDlYi0+7rNfYXTOYP2cDic root@armv7
(DSA)
ssh-keygen: 521 SHA256:Eoj382aaJNlSxuq/aYj3AXgxfMJAkyVPoCQd2BNjJiA root@armv7
(ECDSA)
ssh-keygen: 256 SHA256:+e9/qTbbN/g6xvkadtHsmIQ+Pc0afZRxbXJsk2HKIzY root@armv7
(ED25519)
ssh-keygen: 2048 SHA256:urNaF/m6oiCe5hXFZBxGLW2PvLz0ibtRFrqYw6R+qTw root@armv7
(RSA)
ssh-keygen: 256 SHA256:Su2Nal2W3vrFz8ukpcSXngl1/bu6xUm1nSvbxTHe9Js root@armv7
(XMSS)
Starting sshd.
To generate a diff of this commit:
cvs rdiff -u -r1.23.8.2 -r1.23.8.3 src/etc/rc.d/sshd
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/sshd
diff -u src/etc/rc.d/sshd:1.23.8.2 src/etc/rc.d/sshd:1.23.8.3
--- src/etc/rc.d/sshd:1.23.8.2 Sun Dec 10 09:44:48 2017
+++ src/etc/rc.d/sshd Thu Jun 7 16:11:49 2018
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: sshd,v 1.23.8.2 2017/12/10 09:44:48 snj Exp $
+# $NetBSD: sshd,v 1.23.8.3 2018/06/07 16:11:49 martin Exp $
#
# PROVIDE: sshd
@@ -32,7 +32,8 @@ sshd_keygen()
0) bitarg="${ssh_keygen_flags}";;
*) bitarg="-b ${bits}";;
esac
- "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N ''
+ "${keygen}" -t "${type}" ${bitarg} -f "${f}" -N '' -q && \
+ printf "ssh-keygen: " && "${keygen}" -f "${f}" -l
fi
done << _EOF
dsa 1024 ssh_host_dsa_key 2 DSA
CVS commit: [netbsd-8] src/sys/netinet
Module Name:src
Committed By: martin
Date: Thu Jun 7 16:05:09 UTC 2018
Modified Files:
src/sys/netinet [netbsd-8]: udp_usrreq.c
Log Message:
Pull up following revision(s) (requested by maxv in ticket #837):
sys/netinet/udp_usrreq.c: revision 1.237
Fix three pretty bad mistakes in NAT-T:
* If we got a keepalive packet, we need to call m_freem, not m_free.
Here the next mbufs in the chain are not freed. Seems easy to remotely
DoS the system by sending fragmented keepalives in a loop.
* If !ipsec_used, free the mbuf.
* In udp_input, we need to update 'uh', because udp4_realinput may have
modified the chain. Perhaps we also need to re-enforce alignment, so
add an XXX.
To generate a diff of this commit:
cvs rdiff -u -r1.233.4.2 -r1.233.4.3 src/sys/netinet/udp_usrreq.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/udp_usrreq.c
diff -u src/sys/netinet/udp_usrreq.c:1.233.4.2 src/sys/netinet/udp_usrreq.c:1.233.4.3
--- src/sys/netinet/udp_usrreq.c:1.233.4.2 Mon Apr 9 13:34:10 2018
+++ src/sys/netinet/udp_usrreq.c Thu Jun 7 16:05:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: udp_usrreq.c,v 1.233.4.2 2018/04/09 13:34:10 bouyer Exp $ */
+/* $NetBSD: udp_usrreq.c,v 1.233.4.3 2018/06/07 16:05:09 martin Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -66,7 +66,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.233.4.2 2018/04/09 13:34:10 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: udp_usrreq.c,v 1.233.4.3 2018/06/07 16:05:09 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -410,7 +410,15 @@ udp_input(struct mbuf *m, ...)
*/
return;
}
+
ip = mtod(m, struct ip *);
+ IP6_EXTHDR_GET(uh, struct udphdr *, m, iphlen, sizeof(struct udphdr));
+ if (uh == NULL) {
+ UDP_STATINC(UDP_STAT_HDROPS);
+ return;
+ }
+ /* XXX Re-enforce alignment? */
+
#ifdef INET6
if (IN_MULTICAST(ip->ip_dst.s_addr) || n == 0) {
struct sockaddr_in6 src6, dst6;
@@ -1287,7 +1295,7 @@ udp4_espinudp(struct mbuf **mp, int off,
/* Ignore keepalive packets */
if ((len == 1) && (*(unsigned char *)data == 0xff)) {
- m_free(m);
+ m_freem(m);
*mp = NULL; /* avoid any further processiong by caller ... */
return 1;
}
@@ -1368,7 +1376,8 @@ udp4_espinudp(struct mbuf **mp, int off,
if (ipsec_used)
ipsec4_common_input(m, iphdrlen, IPPROTO_ESP);
- /* XXX: else */
+ else
+ m_freem(m);
/* We handled it, it shouldn't be handled by UDP */
*mp = NULL; /* avoid free by caller ... */
CVS commit: [netbsd-8] src/external/gpl2/gmake/dist/glob
Module Name:src Committed By: martin Date: Thu Jun 7 16:02:16 UTC 2018 Modified Files: src/external/gpl2/gmake/dist/glob [netbsd-8]: glob.c Log Message: Pull up following revision(s) (requested by nonaka in ticket #836): external/gpl2/gmake/dist/glob/glob.c: revision 1.5 gmake: __alloca and __stat are provided only when building with GLIBC. Fix a build failure on Ubuntu 18.04. To generate a diff of this commit: cvs rdiff -u -r1.1.1.1.8.1 -r1.1.1.1.8.2 \ src/external/gpl2/gmake/dist/glob/glob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl2/gmake/dist/glob/glob.c diff -u src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1.8.1 src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1.8.2 --- src/external/gpl2/gmake/dist/glob/glob.c:1.1.1.1.8.1 Tue Apr 17 08:04:34 2018 +++ src/external/gpl2/gmake/dist/glob/glob.c Thu Jun 7 16:02:16 2018 @@ -207,7 +207,7 @@ my_realloc (p, n) #endif /* __GNU_LIBRARY__ */ -#if !defined __alloca && !(defined __GNU_LIBRARY__ || defined __GLIBC__) +#if !defined __alloca # ifdef __GNUC__ # undef alloca @@ -230,7 +230,7 @@ extern char *alloca (); #endif -#ifndef __GNU_LIBRARY__ +#if !defined __stat # define __stat stat # ifdef STAT_MACROS_BROKEN # undef S_ISDIR
CVS commit: [netbsd-8] src
Module Name:src
Committed By: martin
Date: Thu Jun 7 15:59:27 UTC 2018
Modified Files:
src/share/mk [netbsd-8]: bsd.obj.mk bsd.sys.mk sys.mk
src/usr.bin/make [netbsd-8]: var.c
src/usr.sbin/crash [netbsd-8]: Makefile
Log Message:
Pull up following revision(s) (requested by christos in ticket #834):
usr.bin/make/var.c: revision 1.219
share/mk/bsd.obj.mk: revision 1.52
usr.sbin/crash/Makefile: revision 1.40
share/mk/sys.mk: revision 1.131
share/mk/bsd.sys.mk: revision 1.276
share/mk/bsd.sys.mk: revision 1.277
Prevent 'make obj' creating an objdir inside an objdir. This happens the
second time we call 'make obj' in /usr/src/rescue with MAKEOBJDIR set.
XXX: pullup-8
-
Need to delete ${DESTDIR} for lint
XXX: pullup-8
-
Fix reproducible builds
XXX: pullup-8
-
Also substitute ${X11SRCDIR} for the random seed for reproducible builds so
that the random seed is consistent.
XXX: pullup-8
-
Since ${MAKE} converts $$ -> $ during parsing we need to put it back to
preserve the original variable value with :Q.
XXX: pullup-8
-
Be more selective about remapping object directories otherwise we pick
objdump and objcopy with the regex.
XXX: pullup-8
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.51.6.1 src/share/mk/bsd.obj.mk
cvs rdiff -u -r1.271 -r1.271.4.1 src/share/mk/bsd.sys.mk
cvs rdiff -u -r1.129 -r1.129.8.1 src/share/mk/sys.mk
cvs rdiff -u -r1.215 -r1.215.4.1 src/usr.bin/make/var.c
cvs rdiff -u -r1.36.4.1 -r1.36.4.2 src/usr.sbin/crash/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.obj.mk
diff -u src/share/mk/bsd.obj.mk:1.51 src/share/mk/bsd.obj.mk:1.51.6.1
--- src/share/mk/bsd.obj.mk:1.51 Sat Dec 10 23:12:39 2016
+++ src/share/mk/bsd.obj.mk Thu Jun 7 15:59:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.obj.mk,v 1.51 2016/12/10 23:12:39 christos Exp $
+# $NetBSD: bsd.obj.mk,v 1.51.6.1 2018/06/07 15:59:27 martin Exp $
.if !defined(_BSD_OBJ_MK_)
_BSD_OBJ_MK_=1
@@ -27,6 +27,7 @@ obj:
exit 1; \
fi;
.endif
+.if ${.CURDIR} == ${.OBJDIR}
@if [ ! -d ${__objdir} ]; then \
mkdir -p ${__objdir}; \
if [ ! -d ${__objdir} ]; then \
@@ -34,6 +35,7 @@ obj:
fi; \
${_MKSHMSG} " objdir ${__objdir}"; \
fi
+.endif
.else
PAWD?= /bin/pwd
Index: src/share/mk/bsd.sys.mk
diff -u src/share/mk/bsd.sys.mk:1.271 src/share/mk/bsd.sys.mk:1.271.4.1
--- src/share/mk/bsd.sys.mk:1.271 Thu Apr 20 09:29:11 2017
+++ src/share/mk/bsd.sys.mk Thu Jun 7 15:59:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.sys.mk,v 1.271 2017/04/20 09:29:11 ozaki-r Exp $
+# $NetBSD: bsd.sys.mk,v 1.271.4.1 2018/06/07 15:59:27 martin Exp $
#
# Build definitions used for NetBSD source tree builds.
@@ -29,9 +29,12 @@ CPPFLAGS+= -Wp,-iremap,${X11SRCDIR}:/usr
REPROFLAGS+= -fdebug-prefix-map=\$$NETBSDSRCDIR=/usr/src
REPROFLAGS+= -fdebug-prefix-map=\$$X11SRCDIR=/usr/xsrc
LINTFLAGS+= -R${NETBSDSRCDIR}=/usr/src -R${X11SRCDIR}=/usr/xsrc
+LINTFLAGS+= -R${DESTDIR}=
-REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj.*=/usr/obj/\1'
-REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj.*/(.*)=/usr/obj/\1/\2'
+REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj$$=/usr/obj/\1'
+REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj/(.*)=/usr/obj/\1/\2'
+REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj\..*=/usr/obj/\1'
+REPROFLAGS+= -fdebug-regex-map='/usr/src/(.*)/obj\..*/(.*)=/usr/obj/\1/\2'
CFLAGS+= ${REPROFLAGS}
CXXFLAGS+= ${REPROFLAGS}
Index: src/share/mk/sys.mk
diff -u src/share/mk/sys.mk:1.129 src/share/mk/sys.mk:1.129.8.1
--- src/share/mk/sys.mk:1.129 Wed Mar 30 17:35:43 2016
+++ src/share/mk/sys.mk Thu Jun 7 15:59:27 2018
@@ -1,4 +1,4 @@
-# $NetBSD: sys.mk,v 1.129 2016/03/30 17:35:43 martin Exp $
+# $NetBSD: sys.mk,v 1.129.8.1 2018/06/07 15:59:27 martin Exp $
# @(#)sys.mk 8.2 (Berkeley) 3/21/94
#
# This file contains the basic rules for make(1) and is read first
@@ -52,7 +52,8 @@ CXXFLAGS?= ${CFLAGS:N-Wno-traditional:N-
__ALLSRC1= ${empty(DESTDIR):?${.ALLSRC}:${.ALLSRC:S|^${DESTDIR}|^destdir|}}
__ALLSRC2= ${empty(MAKEOBJDIR):?${__ALLSRC1}:${__ALLSRC1:S|^${MAKEOBJDIR}|^obj|}}
__ALLSRC3= ${empty(NETBSDSRCDIR):?${__ALLSRC2}:${__ALLSRC2:S|^${NETBSDSRCDIR}|^src|}}
-__BUILDSEED= ${BUILDSEED}/${__ALLSRC3:O}/${.TARGET}
+__ALLSRC4= ${empty(X11SRCDIR):?${__ALLSRC3}:${__ALLSRC3:S|^${X11SRCDIR}|^xsrc|}}
+__BUILDSEED= ${BUILDSEED}/${__ALLSRC4:O}/${.TARGET}
_CXXSEED?= ${BUILDSEED:D-frandom-seed=${__BUILDSEED:hash}}
COMPILE.cc?= ${CXX} ${_CXXSEED} ${CXXFLAGS} ${CPPFLAGS} -c
Index: src/usr.bin/make/var.c
diff -u src/usr.bin/make/var.c:1.215 src/usr.bin/make/var.c:1.215.4.1
--- src/usr.bin/make/var.c:1.215 Sun Apr 16 21:39:49 2017
+++ src/usr.bin/make/var.c Thu Jun 7 15:59:27 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: var.c,v 1.215 2017/04/16 21:39:49 riastradh Exp $ */
+/* $NetBSD: var.c,v 1.215.4.1 2018/06/07 15:59:27 martin Exp $ */
/*
*
CVS commit: [netbsd-8] src/sys
Module Name:src
Committed By: martin
Date: Thu Jun 7 15:52:54 UTC 2018
Modified Files:
src/sys/arch/x86/x86 [netbsd-8]: efi.c
src/sys/dev/pci [netbsd-8]: pci_map.c pcivar.h
Log Message:
Pull up following revision(s) (requested by jakllsch in ticket #832):
sys/dev/pci/pcivar.h: revision 1.112
sys/dev/pci/pci_map.c: revision 1.34,1.35
sys/arch/x86/x86/efi.c: revision 1.15
Enable the appropriate memory or I/O space decode in the PCI
Command/Status Register upon mapping a BAR.
This should fix PR #53286. It's also possible there are other similar
PRs that might be fixed by this.
-
Refine previous change to enable PCI window decoding in Command
Register upon mapping; conditionalize on a global variable, that is set
to true on x86 machines booting under EFI.
For now, initialize the global variable at compile time to false. This
is intended to limit potential problems for other NetBSD ports, should
this changeset be pulled up to netbsd-8.
Related to PR #53286.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.6.1 src/sys/arch/x86/x86/efi.c
cvs rdiff -u -r1.33 -r1.33.6.1 src/sys/dev/pci/pci_map.c
cvs rdiff -u -r1.109 -r1.109.8.1 src/sys/dev/pci/pcivar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/efi.c
diff -u src/sys/arch/x86/x86/efi.c:1.11 src/sys/arch/x86/x86/efi.c:1.11.6.1
--- src/sys/arch/x86/x86/efi.c:1.11 Sat Mar 11 07:21:10 2017
+++ src/sys/arch/x86/x86/efi.c Thu Jun 7 15:52:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: efi.c,v 1.11 2017/03/11 07:21:10 nonaka Exp $ */
+/* $NetBSD: efi.c,v 1.11.6.1 2018/06/07 15:52:54 martin Exp $ */
/*-
* Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -27,7 +27,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.11 2017/03/11 07:21:10 nonaka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.11.6.1 2018/06/07 15:52:54 martin Exp $");
#include
#include
@@ -40,6 +40,7 @@ __KERNEL_RCSID(0, "$NetBSD: efi.c,v 1.11
#include
#include
+#include /* for pci_mapreg_map_enable_decode */
const struct uuid EFI_UUID_ACPI20 = EFI_TABLE_ACPI20;
const struct uuid EFI_UUID_ACPI10 = EFI_TABLE_ACPI10;
@@ -403,6 +404,7 @@ efi_probe(void)
efi_relva((vaddr_t) efi_systbl_va);
return false;
}
+ pci_mapreg_map_enable_decode = true; /* PR port-amd64/53286 */
return true;
}
Index: src/sys/dev/pci/pci_map.c
diff -u src/sys/dev/pci/pci_map.c:1.33 src/sys/dev/pci/pci_map.c:1.33.6.1
--- src/sys/dev/pci/pci_map.c:1.33 Fri Mar 17 11:21:45 2017
+++ src/sys/dev/pci/pci_map.c Thu Jun 7 15:52:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_map.c,v 1.33 2017/03/17 11:21:45 msaitoh Exp $ */
+/* $NetBSD: pci_map.c,v 1.33.6.1 2018/06/07 15:52:54 martin Exp $ */
/*-
* Copyright (c) 1998, 2000 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.33 2017/03/17 11:21:45 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_map.c,v 1.33.6.1 2018/06/07 15:52:54 martin Exp $");
#include
#include
@@ -43,6 +43,8 @@ __KERNEL_RCSID(0, "$NetBSD: pci_map.c,v
#include
#include
+bool pci_mapreg_map_enable_decode = false;
+
static int
pci_io_find(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t type,
bus_addr_t *basep, bus_size_t *sizep, int *flagsp)
@@ -287,7 +289,8 @@ pci_mapreg_submap(const struct pci_attac
bus_space_handle_t handle;
bus_addr_t base;
bus_size_t realmaxsize;
- int flags;
+ pcireg_t csr;
+ int flags, s;
if (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO) {
if ((pa->pa_flags & PCI_FLAGS_IO_OKAY) == 0)
@@ -307,7 +310,6 @@ pci_mapreg_submap(const struct pci_attac
if (reg == PCI_MAPREG_ROM) {
pcireg_t mask;
- int s;
/* we have to enable the ROM address decoder... */
s = splhigh();
mask = pci_conf_read(pa->pa_pc, pa->pa_tag, reg);
@@ -329,6 +331,15 @@ pci_mapreg_submap(const struct pci_attac
if (bus_space_map(tag, base, reqsize, busflags | flags, ))
return 1;
+ if (pci_mapreg_map_enable_decode) {
+ s = splhigh();
+ csr = pci_conf_read(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG);
+ csr |= (PCI_MAPREG_TYPE(type) == PCI_MAPREG_TYPE_IO) ?
+ PCI_COMMAND_IO_ENABLE : PCI_COMMAND_MEM_ENABLE;
+ pci_conf_write(pa->pa_pc, pa->pa_tag, PCI_COMMAND_STATUS_REG, csr);
+ splx(s);
+ }
+
if (tagp != NULL)
*tagp = tag;
if (handlep != NULL)
Index: src/sys/dev/pci/pcivar.h
diff -u src/sys/dev/pci/pcivar.h:1.109 src/sys/dev/pci/pcivar.h:1.109.8.1
--- src/sys/dev/pci/pcivar.h:1.109 Fri Nov 25 12:10:59 2016
+++ src/sys/dev/pci/pcivar.h Thu Jun 7 15:52:54 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcivar.h,v 1.109 2016/11/25 12:10:59 knakahara Exp $ */
+/* $NetBSD: pcivar.h,v 1.109.8.1 2018/06/07 15:52:54 martin Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -256,6 +256,8 @@ struct pci_softc {
extern struct cfdriver pci_cd;
+extern bool
CVS commit: src/crypto/external/bsd/openssh/dist
Module Name:src
Committed By: riastradh
Date: Thu Jun 7 15:26:09 UTC 2018
Modified Files:
src/crypto/external/bsd/openssh/dist: servconf.c
Log Message:
Disable loading XMSS keys by default too.
Nobody should be using XMSS host keys without an explicit decision,
because they're qualitatively different from all other types of host
keys in that they require keeping state.
This also eliminates a harmless but confusing warning that began
after we stopped generating XMSS keys by default.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/crypto/external/bsd/openssh/dist/servconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/servconf.c
diff -u src/crypto/external/bsd/openssh/dist/servconf.c:1.27 src/crypto/external/bsd/openssh/dist/servconf.c:1.28
--- src/crypto/external/bsd/openssh/dist/servconf.c:1.27 Sun Apr 8 21:56:48 2018
+++ src/crypto/external/bsd/openssh/dist/servconf.c Thu Jun 7 15:26:09 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $ */
+/* $NetBSD: servconf.c,v 1.28 2018/06/07 15:26:09 riastradh Exp $ */
/* $OpenBSD: servconf.c,v 1.326 2018/03/01 20:32:16 markus Exp $ */
/*
@@ -13,7 +13,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: servconf.c,v 1.27 2018/04/08 21:56:48 joerg Exp $");
+__RCSID("$NetBSD: servconf.c,v 1.28 2018/06/07 15:26:09 riastradh Exp $");
#include
#include
#include
@@ -294,10 +294,6 @@ fill_default_server_options(ServerOption
_PATH_HOST_ECDSA_KEY_FILE);
servconf_add_hostkey("[default]", 0, options,
_PATH_HOST_ED25519_KEY_FILE);
-#ifdef WITH_XMSS
- servconf_add_hostkey("[default]", 0, options,
- _PATH_HOST_XMSS_KEY_FILE);
-#endif /* WITH_XMSS */
}
/* No certificates by default */
if (options->num_ports == 0)
CVS commit: src/sys/arch
Module Name:src Committed By: thorpej Date: Thu Jun 7 13:36:29 UTC 2018 Modified Files: src/sys/arch/acorn32/conf: EB7500ATX GENERIC INSTALL LOWMEM_WSCONS NC src/sys/arch/alpha/conf: GENERIC src/sys/arch/amd64/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/evbarm/conf: ARMADAXP ARMADILLO210 ARMADILLO9 CUBOX DNS323 GUMSTIX KUROBOX_PRO KURONAS_X4 MMNET_GENERIC MPCSA_GENERIC MV2120 TEAMASA_NPWR VTC100 src/sys/arch/evbmips/conf: GDIUM LOONGSON src/sys/arch/hpcarm/conf: NETBOOKPRO src/sys/arch/i386/conf: ALL GENERIC XEN3_DOM0 src/sys/arch/mmeye/conf: MMEYE_WLF src/sys/arch/zaurus/conf: GENERIC INSTALL INSTALL_C700 Log Message: Revert changes that pinned-down i2c parent specs. The i2c subsystem has been enhanced to make this unnecessary. To generate a diff of this commit: cvs rdiff -u -r1.65 -r1.66 src/sys/arch/acorn32/conf/EB7500ATX cvs rdiff -u -r1.125 -r1.126 src/sys/arch/acorn32/conf/GENERIC cvs rdiff -u -r1.79 -r1.80 src/sys/arch/acorn32/conf/INSTALL cvs rdiff -u -r1.73 -r1.74 src/sys/arch/acorn32/conf/LOWMEM_WSCONS cvs rdiff -u -r1.72 -r1.73 src/sys/arch/acorn32/conf/NC cvs rdiff -u -r1.382 -r1.383 src/sys/arch/alpha/conf/GENERIC cvs rdiff -u -r1.88 -r1.89 src/sys/arch/amd64/conf/ALL cvs rdiff -u -r1.492 -r1.493 src/sys/arch/amd64/conf/GENERIC cvs rdiff -u -r1.150 -r1.151 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.22 -r1.23 src/sys/arch/evbarm/conf/ARMADAXP cvs rdiff -u -r1.39 -r1.40 src/sys/arch/evbarm/conf/ARMADILLO210 cvs rdiff -u -r1.56 -r1.57 src/sys/arch/evbarm/conf/ARMADILLO9 \ src/sys/arch/evbarm/conf/MPCSA_GENERIC cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/CUBOX cvs rdiff -u -r1.10 -r1.11 src/sys/arch/evbarm/conf/DNS323 cvs rdiff -u -r1.95 -r1.96 src/sys/arch/evbarm/conf/GUMSTIX cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/conf/KUROBOX_PRO cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/conf/KURONAS_X4 cvs rdiff -u -r1.35 -r1.36 src/sys/arch/evbarm/conf/MMNET_GENERIC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/evbarm/conf/MV2120 cvs rdiff -u -r1.93 -r1.94 src/sys/arch/evbarm/conf/TEAMASA_NPWR cvs rdiff -u -r1.16 -r1.17 src/sys/arch/evbarm/conf/VTC100 cvs rdiff -u -r1.30 -r1.31 src/sys/arch/evbmips/conf/GDIUM cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbmips/conf/LOONGSON cvs rdiff -u -r1.23 -r1.24 src/sys/arch/hpcarm/conf/NETBOOKPRO cvs rdiff -u -r1.439 -r1.440 src/sys/arch/i386/conf/ALL cvs rdiff -u -r1.1179 -r1.1180 src/sys/arch/i386/conf/GENERIC cvs rdiff -u -r1.128 -r1.129 src/sys/arch/i386/conf/XEN3_DOM0 cvs rdiff -u -r1.24 -r1.25 src/sys/arch/mmeye/conf/MMEYE_WLF cvs rdiff -u -r1.76 -r1.77 src/sys/arch/zaurus/conf/GENERIC cvs rdiff -u -r1.36 -r1.37 src/sys/arch/zaurus/conf/INSTALL cvs rdiff -u -r1.3 -r1.4 src/sys/arch/zaurus/conf/INSTALL_C700 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/acorn32/conf/EB7500ATX diff -u src/sys/arch/acorn32/conf/EB7500ATX:1.65 src/sys/arch/acorn32/conf/EB7500ATX:1.66 --- src/sys/arch/acorn32/conf/EB7500ATX:1.65 Mon May 14 21:05:17 2018 +++ src/sys/arch/acorn32/conf/EB7500ATX Thu Jun 7 13:36:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: EB7500ATX,v 1.65 2018/05/14 21:05:17 thorpej Exp $ +# $NetBSD: EB7500ATX,v 1.66 2018/06/07 13:36:28 thorpej Exp $ # # EB7500ATX --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "EB7500ATX-$Revision: 1.65 $" +#ident "EB7500ATX-$Revision: 1.66 $" # estimated number of users maxusers 32 @@ -159,10 +159,10 @@ clock* at iomd? # IIC bus device #iomdiic* at iomd? -#iic0 at iomdiic? +#iic* at iomdiic? # RTC device via IIC bus -#pcfrtc* at iic0 addr 0x50 +#pcfrtc* at iic? addr 0x50 # VIDC device vidc0 at mainbus? Index: src/sys/arch/acorn32/conf/GENERIC diff -u src/sys/arch/acorn32/conf/GENERIC:1.125 src/sys/arch/acorn32/conf/GENERIC:1.126 --- src/sys/arch/acorn32/conf/GENERIC:1.125 Mon May 14 21:05:17 2018 +++ src/sys/arch/acorn32/conf/GENERIC Thu Jun 7 13:36:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: GENERIC,v 1.125 2018/05/14 21:05:17 thorpej Exp $ +# $NetBSD: GENERIC,v 1.126 2018/06/07 13:36:28 thorpej Exp $ # # GENERIC --- NetBSD/acorn32 complete configuration # @@ -22,7 +22,7 @@ include "arch/acorn32/conf/std.acorn32" options INCLUDE_CONFIG_FILE # embed config file in kernel binary -#ident "GENERIC-$Revision: 1.125 $" +#ident "GENERIC-$Revision: 1.126 $" # estimated number of users maxusers 32 @@ -166,7 +166,7 @@ iomdiic* at iomd? iic0 at iomdiic? # RTC device via IIC bus -pcfrtc* at iic0 addr 0x50 +pcfrtc* at iic? addr 0x50 # VIDC device vidc0 at mainbus? Index: src/sys/arch/acorn32/conf/INSTALL diff -u src/sys/arch/acorn32/conf/INSTALL:1.79 src/sys/arch/acorn32/conf/INSTALL:1.80 --- src/sys/arch/acorn32/conf/INSTALL:1.79 Mon May 14 21:05:17
CVS commit: src/sys/arch/x86/x86
Module Name:src
Committed By: thorpej
Date: Thu Jun 7 13:35:31 UTC 2018
Modified Files:
src/sys/arch/x86/x86: x86_autoconf.c
Log Message:
In device_register(), if the device is an "iic" child of "imcsmb",
attach a I2C_PROP_INDIRECT_DEVICE_WHITELIST property that limits
the allowed devices to "spdmem" and "sdtemp". Also set the
I2C_PROP_INDIRECT_PROBE_STRATEGY property to I2C_PROBE_STRATEGY_NONE,
since that controller can't issue any of the "quick" commands.
XXX It would be nice to be able to do this in the imcsmb driver
itself, but the way autoconfiguration works makes that infeasible.
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/sys/arch/x86/x86/x86_autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/x86/x86_autoconf.c
diff -u src/sys/arch/x86/x86/x86_autoconf.c:1.76 src/sys/arch/x86/x86/x86_autoconf.c:1.77
--- src/sys/arch/x86/x86/x86_autoconf.c:1.76 Thu Nov 9 01:02:56 2017
+++ src/sys/arch/x86/x86/x86_autoconf.c Thu Jun 7 13:35:31 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: x86_autoconf.c,v 1.76 2017/11/09 01:02:56 christos Exp $ */
+/* $NetBSD: x86_autoconf.c,v 1.77 2018/06/07 13:35:31 thorpej Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -35,7 +35,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.76 2017/11/09 01:02:56 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: x86_autoconf.c,v 1.77 2018/06/07 13:35:31 thorpej Exp $");
#include
#include
@@ -54,6 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: x86_autoconf
#include
#include
+#include
+
#include "acpica.h"
#include "wsdisplay.h"
@@ -547,6 +549,36 @@ device_register(device_t dev, void *aux)
{
device_t isaboot, pciboot;
+ /*
+ * The Intel Integrated Memory Controller has a built-in i2c
+ * controller that's rather limited in capability; it is intended
+ * only for reading memory module EERPOMs and sensors.
+ */
+ if (device_is_a(dev, "iic") &&
+ device_is_a(dev->dv_parent, "imcsmb")) {
+ static const char *imcsmb_device_whitelist[] = {
+ "spdmem",
+ "sdtemp",
+ NULL,
+ };
+ prop_array_t whitelist = prop_array_create();
+ prop_dictionary_t props = device_properties(dev);
+ int i;
+
+ for (i = 0; imcsmb_device_whitelist[i] != NULL; i++) {
+ prop_string_t pstr = prop_string_create_cstring_nocopy(
+ imcsmb_device_whitelist[i]);
+ (void) prop_array_add(whitelist, pstr);
+ prop_object_release(pstr);
+ }
+ (void) prop_dictionary_set(props,
+ I2C_PROP_INDIRECT_DEVICE_WHITELIST,
+ whitelist);
+ (void) prop_dictionary_set_cstring_nocopy(props,
+ I2C_PROP_INDIRECT_PROBE_STRATEGY,
+ I2C_PROBE_STRATEGY_NONE);
+ }
+
device_acpi_register(dev, aux);
isaboot = device_isa_register(dev, aux);
CVS commit: src/sys/dev/i2c
Module Name:src
Committed By: thorpej
Date: Thu Jun 7 13:30:49 UTC 2018
Modified Files:
src/sys/dev/i2c: i2c.c i2cvar.h
Log Message:
Changes / enhancements to i2c indirect device auto-configuration:
— iic_search() chooses a “probe strategy” based on the
"i2c-indirect-probe-strategy” property on the “iic” instance.
Valid values are "smbus-quick-write”, "smbus-receive-byte”, and
“none”. If no value is specified, the default is "smbus-quick-write”.
— If the "i2c-indirect-device-whitelist” exists on the “iic” instance,
iic_search() will first check the driver name in the cfdata_t against
this list, and only allow the match/probe to move forward if the
cfdata_t driver name is in the list. This is primarily to accommodate
the Intel integrated memory controller neutered-i2c-thing.
— If the cfdata_t specifies a wildcard address, each address of the i2c
bus will be consulted. If the cfdata_t contains a nailed-down address,
then we limit the bus scan to that specific address.
— We explicitly skip reserved / special i2c addresses, such as the
General-Call address, etc.
— We introduce the notion of a “match quality” for i2c drivers. From
lowest-quality to highest-quality: matched by plausible address only,
matched by plausible address and poking at the bus to see if the
device looks reasonable, matched by direct-config “compatible” string,
matched by direct-config “driver name” string.
— If the “match quality” is merely “plausible address only”, then
iic_search() will use the probe strategy selected above to see if
a device responds to that address.
To generate a diff of this commit:
cvs rdiff -u -r1.60 -r1.61 src/sys/dev/i2c/i2c.c
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/i2c/i2cvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/i2c/i2c.c
diff -u src/sys/dev/i2c/i2c.c:1.60 src/sys/dev/i2c/i2c.c:1.61
--- src/sys/dev/i2c/i2c.c:1.60 Thu Jun 7 05:56:18 2018
+++ src/sys/dev/i2c/i2c.c Thu Jun 7 13:30:49 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: i2c.c,v 1.60 2018/06/07 05:56:18 thorpej Exp $ */
+/* $NetBSD: i2c.c,v 1.61 2018/06/07 13:30:49 thorpej Exp $ */
/*
* Copyright (c) 2003 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
#endif
#include
-__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.60 2018/06/07 05:56:18 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.61 2018/06/07 13:30:49 thorpej Exp $");
#include
#include
@@ -67,6 +67,7 @@ __KERNEL_RCSID(0, "$NetBSD: i2c.c,v 1.60
#endif
struct iic_softc {
+ device_t sc_dev;
i2c_tag_t sc_tag;
int sc_type;
device_t sc_devices[I2C_MAX_ADDR + 1];
@@ -127,21 +128,160 @@ iic_print(void *aux, const char *pnp)
return UNCONF;
}
+static bool
+iic_is_special_address(i2c_addr_t addr)
+{
+
+ /*
+ * See: https://www.i2c-bus.org/addressing/
+ */
+
+ /* General Call (read) / Start Byte (write) */
+ if (addr == 0x00)
+ return (true);
+
+ /* CBUS Addresses */
+ if (addr == 0x01)
+ return (true);
+
+ /* Reserved for Different Bus Formats */
+ if (addr == 0x02)
+ return (true);
+
+ /* Reserved for future purposes */
+ if (addr == 0x03)
+ return (true);
+
+ /* High Speed Master Code */
+ if ((addr & 0x7c) == 0x04)
+ return (true);
+
+ /* 10-bit Slave Addressing prefix */
+ if ((addr & 0x7c) == 0x78)
+ return (true);
+
+ /* Reserved for future purposes */
+ if ((addr & 0x7c) == 0x7c)
+ return (true);
+
+ return (false);
+}
+
+static int
+iic_probe_none(struct iic_softc *sc,
+ const struct i2c_attach_args *ia, int flags)
+{
+
+ return (0);
+}
+
+static int
+iic_probe_smbus_quick_write(struct iic_softc *sc,
+ const struct i2c_attach_args *ia, int flags)
+{
+ int error;
+
+ if ((error = iic_acquire_bus(ia->ia_tag, flags)) == 0) {
+ error = iic_smbus_quick_write(ia->ia_tag, ia->ia_addr, flags);
+ }
+ (void) iic_release_bus(ia->ia_tag, flags);
+
+ return (error);
+}
+
+static int
+iic_probe_smbus_receive_byte(struct iic_softc *sc,
+ const struct i2c_attach_args *ia, int flags)
+{
+ int error;
+
+ if ((error = iic_acquire_bus(ia->ia_tag, flags)) == 0) {
+ uint8_t dummy;
+
+ error = iic_smbus_receive_byte(ia->ia_tag, ia->ia_addr,
+ , flags);
+ }
+ (void) iic_release_bus(ia->ia_tag, flags);
+
+ return (error);
+}
+
+static bool
+iic_indirect_driver_is_whitelisted(struct iic_softc *sc, cfdata_t cf)
+{
+ prop_object_iterator_t iter;
+ prop_array_t whitelist;
+ prop_string_t pstr;
+ prop_type_t ptype;
+ bool rv = false;
+
+ whitelist = prop_dictionary_get(device_properties(sc->sc_dev),
+ I2C_PROP_INDIRECT_DEVICE_WHITELIST);
+ if (whitelist == NULL) {
+ /* No whitelist -> everything allowed */
+ return (true);
+ }
+
+ if ((ptype = prop_object_type(whitelist)) != PROP_TYPE_ARRAY) {
+ aprint_error_dev(sc->sc_dev,
+ "invalid property type (%d) for '%s'; must be array (%d)\n",
+ ptype, I2C_PROP_INDIRECT_DEVICE_WHITELIST, PROP_TYPE_ARRAY);
+ return (false);
+ }
+
+ iter =
CVS commit: src
Module Name:src
Committed By: kamil
Date: Thu Jun 7 13:21:44 UTC 2018
Modified Files:
src/external/cddl/osnet: Makefile.zfs
src/external/cddl/osnet/lib/libdtrace: Makefile
src/external/cddl/osnet/usr.sbin/dtrace: Makefile
src/sys/modules/dtrace/dtrace: Makefile
src/sys/modules/dtrace/linux32_syscall: Makefile
src/sys/modules/dtrace/linux_syscall: Makefile
src/sys/modules/dtrace/netbsd32_syscall: Makefile
src/sys/modules/dtrace/profile: Makefile
src/sys/modules/dtrace/syscall: Makefile
Log Message:
Replace HAVE_GCC with ACTIVE_CC == gcc checks
Kernel modules build with GCC and Clang/LLVM.
Requested by
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/external/cddl/osnet/Makefile.zfs
cvs rdiff -u -r1.18 -r1.19 src/external/cddl/osnet/lib/libdtrace/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/cddl/osnet/usr.sbin/dtrace/Makefile
cvs rdiff -u -r1.8 -r1.9 src/sys/modules/dtrace/dtrace/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/linux32_syscall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/linux_syscall/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/netbsd32_syscall/Makefile
cvs rdiff -u -r1.5 -r1.6 src/sys/modules/dtrace/profile/Makefile
cvs rdiff -u -r1.4 -r1.5 src/sys/modules/dtrace/syscall/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/Makefile.zfs
diff -u src/external/cddl/osnet/Makefile.zfs:1.7 src/external/cddl/osnet/Makefile.zfs:1.8
--- src/external/cddl/osnet/Makefile.zfs:1.7 Wed Jun 6 15:01:13 2018
+++ src/external/cddl/osnet/Makefile.zfs Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.zfs,v 1.7 2018/06/06 15:01:13 kamil Exp $
+# $NetBSD: Makefile.zfs,v 1.8 2018/06/07 13:21:44 kamil Exp $
.include
@@ -42,9 +42,7 @@ CPPFLAGS+= -I${ZFSDIR}/dist/common
CWARNFLAGS+= -Wno-missing-field-initializers
CWARNFLAGS+= -Wno-strict-prototypes
CWARNFLAGS+= -Wno-cast-qual
-.if defined(HAVE_GCC)
-CWARNFLAGS+= -Wno-discarded-qualifiers
-.endif
+CWARNFLAGS+= ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
CWARNFLAGS+= -Wno-switch
CWARNFLAGS+= -Wno-missing-prototypes
CWARNFLAGS+= -Wno-unused-variable
Index: src/external/cddl/osnet/lib/libdtrace/Makefile
diff -u src/external/cddl/osnet/lib/libdtrace/Makefile:1.18 src/external/cddl/osnet/lib/libdtrace/Makefile:1.19
--- src/external/cddl/osnet/lib/libdtrace/Makefile:1.18 Wed Jun 6 14:18:39 2018
+++ src/external/cddl/osnet/lib/libdtrace/Makefile Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2018/06/06 14:18:39 kamil Exp $
+# $NetBSD: Makefile,v 1.19 2018/06/07 13:21:44 kamil Exp $
# $FreeBSD: head/cddl/lib/libdtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -87,13 +87,9 @@ COPTS.dt_provider.c += -Wno-stack-protec
COPTS.dt_subr.c += -Wno-stack-protector
COPTS.dt_consume.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dt_consume.c += -Wno-maybe-uninitialized
-.endif
+COPTS.dt_consume.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
COPTS.dt_options.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dt_pid.c += -Wno-unused-but-set-variable
-.endif
+COPTS.dt_pid.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dt_isadep.c += -Wno-unused-variable
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
@@ -102,9 +98,7 @@ CPPFLAGS+= -I${.CURDIR}/../../dev/dtrace
.PATH: ${.CURDIR}/../../dist/lib/libdtrace/i386 ${.CURDIR}/../../dev/dtrace/x86
SRCS+= dis_tables.c
COPTS.dis_tables.c += -Wno-parentheses
-.if defined(HAVE_GCC)
-COPTS.dis_tables.c += -Wno-maybe-uninitialized
-.endif
+COPTS.dis_tables.c += ${${ACTIVE_CC} == "gcc" :? -Wno-maybe-uninitialized :}
.elif ${MACHINE_ARCH} == "sparc64"
CPPFLAGS+= -I${OPENSOLARIS_SYS_DISTDIR}/uts/sparc
.elif ${MACHINE_CPU} == "arm"
Index: src/external/cddl/osnet/usr.sbin/dtrace/Makefile
diff -u src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.11 src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.12
--- src/external/cddl/osnet/usr.sbin/dtrace/Makefile:1.11 Wed Jun 6 14:31:45 2018
+++ src/external/cddl/osnet/usr.sbin/dtrace/Makefile Thu Jun 7 13:21:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2018/06/06 14:31:45 kamil Exp $
+# $NetBSD: Makefile,v 1.12 2018/06/07 13:21:44 kamil Exp $
# $FreeBSD: head/cddl/usr.sbin/dtrace/Makefile 314654 2017-03-04 11:30:04Z ngie $
@@ -32,10 +32,8 @@ COPTS.dtrace.c += -Wno-stack-protector
COPTS.dtrace.c += -Wno-format-extra-args
COPTS.dtrace.c += -Wno-shadow
-.if defined(HAVE_GCC)
-COPTS.dtrace.c += -Wno-discarded-qualifiers
-COPTS.dtrace.c += -Wno-unused-but-set-variable
-.endif
+COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-discarded-qualifiers :}
+COPTS.dtrace.c += ${${ACTIVE_CC} == "gcc" :? -Wno-unused-but-set-variable :}
COPTS.dtrace.c += -Wno-missing-field-initializers
COPTS.dtrace.c +=
CVS commit: src/doc
Module Name:src Committed By: jakllsch Date: Thu Jun 7 12:36:45 UTC 2018 Modified Files: src/doc: CHANGES Log Message: note virtio(4) now attaching to fdt(4) w/ MMIO transport To generate a diff of this commit: cvs rdiff -u -r1.2393 -r1.2394 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.2393 src/doc/CHANGES:1.2394 --- src/doc/CHANGES:1.2393 Mon Jun 4 16:46:46 2018 +++ src/doc/CHANGES Thu Jun 7 12:36:45 2018 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2393 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.2394 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -159,3 +159,4 @@ Changes from NetBSD 8.0 to NetBSD 9.0: capability for Broadcom BCM283x SoCs (e.g. Raspberry Pi). [thorpej 20180519] dhcpcd: Import 7.0.5b. [roy 20180604] + virtio(4): Add MMIO transport and fdt(4) attachment. [jakllsch 20180606]
CVS commit: src/share/man/man4
Module Name:src Committed By: jakllsch Date: Thu Jun 7 12:32:26 UTC 2018 Modified Files: src/share/man/man4: virtio.4 Log Message: make note of new 'virtio at fdt' attachment To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/share/man/man4/virtio.4 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/man4/virtio.4 diff -u src/share/man/man4/virtio.4:1.8 src/share/man/man4/virtio.4:1.9 --- src/share/man/man4/virtio.4:1.8 Tue May 16 23:21:53 2017 +++ src/share/man/man4/virtio.4 Thu Jun 7 12:32:26 2018 @@ -1,4 +1,4 @@ -.\" $NetBSD: virtio.4,v 1.8 2017/05/16 23:21:53 jdolecek Exp $ +.\" $NetBSD: virtio.4,v 1.9 2018/06/07 12:32:26 jakllsch Exp $ .\" .\" Copyright (c) 2011 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -24,13 +24,14 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.Dd May 17, 2017 +.Dd June 7, 2018 .Dt VIRTIO 4 .Os .Sh NAME .Nm virtio .Nd Para-virtualized I/O in a virtual machine .Sh SYNOPSIS +.Cd "virtio* at fdt?" .Cd "virtio* at pci? dev ? function ?" .Cd "ld* at virtio?" .Cd "vioif* at virtio?" @@ -43,7 +44,7 @@ defines an interface for efficient, stan hypervisor and the virtual machine. The .Nm -device driver represents an emulated PCI device that the hypervisor makes +device driver represents an emulated device that the hypervisor makes available to the virtual machine. .Pp .Nm
