CVS commit: src/distrib/notes/common
Module Name:src Committed By: nils Date: Tue Jan 6 06:31:31 UTC 2015 Modified Files: src/distrib/notes/common: main Log Message: Added myself To generate a diff of this commit: cvs rdiff -u -r1.512 -r1.513 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/notes/common
Module Name:src Committed By: nils Date: Tue Jan 6 06:31:31 UTC 2015 Modified Files: src/distrib/notes/common: main Log Message: Added myself To generate a diff of this commit: cvs rdiff -u -r1.512 -r1.513 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.512 src/distrib/notes/common/main:1.513 --- src/distrib/notes/common/main:1.512 Wed Nov 5 07:09:47 2014 +++ src/distrib/notes/common/main Tue Jan 6 06:31:31 2015 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.512 2014/11/05 07:09:47 snj Exp $ +.\ $NetBSD: main,v 1.513 2015/01/06 06:31:31 nils Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1333,6 +1333,7 @@ If you're one of them, and would like to .It Ta Pierre Pronchery Ta Mt khor...@netbsd.org .It Ta Chris Provenzano Ta Mt pro...@netbsd.org .It Ta Mindaugas Rasiukevicius Ta Mt rm...@netbsd.org +.It Ta Nils Ratusznik Ta Mt n...@netbsd.org .It Ta Michael Rauch Ta Mt mra...@netbsd.org .It Ta Marc Recht Ta Mt re...@netbsd.org .It Ta Darren Reed Ta Mt darr...@netbsd.org
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Mon Jan 5 10:48:40 UTC 2015 Modified Files: src/share/man/man4: cdce.4 Log Message: add Realtek RTL8152B Ethernet controller to supported device list To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/cdce.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/cdce.4 diff -u src/share/man/man4/cdce.4:1.11 src/share/man/man4/cdce.4:1.12 --- src/share/man/man4/cdce.4:1.11 Thu Jan 1 08:11:45 2015 +++ src/share/man/man4/cdce.4 Mon Jan 5 10:48:40 2015 @@ -25,9 +25,9 @@ .\ ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.\ $NetBSD: cdce.4,v 1.11 2015/01/01 08:11:45 ryoon Exp $ +.\ $NetBSD: cdce.4,v 1.12 2015/01/05 10:48:40 jmcneill Exp $ .\ -.Dd January 1, 2014 +.Dd January 5, 2015 .Dt CDCE 4 .Os .Sh NAME @@ -55,6 +55,8 @@ NetChip EthernetGadget .It Prolific PL-2501 .It +Realtek RTL8152B Ethernet controller +.It Sharp Zaurus .El .Pp
CVS commit: src/share/man/man4
Module Name:src Committed By: jmcneill Date: Mon Jan 5 10:48:40 UTC 2015 Modified Files: src/share/man/man4: cdce.4 Log Message: add Realtek RTL8152B Ethernet controller to supported device list To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/share/man/man4/cdce.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Mon Jan 5 08:40:56 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Initialize TLB for non cpu0. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.37 src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.37 Sat Dec 27 16:19:33 2014 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Mon Jan 5 08:40:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.37 2014/12/27 16:19:33 nonaka Exp $ */ +/* $NetBSD: machdep.c,v 1.38 2015/01/05 08:40:56 nonaka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -997,6 +997,11 @@ e500_cpu_hatch(struct cpu_info *ci) */ cpu_write_4(OPENPIC_BASE + OPENPIC_CTPR, 15); /* IPL_HIGH */ + /* Initialize TLB */ + e500_tlb1_sync(); + mtspr(SPR_MAS4, MAS4_TSIZED_4KB | MAS4_MD); + tlb_invalidate_all(); + intr_cpu_hatch(ci); cpu_probe_cache();
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Mon Jan 5 08:40:56 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: Initialize TLB for non cpu0. To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src Committed By: palle Date: Mon Jan 5 11:40:56 UTC 2015 Modified Files: src/sys/arch/sparc64/sparc64: cache.c cache.h Log Message: cache_flush_phys(): Avoid run-time check for cpu type/implementation by installing correct function pointer in cache_setup_funcs() To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/sparc64/cache.c cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/sparc64/cache.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/sparc64/sparc64
Module Name:src
Committed By: palle
Date: Mon Jan 5 11:40:56 UTC 2015
Modified Files:
src/sys/arch/sparc64/sparc64: cache.c cache.h
Log Message:
cache_flush_phys(): Avoid run-time check for cpu type/implementation by
installing correct function pointer in cache_setup_funcs()
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sparc64/sparc64/cache.c
cvs rdiff -u -r1.27 -r1.28 src/sys/arch/sparc64/sparc64/cache.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/sparc64/sparc64/cache.c
diff -u src/sys/arch/sparc64/sparc64/cache.c:1.9 src/sys/arch/sparc64/sparc64/cache.c:1.10
--- src/sys/arch/sparc64/sparc64/cache.c:1.9 Tue Dec 30 18:29:20 2014
+++ src/sys/arch/sparc64/sparc64/cache.c Mon Jan 5 11:40:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.c,v 1.9 2014/12/30 18:29:20 palle Exp $ */
+/* $NetBSD: cache.c,v 1.10 2015/01/05 11:40:56 palle Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.9 2014/12/30 18:29:20 palle Exp $);
+__KERNEL_RCSID(0, $NetBSD: cache.c,v 1.10 2015/01/05 11:40:56 palle Exp $);
#include opt_multiprocessor.h
@@ -78,6 +78,8 @@ void(*sp_dcache_flush_page)(paddr_t)
void (*sp_tlb_flush_pte)(vaddr_t, int) = sp_tlb_flush_pte_us;
void (*sp_tlb_flush_all)(void) = sp_tlb_flush_all_us;
+void (*cache_flush_phys)(paddr_t, psize_t, int) = cache_flush_phys_us;
+
static void
sp_tlb_flush_pte_sun4v(vaddr_t va, int ctx)
{
@@ -93,6 +95,13 @@ sp_tlb_flush_all_sun4v(void)
panic(sp_tlb_flush_all_sun4v() not implemented yet);
}
+
+static void
+cache_flush_phys_sun4v(paddr_t pa, psize_t size, int ecache)
+{
+ panic(cache_flush_phys_sun4v() not implemented yet);
+}
+
void
cache_setup_funcs(void)
{
@@ -122,14 +131,16 @@ cache_setup_funcs(void)
#endif
}
- /* Prepare sp_tlb_flush_* functions */
+ /* Prepare sp_tlb_flush_* and cache_flush_phys() functions */
if (CPU_ISSUN4V) {
sp_tlb_flush_pte = sp_tlb_flush_pte_sun4v;
sp_tlb_flush_all = sp_tlb_flush_all_sun4v;
+ cache_flush_phys = cache_flush_phys_sun4v;
} else {
if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP()) {
sp_tlb_flush_pte = sp_tlb_flush_pte_usiii;
sp_tlb_flush_all = sp_tlb_flush_all_usiii;
+ cache_flush_phys = cache_flush_phys_usiii;
}
}
Index: src/sys/arch/sparc64/sparc64/cache.h
diff -u src/sys/arch/sparc64/sparc64/cache.h:1.27 src/sys/arch/sparc64/sparc64/cache.h:1.28
--- src/sys/arch/sparc64/sparc64/cache.h:1.27 Tue Dec 30 18:29:20 2014
+++ src/sys/arch/sparc64/sparc64/cache.h Mon Jan 5 11:40:56 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: cache.h,v 1.27 2014/12/30 18:29:20 palle Exp $ */
+/* $NetBSD: cache.h,v 1.28 2015/01/05 11:40:56 palle Exp $ */
/*
* Copyright (c) 2011 Matthew R. Green
@@ -101,15 +101,7 @@ void blast_icache_usiii(void); /* Clear
/* The following flush a range from the D$ and I$ but not E$. */
void cache_flush_phys_us(paddr_t, psize_t, int);
void cache_flush_phys_usiii(paddr_t, psize_t, int);
-
-static __inline__ void
-cache_flush_phys(paddr_t pa, psize_t size, int ecache)
-{
- if (CPU_IS_USIII_UP() || CPU_IS_SPARC64_V_UP())
- cache_flush_phys_usiii(pa, size, ecache);
- else
- cache_flush_phys_us(pa, size, ecache);
-}
+extern void (*cache_flush_phys)(paddr_t, psize_t, int);
/* SPARC64 specific */
/* Assembly routines to flush TLB mappings */
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Mon Jan 5 11:42:19 UTC 2015 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: Add reminder to change run-time cpu type checks To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/doc/TODO 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/doc/TODO diff -u src/sys/arch/sparc64/doc/TODO:1.7 src/sys/arch/sparc64/doc/TODO:1.8 --- src/sys/arch/sparc64/doc/TODO:1.7 Thu Sep 4 18:55:03 2014 +++ src/sys/arch/sparc64/doc/TODO Mon Jan 5 11:42:19 2015 @@ -1,10 +1,11 @@ - /* $NetBSD: TODO,v 1.7 2014/09/04 18:55:03 palle Exp $ */ + /* $NetBSD: TODO,v 1.8 2015/01/05 11:42:19 palle Exp $ */ Things to be done: common: - make %g6 point to curcpu - make %g7 point to curlwp +- change run-time checks for cpu type to function pointers sun4u:
CVS commit: src/sys/arch/sparc64/doc
Module Name:src Committed By: palle Date: Mon Jan 5 11:42:19 UTC 2015 Modified Files: src/sys/arch/sparc64/doc: TODO Log Message: Add reminder to change run-time cpu type checks To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/sparc64/doc/TODO Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Mon Jan 5 16:26:48 UTC 2015 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Prevent .y.c from regenerating c files from yacc. XXX: Why are we compiling glcpp-parse.c both here and in the gallium subdirectory? To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/dri/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/dri/Makefile diff -u src/external/mit/xorg/lib/dri/Makefile:1.24 src/external/mit/xorg/lib/dri/Makefile:1.25 --- src/external/mit/xorg/lib/dri/Makefile:1.24 Sun Jan 4 20:34:42 2015 +++ src/external/mit/xorg/lib/dri/Makefile Mon Jan 5 11:26:48 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2015/01/05 01:34:42 joerg Exp $ +# $NetBSD: Makefile,v 1.25 2015/01/05 16:26:48 christos Exp $ # Link the mesa_dri_drivers mega driver. @@ -405,3 +405,5 @@ CWARNFLAGS.clang+= -Wno-error=initialize .else .include bsd.inc.mk .endif +# Don't re-build .c files when .y files change +.y.c:
CVS commit: src/external/mit/xorg/lib/dri
Module Name:src Committed By: christos Date: Mon Jan 5 16:26:48 UTC 2015 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Prevent .y.c from regenerating c files from yacc. XXX: Why are we compiling glcpp-parse.c both here and in the gallium subdirectory? To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/dri/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: joerg Date: Mon Jan 5 17:04:24 UTC 2015 Modified Files: src/sys/arch/arm/arm32: arm32_reboot.c Log Message: Mark end of cpu_reboot as unreachable. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm32/arm32_reboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_reboot.c diff -u src/sys/arch/arm/arm32/arm32_reboot.c:1.7 src/sys/arch/arm/arm32/arm32_reboot.c:1.8 --- src/sys/arch/arm/arm32/arm32_reboot.c:1.7 Fri Jan 2 18:49:02 2015 +++ src/sys/arch/arm/arm32/arm32_reboot.c Mon Jan 5 17:04:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_reboot.c,v 1.7 2015/01/02 18:49:02 christos Exp $ */ +/* $NetBSD: arm32_reboot.c,v 1.8 2015/01/05 17:04:24 joerg Exp $ */ /* * Copyright (c) 2002, 2003, 2005 Genetec Corporation. All rights reserved. @@ -122,7 +122,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_reboot.c,v 1.7 2015/01/02 18:49:02 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_reboot.c,v 1.8 2015/01/05 17:04:24 joerg Exp $); #include sys/param.h #include sys/device.h @@ -203,4 +203,5 @@ cpu_reboot(int howto, char *bootstr) IRQdisable; docpureset(howto); + __unreachable(); }
CVS commit: src/sys/arch/arm/arm32
Module Name:src Committed By: joerg Date: Mon Jan 5 17:04:24 UTC 2015 Modified Files: src/sys/arch/arm/arm32: arm32_reboot.c Log Message: Mark end of cpu_reboot as unreachable. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm32/arm32_reboot.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src Committed By: martin Date: Mon Jan 5 21:37:07 UTC 2015 Modified Files: src/sys/dev/ic: dwc_gmac.c Log Message: Fix index vs. count confusion when syncing a range of newly queued TX descriptors. Pointed out by naobsd in private chat. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_gmac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: martin
Date: Mon Jan 5 21:37:07 UTC 2015
Modified Files:
src/sys/dev/ic: dwc_gmac.c
Log Message:
Fix index vs. count confusion when syncing a range of newly queued TX
descriptors. Pointed out by naobsd in private chat.
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/dwc_gmac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/dwc_gmac.c
diff -u src/sys/dev/ic/dwc_gmac.c:1.29 src/sys/dev/ic/dwc_gmac.c:1.30
--- src/sys/dev/ic/dwc_gmac.c:1.29 Sun Dec 7 02:23:14 2014
+++ src/sys/dev/ic/dwc_gmac.c Mon Jan 5 21:37:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_gmac.c,v 1.29 2014/12/07 02:23:14 jmcneill Exp $ */
+/* $NetBSD: dwc_gmac.c,v 1.30 2015/01/05 21:37:07 martin Exp $ */
/*-
* Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.29 2014/12/07 02:23:14 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: dwc_gmac.c,v 1.30 2015/01/05 21:37:07 martin Exp $);
/* #define DWC_GMAC_DEBUG 1 */
@@ -787,6 +787,7 @@ dwc_gmac_start(struct ifnet *ifp)
{
struct dwc_gmac_softc *sc = ifp-if_softc;
int old = sc-sc_txq.t_queued;
+ int start = sc-sc_txq.t_cur;
struct mbuf *m0;
if ((ifp-if_flags (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -806,7 +807,7 @@ dwc_gmac_start(struct ifnet *ifp)
if (sc-sc_txq.t_queued != old) {
/* packets have been queued, kick it off */
- dwc_gmac_txdesc_sync(sc, old, sc-sc_txq.t_cur,
+ dwc_gmac_txdesc_sync(sc, start, sc-sc_txq.t_cur,
BUS_DMASYNC_PREREAD|BUS_DMASYNC_PREWRITE);
bus_space_write_4(sc-sc_bst, sc-sc_bsh,
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Mon Jan 5 21:57:49 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: rockchip_emac.c
Log Message:
various fixes from FUKAUMI Naoki f...@naobsd.org and martin@
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rockchip_emac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rockchip_emac.c
diff -u src/sys/arch/arm/rockchip/rockchip_emac.c:1.2 src/sys/arch/arm/rockchip/rockchip_emac.c:1.3
--- src/sys/arch/arm/rockchip/rockchip_emac.c:1.2 Sun Jan 4 11:54:43 2015
+++ src/sys/arch/arm/rockchip/rockchip_emac.c Mon Jan 5 21:57:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_emac.c,v 1.2 2015/01/04 11:54:43 jmcneill Exp $ */
+/* $NetBSD: rockchip_emac.c,v 1.3 2015/01/05 21:57:49 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_rkemac.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.2 2015/01/04 11:54:43 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.3 2015/01/05 21:57:49 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -119,6 +119,7 @@ struct rkemac_softc {
bus_dma_segment_t sc_ring_dmaseg;
struct rkemac_txring sc_txq;
struct rkemac_rxring sc_rxq;
+ bus_addr_t sc_pad_physaddr;
};
static int rkemac_match(device_t, cfdata_t, void *);
@@ -186,8 +187,8 @@ rkemac_attach(device_t parent, device_t
} else {
soc_con1_reg = 0x0154;
}
- bus_space_subregion(obio-obio_bst, obio-obio_bsh,
- ROCKCHIP_GRF_OFFSET + soc_con1_reg, 4, sc-sc_soc_con1_bsh);
+ bus_space_subregion(obio-obio_bst, obio-obio_grf_bsh, soc_con1_reg,
+ 4, sc-sc_soc_con1_bsh);
aprint_naive(\n);
aprint_normal(: Ethernet controller\n);
@@ -275,7 +276,8 @@ static int
rkemac_dma_init(struct rkemac_softc *sc)
{
size_t descsize = RKEMAC_RX_RING_COUNT * sizeof(struct rkemac_rxdesc) +
- RKEMAC_TX_RING_COUNT * sizeof(struct rkemac_txdesc);
+ RKEMAC_TX_RING_COUNT * sizeof(struct rkemac_txdesc) +
+ ETHER_MIN_LEN;
bus_addr_t physaddr;
int error, nsegs;
void *descs;
@@ -310,6 +312,9 @@ rkemac_dma_init(struct rkemac_softc *sc)
sc-sc_txq.t_physaddr = sc-sc_rxq.r_physaddr +
RKEMAC_RX_RING_COUNT * sizeof(struct rkemac_rxdesc);
+ sc-sc_pad_physaddr = sc-sc_txq.t_physaddr +
+ RKEMAC_TX_RING_COUNT * sizeof(struct rkemac_txdesc);
+
/*
* Setup RX ring
*/
@@ -538,6 +543,8 @@ rkemac_init(struct ifnet *ifp)
control |= EMAC_CONTROL_EN;
EMAC_WRITE(sc, EMAC_CONTROL_REG, control);
+ callout_schedule(sc-sc_mii_tick, hz);
+
ifp-if_flags |= IFF_RUNNING;
ifp-if_flags = ~IFF_OACTIVE;
@@ -548,7 +555,8 @@ static void
rkemac_start(struct ifnet *ifp)
{
struct rkemac_softc *sc = ifp-if_softc;
- int old = sc-sc_txq.t_queued;
+ const int old = sc-sc_txq.t_queued;
+ const int start = sc-sc_txq.t_cur;
struct mbuf *m0;
if ((ifp-if_flags (IFF_RUNNING | IFF_OACTIVE)) != IFF_RUNNING)
@@ -567,10 +575,9 @@ rkemac_start(struct ifnet *ifp)
}
if (sc-sc_txq.t_queued != old) {
- rkemac_txdesc_sync(sc, old, sc-sc_txq.t_cur,
+ rkemac_txdesc_sync(sc, start, sc-sc_txq.t_cur,
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
- EMAC_WRITE(sc, EMAC_STAT_REG,
- EMAC_READ(sc, EMAC_STAT_REG) | EMAC_STAT_TXPL);
+ EMAC_WRITE(sc, EMAC_STAT_REG, EMAC_STAT_TXPL);
}
}
@@ -694,8 +701,6 @@ rkemac_queue(struct rkemac_softc *sc, st
map = sc-sc_txq.t_data[first].td_map;
info = 0;
- KASSERT(map-dm_nsegs 0);
-
error = bus_dmamap_load_mbuf(sc-sc_dmat, map, m0,
BUS_DMA_WRITE | BUS_DMA_NOWAIT);
if (error) {
@@ -703,7 +708,12 @@ rkemac_queue(struct rkemac_softc *sc, st
return error;
}
- if (sc-sc_txq.t_queued + map-dm_nsegs = RKEMAC_TX_RING_COUNT - 1) {
+ KASSERT(map-dm_nsegs 0);
+
+ const u_int nbufs = map-dm_nsegs +
+ ((m0-m_pkthdr.len ETHER_MIN_LEN) ? 1 : 0);
+
+ if (sc-sc_txq.t_queued + nbufs = RKEMAC_TX_RING_COUNT - 1) {
bus_dmamap_unload(sc-sc_dmat, map);
return ENOBUFS;
}
@@ -715,11 +725,23 @@ rkemac_queue(struct rkemac_softc *sc, st
tx-tx_ptr = htole32(map-dm_segs[i].ds_addr);
len = __SHIFTIN(map-dm_segs[i].ds_len, EMAC_TXDESC_TXLEN);
- if (i == map-dm_nsegs - 1)
- info |= EMAC_TXDESC_LAST;
tx-tx_info = htole32(info | len);
- if (i 0)
- tx-tx_info |= EMAC_TXDESC_OWN;
+ info = ~EMAC_TXDESC_FIRST;
+ info |= EMAC_TXDESC_OWN;
+ if (i == map-dm_nsegs - 1) {
+ if (m0-m_pkthdr.len ETHER_MIN_LEN) {
+sc-sc_txq.t_queued++;
+sc-sc_txq.t_cur = (sc-sc_txq.t_cur + 1)
+% RKEMAC_TX_RING_COUNT;
+ td = sc-sc_txq.t_data[sc-sc_txq.t_cur];
+tx = sc-sc_txq.t_desc[sc-sc_txq.t_cur];
+tx-tx_ptr = htole32(sc-sc_pad_physaddr);
+len = __SHIFTIN(ETHER_MIN_LEN -
+m0-m_pkthdr.len , EMAC_TXDESC_TXLEN);
+tx-tx_info = htole32(info | len);
+ }
+ tx-tx_info |= htole32(EMAC_TXDESC_LAST);
+
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Mon Jan 5 21:57:49 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: various fixes from FUKAUMI Naoki f...@naobsd.org and martin@ To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/rockchip/rockchip_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src
Committed By: jmcneill
Date: Mon Jan 5 22:16:49 UTC 2015
Modified Files:
src/sys/arch/arm/rockchip: rockchip_emac.c
Log Message:
add multicast filter support
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rockchip_emac.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rockchip_emac.c
diff -u src/sys/arch/arm/rockchip/rockchip_emac.c:1.3 src/sys/arch/arm/rockchip/rockchip_emac.c:1.4
--- src/sys/arch/arm/rockchip/rockchip_emac.c:1.3 Mon Jan 5 21:57:49 2015
+++ src/sys/arch/arm/rockchip/rockchip_emac.c Mon Jan 5 22:16:49 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_emac.c,v 1.3 2015/01/05 21:57:49 jmcneill Exp $ */
+/* $NetBSD: rockchip_emac.c,v 1.4 2015/01/05 22:16:49 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include opt_rkemac.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.3 2015/01/05 21:57:49 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.4 2015/01/05 22:16:49 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -144,6 +144,7 @@ static int rkemac_queue(struct rkemac_so
static void rkemac_txdesc_sync(struct rkemac_softc *, int, int, int);
static void rkemac_txintr(struct rkemac_softc *);
static void rkemac_rxintr(struct rkemac_softc *);
+static void rkemac_setmulti(struct rkemac_softc *);
CFATTACH_DECL_NEW(rkemac, sizeof(struct rkemac_softc),
rkemac_match, rkemac_attach, NULL, NULL);
@@ -502,8 +503,6 @@ static int
rkemac_init(struct ifnet *ifp)
{
struct rkemac_softc *sc = ifp-if_softc;
- struct ether_multi *em;
- struct ether_multistep ems;
uint32_t control;
if (ifp-if_flags IFF_RUNNING)
@@ -511,6 +510,11 @@ rkemac_init(struct ifnet *ifp)
rkemac_stop(ifp, 0);
+ EMAC_WRITE(sc, EMAC_POLLRATE_REG, RKEMAC_POLLRATE);
+ EMAC_WRITE(sc, EMAC_RXRINGPTR_REG, sc-sc_rxq.r_physaddr);
+ EMAC_WRITE(sc, EMAC_TXRINGPTR_REG, sc-sc_txq.t_physaddr);
+
+ control = ~EMAC_CONTROL_RXBDTLEN;
control = EMAC_READ(sc, EMAC_CONTROL_REG);
if (ifp-if_flags IFF_PROMISC) {
control |= EMAC_CONTROL_PROM;
@@ -522,24 +526,16 @@ rkemac_init(struct ifnet *ifp)
} else {
control |= EMAC_CONTROL_DISBC;
}
- ETHER_FIRST_MULTI(ems, sc-sc_ec, em);
- if (em) {
- ifp-if_flags |= IFF_ALLMULTI;
- control |= EMAC_CONTROL_PROM;
- } else {
- ifp-if_flags = ~IFF_ALLMULTI;
- }
- EMAC_WRITE(sc, EMAC_POLLRATE_REG, RKEMAC_POLLRATE);
- EMAC_WRITE(sc, EMAC_RXRINGPTR_REG, sc-sc_rxq.r_physaddr);
- EMAC_WRITE(sc, EMAC_TXRINGPTR_REG, sc-sc_txq.t_physaddr);
-
- control = ~EMAC_CONTROL_RXBDTLEN;
control |= __SHIFTIN(RKEMAC_RX_RING_COUNT, EMAC_CONTROL_RXBDTLEN);
control = ~EMAC_CONTROL_TXBDTLEN;
control |= __SHIFTIN(RKEMAC_TX_RING_COUNT, EMAC_CONTROL_TXBDTLEN);
control |= EMAC_CONTROL_RXRN;
control |= EMAC_CONTROL_TXRN;
+ EMAC_WRITE(sc, EMAC_CONTROL_REG, control);
+
+ rkemac_setmulti(sc);
+
control |= EMAC_CONTROL_EN;
EMAC_WRITE(sc, EMAC_CONTROL_REG, control);
@@ -630,30 +626,16 @@ static int
rkemac_ioctl(struct ifnet *ifp, u_long cmd, void *data)
{
struct rkemac_softc *sc = ifp-if_softc;
- struct ether_multi *em;
- struct ether_multistep ems;
- uint32_t control;
int s, error;
s = splnet();
if ((error = ether_ioctl(ifp, cmd, data)) == ENETRESET) {
error = 0;
- if (cmd != SIOCADDMULTI cmd != SIOCDELMULTI)
- ;
- else if (ifp-if_flags IFF_RUNNING) {
- control = EMAC_READ(sc, EMAC_CONTROL_REG);
- ETHER_FIRST_MULTI(ems, sc-sc_ec, em);
- if (em) {
-ifp-if_flags |= IFF_ALLMULTI;
-control |= EMAC_CONTROL_PROM;
- } else {
-ifp-if_flags = ~IFF_ALLMULTI;
-if ((ifp-if_flags IFF_PROMISC) == 0) {
- control = ~EMAC_CONTROL_PROM;
-}
+ if (ifp-if_flags IFF_RUNNING) {
+ if (cmd == SIOCADDMULTI || cmd == SIOCDELMULTI) {
+rkemac_setmulti(sc);
}
- EMAC_WRITE(sc, EMAC_CONTROL_REG, control);
}
}
@@ -895,3 +877,46 @@ skip:
sc-sc_rxq.r_cur = i;
}
+static void
+rkemac_setmulti(struct rkemac_softc *sc)
+{
+ struct ifnet *ifp = sc-sc_ec.ec_if;
+ struct ether_multi *enm;
+ struct ether_multistep step;
+ uint32_t hashes[2] = { 0, 0 };
+ uint32_t control, h;
+ int s;
+
+ s = splnet();
+
+ control = EMAC_READ(sc, EMAC_CONTROL_REG);
+
+ if (ifp-if_flags IFF_PROMISC) {
+ control |= EMAC_CONTROL_PROM;
+ hashes[0] = hashes[1] = 0x;
+ goto done;
+ }
+
+ ifp-if_flags = ~IFF_ALLMULTI;
+ control = ~EMAC_CONTROL_PROM;
+
+ ETHER_FIRST_MULTI(step, sc-sc_ec, enm);
+ while (enm != NULL) {
+ if (memcmp(enm-enm_addrlo, enm-enm_addrhi, ETHER_ADDR_LEN)) {
+ control |= EMAC_CONTROL_PROM;
+ ifp-if_flags |= IFF_ALLMULTI;
+ hashes[0] = hashes[1] = 0x;
+ goto done;
+ }
+ h = ether_crc32_le(enm-enm_addrlo, ETHER_ADDR_LEN);
+ hashes[h 5] |= (1 (h 0x1f));
+ ETHER_NEXT_MULTI(step, enm);
+ }
+
+done:
+ EMAC_WRITE(sc, EMAC_CONTROL_REG,
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Mon Jan 5 22:16:49 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: add multicast filter support To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/rockchip/rockchip_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:03:51 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.3 -r1.12.4.4 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/include/isc/platform.h diff -u src/external/bsd/bind/include/isc/platform.h:1.12.4.3 src/external/bsd/bind/include/isc/platform.h:1.12.4.4 --- src/external/bsd/bind/include/isc/platform.h:1.12.4.3 Wed Dec 31 05:56:29 2014 +++ src/external/bsd/bind/include/isc/platform.h Mon Jan 5 23:03:51 2015 @@ -270,9 +270,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-6] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:03:51 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.3 -r1.12.4.4 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-1] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:07:48 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6-1]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.1.6.2 -r1.12.4.1.6.3 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/include/isc/platform.h diff -u src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.2 src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.3 --- src/external/bsd/bind/include/isc/platform.h:1.12.4.1.6.2 Wed Dec 31 06:17:24 2014 +++ src/external/bsd/bind/include/isc/platform.h Mon Jan 5 23:07:48 2015 @@ -270,9 +270,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-6-1] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:07:48 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6-1]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.1.6.2 -r1.12.4.1.6.3 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:27:01 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5-2]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.4.1 -r1.9.4.1.2.1 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:27:01 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5-2]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.4.1 -r1.9.4.1.2.1 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/bind/include/isc/platform.h diff -u src/usr.sbin/bind/include/isc/platform.h:1.9.4.1 src/usr.sbin/bind/include/isc/platform.h:1.9.4.1.2.1 --- src/usr.sbin/bind/include/isc/platform.h:1.9.4.1 Thu Jan 6 21:42:52 2011 +++ src/usr.sbin/bind/include/isc/platform.h Mon Jan 5 23:27:01 2015 @@ -258,9 +258,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:10 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Mon Jan 5 21:35:54 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: obio.c rockchip_var.h Log Message: add GRF bus space handle to obio_attach_args, from FUKAUMI Naoki f...@naobsd.org To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/rockchip/obio.c cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/rockchip/rockchip_var.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 22:58:44 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-7]: platform.h Log Message: Pullup the following revision (requested by he in ticket #349): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/include/isc/platform.h diff -u src/external/bsd/bind/include/isc/platform.h:1.16.2.1 src/external/bsd/bind/include/isc/platform.h:1.16.2.2 --- src/external/bsd/bind/include/isc/platform.h:1.16.2.1 Mon Dec 22 03:28:48 2014 +++ src/external/bsd/bind/include/isc/platform.h Mon Jan 5 22:58:44 2015 @@ -270,9 +270,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-7] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 22:58:44 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-7]: platform.h Log Message: Pullup the following revision (requested by he in ticket #349): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.16.2.1 -r1.16.2.2 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:21:24 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.4.1 -r1.9.4.2 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/bind/include/isc/platform.h diff -u src/usr.sbin/bind/include/isc/platform.h:1.9.4.1 src/usr.sbin/bind/include/isc/platform.h:1.9.4.2 --- src/usr.sbin/bind/include/isc/platform.h:1.9.4.1 Thu Jan 6 21:42:52 2011 +++ src/usr.sbin/bind/include/isc/platform.h Mon Jan 5 23:21:24 2015 @@ -258,9 +258,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:26 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.2.4 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-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.10 src/doc/CHANGES-5.2.4:1.1.2.11 --- src/doc/CHANGES-5.2.4:1.1.2.10 Thu Dec 25 23:31:43 2014 +++ src/doc/CHANGES-5.2.4 Mon Jan 5 23:33:26 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.10 2014/12/25 23:31:43 he Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.11 2015/01/05 23:33:26 msaitoh Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -144,6 +144,7 @@ dist/bind/lib/isc/include/isc/types.h dist/bind/lib/isccfg/namedconf.cpatch lib/libisc/Makefile patch usr.sbin/bind/Makefile.inc patch +usr.sbin/bind/include/isc/platform.h 1.18 Apply fix for BIND, backported from the patch for 9.8.8 from ISC. This is a fix for CVE-2014-8500, where a maliciously constructed
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:10 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.89 -r1.1.2.90 src/doc/CHANGES-5.3 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-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.89 src/doc/CHANGES-5.3:1.1.2.90 --- src/doc/CHANGES-5.3:1.1.2.89 Thu Dec 25 23:20:19 2014 +++ src/doc/CHANGES-5.3 Mon Jan 5 23:33:10 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.89 2014/12/25 23:20:19 he Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.90 2015/01/05 23:33:10 msaitoh Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -1295,6 +1295,7 @@ dist/bind/lib/isc/include/isc/types.h p dist/bind/lib/isccfg/namedconf.c patch lib/libisc/Makefilepatch usr.sbin/bind/Makefile.inc patch +usr.sbin/bind/include/isc/platform.h 1.18 Apply fix for BIND, backported from the patch for 9.8.8 from ISC. This is a fix for CVE-2014-8500, where a maliciously constructed
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:45 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.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-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.10 src/doc/CHANGES-5.1.6:1.1.2.11 --- src/doc/CHANGES-5.1.6:1.1.2.10 Thu Dec 25 23:46:18 2014 +++ src/doc/CHANGES-5.1.6 Mon Jan 5 23:33:45 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.10 2014/12/25 23:46:18 he Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.11 2015/01/05 23:33:45 msaitoh Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -144,6 +144,7 @@ dist/bind/lib/isc/include/isc/types.h p dist/bind/lib/isccfg/namedconf.c patch lib/libisc/Makefilepatch usr.sbin/bind/Makefile.inc patch +usr.sbin/bind/include/isc/platform.h 1.18 Apply fix for BIND, backported from the patch for 9.8.8 from ISC. This is a fix for CVE-2014-8500, where a maliciously constructed
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:45 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:33:26 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: Update ticket 1937. To generate a diff of this commit: cvs rdiff -u -r1.1.2.10 -r1.1.2.11 src/doc/CHANGES-5.2.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net
Module Name:src
Committed By: christos
Date: Mon Jan 5 22:38:36 UTC 2015
Modified Files:
src/tests/net: Makefile
Added Files:
src/tests/net/in_cksum: Makefile in_cksum.c t_in_cksum.sh
Log Message:
Port the in_cksum test from regress.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tests/net/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/Makefile \
src/tests/net/in_cksum/in_cksum.c src/tests/net/in_cksum/t_in_cksum.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/Makefile
diff -u src/tests/net/Makefile:1.19 src/tests/net/Makefile:1.20
--- src/tests/net/Makefile:1.19 Sat Oct 11 19:04:42 2014
+++ src/tests/net/Makefile Mon Jan 5 17:38:36 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.19 2014/10/11 23:04:42 christos Exp $
+# $NetBSD: Makefile,v 1.20 2015/01/05 22:38:36 christos Exp $
.include bsd.own.mk
TESTSDIR= ${TESTSBASE}/net
-TESTS_SUBDIRS= fdpass mcast net route sys
+TESTS_SUBDIRS= fdpass in_cksum mcast net route sys
.if (${MKRUMP} != no)
TESTS_SUBDIRS+= bpf bpfilter carp icmp if if_bridge if_loop mpls npf
.if (${MKSLJIT} != no)
Added files:
Index: src/tests/net/in_cksum/Makefile
diff -u /dev/null src/tests/net/in_cksum/Makefile:1.1
--- /dev/null Mon Jan 5 17:38:36 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 17:38:36 2015
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2015/01/05 22:38:36 christos Exp $
+
+.include bsd.own.mk
+
+MKMAN=no
+TESTSDIR= ${TESTSBASE}/net/cksum
+
+TESTS_SH=t_in_cksum
+
+ADIR=${NETBSDSRCDIR}/sys/arch/${MACHINE}/${MACHINE}
+CDIR=${NETBSDSRCDIR}/sys/netinet
+.if exists(${ADIR}/cpu_in_cksum.S)
+.PATH.S: ${ADIR}
+SRCS+=cpu_in_cksum.S
+CPPFLAGS+=-DHAVE_CPU_IN_CKSUM
+.endif
+
+PROGS=in_cksum
+
+CPPFLAGS+=-I${CDIR}
+
+.include bsd.test.mk
+
+foo:
+ echo ${ADIR}/cpu_in_cksum.S
Index: src/tests/net/in_cksum/in_cksum.c
diff -u /dev/null src/tests/net/in_cksum/in_cksum.c:1.1
--- /dev/null Mon Jan 5 17:38:36 2015
+++ src/tests/net/in_cksum/in_cksum.c Mon Jan 5 17:38:36 2015
@@ -0,0 +1,211 @@
+/* $NetBSD: in_cksum.c,v 1.1 2015/01/05 22:38:36 christos Exp $ */
+/*-
+ * Copyright (c) 2008 Joerg Sonnenberger jo...@netbsd.org.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in
+ *the documentation and/or other materials provided with the
+ *distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
+ * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+ * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
+ * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#include sys/cdefs.h
+__KERNEL_RCSID(0, $NetBSD: in_cksum.c,v 1.1 2015/01/05 22:38:36 christos Exp $);
+
+#include sys/param.h
+#include sys/mbuf.h
+#include sys/resource.h
+#include err.h
+#include stdbool.h
+#include stdio.h
+#include unistd.h
+#include stdlib.h
+#include string.h
+
+#define cpu_in_cksum portable_cpu_in_cksum
+#include cpu_in_cksum.c
+
+#ifdef HAVE_CPU_IN_CKSUM
+int cpu_in_cksum(struct mbuf*, int, int, uint32_t);
+#endif
+
+static bool random_aligned;
+
+static void
+free_mbuf_chain(struct mbuf *m)
+{
+ struct mbuf *next;
+
+ if (m == NULL)
+ return;
+
+ next = m-m_next;
+ free(m);
+ free_mbuf_chain(next);
+}
+
+static struct mbuf *
+allocate_mbuf_chain(char **lens)
+{
+ int len, off;
+ struct mbuf *m;
+
+ if (*lens == NULL)
+ return NULL;
+
+ len = atoi(*lens);
+ off = random_aligned ? rand() % 64 : 0;
+
+ m = malloc(sizeof(struct m_hdr) + len + off);
+ if (m == NULL)
+ err(EXIT_FAILURE, malloc failed);
+
+ m-m_data = (char *)m + sizeof(struct m_hdr) + off;
+ m-m_len = len;
+
+ m-m_next = allocate_mbuf_chain(lens + 1);
+
+ return m;
+}
+
+static void
+randomise_mbuf_chain(struct mbuf *m)
+{
+ int i, data, len;
+
+ for (i = 0; i m-m_len; i += sizeof(int)) {
+ data = rand();
+ if (i + sizeof(int) (size_t)m-m_len)
+ len = sizeof(int);
+ else
+ len = m-m_len - i;
+ memcpy(m-m_data + i, data,
CVS commit: src/tests/net
Module Name:src Committed By: christos Date: Mon Jan 5 22:38:36 UTC 2015 Modified Files: src/tests/net: Makefile Added Files: src/tests/net/in_cksum: Makefile in_cksum.c t_in_cksum.sh Log Message: Port the in_cksum test from regress. To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tests/net/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/Makefile \ src/tests/net/in_cksum/in_cksum.c src/tests/net/in_cksum/t_in_cksum.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/regress/sys/net/in_cksum
Module Name:src Committed By: christos Date: Mon Jan 5 22:39:29 UTC 2015 Removed Files: src/regress/sys/net/in_cksum: Makefile in_cksum.c Log Message: moved to tests/net/in_cksum. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/regress/sys/net/in_cksum/Makefile cvs rdiff -u -r1.3 -r0 src/regress/sys/net/in_cksum/in_cksum.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/regress/sys/net/in_cksum
Module Name:src Committed By: christos Date: Mon Jan 5 22:39:29 UTC 2015 Removed Files: src/regress/sys/net/in_cksum: Makefile in_cksum.c Log Message: moved to tests/net/in_cksum. To generate a diff of this commit: cvs rdiff -u -r1.4 -r0 src/regress/sys/net/in_cksum/Makefile cvs rdiff -u -r1.3 -r0 src/regress/sys/net/in_cksum/in_cksum.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Mon Jan 5 23:00:53 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: dont clear EMAC_STAT_MDIO on irq, as we poll this bit in readreg/writereg To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rockchip_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/rockchip/rockchip_emac.c diff -u src/sys/arch/arm/rockchip/rockchip_emac.c:1.4 src/sys/arch/arm/rockchip/rockchip_emac.c:1.5 --- src/sys/arch/arm/rockchip/rockchip_emac.c:1.4 Mon Jan 5 22:16:49 2015 +++ src/sys/arch/arm/rockchip/rockchip_emac.c Mon Jan 5 23:00:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: rockchip_emac.c,v 1.4 2015/01/05 22:16:49 jmcneill Exp $ */ +/* $NetBSD: rockchip_emac.c,v 1.5 2015/01/05 23:00:52 jmcneill Exp $ */ /*- * Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca @@ -29,7 +29,7 @@ #include opt_rkemac.h #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.4 2015/01/05 22:16:49 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: rockchip_emac.c,v 1.5 2015/01/05 23:00:52 jmcneill Exp $); #include sys/param.h #include sys/bus.h @@ -384,7 +384,7 @@ rkemac_intr(void *priv) if (!stat) return 0; - EMAC_WRITE(sc, EMAC_STAT_REG, stat); + EMAC_WRITE(sc, EMAC_STAT_REG, stat ~EMAC_STAT_MDIO); if (stat EMAC_STAT_TXINT) rkemac_txintr(sc);
CVS commit: src/sys/arch/arm/rockchip
Module Name:src Committed By: jmcneill Date: Mon Jan 5 23:00:53 UTC 2015 Modified Files: src/sys/arch/arm/rockchip: rockchip_emac.c Log Message: dont clear EMAC_STAT_MDIO on irq, as we poll this bit in readreg/writereg To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rockchip_emac.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-6-0] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:09:44 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6-0]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.1.4.1 -r1.12.4.1.4.2 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/bsd/bind/include/isc/platform.h diff -u src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.1 src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.2 --- src/external/bsd/bind/include/isc/platform.h:1.12.4.1.4.1 Wed Dec 31 11:59:14 2014 +++ src/external/bsd/bind/include/isc/platform.h Mon Jan 5 23:09:44 2015 @@ -270,9 +270,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-6-0] src/external/bsd/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:09:44 UTC 2015 Modified Files: src/external/bsd/bind/include/isc [netbsd-6-0]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1217): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.12.4.1.4.1 -r1.12.4.1.4.2 \ src/external/bsd/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:21:24 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.4.1 -r1.9.4.2 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Mon Jan 5 21:28:54 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets 373, 374, 375, 377, 378, 380 and 381 To generate a diff of this commit: cvs rdiff -u -r1.1.2.146 -r1.1.2.147 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Jan 5 22:17:38 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ROCKCHIP Log Message: remove rgephy, radxa rock seems to have an smsc phy that works with ukphy To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ROCKCHIP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/ROCKCHIP diff -u src/sys/arch/evbarm/conf/ROCKCHIP:1.13 src/sys/arch/evbarm/conf/ROCKCHIP:1.14 --- src/sys/arch/evbarm/conf/ROCKCHIP:1.13 Sun Jan 4 03:53:34 2015 +++ src/sys/arch/evbarm/conf/ROCKCHIP Mon Jan 5 22:17:38 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ROCKCHIP,v 1.13 2015/01/04 03:53:34 jmcneill Exp $ +# $NetBSD: ROCKCHIP,v 1.14 2015/01/05 22:17:38 jmcneill Exp $ # # Rockchip RK3066/RK3188 based SBC (Single Board Computer) # @@ -202,7 +202,6 @@ ld* at sdmmc? # Ethernet rkemac0 at obio0 addr 0x10204000 size 0x4000 intr 51 -rgephy* at mii? phy ? ukphy* at mii? phy ? #options DWC_MMC_DEBUG
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Jan 5 22:17:38 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ROCKCHIP Log Message: remove rgephy, radxa rock seems to have an smsc phy that works with ukphy To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbarm/conf/ROCKCHIP Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jan 5 22:45:09 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add in_cksum tests To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.607 -r1.608 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.98 src/distrib/sets/lists/debug/mi:1.99 --- src/distrib/sets/lists/debug/mi:1.98 Mon Dec 29 23:22:18 2014 +++ src/distrib/sets/lists/debug/mi Mon Jan 5 17:45:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.98 2014/12/30 04:22:18 mrg Exp $ +# $NetBSD: mi,v 1.99 2015/01/05 22:45:09 christos Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/lib/i18n/libBIG5_g.a comp-c-debuglib debuglib @@ -2159,6 +2159,7 @@ ./usr/libdata/debug/usr/tests/net/if/ifconf.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/if/t_compat.debug tests-net-debug debug,atf,rump ./usr/libdata/debug/usr/tests/net/if_loop/t_pr.debug tests-net-debug debug,atf,rump +./usr/libdata/debug/usr/tests/net/in_cksum/in_cksum.debug tests-net-debug debug,atf ./usr/libdata/debug/usr/tests/net/mcast/t_mcast.debug tests-net-debug debug,atf ./usr/libdata/debug/usr/tests/net/net/t_pktinfo.debug tests-net-debug debug,atf ./usr/libdata/debug/usr/tests/net/net/t_raw.debug tests-net-debug debug,atf,rump Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.607 src/distrib/sets/lists/tests/mi:1.608 --- src/distrib/sets/lists/tests/mi:1.607 Mon Jan 5 13:03:59 2015 +++ src/distrib/sets/lists/tests/mi Mon Jan 5 17:45:09 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.607 2015/01/05 18:03:59 joerg Exp $ +# $NetBSD: mi,v 1.608 2015/01/05 22:45:09 christos Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -148,6 +148,7 @@ ./usr/libdata/debug/usr/tests/net/icmp tests-net-debug ./usr/libdata/debug/usr/tests/net/if tests-net-debug ./usr/libdata/debug/usr/tests/net/if_loop tests-net-debug +./usr/libdata/debug/usr/tests/net/in_cksumtests-net-debug ./usr/libdata/debug/usr/tests/net/mcast tests-net-debug ./usr/libdata/debug/usr/tests/net/net tests-net-debug ./usr/libdata/debug/usr/tests/net/sys tests-net-debug @@ -3137,6 +3138,11 @@ ./usr/tests/net/if_loop/Atffile tests-net-tests atf,rump ./usr/tests/net/if_loop/Kyuafile tests-net-tests atf,rump,kyua ./usr/tests/net/if_loop/t_pr tests-net-tests atf,rump +./usr/tests/net/in_cksum tests-net-tests +./usr/tests/net/in_cksum/Atffile tests-net-tests atf +./usr/tests/net/in_cksum/Kyuafile tests-net-tests atf,kyua +./usr/tests/net/in_cksum/t_in_cksum tests-net-tests atf +./usr/tests/net/in_cksum/in_cksum tests-net-tests atf ./usr/tests/net/mcasttests-net-tests ./usr/tests/net/mcast/Atffile tests-net-tests atf,rump ./usr/tests/net/mcast/Kyuafile tests-net-tests atf,rump,kyua
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Mon Jan 5 22:45:09 UTC 2015 Modified Files: src/distrib/sets/lists/debug: mi src/distrib/sets/lists/tests: mi Log Message: add in_cksum tests To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.607 -r1.608 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:31:37 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5-1]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.12.1 -r1.9.12.2 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/bind/include/isc/platform.h diff -u src/usr.sbin/bind/include/isc/platform.h:1.9.12.1 src/usr.sbin/bind/include/isc/platform.h:1.9.12.2 --- src/usr.sbin/bind/include/isc/platform.h:1.9.12.1 Sun Jan 9 20:43:32 2011 +++ src/usr.sbin/bind/include/isc/platform.h Mon Jan 5 23:31:37 2015 @@ -258,9 +258,7 @@ * If the xadd operation is available on this architecture, * ISC_PLATFORM_HAVEXADD will be defined. */ -#ifdef __HAVE_ATOMIC64_OPS #define ISC_PLATFORM_HAVEXADD 1 -#endif /* * If the xaddq operation (64bit xadd) is available on this architecture,
CVS commit: [netbsd-5-1] src/usr.sbin/bind/include/isc
Module Name:src Committed By: msaitoh Date: Mon Jan 5 23:31:37 UTC 2015 Modified Files: src/usr.sbin/bind/include/isc [netbsd-5-1]: platform.h Log Message: Pullup the following revision (requested by he in ticket #1937): src/external/bsd/bind/include/isc/platform.hrev. 1.18 What ISC wraps under ISC_PLATFORM_HAVEXADD appears to be 32-bit atomic adds, and I beleive all our platforms can do that. Therefore, no need to conditionalize that definition under __HAVE_ATOMIC64_OPS. To generate a diff of this commit: cvs rdiff -u -r1.9.12.1 -r1.9.12.2 src/usr.sbin/bind/include/isc/platform.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/external/mit/xorg/lib/libGL
Module Name:src Committed By: martin Date: Mon Jan 5 23:11:03 UTC 2015 Modified Files: src/external/mit/xorg/lib/libGL [netbsd-7]: mesa-ver.mk src/external/mit/xorg/lib/libGL/internal [netbsd-7]: Makefile Log Message: Actually do pullup external/mit/xorg/lib/libGL/internal/Makefile 1.2 external/mit/xorg/lib/libGL/mesa-ver.mk 1.2 as claimed in ticket #381 (but somehow not actually done) To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.1.24.1 src/external/mit/xorg/lib/libGL/mesa-ver.mk cvs rdiff -u -r1.1 -r1.1.24.1 \ src/external/mit/xorg/lib/libGL/internal/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/external/mit/xorg/lib/libGL
Module Name:src
Committed By: martin
Date: Mon Jan 5 23:11:03 UTC 2015
Modified Files:
src/external/mit/xorg/lib/libGL [netbsd-7]: mesa-ver.mk
src/external/mit/xorg/lib/libGL/internal [netbsd-7]: Makefile
Log Message:
Actually do pullup
external/mit/xorg/lib/libGL/internal/Makefile 1.2
external/mit/xorg/lib/libGL/mesa-ver.mk 1.2
as claimed in ticket #381 (but somehow not actually done)
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.1.24.1 src/external/mit/xorg/lib/libGL/mesa-ver.mk
cvs rdiff -u -r1.1 -r1.1.24.1 \
src/external/mit/xorg/lib/libGL/internal/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/libGL/mesa-ver.mk
diff -u src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1 src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1.24.1
--- src/external/mit/xorg/lib/libGL/mesa-ver.mk:1.1 Mon Nov 22 21:05:29 2010
+++ src/external/mit/xorg/lib/libGL/mesa-ver.mk Mon Jan 5 23:11:03 2015
@@ -1,3 +1,3 @@
-# $NetBSD: mesa-ver.mk,v 1.1 2010/11/22 21:05:29 mrg Exp $
+# $NetBSD: mesa-ver.mk,v 1.1.24.1 2015/01/05 23:11:03 martin Exp $
-MESA_VER= 7.8.2
+MESA_VER= 10.3.5
Index: src/external/mit/xorg/lib/libGL/internal/Makefile
diff -u src/external/mit/xorg/lib/libGL/internal/Makefile:1.1 src/external/mit/xorg/lib/libGL/internal/Makefile:1.1.24.1
--- src/external/mit/xorg/lib/libGL/internal/Makefile:1.1 Sat May 22 08:52:34 2010
+++ src/external/mit/xorg/lib/libGL/internal/Makefile Mon Jan 5 23:11:03 2015
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2010/05/22 08:52:34 mrg Exp $
+# $NetBSD: Makefile,v 1.1.24.1 2015/01/05 23:11:03 martin Exp $
.include bsd.own.mk
.PATH: ${X11SRCDIR.MesaLib}/include/GL/internal
-INCS= dri_interface.h sarea.h
+INCS= dri_interface.h
INCSDIR=${X11INCDIR}/GL/internal
NOOBJ= # defined
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Mon Jan 5 23:25:10 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile in_cksum.c Added Files: src/tests/net/in_cksum: mkassym.c Log Message: add a dummy mkassym look in more places for cpu_in_cksum To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/net/in_cksum/Makefile \ src/tests/net/in_cksum/in_cksum.c cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/mkassym.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Mon Jan 5 23:25:10 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile in_cksum.c
Added Files:
src/tests/net/in_cksum: mkassym.c
Log Message:
add a dummy mkassym
look in more places for cpu_in_cksum
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tests/net/in_cksum/Makefile \
src/tests/net/in_cksum/in_cksum.c
cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/mkassym.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.1 src/tests/net/in_cksum/Makefile:1.2
--- src/tests/net/in_cksum/Makefile:1.1 Mon Jan 5 17:38:36 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 18:25:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2015/01/05 22:38:36 christos Exp $
+# $NetBSD: Makefile,v 1.2 2015/01/05 23:25:10 christos Exp $
.include bsd.own.mk
@@ -7,19 +7,25 @@ TESTSDIR= ${TESTSBASE}/net/cksum
TESTS_SH=t_in_cksum
-ADIR=${NETBSDSRCDIR}/sys/arch/${MACHINE}/${MACHINE}
+
CDIR=${NETBSDSRCDIR}/sys/netinet
+
+.for i in ${MACHINE_CPU} ${MACHINE_ARCH} ${MACHINE}
+ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.if exists(${ADIR}/cpu_in_cksum.S)
.PATH.S: ${ADIR}
-SRCS+=cpu_in_cksum.S
-CPPFLAGS+=-DHAVE_CPU_IN_CKSUM
+SRCS.in_cksum+=cpu_in_cksum.S in_cksum.c
+cpu_in_cksum.S: assym.h
+CLEANFILES+= assym.h
+CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I.
.endif
+.endfor
-PROGS=in_cksum
+PROGS=in_cksum mkassym
CPPFLAGS+=-I${CDIR}
-.include bsd.test.mk
+assym.h: mkassym
+ ${.ALLSRC} ${.TARGET}
-foo:
- echo ${ADIR}/cpu_in_cksum.S
+.include bsd.test.mk
Index: src/tests/net/in_cksum/in_cksum.c
diff -u src/tests/net/in_cksum/in_cksum.c:1.1 src/tests/net/in_cksum/in_cksum.c:1.2
--- src/tests/net/in_cksum/in_cksum.c:1.1 Mon Jan 5 17:38:36 2015
+++ src/tests/net/in_cksum/in_cksum.c Mon Jan 5 18:25:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: in_cksum.c,v 1.1 2015/01/05 22:38:36 christos Exp $ */
+/* $NetBSD: in_cksum.c,v 1.2 2015/01/05 23:25:10 christos Exp $ */
/*-
* Copyright (c) 2008 Joerg Sonnenberger jo...@netbsd.org.
* All rights reserved.
@@ -29,7 +29,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: in_cksum.c,v 1.1 2015/01/05 22:38:36 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: in_cksum.c,v 1.2 2015/01/05 23:25:10 christos Exp $);
#include sys/param.h
#include sys/mbuf.h
@@ -37,6 +37,7 @@ __KERNEL_RCSID(0, $NetBSD: in_cksum.c,v
#include err.h
#include stdbool.h
#include stdio.h
+#include stdarg.h
#include unistd.h
#include stdlib.h
#include string.h
@@ -45,11 +46,22 @@ __KERNEL_RCSID(0, $NetBSD: in_cksum.c,v
#include cpu_in_cksum.c
#ifdef HAVE_CPU_IN_CKSUM
+#undef cpu_in_cksum
int cpu_in_cksum(struct mbuf*, int, int, uint32_t);
#endif
static bool random_aligned;
+void panic(const char *, ...);
+void
+panic(const char *fmt, ...)
+{
+ va_list ap;
+ va_start(ap, fmt);
+ verrx(1, fmt, ap);
+ va_end(ap);
+}
+
static void
free_mbuf_chain(struct mbuf *m)
{
Added files:
Index: src/tests/net/in_cksum/mkassym.c
diff -u /dev/null src/tests/net/in_cksum/mkassym.c:1.1
--- /dev/null Mon Jan 5 18:25:10 2015
+++ src/tests/net/in_cksum/mkassym.c Mon Jan 5 18:25:10 2015
@@ -0,0 +1,15 @@
+
+#include sys/param.h
+#include sys/types.h
+#include sys/mbuf.h
+#include stddef.h
+#include stdio.h
+
+int
+main(void)
+{
+ printf(#define M_LEN %zu\n, offsetof(struct m_hdr, mh_len));
+ printf(#define M_DATA %zu\n, offsetof(struct m_hdr, mh_data));
+ printf(#define M_NEXT %zu\n, offsetof(struct m_hdr, mh_next));
+ return 0;
+}
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Mon Jan 5 23:46:49 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile Added Files: src/tests/net/in_cksum: assym.h Removed Files: src/tests/net/in_cksum: mkassym.c Log Message: Too hard to cross-build mkassym.c correctly, use a standard assym.h To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/tests/net/in_cksum/Makefile cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/assym.h cvs rdiff -u -r1.1 -r0 src/tests/net/in_cksum/mkassym.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src
Committed By: jmcneill
Date: Tue Jan 6 00:43:59 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
allow passing rkemac0.mac-address=xx:xx:xx:xx:xx:xx on kernel cmdline to
override random mac address
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/rockchip/rockchip_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.17 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.18
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.17 Sun Jan 4 03:55:11 2015
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Tue Jan 6 00:43:59 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.17 2015/01/04 03:55:11 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.18 2015/01/06 00:43:59 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rockchip_machdep.c,v 1.17 2015/01/04 03:55:11 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rockchip_machdep.c,v 1.18 2015/01/06 00:43:59 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -144,6 +144,7 @@ __KERNEL_RCSID(0, $NetBSD: rockchip_mac
#endif
#include arml2cc.h
#include act8846pm.h
+#include ether.h
#include sys/param.h
#include sys/systm.h
@@ -208,6 +209,7 @@ __KERNEL_RCSID(0, $NetBSD: rockchip_mac
#include dev/i2c/ddcreg.h
#include dev/usb/ukbdvar.h
+#include net/if_ether.h
/*
* ATAG cmdline length can be up to UINT32_MAX - 4, but Rockchip RK3188
@@ -765,7 +767,7 @@ rockchip_device_register(device_t self,
return;
}
- if (device_is_a(self, rkemac)) {
+ if (device_is_a(self, rkemac) device_unit(self) == 0) {
#if NACT8846PM 0
device_t pmic = device_find_by_driver_unit(act8846pm, 0);
if (pmic == NULL)
@@ -776,6 +778,16 @@ rockchip_device_register(device_t self,
act8846_set_voltage(ctrl, 3300, 3300);
act8846_enable(ctrl);
#endif
+#if NETHER 0
+ uint8_t enaddr[ETHER_ADDR_LEN];
+ if (get_bootconf_option(boot_args, rkemac0.mac-address,
+ BOOTOPT_TYPE_MACADDR, enaddr)) {
+ prop_data_t pd = prop_data_create_data(enaddr,
+ sizeof(enaddr));
+ prop_dictionary_set(dict, mac-address, pd);
+ prop_object_release(pd);
+ }
+#endif
return;
}
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src Committed By: jmcneill Date: Tue Jan 6 00:43:59 UTC 2015 Modified Files: src/sys/arch/evbarm/rockchip: rockchip_machdep.c Log Message: allow passing rkemac0.mac-address=xx:xx:xx:xx:xx:xx on kernel cmdline to override random mac address To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/sys/arch/evbarm/rockchip/rockchip_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm
Module Name:src
Committed By: jmcneill
Date: Tue Jan 6 00:43:21 UTC 2015
Modified Files:
src/sys/arch/arm/arm: bootconfig.c
src/sys/arch/arm/include: bootconfig.h
Log Message:
add BOOTOPT_TYPE_MACADDR for parsing mac address parameters
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/bootconfig.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/bootconfig.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/arm/bootconfig.c
diff -u src/sys/arch/arm/arm/bootconfig.c:1.7 src/sys/arch/arm/arm/bootconfig.c:1.8
--- src/sys/arch/arm/arm/bootconfig.c:1.7 Fri Sep 5 05:24:53 2014
+++ src/sys/arch/arm/arm/bootconfig.c Tue Jan 6 00:43:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.c,v 1.7 2014/09/05 05:24:53 matt Exp $ */
+/* $NetBSD: bootconfig.c,v 1.8 2015/01/06 00:43:21 jmcneill Exp $ */
/*
* Copyright (c) 1994-1998 Mark Brinicombe.
@@ -36,14 +36,20 @@
* SUCH DAMAGE.
*/
+#include ether.h
+
#include sys/param.h
-__KERNEL_RCSID(0, $NetBSD: bootconfig.c,v 1.7 2014/09/05 05:24:53 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: bootconfig.c,v 1.8 2015/01/06 00:43:21 jmcneill Exp $);
#include sys/systm.h
#include machine/bootconfig.h
+#if NETHER 0
+#include net/if_ether.h
+#endif
+
/*
* Function to identify and process different types of boot argument
* Note, results may contain trailing data, eg:
@@ -116,6 +122,18 @@ get_bootconf_option(char *opts, const ch
*((int *)result) =
(u_int)strtoul(ptr, NULL, 16);
break;
+#if NETHER 0
+case BOOTOPT_TYPE_MACADDR : {
+ char mac[18];
+ if (strlen(ptr) ETHER_ADDR_LEN)
+ return 0;
+ strlcpy(mac, ptr, sizeof(mac));
+ if (ether_aton_r((u_char *)result,
+ ETHER_ADDR_LEN, mac))
+ return 0;
+ break;
+}
+#endif
default:
return 0;
}
Index: src/sys/arch/arm/include/bootconfig.h
diff -u src/sys/arch/arm/include/bootconfig.h:1.6 src/sys/arch/arm/include/bootconfig.h:1.7
--- src/sys/arch/arm/include/bootconfig.h:1.6 Fri Aug 31 23:59:52 2012
+++ src/sys/arch/arm/include/bootconfig.h Tue Jan 6 00:43:21 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bootconfig.h,v 1.6 2012/08/31 23:59:52 matt Exp $ */
+/* $NetBSD: bootconfig.h,v 1.7 2015/01/06 00:43:21 jmcneill Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -42,6 +42,7 @@
#define BOOTOPT_TYPE_INT 2
#define BOOTOPT_TYPE_BININT 3
#define BOOTOPT_TYPE_HEXINT 4
+#define BOOTOPT_TYPE_MACADDR 5
#define BOOTOPT_TYPE_MASK 7
struct boot_physmem {
CVS commit: src/sys/arch/arm
Module Name:src Committed By: jmcneill Date: Tue Jan 6 00:43:21 UTC 2015 Modified Files: src/sys/arch/arm/arm: bootconfig.c src/sys/arch/arm/include: bootconfig.h Log Message: add BOOTOPT_TYPE_MACADDR for parsing mac address parameters To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/arm/bootconfig.c cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/include/bootconfig.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/awin
Module Name:src
Committed By: jmcneill
Date: Tue Jan 6 00:52:26 UTC 2015
Modified Files:
src/sys/arch/evbarm/awin: awin_machdep.c
Log Message:
use BOOTOPT_TYPE_MACADDR
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/awin/awin_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.38 src/sys/arch/evbarm/awin/awin_machdep.c:1.39
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.38 Sun Jan 4 15:59:32 2015
+++ src/sys/arch/evbarm/awin/awin_machdep.c Tue Jan 6 00:52:26 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.38 2015/01/04 15:59:32 martin Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.39 2015/01/06 00:52:26 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.38 2015/01/04 15:59:32 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: awin_machdep.c,v 1.39 2015/01/06 00:52:26 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -783,28 +783,18 @@ awin_device_register(device_t self, void
return;
}
- if (device_is_a(self, awge)) {
+ if (device_is_a(self, awge) device_unit(self) == 0) {
#if NETHER 0
/*
* Get the GMAC MAC address from cmdline.
*/
uint8_t enaddr[ETHER_ADDR_LEN];
- char argname[strlen(awge?.mac-address) + 1];
- char *mac_addr;
- snprintf(argname, sizeof(argname), %s.mac-address,
- device_xname(self));
-
- if (get_bootconf_option(boot_args, argname,
- BOOTOPT_TYPE_STRING, mac_addr)) {
- char mac[strlen(XX:XX:XX:XX:XX:XX) + 1];
- strlcpy(mac, mac_addr, sizeof(mac));
- if (!ether_aton_r(enaddr, sizeof(enaddr), mac)) {
-prop_data_t pd;
-pd = prop_data_create_data(enaddr, sizeof(enaddr));
-KASSERT(pd != NULL);
-prop_dictionary_set(dict, mac-address, pd);
-prop_object_release(pd);
- }
+ if (get_bootconf_option(boot_args, awge0.mac-address,
+ BOOTOPT_TYPE_MACADDR, enaddr)) {
+ prop_data_t pd = prop_data_create_data(enaddr,
+ sizeof(enaddr));
+ prop_dictionary_set(dict, mac-address, pd);
+ prop_object_release(pd);
}
#endif
CVS commit: src/sys/arch/evbarm/awin
Module Name:src Committed By: jmcneill Date: Tue Jan 6 00:52:26 UTC 2015 Modified Files: src/sys/arch/evbarm/awin: awin_machdep.c Log Message: use BOOTOPT_TYPE_MACADDR To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbarm/awin/awin_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Mon Jan 5 23:46:49 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Added Files:
src/tests/net/in_cksum: assym.h
Removed Files:
src/tests/net/in_cksum: mkassym.c
Log Message:
Too hard to cross-build mkassym.c correctly, use a standard assym.h
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/net/in_cksum/Makefile
cvs rdiff -u -r0 -r1.1 src/tests/net/in_cksum/assym.h
cvs rdiff -u -r1.1 -r0 src/tests/net/in_cksum/mkassym.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.2 src/tests/net/in_cksum/Makefile:1.3
--- src/tests/net/in_cksum/Makefile:1.2 Mon Jan 5 18:25:10 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 18:46:49 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2015/01/05 23:25:10 christos Exp $
+# $NetBSD: Makefile,v 1.3 2015/01/05 23:46:49 christos Exp $
.include bsd.own.mk
@@ -16,16 +16,12 @@ ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.PATH.S: ${ADIR}
SRCS.in_cksum+=cpu_in_cksum.S in_cksum.c
cpu_in_cksum.S: assym.h
-CLEANFILES+= assym.h
CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I.
.endif
.endfor
-PROGS=in_cksum mkassym
+PROGS=in_cksum
CPPFLAGS+=-I${CDIR}
-assym.h: mkassym
- ${.ALLSRC} ${.TARGET}
-
.include bsd.test.mk
Added files:
Index: src/tests/net/in_cksum/assym.h
diff -u /dev/null src/tests/net/in_cksum/assym.h:1.1
--- /dev/null Mon Jan 5 18:46:49 2015
+++ src/tests/net/in_cksum/assym.h Mon Jan 5 18:46:49 2015
@@ -0,0 +1,10 @@
+/* XXX: Depends on m_hdr */
+#ifdef _LP64
+#define M_NEXT 0
+#define M_DATA 16
+#define M_LEN 32
+#else
+#define M_NEXT 0
+#define M_DATA 8
+#define M_LEN 16
+#endif
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Mon Jan 5 23:48:46 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
Form the sources in a better way.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/net/in_cksum/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.3 src/tests/net/in_cksum/Makefile:1.4
--- src/tests/net/in_cksum/Makefile:1.3 Mon Jan 5 18:46:49 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 18:48:46 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2015/01/05 23:46:49 christos Exp $
+# $NetBSD: Makefile,v 1.4 2015/01/05 23:48:46 christos Exp $
.include bsd.own.mk
@@ -14,7 +14,7 @@ CDIR=${NETBSDSRCDIR}/sys/netinet
ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.if exists(${ADIR}/cpu_in_cksum.S)
.PATH.S: ${ADIR}
-SRCS.in_cksum+=cpu_in_cksum.S in_cksum.c
+SRCS.in_cksum=cpu_in_cksum.S in_cksum.c
cpu_in_cksum.S: assym.h
CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I.
.endif
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Mon Jan 5 23:48:46 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile Log Message: Form the sources in a better way. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/net/in_cksum/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src
Committed By: jmcneill
Date: Tue Jan 6 00:45:45 UTC 2015
Modified Files:
src/sys/arch/evbarm/rockchip: rockchip_machdep.c
Log Message:
typo fix
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/rockchip/rockchip_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/rockchip/rockchip_machdep.c
diff -u src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.18 src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.19
--- src/sys/arch/evbarm/rockchip/rockchip_machdep.c:1.18 Tue Jan 6 00:43:59 2015
+++ src/sys/arch/evbarm/rockchip/rockchip_machdep.c Tue Jan 6 00:45:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: rockchip_machdep.c,v 1.18 2015/01/06 00:43:59 jmcneill Exp $ */
+/* $NetBSD: rockchip_machdep.c,v 1.19 2015/01/06 00:45:45 jmcneill Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rockchip_machdep.c,v 1.18 2015/01/06 00:43:59 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rockchip_machdep.c,v 1.19 2015/01/06 00:45:45 jmcneill Exp $);
#include opt_machdep.h
#include opt_ddb.h
@@ -781,7 +781,7 @@ rockchip_device_register(device_t self,
#if NETHER 0
uint8_t enaddr[ETHER_ADDR_LEN];
if (get_bootconf_option(boot_args, rkemac0.mac-address,
- BOOTOPT_TYPE_MACADDR, enaddr)) {
+ BOOTOPT_TYPE_MACADDR, enaddr)) {
prop_data_t pd = prop_data_create_data(enaddr,
sizeof(enaddr));
prop_dictionary_set(dict, mac-address, pd);
CVS commit: src/sys/arch/evbarm/rockchip
Module Name:src Committed By: jmcneill Date: Tue Jan 6 00:45:45 UTC 2015 Modified Files: src/sys/arch/evbarm/rockchip: rockchip_machdep.c Log Message: typo fix To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/sys/arch/evbarm/rockchip/rockchip_machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Tue Jan 6 01:23:24 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: No need to call e500_tlb1_sync() at e500_cpu_hatch(). It has already been called at e500_spinup_trampoline(). Pointed by mrg@. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/evbppc/mpc85xx
Module Name:src Committed By: nonaka Date: Tue Jan 6 01:23:24 UTC 2015 Modified Files: src/sys/arch/evbppc/mpc85xx: machdep.c Log Message: No need to call e500_tlb1_sync() at e500_cpu_hatch(). It has already been called at e500_spinup_trampoline(). Pointed by mrg@. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/arch/evbppc/mpc85xx/machdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbppc/mpc85xx/machdep.c diff -u src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 src/sys/arch/evbppc/mpc85xx/machdep.c:1.39 --- src/sys/arch/evbppc/mpc85xx/machdep.c:1.38 Mon Jan 5 08:40:56 2015 +++ src/sys/arch/evbppc/mpc85xx/machdep.c Tue Jan 6 01:23:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.38 2015/01/05 08:40:56 nonaka Exp $ */ +/* $NetBSD: machdep.c,v 1.39 2015/01/06 01:23:24 nonaka Exp $ */ /*- * Copyright (c) 2010, 2011 The NetBSD Foundation, Inc. * All rights reserved. @@ -997,8 +997,7 @@ e500_cpu_hatch(struct cpu_info *ci) */ cpu_write_4(OPENPIC_BASE + OPENPIC_CTPR, 15); /* IPL_HIGH */ - /* Initialize TLB */ - e500_tlb1_sync(); + /* Set the MAS4 defaults */ mtspr(SPR_MAS4, MAS4_TSIZED_4KB | MAS4_MD); tlb_invalidate_all();
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Tue Jan 6 03:20:24 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
fix directory
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/tests/net/in_cksum/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.5 src/tests/net/in_cksum/Makefile:1.6
--- src/tests/net/in_cksum/Makefile:1.5 Mon Jan 5 21:49:21 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 22:20:24 2015
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2015/01/06 02:49:21 christos Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/06 03:20:24 christos Exp $
.include bsd.own.mk
MKMAN=no
-TESTSDIR= ${TESTSBASE}/net/cksum
+TESTSDIR= ${TESTSBASE}/net/in_cksum
TESTS_SH=t_in_cksum
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Tue Jan 6 02:49:21 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
assym.h moved.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/net/in_cksum/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.4 src/tests/net/in_cksum/Makefile:1.5
--- src/tests/net/in_cksum/Makefile:1.4 Mon Jan 5 18:48:46 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 21:49:21 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/01/05 23:48:46 christos Exp $
+# $NetBSD: Makefile,v 1.5 2015/01/06 02:49:21 christos Exp $
.include bsd.own.mk
@@ -16,7 +16,7 @@ ADIR:=${NETBSDSRCDIR}/sys/arch/${i}/${i}
.PATH.S: ${ADIR}
SRCS.in_cksum=cpu_in_cksum.S in_cksum.c
cpu_in_cksum.S: assym.h
-CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I.
+CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I${.CURDIR}
.endif
.endfor
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Tue Jan 6 02:49:21 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile Log Message: assym.h moved. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/net/in_cksum/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Tue Jan 6 03:14:03 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: new tests directory To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Tue Jan 6 03:20:24 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile Log Message: fix directory To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/tests/net/in_cksum/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Tue Jan 6 03:26:05 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Missed one To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/etc/mtree/NetBSD.dist.tests diff -u src/etc/mtree/NetBSD.dist.tests:1.115 src/etc/mtree/NetBSD.dist.tests:1.116 --- src/etc/mtree/NetBSD.dist.tests:1.115 Mon Jan 5 22:14:03 2015 +++ src/etc/mtree/NetBSD.dist.tests Mon Jan 5 22:26:05 2015 @@ -1,4 +1,4 @@ -# $NetBSD: NetBSD.dist.tests,v 1.115 2015/01/06 03:14:03 christos Exp $ +# $NetBSD: NetBSD.dist.tests,v 1.116 2015/01/06 03:26:05 christos Exp $ ./usr/libdata/debug/usr/tests ./usr/libdata/debug/usr/tests/atf @@ -316,6 +316,7 @@ ./usr/tests/net/if ./usr/tests/net/if_bridge ./usr/tests/net/if_loop +./usr/tests/net/in_cksum ./usr/tests/net/mcast ./usr/tests/net/mpls ./usr/tests/net/net
CVS commit: src/etc/mtree
Module Name:src Committed By: christos Date: Tue Jan 6 03:26:05 UTC 2015 Modified Files: src/etc/mtree: NetBSD.dist.tests Log Message: Missed one To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/etc/mtree/NetBSD.dist.tests Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/net/in_cksum
Module Name:src
Committed By: christos
Date: Tue Jan 6 03:41:42 UTC 2015
Modified Files:
src/tests/net/in_cksum: Makefile
Log Message:
fix helper program installation
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tests/net/in_cksum/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/net/in_cksum/Makefile
diff -u src/tests/net/in_cksum/Makefile:1.6 src/tests/net/in_cksum/Makefile:1.7
--- src/tests/net/in_cksum/Makefile:1.6 Mon Jan 5 22:20:24 2015
+++ src/tests/net/in_cksum/Makefile Mon Jan 5 22:41:42 2015
@@ -1,13 +1,11 @@
-# $NetBSD: Makefile,v 1.6 2015/01/06 03:20:24 christos Exp $
+# $NetBSD: Makefile,v 1.7 2015/01/06 03:41:42 christos Exp $
.include bsd.own.mk
-MKMAN=no
TESTSDIR= ${TESTSBASE}/net/in_cksum
TESTS_SH=t_in_cksum
-
CDIR=${NETBSDSRCDIR}/sys/netinet
.for i in ${MACHINE_CPU} ${MACHINE_ARCH} ${MACHINE}
@@ -21,6 +19,8 @@ CPPFLAGS+=-DHAVE_CPU_IN_CKSUM -I${.CURDI
.endfor
PROGS=in_cksum
+MAN.in_cksum=# empty
+BINDIR.in_cksum= ${TESTSDIR}
CPPFLAGS+=-I${CDIR}
CVS commit: src/tests/net/in_cksum
Module Name:src Committed By: christos Date: Tue Jan 6 03:41:42 UTC 2015 Modified Files: src/tests/net/in_cksum: Makefile Log Message: fix helper program installation To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/tests/net/in_cksum/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Mon Jan 5 18:03:59 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi Log Message: Add missing gcccmds tags. To generate a diff of this commit: cvs rdiff -u -r1.1932 -r1.1933 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.606 -r1.607 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1932 src/distrib/sets/lists/comp/mi:1.1933 --- src/distrib/sets/lists/comp/mi:1.1932 Mon Jan 5 01:52:23 2015 +++ src/distrib/sets/lists/comp/mi Mon Jan 5 18:03:59 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1932 2015/01/05 01:52:23 mrg Exp $ +# $NetBSD: mi,v 1.1933 2015/01/05 18:03:59 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3584,10 +3584,10 @@ ./usr/lib/libg2c.acomp-obsolete gcc=4,obsolete ./usr/lib/libg2c_p.acomp-fortran-proflib gcc=3,profile ./usr/lib/libg2c_p.acomp-obsolete gcc=4,obsolete -./usr/lib/libgcc.acomp-c-lib +./usr/lib/libgcc.acomp-c-lib gcccmds ./usr/lib/libgcc_p.acomp-c-proflib obsolete ./usr/lib/libgcc_s.acomp-obsolete obsolete -./usr/lib/libgcov.acomp-c-lib +./usr/lib/libgcov.acomp-c-lib gcccmds ./usr/lib/libgmp.a-unknown- obsolete ./usr/lib/libgmp.acomp-c-lib obsolete ./usr/lib/libgmp_p.acomp-c-proflib obsolete @@ -3696,8 +3696,8 @@ ./usr/lib/libntp_p.acomp-obsolete obsolete ./usr/lib/libnvpair.acomp-zfs-lib zfs ./usr/lib/libnvpair_p.acomp-zfs-proflib profile,zfs -./usr/lib/libobjc.acomp-objc-lib -./usr/lib/libobjc_p.acomp-objc-proflib profile +./usr/lib/libobjc.acomp-objc-lib gcccmds +./usr/lib/libobjc_p.acomp-objc-proflib profile,gcccmds ./usr/lib/libopenpgpsdk.a comp-obsolete obsolete ./usr/lib/libopenpgpsdk_p.a comp-obsolete obsolete ./usr/lib/libossaudio.acomp-c-lib @@ -3931,9 +3931,9 @@ ./usr/lib/libssl_p.acomp-c-proflib profile,crypto ./usr/lib/libssp.acomp-obsolete obsolete ./usr/lib/libssp_p.acomp-obsolete obsolete -./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx -./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx -./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx +./usr/lib/libstdc++.acomp-cxx-lib cxx,libstdcxx,gcccmds +./usr/lib/libstdc++_p.acomp-cxx-proflib profile,cxx,libstdcxx,gcccmds +./usr/lib/libsupc++.acomp-cxx-lib cxx,libstdcxx,gcccmds ./usr/lib/libtddl.acomp-c-lib tpm ./usr/lib/libtddl_p.acomp-c-proflib tpm,profile ./usr/lib/libtelnet.acomp-obsolete obsolete Index: src/distrib/sets/lists/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.606 src/distrib/sets/lists/tests/mi:1.607 --- src/distrib/sets/lists/tests/mi:1.606 Mon Jan 5 01:52:23 2015 +++ src/distrib/sets/lists/tests/mi Mon Jan 5 18:03:59 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.606 2015/01/05 01:52:23 mrg Exp $ +# $NetBSD: mi,v 1.607 2015/01/05 18:03:59 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2889,7 +2889,7 @@ ./usr/tests/lib/libobjctests-lib-tests atf ./usr/tests/lib/libobjc/Atffile tests-lib-tests atf ./usr/tests/lib/libobjc/Kyuafile tests-lib-tests atf,kyua -./usr/tests/lib/libobjc/t_threads tests-lib-tests atf +./usr/tests/lib/libobjc/t_threads tests-lib-tests atf,gcccmds ./usr/tests/lib/libposix tests-lib-tests atf ./usr/tests/lib/libposix/Atffile tests-lib-tests atf ./usr/tests/lib/libposix/Kyuafile tests-lib-tests atf,kyua
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: joerg Date: Mon Jan 5 18:03:59 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/distrib/sets/lists/tests: mi Log Message: Add missing gcccmds tags. To generate a diff of this commit: cvs rdiff -u -r1.1932 -r1.1933 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.606 -r1.607 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
re: CVS commit: src/external/mit/xorg/lib/dri
Christos Zoulas writes: Module Name: src Committed By: christos Date: Mon Jan 5 16:26:48 UTC 2015 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Prevent .y.c from regenerating c files from yacc. XXX: Why are we compiling glcpp-parse.c both here and in the gallium subdirectory? you know of a way for convience libraries in netbsd to be all linked together into a single library, like libtool provides? no? that's why. :-) sounds like the .y.c hack belongs in libglsl.mk, which is where glcpp-parse.c is listed. .mrg.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src Committed By: joerg Date: Mon Jan 5 20:06:06 UTC 2015 Modified Files: src/external/mit/xorg/lib/gallium: Makefile Log Message: Don't bail out on the broken inline functions that use static variables. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/mit/xorg/lib/gallium
Module Name:src
Committed By: joerg
Date: Mon Jan 5 20:06:06 UTC 2015
Modified Files:
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Don't bail out on the broken inline functions that use static variables.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/lib/gallium/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/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.5 src/external/mit/xorg/lib/gallium/Makefile:1.6
--- src/external/mit/xorg/lib/gallium/Makefile:1.5 Mon Jan 5 18:51:10 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Jan 5 20:06:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2015/01/05 18:51:10 gson Exp $
+# $NetBSD: Makefile,v 1.6 2015/01/05 20:06:06 joerg Exp $
# Link the gallium mega driver.
@@ -468,7 +468,8 @@ CWARNFLAGS.clang+= -Wno-error=constant-c
-Wno-error=pointer-sign \
-Wno-error=switch \
-Wno-error=absolute-value \
- -Wno-error=tautological-compare
+ -Wno-error=tautological-compare \
+ -Wno-error=static-in-inline
.include bsd.x11.mk
LIBDIR= ${X11USRLIBDIR}/modules/dri
CVS commit: src/tools/llvm
Module Name:src Committed By: joerg Date: Mon Jan 5 18:41:59 UTC 2015 Modified Files: src/tools/llvm: Makefile Log Message: cleandir-llvm should not exist in the filesystem To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/tools/llvm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tools/llvm/Makefile diff -u src/tools/llvm/Makefile:1.18 src/tools/llvm/Makefile:1.19 --- src/tools/llvm/Makefile:1.18 Thu Jan 16 09:00:55 2014 +++ src/tools/llvm/Makefile Mon Jan 5 18:41:59 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2014/01/16 09:00:55 matt Exp $ +# $NetBSD: Makefile,v 1.19 2015/01/05 18:41:59 joerg Exp $ .include bsd.init.mk @@ -43,7 +43,7 @@ CLEANFILES+= need-dl need-dl.c need-dl.o cleandir: cleandir-llvm -cleandir-llvm: +cleandir-llvm: .PHONY test ! -d config || rm -r config rm -f need-dl need-dl.tmp
CVS commit: src/tools/llvm
Module Name:src Committed By: joerg Date: Mon Jan 5 18:41:59 UTC 2015 Modified Files: src/tools/llvm: Makefile Log Message: cleandir-llvm should not exist in the filesystem To generate a diff of this commit: cvs rdiff -u -r1.18 -r1.19 src/tools/llvm/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/external/mit/xorg/lib/dri
In article 17212.1420481...@splode.eterna.com.au, matthew green m...@eterna.com.au wrote: Christos Zoulas writes: Module Name: src Committed By:christos Date:Mon Jan 5 16:26:48 UTC 2015 Modified Files: src/external/mit/xorg/lib/dri: Makefile Log Message: Prevent .y.c from regenerating c files from yacc. XXX: Why are we compiling glcpp-parse.c both here and in the gallium subdirectory? you know of a way for convience libraries in netbsd to be all linked together into a single library, like libtool provides? no? that's why. :-) sounds like the .y.c hack belongs in libglsl.mk, which is where glcpp-parse.c is listed. Or we can just change the SRCS to include glcpp-parse.y and remove the generated files and the .y.c hacks. In general we should stop depending on timestamps to be correct to handle pre-generated files. It is an accident waiting to happen and I am afraid to break the build for program_parse.y... christos
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: gson
Date: Mon Jan 5 18:51:10 UTC 2015
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Test for ${MKDEBUG} using the same construct as in other places, so that
we get consistent behavior when the value is neither no nor yes.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium/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/dri/Makefile
diff -u src/external/mit/xorg/lib/dri/Makefile:1.25 src/external/mit/xorg/lib/dri/Makefile:1.26
--- src/external/mit/xorg/lib/dri/Makefile:1.25 Mon Jan 5 16:26:48 2015
+++ src/external/mit/xorg/lib/dri/Makefile Mon Jan 5 18:51:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2015/01/05 16:26:48 christos Exp $
+# $NetBSD: Makefile,v 1.26 2015/01/05 18:51:10 gson Exp $
# Link the mesa_dri_drivers mega driver.
@@ -372,7 +372,7 @@ CPPFLAGS.streaming-load-memcpy.c+= -msse
.for _d in ${DRIVERS}
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
SYMLINKS+= ${_d}_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so
-.if ${MKDEBUG:Uno} == yes
+.if ${MKDEBUG} != no
SYMLINKS+= mesa_dri_drivers.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
Index: src/external/mit/xorg/lib/gallium/Makefile
diff -u src/external/mit/xorg/lib/gallium/Makefile:1.4 src/external/mit/xorg/lib/gallium/Makefile:1.5
--- src/external/mit/xorg/lib/gallium/Makefile:1.4 Mon Jan 5 01:34:42 2015
+++ src/external/mit/xorg/lib/gallium/Makefile Mon Jan 5 18:51:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2015/01/05 01:34:42 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2015/01/05 18:51:10 gson Exp $
# Link the gallium mega driver.
@@ -476,7 +476,7 @@ LIBDIR= ${X11USRLIBDIR}/modules/dri
.for _d in ${DRIVERS}
SYMLINKS+= gallium_dri.so ${DRIDIR}/${_d}_dri.so
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR} ${DRIDIR}/${_d}_dri.so.${SHLIB_MAJOR}
-.if ${MKDEBUG:Uno} == yes
+.if ${MKDEBUG} != no
SYMLINKS+= gallium_dri.so.${SHLIB_MAJOR}.debug ${DRIDEBUGDIR}/${_d}_dri.so.${SHLIB_MAJOR}.debug
.endif
.endfor
CVS commit: src/external/mit/xorg/lib
Module Name:src
Committed By: gson
Date: Mon Jan 5 18:51:10 UTC 2015
Modified Files:
src/external/mit/xorg/lib/dri: Makefile
src/external/mit/xorg/lib/gallium: Makefile
Log Message:
Test for ${MKDEBUG} using the same construct as in other places, so that
we get consistent behavior when the value is neither no nor yes.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/external/mit/xorg/lib/dri/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/gallium/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Jan 5 21:23:52 UTC 2015 Modified Files: src/distrib/sets/lists/xbase [netbsd-7]: shl.mi src/distrib/sets/lists/xcomp [netbsd-7]: mi shl.mi src/distrib/sets/lists/xdebug [netbsd-7]: md.amd64 md.i386 md.macppc md.ofppc md.sparc md.sparc64 mi shl.mi src/distrib/sets/lists/xetc [netbsd-7]: mi src/distrib/sets/lists/xserver [netbsd-7]: md.alpha md.amd64 md.bebox md.i386 md.macppc md.ofppc md.prep md.sparc md.sparc64 mi src/external/mit/xorg/bin/glxgears [netbsd-7]: Makefile src/external/mit/xorg/bin/glxinfo [netbsd-7]: Makefile src/external/mit/xorg/lib [netbsd-7]: Makefile src/external/mit/xorg/lib/dri [netbsd-7]: Makefile src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile src/external/mit/xorg/lib/libGLw [netbsd-7]: Makefile Added Files: src/external/mit/xorg/lib [netbsd-7]: asm.mk driver.mk libglsl.mk libloader.mk libmesa.mk src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile src/external/mit/xorg/lib/libglapi [netbsd-7]: Makefile Removed Files: src/external/mit/xorg [netbsd-7]: TODO src/external/mit/xorg/lib/dri [netbsd-7]: dri.mk src/external/mit/xorg/lib/dri/i810 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/i915 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/i965 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/libmesa [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/mach64 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/mga [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r128 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r200 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r300 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r600 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/radeon [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/s3v [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/savage [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/sis [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/swrast [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/tdfx [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/trident [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/unichrome [netbsd-7]: Makefile src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile.glslsrcs Makefile.mesa src/external/mit/xorg/lib/libOSMesa [netbsd-7]: Makefile libmesa.mk shlib_version Log Message: Pull up following revision(s) (requested by mrg in ticket #381): distrib/sets/lists/xdebug/md.amd64: revision 1.7 external/mit/xorg/lib/libGL/internal/Makefile: revision 1.2 distrib/sets/lists/xdebug/md.amd64: revision 1.8 distrib/sets/lists/xserver/md.sparc64: revision 1.55 distrib/sets/lists/xdebug/md.sparc64: revision 1.4 external/mit/xorg/lib/Makefile: revision 1.30 external/mit/xorg/lib/libglapi/Makefile: revision 1.1 distrib/sets/lists/xserver/md.macppc: revision 1.67 external/mit/xorg/lib/dri/radeon/Makefile: file removal external/mit/xorg/lib/asm.mk: revision 1.1 external/mit/xorg/lib/dri/dri.mk: file removal external/mit/xorg/lib/dri/mach64/Makefile: file removal external/mit/xorg/lib/libGL/Makefile: revision 1.21 external/mit/xorg/lib/libGL/Makefile.glslsrcs: file removal external/mit/xorg/lib/dri/Makefile: revision 1.20 external/mit/xorg/lib/driver.mk: revision 1.1 external/mit/xorg/lib/dri/r600/Makefile: file removal external/mit/xorg/lib/dri/r128/Makefile: file removal external/mit/xorg/lib/dri/i915/Makefile: file removal external/mit/xorg/lib/dri/Makefile: revision 1.23 external/mit/xorg/lib/gallium/Makefile: revision 1.1 external/mit/xorg/lib/gallium/Makefile: revision 1.2 distrib/sets/lists/xcomp/mi: revision 1.154 external/mit/xorg/lib/libOSMesa/libmesa.mk: file removal external/mit/xorg/lib/libGL/mesa-ver.mk: revision 1.2 distrib/sets/lists/xserver/mi: revision 1.34 external/mit/xorg/bin/glxgears/Makefile: revision 1.4 distrib/sets/lists/xserver/md.alpha: revision 1.38 external/mit/xorg/lib/libOSMesa/shlib_version: file removal external/mit/xorg/lib/dri/trident/Makefile: file removal external/mit/xorg/lib/dri/i810/Makefile: file removal external/mit/xorg/lib/libGLw/Makefile: revision 1.4 external/mit/xorg/TODO: file removal external/mit/xorg/lib/dri/sis/Makefile: file removal distrib/sets/lists/xserver/md.sparc: revision 1.57 distrib/sets/lists/xserver/md.prep: revision 1.15 distrib/sets/lists/xcomp/shl.mi: revision 1.38 external/mit/xorg/lib/dri/tdfx/Makefile: file removal
CVS commit: [netbsd-7] src
Module Name:src Committed By: martin Date: Mon Jan 5 21:23:52 UTC 2015 Modified Files: src/distrib/sets/lists/xbase [netbsd-7]: shl.mi src/distrib/sets/lists/xcomp [netbsd-7]: mi shl.mi src/distrib/sets/lists/xdebug [netbsd-7]: md.amd64 md.i386 md.macppc md.ofppc md.sparc md.sparc64 mi shl.mi src/distrib/sets/lists/xetc [netbsd-7]: mi src/distrib/sets/lists/xserver [netbsd-7]: md.alpha md.amd64 md.bebox md.i386 md.macppc md.ofppc md.prep md.sparc md.sparc64 mi src/external/mit/xorg/bin/glxgears [netbsd-7]: Makefile src/external/mit/xorg/bin/glxinfo [netbsd-7]: Makefile src/external/mit/xorg/lib [netbsd-7]: Makefile src/external/mit/xorg/lib/dri [netbsd-7]: Makefile src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile src/external/mit/xorg/lib/libGLw [netbsd-7]: Makefile Added Files: src/external/mit/xorg/lib [netbsd-7]: asm.mk driver.mk libglsl.mk libloader.mk libmesa.mk src/external/mit/xorg/lib/gallium [netbsd-7]: Makefile src/external/mit/xorg/lib/libglapi [netbsd-7]: Makefile Removed Files: src/external/mit/xorg [netbsd-7]: TODO src/external/mit/xorg/lib/dri [netbsd-7]: dri.mk src/external/mit/xorg/lib/dri/i810 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/i915 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/i965 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/libmesa [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/mach64 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/mga [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r128 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r200 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r300 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/r600 [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/radeon [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/s3v [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/savage [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/sis [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/swrast [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/tdfx [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/trident [netbsd-7]: Makefile src/external/mit/xorg/lib/dri/unichrome [netbsd-7]: Makefile src/external/mit/xorg/lib/libGL [netbsd-7]: Makefile.glslsrcs Makefile.mesa src/external/mit/xorg/lib/libOSMesa [netbsd-7]: Makefile libmesa.mk shlib_version Log Message: Pull up following revision(s) (requested by mrg in ticket #381): distrib/sets/lists/xdebug/md.amd64: revision 1.7 external/mit/xorg/lib/libGL/internal/Makefile: revision 1.2 distrib/sets/lists/xdebug/md.amd64: revision 1.8 distrib/sets/lists/xserver/md.sparc64: revision 1.55 distrib/sets/lists/xdebug/md.sparc64: revision 1.4 external/mit/xorg/lib/Makefile: revision 1.30 external/mit/xorg/lib/libglapi/Makefile: revision 1.1 distrib/sets/lists/xserver/md.macppc: revision 1.67 external/mit/xorg/lib/dri/radeon/Makefile: file removal external/mit/xorg/lib/asm.mk: revision 1.1 external/mit/xorg/lib/dri/dri.mk: file removal external/mit/xorg/lib/dri/mach64/Makefile: file removal external/mit/xorg/lib/libGL/Makefile: revision 1.21 external/mit/xorg/lib/libGL/Makefile.glslsrcs: file removal external/mit/xorg/lib/dri/Makefile: revision 1.20 external/mit/xorg/lib/driver.mk: revision 1.1 external/mit/xorg/lib/dri/r600/Makefile: file removal external/mit/xorg/lib/dri/r128/Makefile: file removal external/mit/xorg/lib/dri/i915/Makefile: file removal external/mit/xorg/lib/dri/Makefile: revision 1.23 external/mit/xorg/lib/gallium/Makefile: revision 1.1 external/mit/xorg/lib/gallium/Makefile: revision 1.2 distrib/sets/lists/xcomp/mi: revision 1.154 external/mit/xorg/lib/libOSMesa/libmesa.mk: file removal external/mit/xorg/lib/libGL/mesa-ver.mk: revision 1.2 distrib/sets/lists/xserver/mi: revision 1.34 external/mit/xorg/bin/glxgears/Makefile: revision 1.4 distrib/sets/lists/xserver/md.alpha: revision 1.38 external/mit/xorg/lib/libOSMesa/shlib_version: file removal external/mit/xorg/lib/dri/trident/Makefile: file removal external/mit/xorg/lib/dri/i810/Makefile: file removal external/mit/xorg/lib/libGLw/Makefile: revision 1.4 external/mit/xorg/TODO: file removal external/mit/xorg/lib/dri/sis/Makefile: file removal distrib/sets/lists/xserver/md.sparc: revision 1.57 distrib/sets/lists/xserver/md.prep: revision 1.15 distrib/sets/lists/xcomp/shl.mi: revision 1.38 external/mit/xorg/lib/dri/tdfx/Makefile: file removal
