CVS commit: src/sys/dev/pci
Module Name:src Committed By: enami Date: Tue Feb 17 23:07:56 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Make this file compiles again with BGE_DEBUG defined. To generate a diff of this commit: cvs rdiff -u -r1.279 -r1.280 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src
Committed By: ozaki-r
Date: Wed Feb 18 03:07:56 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c
Log Message:
Don't return success when the target CPU is offline
dt_status originally expected the behavior.
This fixes a segfault happens in dt_aggregate_go (a user of dt_status)
that depends on the behavior.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c
diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.9 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.10
--- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c:1.9 Sat Feb 7 20:30:03 2015
+++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c Wed Feb 18 03:07:56 2015
@@ -41,10 +41,12 @@
#else
#include sys/ioctl.h
#include sys/sysctl.h
+#include sys/cpuio.h
#endif
#include assert.h
#include libgen.h
#include limits.h
+#include paths.h
#include dt_impl.h
@@ -497,6 +499,25 @@ dt_ioctl(dtrace_hdl_t *dtp, u_long val,
return (-1);
}
+static bool
+cpu_online(processorid_t cpu)
+{
+ cpustate_t cs;
+ int fd, online = false;
+
+ if ((fd = open(_PATH_CPUCTL, O_RDONLY)) 0)
+ return false;
+
+ cs.cs_id = cpu;
+ if (ioctl(fd, IOC_CPU_GETSTATE, cs) == 0) {
+ if (cs.cs_online)
+ online = true;
+ }
+
+ close(fd);
+ return online;
+}
+
int
dt_status(dtrace_hdl_t *dtp, processorid_t cpu)
{
@@ -506,7 +527,7 @@ dt_status(dtrace_hdl_t *dtp, processorid
#if defined(sun)
return (p_online(cpu, P_STATUS));
#else
- return 1;
+ return cpu_online(cpu) ? 1 : -1;
#endif
}
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: ozaki-r Date: Wed Feb 18 03:08:38 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_aggregate.c Log Message: Add assert To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c diff -u src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c:1.4 src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c:1.5 --- src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c:1.4 Sat Feb 7 20:30:03 2015 +++ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c Wed Feb 18 03:08:38 2015 @@ -1074,6 +1074,7 @@ dt_aggregate_go(dtrace_hdl_t *dtp) if (dt_status(dtp, i) == -1) continue; + assert(agp-dtat_ncpus agp-dtat_ncpu); agp-dtat_cpus[agp-dtat_ncpus++] = i; }
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: ozaki-r Date: Wed Feb 18 03:08:38 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_aggregate.c Log Message: Add assert To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_aggregate.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/external/cddl/osnet/dist/lib/libdtrace/common
Module Name:src Committed By: ozaki-r Date: Wed Feb 18 03:07:56 UTC 2015 Modified Files: src/external/cddl/osnet/dist/lib/libdtrace/common: dt_subr.c Log Message: Don't return success when the target CPU is offline dt_status originally expected the behavior. This fixes a segfault happens in dt_aggregate_go (a user of dt_status) that depends on the behavior. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/external/cddl/osnet/dist/lib/libdtrace/common/dt_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Tue Feb 17 22:49:26 UTC 2015 Modified Files: src/lib/libedit: chartype.h Log Message: OpenBSD is like us. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/chartype.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libedit
Module Name:src Committed By: christos Date: Tue Feb 17 22:49:26 UTC 2015 Modified Files: src/lib/libedit: chartype.h Log Message: OpenBSD is like us. To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 src/lib/libedit/chartype.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libedit/chartype.h diff -u src/lib/libedit/chartype.h:1.10 src/lib/libedit/chartype.h:1.11 --- src/lib/libedit/chartype.h:1.10 Tue Nov 15 20:45:10 2011 +++ src/lib/libedit/chartype.h Tue Feb 17 17:49:26 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: chartype.h,v 1.10 2011/11/16 01:45:10 christos Exp $ */ +/* $NetBSD: chartype.h,v 1.11 2015/02/17 22:49:26 christos Exp $ */ /*- * Copyright (c) 2009 The NetBSD Foundation, Inc. @@ -44,7 +44,7 @@ * supports non-BMP code points without requiring UTF-16, but nothing * seems to actually advertise this properly, despite Unicode 3.1 having * been around since 2001... */ -#if !defined(__NetBSD__) !defined(__sun) !(defined(__APPLE__) defined(__MACH__)) +#if !defined(__NetBSD__) !defined(__sun) !(defined(__APPLE__) defined(__MACH__)) !defined(__OpenBSD__) #ifndef __STDC_ISO_10646__ /* In many places it is assumed that the first 127 code points are ASCII * compatible, so ensure wchar_t indeed does ISO 10646 and not some other
re: CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi
David Laight writes: On Sat, Feb 14, 2015 at 08:14:01AM +, Soren Jacobsen wrote: Module Name:xsrc Committed By: snj Date: Sat Feb 14 08:14:01 UTC 2015 Modified Files: xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c Log Message: Pull up following revision(s) (requested by mrg in ticket #514): external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2 disable the use of 32 bit x86 asm code here, it (like the 64 bit code), does not work on netbsd and probably needs an x86 guru to fix. Wouldn't it be more sensible to undefine USE_X86_ASM in the maefile? there is a whole bunch of other stuff that seems to work fine, it is only this TLS-related stuff that is problematic (i'm guessing it's linux-specific code here.) we're getting all the other benefit, it seemed better to only disable this one case. .mrg.
CVS commit: [netbsd-7] src/sys/kern
Module Name:src
Committed By: snj
Date: Wed Feb 18 06:35:58 UTC 2015
Modified Files:
src/sys/kern [netbsd-7]: vfs_syscalls.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #523):
sys/kern/vfs_syscalls.c: revision 1.493
A syscall like posix_fallocate() that is not supposed to set errno in
userland needs to always return 0 and store the error code *retval.
To generate a diff of this commit:
cvs rdiff -u -r1.490.2.1 -r1.490.2.2 src/sys/kern/vfs_syscalls.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/kern/vfs_syscalls.c
diff -u src/sys/kern/vfs_syscalls.c:1.490.2.1 src/sys/kern/vfs_syscalls.c:1.490.2.2
--- src/sys/kern/vfs_syscalls.c:1.490.2.1 Mon Dec 1 09:54:50 2014
+++ src/sys/kern/vfs_syscalls.c Wed Feb 18 06:35:58 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_syscalls.c,v 1.490.2.1 2014/12/01 09:54:50 martin Exp $ */
+/* $NetBSD: vfs_syscalls.c,v 1.490.2.2 2015/02/18 06:35:58 snj Exp $ */
/*-
* Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -70,7 +70,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.490.2.1 2014/12/01 09:54:50 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_syscalls.c,v 1.490.2.2 2015/02/18 06:35:58 snj Exp $);
#ifdef _KERNEL_OPT
#include opt_fileassoc.h
@@ -4716,12 +4716,14 @@ sys_posix_fallocate(struct lwp *l, const
len = SCARG(uap, len);
if (pos 0 || len 0 || len OFF_T_MAX - pos) {
- return EINVAL;
+ *retval = EINVAL;
+ return 0;
}
error = fd_getvnode(fd, fp);
if (error) {
- return error;
+ *retval = error;
+ return 0;
}
if ((fp-f_flag FWRITE) == 0) {
error = EBADF;
@@ -4739,7 +4741,8 @@ sys_posix_fallocate(struct lwp *l, const
fail:
fd_putfile(fd);
- return error;
+ *retval = error;
+ return 0;
}
/*
CVS commit: [netbsd-7] src/sys/kern
Module Name:src Committed By: snj Date: Wed Feb 18 06:35:58 UTC 2015 Modified Files: src/sys/kern [netbsd-7]: vfs_syscalls.c Log Message: Pull up following revision(s) (requested by martin in ticket #523): sys/kern/vfs_syscalls.c: revision 1.493 A syscall like posix_fallocate() that is not supposed to set errno in userland needs to always return 0 and store the error code *retval. To generate a diff of this commit: cvs rdiff -u -r1.490.2.1 -r1.490.2.2 src/sys/kern/vfs_syscalls.c 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: snj Date: Wed Feb 18 06:41:11 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 523 To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.207 src/doc/CHANGES-7.0:1.1.2.208 --- src/doc/CHANGES-7.0:1.1.2.207 Tue Feb 17 15:13:10 2015 +++ src/doc/CHANGES-7.0 Wed Feb 18 06:41:11 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.207 2015/02/17 15:13:10 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.208 2015/02/18 06:41:11 snj Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -15928,3 +15928,10 @@ sys/external/bsd/sljit/dist/sljit_src/sl Apply a bugfix from r282 http://sourceforge.net/p/sljit/code/282/. [alnsn, ticket #531] +sys/kern/vfs_syscalls.c1.493 + + A syscall like posix_fallocate() that is not supposed to set errno + in userland needs to always return 0 and store the error code + *retval. + [martin, ticket #523] +
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: snj Date: Wed Feb 18 06:41:11 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: 523 To generate a diff of this commit: cvs rdiff -u -r1.1.2.207 -r1.1.2.208 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: [netbsd-7] src/sys/arch/sh3/sh3
Module Name:src Committed By: martin Date: Tue Feb 17 14:40:56 UTC 2015 Modified Files: src/sys/arch/sh3/sh3 [netbsd-7]: locore_subr.S Log Message: Pull up following revision(s) (requested by skrll in ticket #524): sys/arch/sh3/sh3/locore_subr.S: revision 1.55 port-sh3/49613: errno does not set by some systemcall at error case Branch to correct point when error detected. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.54.30.1 src/sys/arch/sh3/sh3/locore_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sh3/sh3/locore_subr.S diff -u src/sys/arch/sh3/sh3/locore_subr.S:1.54 src/sys/arch/sh3/sh3/locore_subr.S:1.54.30.1 --- src/sys/arch/sh3/sh3/locore_subr.S:1.54 Tue Feb 1 01:54:14 2011 +++ src/sys/arch/sh3/sh3/locore_subr.S Tue Feb 17 14:40:56 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_subr.S,v 1.54 2011/02/01 01:54:14 uwe Exp $ */ +/* $NetBSD: locore_subr.S,v 1.54.30.1 2015/02/17 14:40:56 martin Exp $ */ /*- * Copyright (c) 2002 The NetBSD Foundation, Inc. @@ -40,7 +40,7 @@ #include sh3/mmu_sh3.h #include sh3/mmu_sh4.h -__KERNEL_RCSID(0, $NetBSD: locore_subr.S,v 1.54 2011/02/01 01:54:14 uwe Exp $) +__KERNEL_RCSID(0, $NetBSD: locore_subr.S,v 1.54.30.1 2015/02/17 14:40:56 martin Exp $) /* @@ -645,7 +645,7 @@ ENTRY(copyinstr) mov.l .L_copyinstr_VM_MAXUSER_ADDRESS, r3 cmp/hi r3, r4 /* bomb if usrc isn't in user space */ - bt 4f + bt 5f mov r3, r0 sub r4, r0 cmp/hi r6, r0 /* don't beyond user space */
CVS commit: [netbsd-7] src/sys/dev/pci/ixgbe
Module Name:src Committed By: martin Date: Tue Feb 17 14:54:37 UTC 2015 Modified Files: src/sys/dev/pci/ixgbe [netbsd-7]: ixgbe.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #527): sys/dev/pci/ixgbe/ixgbe.c: revision 1.15 Fix a legacy interrupt problem. If the INTx line was shared with another device, the ixgbe_legacy_irq() enabled the interrupt even if the interface was down. Check the interface state and call functions appropriately. To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/pci/ixgbe/ixgbe.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/external/bsd/sljit/dist/sljit_src
Module Name:src Committed By: martin Date: Tue Feb 17 15:11:28 UTC 2015 Modified Files: src/sys/external/bsd/sljit/dist/sljit_src [netbsd-7]: sljitNativeX86_common.c Log Message: Pull up following revision(s) (requested by alnsn in ticket #531): sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c: revision 1.7 Apply a bugfix from r282 http://sourceforge.net/p/sljit/code/282/. The bug was originally reported by me in a newer upstream version. American fuzzy lop rediscovered it for the version of sljit in the NetBSD tree. To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.6.2.1 \ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/sys/dev/pci
In article 20150217101125.1591...@cvs.netbsd.org, SAITOH Masanobu source-changes-d@NetBSD.org wrote: -=-=-=-=-=- Module Name: src Committed By: msaitoh Date: Tue Feb 17 10:11:25 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Print bit setting of bge_asf_mode if BGE_DEBUG is set. To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. -=-=-=-=-=- Modified files: Index: src/sys/dev/pci/if_bge.c diff -u src/sys/dev/pci/if_bge.c:1.278 src/sys/dev/pci/if_bge.c:1.279 --- src/sys/dev/pci/if_bge.c:1.278 Wed Feb 11 23:07:13 2015 +++ src/sys/dev/pci/if_bge.c Tue Feb 17 10:11:24 2015 @@ -1,4 +1,4 @@ -/*$NetBSD: if_bge.c,v 1.278 2015/02/11 23:07:13 msaitoh Exp $ */ +/*$NetBSD: if_bge.c,v 1.279 2015/02/17 10:11:24 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.278 2015/02/11 23:07:13 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.279 2015/02/17 10:11:24 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -6053,6 +6053,7 @@ bge_debug_info(struct bge_softc *sc) if (sc-bge_flags BGEF_TSO) printf( - TSO\n); + /* PHY related */ if (sc-bge_phy_flags BGEPHYF_NO_3LED) printf( - No 3 LEDs\n); if (sc-bge_phy_flags BGEPHYF_CRC_BUG) @@ -6069,6 +6070,14 @@ bge_debug_info(struct bge_softc *sc) printf( - adjust trim\n); if (sc-bge_phy_flags BGEPHYF_NO_WIRESPEED) printf( - no wirespeed\n); + + /* ASF related */ + if (sc-bge_asf_mode ASF_ENABLE) + printf( - ASF enable\n); + if (sc-bge_asf_mode ASF_NEW_HANDSHARE) + printf( - ASF new handshake\n); + if (sc-bge_asf_mode ASF_STACKUP) + printf( - ASF stackup\n); Candidates for snprintb()? christos
CVS commit: [netbsd-7] src/sys/arch/arm/arm
Module Name:src Committed By: martin Date: Tue Feb 17 15:30:34 UTC 2015 Modified Files: src/sys/arch/arm/arm [netbsd-7]: cpu_in_cksum.S Log Message: Fix previous (r1.11 missing in last pullup) To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/sys/arch/arm/arm/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm/cpu_in_cksum.S diff -u src/sys/arch/arm/arm/cpu_in_cksum.S:1.8.4.1 src/sys/arch/arm/arm/cpu_in_cksum.S:1.8.4.2 --- src/sys/arch/arm/arm/cpu_in_cksum.S:1.8.4.1 Mon Feb 16 21:33:13 2015 +++ src/sys/arch/arm/arm/cpu_in_cksum.S Tue Feb 17 15:30:34 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu_in_cksum.S,v 1.8.4.1 2015/02/16 21:33:13 martin Exp $ */ +/* $NetBSD: cpu_in_cksum.S,v 1.8.4.2 2015/02/17 15:30:34 martin Exp $ */ /* * Copyright 2003 Wasabi Systems, Inc. @@ -40,7 +40,7 @@ */ #include machine/asm.h -RCSID($NetBSD: cpu_in_cksum.S,v 1.8.4.1 2015/02/16 21:33:13 martin Exp $) +RCSID($NetBSD: cpu_in_cksum.S,v 1.8.4.2 2015/02/17 15:30:34 martin Exp $) #include assym.h @@ -190,7 +190,7 @@ ASENTRY_NP(arm_cksumdata) #else RETc(eq) /* done */ #endif - adds r7, r7, r1 /* undo sub */ + adds r1, r1, r7 /* undo sub */ subs r7, r7, r1 lsls r7, r7, #3 #if defined(__ARMEB__)
CVS commit: [netbsd-7] src/sys/dev/pci/ixgbe
Module Name:src
Committed By: martin
Date: Tue Feb 17 14:54:37 UTC 2015
Modified Files:
src/sys/dev/pci/ixgbe [netbsd-7]: ixgbe.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #527):
sys/dev/pci/ixgbe/ixgbe.c: revision 1.15
Fix a legacy interrupt problem. If the INTx line was shared with another
device, the ixgbe_legacy_irq() enabled the interrupt even if the interface
was down. Check the interface state and call functions appropriately.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.14.2.1 src/sys/dev/pci/ixgbe/ixgbe.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/ixgbe/ixgbe.c
diff -u src/sys/dev/pci/ixgbe/ixgbe.c:1.14 src/sys/dev/pci/ixgbe/ixgbe.c:1.14.2.1
--- src/sys/dev/pci/ixgbe/ixgbe.c:1.14 Mon Apr 21 16:35:06 2014
+++ src/sys/dev/pci/ixgbe/ixgbe.c Tue Feb 17 14:54:37 2015
@@ -59,7 +59,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
/*$FreeBSD: src/sys/dev/ixgbe/ixgbe.c,v 1.51 2011/04/25 23:34:21 jfv Exp $*/
-/*$NetBSD: ixgbe.c,v 1.14 2014/04/21 16:35:06 chs Exp $*/
+/*$NetBSD: ixgbe.c,v 1.14.2.1 2015/02/17 14:54:37 martin Exp $*/
#include opt_inet.h
@@ -1478,30 +1478,33 @@ ixgbe_legacy_irq(void *arg)
{
struct ix_queue *que = arg;
struct adapter *adapter = que-adapter;
+ struct ifnet *ifp = adapter-ifp;
struct ixgbe_hw *hw = adapter-hw;
struct tx_ring *txr = adapter-tx_rings;
- bool more_tx, more_rx;
+ bool more_tx = false, more_rx = false;
u32 reg_eicr, loop = MAX_LOOP;
-
reg_eicr = IXGBE_READ_REG(hw, IXGBE_EICR);
adapter-stats.legint.ev_count++;
++que-irqs;
if (reg_eicr == 0) {
adapter-stats.intzero.ev_count++;
- ixgbe_enable_intr(adapter);
+ if ((ifp-if_flags IFF_UP) != 0)
+ ixgbe_enable_intr(adapter);
return 0;
}
- more_rx = ixgbe_rxeof(que, adapter-rx_process_limit);
+ if ((ifp-if_flags IFF_RUNNING) != 0) {
+ more_rx = ixgbe_rxeof(que, adapter-rx_process_limit);
- IXGBE_TX_LOCK(txr);
- do {
- adapter-txloops.ev_count++;
- more_tx = ixgbe_txeof(txr);
- } while (loop-- more_tx);
- IXGBE_TX_UNLOCK(txr);
+ IXGBE_TX_LOCK(txr);
+ do {
+ adapter-txloops.ev_count++;
+ more_tx = ixgbe_txeof(txr);
+ } while (loop-- more_tx);
+ IXGBE_TX_UNLOCK(txr);
+ }
if (more_rx || more_tx) {
if (more_rx)
CVS commit: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Feb 17 15:13:11 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #524-529, 531 To generate a diff of this commit: cvs rdiff -u -r1.1.2.206 -r1.1.2.207 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: [netbsd-7] src/doc
Module Name:src Committed By: martin Date: Tue Feb 17 15:13:11 UTC 2015 Modified Files: src/doc [netbsd-7]: CHANGES-7.0 Log Message: Tickets #524-529, 531 To generate a diff of this commit: cvs rdiff -u -r1.1.2.206 -r1.1.2.207 src/doc/CHANGES-7.0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-7.0 diff -u src/doc/CHANGES-7.0:1.1.2.206 src/doc/CHANGES-7.0:1.1.2.207 --- src/doc/CHANGES-7.0:1.1.2.206 Mon Feb 16 21:38:38 2015 +++ src/doc/CHANGES-7.0 Tue Feb 17 15:13:10 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-7.0,v 1.1.2.206 2015/02/16 21:38:38 martin Exp $ +# $NetBSD: CHANGES-7.0,v 1.1.2.207 2015/02/17 15:13:10 martin Exp $ A complete list of changes from the initial NetBSD 7.0 branch on 11 Aug 2014 until the 7.0 release: @@ -15876,3 +15876,55 @@ sys/arch/arm/conf/std.arm 1.3 Fix checksum calculation and re-enable it by default. [skrll, ticket #522] +sys/arch/sh3/sh3/locore_subr.S 1.55 + + Branch to correct point when a system call returns an error. + [skrll, ticket #524] + +sbin/devpubd/Makefile1.5 +sbin/devpubd/devpubd-run-hooks.in 1.3 +sbin/devpubd/devpubd.c1.3-1.4 +sbin/devpubd/hooks/01-makedev 1.2 +sbin/devpubd/hooks/02-wedgenames 1.2 + + At startup, instead of doing run-hooks for each device, call run-hooks + once with a list of all found devices. + Run the initial device enumeration hooks before detaching from the + foreground, ensuring that any required devices have been created + before the rc.d script exits. + [jmcneill, ticket #525] + +sys/dev/pci/if_bge.c1.278 + + - bge_miibus_writereg(): Fix a bug that BCM5906 may leave an APE lock. + - Fix hwcfg4 isn't printed correctly. + - Fix a bug that BGE_PHY_TEST_CTRL_REG isn't set correctly on some + PCIe devices. + [msaitoh, ticket #526] + +sys/dev/pci/ixgbe/ixgbe.c 1.15 + + Fix a legacy interrupt problem if the INTx line was shared + with another device. + [msaitoh, ticket #527] + +sys/arch/x86/pci/ichlpcib.c 1.44 +sys/dev/pci/ichsmb.c1.38 +sys/dev/pci/pcidevs1.1206-1.1207 +sys/dev/pci/pcidevs.h(regen) +sys/dev/pci/pcidevs_data.h (regen) + + Rename a few Intel devices and add DH89xxC[CL] LPC devices. + [msaitoh, ticket #528] + +sys/fs/union/union_subr.c 1.68 + + Remove a superfluous vref(), VOP_CREATE() was changed to + keep dvp referenced and locked some time ago. + [hannken, ticket #529] + +sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c 1.7 + + Apply a bugfix from r282 http://sourceforge.net/p/sljit/code/282/. + [alnsn, ticket #531] +
CVS commit: [netbsd-7] src/sys/external/bsd/sljit/dist/sljit_src
Module Name:src
Committed By: martin
Date: Tue Feb 17 15:11:28 UTC 2015
Modified Files:
src/sys/external/bsd/sljit/dist/sljit_src [netbsd-7]:
sljitNativeX86_common.c
Log Message:
Pull up following revision(s) (requested by alnsn in ticket #531):
sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c: revision
1.7
Apply a bugfix from r282 http://sourceforge.net/p/sljit/code/282/.
The bug was originally reported by me in a newer upstream version.
American fuzzy lop rediscovered it for the version of sljit in the
NetBSD tree.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.6.2.1 \
src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c
diff -u src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.6 src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.6.2.1
--- src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c:1.6 Tue Jun 17 19:33:20 2014
+++ src/sys/external/bsd/sljit/dist/sljit_src/sljitNativeX86_common.c Tue Feb 17 15:11:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: sljitNativeX86_common.c,v 1.6 2014/06/17 19:33:20 alnsn Exp $ */
+/* $NetBSD: sljitNativeX86_common.c,v 1.6.2.1 2015/02/17 15:11:28 martin Exp $ */
/*
*Stack-less Just-In-Time compiler
@@ -1749,7 +1749,7 @@ static sljit_si emit_mul(struct sljit_co
*(sljit_si*)inst = (sljit_si)src2w;
}
else {
- EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_IMM, src1w);
+ EMIT_MOV(compiler, TMP_REG2, 0, SLJIT_IMM, src2w);
if (dst_r != src1)
EMIT_MOV(compiler, dst_r, 0, src1, src1w);
inst = emit_x86_instruction(compiler, 2, dst_r, 0, TMP_REG2, 0);
CVS commit: [netbsd-7] src/sbin/devpubd
Module Name:src
Committed By: martin
Date: Tue Feb 17 14:45:31 UTC 2015
Modified Files:
src/sbin/devpubd [netbsd-7]: Makefile devpubd-run-hooks.in devpubd.c
src/sbin/devpubd/hooks [netbsd-7]: 01-makedev 02-wedgenames
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #525):
sbin/devpubd/hooks/01-makedev: revision 1.2
sbin/devpubd/devpubd-run-hooks.in: revision 1.3
sbin/devpubd/Makefile: revision 1.5
sbin/devpubd/hooks/02-wedgenames: revision 1.2
sbin/devpubd/devpubd.c: revision 1.3
sbin/devpubd/devpubd.c: revision 1.4
At startup, instead of doing run-hooks for each device, call run-hooks
once with a list of all found devices. This lets us batch calls to MAKEDEV
which results in a noticeable improvement in Raspberry Pi boot time.
Run the initial device enumeration hooks before detaching from the foreground,
ensuring that any required devices have been created before the rc.d script
exits.
let's make this compile again.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.4.4.1 src/sbin/devpubd/Makefile
cvs rdiff -u -r1.2 -r1.2.18.1 src/sbin/devpubd/devpubd-run-hooks.in
cvs rdiff -u -r1.2 -r1.2.20.1 src/sbin/devpubd/devpubd.c
cvs rdiff -u -r1.1 -r1.1.20.1 src/sbin/devpubd/hooks/01-makedev
cvs rdiff -u -r1.1 -r1.1.12.1 src/sbin/devpubd/hooks/02-wedgenames
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/devpubd/Makefile
diff -u src/sbin/devpubd/Makefile:1.4 src/sbin/devpubd/Makefile:1.4.4.1
--- src/sbin/devpubd/Makefile:1.4 Sun Aug 11 06:04:38 2013
+++ src/sbin/devpubd/Makefile Tue Feb 17 14:45:31 2015
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.4 2013/08/11 06:04:38 dholland Exp $
+# $NetBSD: Makefile,v 1.4.4.1 2015/02/17 14:45:31 martin Exp $
PROG= devpubd
SRCS= devpubd.c
MAN= devpubd.8
+WARNS= 6
BINDIR?= /sbin
Index: src/sbin/devpubd/devpubd-run-hooks.in
diff -u src/sbin/devpubd/devpubd-run-hooks.in:1.2 src/sbin/devpubd/devpubd-run-hooks.in:1.2.18.1
--- src/sbin/devpubd/devpubd-run-hooks.in:1.2 Sun Dec 4 13:01:54 2011
+++ src/sbin/devpubd/devpubd-run-hooks.in Tue Feb 17 14:45:31 2015
@@ -1,18 +1,19 @@
#!/bin/sh
#
-# $NetBSD: devpubd-run-hooks.in,v 1.2 2011/12/04 13:01:54 jmcneill Exp $
+# $NetBSD: devpubd-run-hooks.in,v 1.2.18.1 2015/02/17 14:45:31 martin Exp $
#
# devpubd run hooks
devpubd_event=$1
-devpubd_device=$2
+shift
+devpubd_devices=$@
devpubd_hooks_base=@HOOKSDIR@
case $devpubd_event in
device-attach|device-detach)
for hook in ${devpubd_hooks_base}/*; do
if [ -x ${hook} ]; then
- ${hook} ${devpubd_event} ${devpubd_device}
+ ${hook} ${devpubd_event} ${devpubd_devices}
fi
done
;;
Index: src/sbin/devpubd/devpubd.c
diff -u src/sbin/devpubd/devpubd.c:1.2 src/sbin/devpubd/devpubd.c:1.2.20.1
--- src/sbin/devpubd/devpubd.c:1.2 Fri Sep 16 15:42:56 2011
+++ src/sbin/devpubd/devpubd.c Tue Feb 17 14:45:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: devpubd.c,v 1.2 2011/09/16 15:42:56 joerg Exp $ */
+/* $NetBSD: devpubd.c,v 1.2.20.1 2015/02/17 14:45:31 martin Exp $ */
/*-
* Copyright (c) 2011 Jared D. McNeill jmcne...@invisible.ca
@@ -36,8 +36,9 @@
#include sys/cdefs.h
__COPYRIGHT(@(#) Copyright (c) 2011\
Jared D. McNeill jmcne...@invisible.ca. All rights reserved.);
-__RCSID($NetBSD: devpubd.c,v 1.2 2011/09/16 15:42:56 joerg Exp $);
+__RCSID($NetBSD: devpubd.c,v 1.2.20.1 2015/02/17 14:45:31 martin Exp $);
+#include sys/queue.h
#include sys/types.h
#include sys/ioctl.h
#include sys/drvctlio.h
@@ -57,18 +58,24 @@ __RCSID($NetBSD: devpubd.c,v 1.2 2011/0
static int drvctl_fd = -1;
static const char devpubd_script[] = DEVPUBD_RUN_HOOKS;
+struct devpubd_probe_event {
+ char *device;
+ TAILQ_ENTRY(devpubd_probe_event) entries;
+};
+
+static TAILQ_HEAD(, devpubd_probe_event) devpubd_probe_events;
+
#define DEVPUBD_ATTACH_EVENT device-attach
#define DEVPUBD_DETACH_EVENT device-detach
__dead static void
-devpubd_exec(const char *path, const char *event, const char *device)
+devpubd_exec(const char *path, char * const *argv)
{
int error;
- error = execl(path, path, event, device, NULL);
+ error = execv(path, argv);
if (error) {
- syslog(LOG_ERR, couldn't exec '%s %s %s': %m,
- path, event, device);
+ syslog(LOG_ERR, couldn't exec '%s': %m, path);
exit(EXIT_FAILURE);
}
@@ -76,12 +83,26 @@ devpubd_exec(const char *path, const cha
}
static void
-devpubd_eventhandler(const char *event, const char *device)
+devpubd_eventhandler(const char *event, const char **device)
{
+ char **argv;
pid_t pid;
int status;
+ size_t i, ndevs;
+
+ for (ndevs = 0, i = 0; device[i] != NULL; i++) {
+ ++ndevs;
+ syslog(LOG_DEBUG, event = '%s', device = '%s', event,
+ device[i]);
+ }
- syslog(LOG_DEBUG, event = '%s', device = '%s', event, device);
+ argv = calloc(3 + ndevs, sizeof(*argv));
+ argv[0] = __UNCONST(devpubd_script);
+ argv[1] =
CVS commit: [netbsd-7] src/sbin/devpubd
Module Name:src Committed By: martin Date: Tue Feb 17 14:45:31 UTC 2015 Modified Files: src/sbin/devpubd [netbsd-7]: Makefile devpubd-run-hooks.in devpubd.c src/sbin/devpubd/hooks [netbsd-7]: 01-makedev 02-wedgenames Log Message: Pull up following revision(s) (requested by jmcneill in ticket #525): sbin/devpubd/hooks/01-makedev: revision 1.2 sbin/devpubd/devpubd-run-hooks.in: revision 1.3 sbin/devpubd/Makefile: revision 1.5 sbin/devpubd/hooks/02-wedgenames: revision 1.2 sbin/devpubd/devpubd.c: revision 1.3 sbin/devpubd/devpubd.c: revision 1.4 At startup, instead of doing run-hooks for each device, call run-hooks once with a list of all found devices. This lets us batch calls to MAKEDEV which results in a noticeable improvement in Raspberry Pi boot time. Run the initial device enumeration hooks before detaching from the foreground, ensuring that any required devices have been created before the rc.d script exits. let's make this compile again. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.4.4.1 src/sbin/devpubd/Makefile cvs rdiff -u -r1.2 -r1.2.18.1 src/sbin/devpubd/devpubd-run-hooks.in cvs rdiff -u -r1.2 -r1.2.20.1 src/sbin/devpubd/devpubd.c cvs rdiff -u -r1.1 -r1.1.20.1 src/sbin/devpubd/hooks/01-makedev cvs rdiff -u -r1.1 -r1.1.12.1 src/sbin/devpubd/hooks/02-wedgenames Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src
Committed By: martin
Date: Tue Feb 17 14:48:10 UTC 2015
Modified Files:
src/sys/dev/pci [netbsd-7]: if_bge.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #526):
sys/dev/pci/if_bge.c: revision 1.278
Fix three bugs reported by enami@:
- bge_miibus_writereg(): Fix a bug that BCM5906 may leave an APE lock.
- Fix hwcfg4 isn't printed correctly.
- Fix a bug that BGE_PHY_TEST_CTRL_REG isn't set correctly on some PCIe
devices.
To generate a diff of this commit:
cvs rdiff -u -r1.277 -r1.277.2.1 src/sys/dev/pci/if_bge.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_bge.c
diff -u src/sys/dev/pci/if_bge.c:1.277 src/sys/dev/pci/if_bge.c:1.277.2.1
--- src/sys/dev/pci/if_bge.c:1.277 Sun Aug 10 16:44:36 2014
+++ src/sys/dev/pci/if_bge.c Tue Feb 17 14:48:10 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_bge.c,v 1.277 2014/08/10 16:44:36 tls Exp $ */
+/* $NetBSD: if_bge.c,v 1.277.2.1 2015/02/17 14:48:10 martin Exp $ */
/*
* Copyright (c) 2001 Wind River Systems
@@ -79,7 +79,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.277 2014/08/10 16:44:36 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.277.2.1 2015/02/17 14:48:10 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1397,13 +1397,13 @@ bge_miibus_writereg(device_t dev, int ph
uint32_t autopoll;
int i;
- if (bge_ape_lock(sc, sc-bge_phy_ape_lock) != 0)
- return;
-
if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5906
(reg == BRGPHY_MII_1000CTL || reg == BRGPHY_MII_AUXCTL))
return;
+ if (bge_ape_lock(sc, sc-bge_phy_ape_lock) != 0)
+ return;
+
/* Reading with autopolling on may trigger PCI errors */
autopoll = CSR_READ_4(sc, BGE_MI_MODE);
if (autopoll BGE_MIMODE_AUTOPOLL) {
@@ -3742,7 +3742,7 @@ bge_attach(device_t parent, device_t sel
hwcfg2 = bge_readmem_ind(sc, BGE_SRAM_DATA_CFG_2);
if (sc-bge_flags BGEF_PCIE)
hwcfg3 = bge_readmem_ind(sc, BGE_SRAM_DATA_CFG_3);
- if (BGE_ASICREV(sc-bge_chipid == BGE_ASICREV_BCM5785))
+ if (BGE_ASICREV(sc-bge_chipid) == BGE_ASICREV_BCM5785)
hwcfg4 = bge_readmem_ind(sc, BGE_SRAM_DATA_CFG_4);
if (BGE_IS_5717_PLUS(sc))
hwcfg5 = bge_readmem_ind(sc, BGE_SRAM_DATA_CFG_5);
@@ -4170,7 +4170,7 @@ bge_reset(struct bge_softc *sc)
* XXX: from FreeBSD/Linux; no documentation
*/
if (sc-bge_flags BGEF_PCIE) {
- if (BGE_ASICREV(sc-bge_chipid != BGE_ASICREV_BCM5785)
+ if ((BGE_ASICREV(sc-bge_chipid) != BGE_ASICREV_BCM5785)
!BGE_IS_57765_PLUS(sc)
(CSR_READ_4(sc, BGE_PHY_TEST_CTRL_REG) ==
(BGE_PHY_PCIE_LTASS_MODE | BGE_PHY_PCIE_SCRAM_MODE))) {
CVS commit: [netbsd-7] src/sys
Module Name:src Committed By: martin Date: Tue Feb 17 15:06:07 UTC 2015 Modified Files: src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c src/sys/dev/pci [netbsd-7]: ichsmb.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #528): sys/dev/pci/ichsmb.c: revision 1.38 sys/dev/pci/pcidevs: revision 1.1206 sys/dev/pci/pcidevs: revision 1.1207 sys/arch/x86/pci/ichlpcib.c: revision 1.44 Change Intel 0x0434 entry: - Rename DH89XX_QA to DH89XXCC_IQIA - Modify the description to DH89xxCC PCIe Endpoint and QuickAssist (include typo fix) - Rename DH89xxCC's names from DH89XX_ to DH89XXCC_. - Add some DH89xxCC's devices. - Add DH89XXCL's devices. - Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB - Add PCI_PRODUCT_INTEL_DH89XXCL_SMB Add DH89xxC[CL] LPC devices. To generate a diff of this commit: cvs rdiff -u -r1.43.4.2 -r1.43.4.3 src/sys/arch/x86/pci/ichlpcib.c cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys
Module Name:src
Committed By: martin
Date: Tue Feb 17 15:06:07 UTC 2015
Modified Files:
src/sys/arch/x86/pci [netbsd-7]: ichlpcib.c
src/sys/dev/pci [netbsd-7]: ichsmb.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #528):
sys/dev/pci/ichsmb.c: revision 1.38
sys/dev/pci/pcidevs: revision 1.1206
sys/dev/pci/pcidevs: revision 1.1207
sys/arch/x86/pci/ichlpcib.c: revision 1.44
Change Intel 0x0434 entry:
- Rename DH89XX_QA to DH89XXCC_IQIA
- Modify the description to DH89xxCC PCIe Endpoint and QuickAssist
(include typo fix)
- Rename DH89xxCC's names from DH89XX_ to DH89XXCC_.
- Add some DH89xxCC's devices.
- Add DH89XXCL's devices.
- Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB
- Add PCI_PRODUCT_INTEL_DH89XXCL_SMB
Add DH89xxC[CL] LPC devices.
To generate a diff of this commit:
cvs rdiff -u -r1.43.4.2 -r1.43.4.3 src/sys/arch/x86/pci/ichlpcib.c
cvs rdiff -u -r1.37 -r1.37.2.1 src/sys/dev/pci/ichsmb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.43.4.2 src/sys/arch/x86/pci/ichlpcib.c:1.43.4.3
--- src/sys/arch/x86/pci/ichlpcib.c:1.43.4.2 Mon Jan 26 16:16:11 2015
+++ src/sys/arch/x86/pci/ichlpcib.c Tue Feb 17 15:06:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.43.4.2 2015/01/26 16:16:11 martin Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.43.4.2 2015/01/26 16:16:11 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.43.4.3 2015/02/17 15:06:07 martin Exp $);
#include sys/types.h
#include sys/param.h
@@ -262,6 +262,8 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C226_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_H81_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCC_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_DH89XXCL_LPC, 1, 0 },
#if 0
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_1, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C2000_PCU_2, 1, 0 },
Index: src/sys/dev/pci/ichsmb.c
diff -u src/sys/dev/pci/ichsmb.c:1.37 src/sys/dev/pci/ichsmb.c:1.37.2.1
--- src/sys/dev/pci/ichsmb.c:1.37 Wed Jul 2 19:49:38 2014
+++ src/sys/dev/pci/ichsmb.c Tue Feb 17 15:06:07 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $ */
+/* $NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $ */
/* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */
/*
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.37 2014/07/02 19:49:38 riastradh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.37.2.1 2015/02/17 15:06:07 martin Exp $);
#include sys/param.h
#include sys/device.h
@@ -117,7 +117,8 @@ ichsmb_match(device_t parent, cfdata_t m
case PCI_PRODUCT_INTEL_C600_SMB_1:
case PCI_PRODUCT_INTEL_C600_SMB_2:
case PCI_PRODUCT_INTEL_EP80579_SMB:
- case PCI_PRODUCT_INTEL_DH89XX_SMB:
+ case PCI_PRODUCT_INTEL_DH89XXCC_SMB:
+ case PCI_PRODUCT_INTEL_DH89XXCL_SMB:
case PCI_PRODUCT_INTEL_C2000_PCU_SMBUS:
return 1;
}
CVS commit: [netbsd-7] src/sys/fs/union
Module Name:src
Committed By: martin
Date: Tue Feb 17 15:09:37 UTC 2015
Modified Files:
src/sys/fs/union [netbsd-7]: union_subr.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #529):
sys/fs/union/union_subr.c: revision 1.68
Remove a superfluous vref(), VOP_CREATE() was changed to
keep dvp referenced and locked some time ago.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/fs/union/union_subr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/fs/union/union_subr.c
diff -u src/sys/fs/union/union_subr.c:1.66 src/sys/fs/union/union_subr.c:1.66.2.1
--- src/sys/fs/union/union_subr.c:1.66 Tue Jun 17 12:38:12 2014
+++ src/sys/fs/union/union_subr.c Tue Feb 17 15:09:37 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: union_subr.c,v 1.66 2014/06/17 12:38:12 hannken Exp $ */
+/* $NetBSD: union_subr.c,v 1.66.2.1 2015/02/17 15:09:37 martin Exp $ */
/*
* Copyright (c) 1994
@@ -72,7 +72,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.66 2014/06/17 12:38:12 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: union_subr.c,v 1.66.2.1 2015/02/17 15:09:37 martin Exp $);
#include sys/param.h
#include sys/systm.h
@@ -889,7 +889,6 @@ union_vn_create(struct vnode **vpp, stru
vattr_null(vap);
vap-va_type = VREG;
vap-va_mode = cmode;
- vref(un-un_dirvp);
vp = NULL;
error = VOP_CREATE(un-un_dirvp, vp, cn, vap);
if (error) {
CVS commit: [netbsd-7] src/sys/fs/union
Module Name:src Committed By: martin Date: Tue Feb 17 15:09:37 UTC 2015 Modified Files: src/sys/fs/union [netbsd-7]: union_subr.c Log Message: Pull up following revision(s) (requested by hannken in ticket #529): sys/fs/union/union_subr.c: revision 1.68 Remove a superfluous vref(), VOP_CREATE() was changed to keep dvp referenced and locked some time ago. To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.66.2.1 src/sys/fs/union/union_subr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/arm/arm
Module Name:src Committed By: martin Date: Tue Feb 17 15:30:34 UTC 2015 Modified Files: src/sys/arch/arm/arm [netbsd-7]: cpu_in_cksum.S Log Message: Fix previous (r1.11 missing in last pullup) To generate a diff of this commit: cvs rdiff -u -r1.8.4.1 -r1.8.4.2 src/sys/arch/arm/arm/cpu_in_cksum.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Feb 17 14:48:10 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-7]: if_bge.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #526): sys/dev/pci/if_bge.c: revision 1.278 Fix three bugs reported by enami@: - bge_miibus_writereg(): Fix a bug that BCM5906 may leave an APE lock. - Fix hwcfg4 isn't printed correctly. - Fix a bug that BGE_PHY_TEST_CTRL_REG isn't set correctly on some PCIe devices. To generate a diff of this commit: cvs rdiff -u -r1.277 -r1.277.2.1 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Feb 17 15:04:47 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs Log Message: Pull up the following, requested by msaitoh in ticket 528: sys/dev/pci/pcidevs: revision 1.1206-1.1207 - Rename DH89XX_QA to DH89XXCC_IQIA - Modify the description to DH89xxCC PCIe Endpoint and QuickAssist (include typo fix) - Rename DH89xxCC'''s names from DH89XX_ to DH89XXCC_. - Add some DH89xxCC'''s devices. - Add DH89XXCL'''s devices. - Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB - Add PCI_PRODUCT_INTEL_DH89XXCL_SMB To generate a diff of this commit: cvs rdiff -u -r1.1199.2.4 -r1.1199.2.5 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/netinet6
Module Name:src
Committed By: christos
Date: Tue Feb 17 15:14:28 UTC 2015
Modified Files:
src/sys/netinet6: nd6.c
Log Message:
something odd happens is not a useful error message.
To generate a diff of this commit:
cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/nd6.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/netinet6/nd6.c
diff -u src/sys/netinet6/nd6.c:1.156 src/sys/netinet6/nd6.c:1.157
--- src/sys/netinet6/nd6.c:1.156 Tue Dec 16 06:42:27 2014
+++ src/sys/netinet6/nd6.c Tue Feb 17 10:14:28 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: nd6.c,v 1.156 2014/12/16 11:42:27 roy Exp $ */
+/* $NetBSD: nd6.c,v 1.157 2015/02/17 15:14:28 christos Exp $ */
/* $KAME: nd6.c,v 1.279 2002/06/08 11:16:51 itojun Exp $ */
/*
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.156 2014/12/16 11:42:27 roy Exp $);
+__KERNEL_RCSID(0, $NetBSD: nd6.c,v 1.157 2015/02/17 15:14:28 christos Exp $);
#include bridge.h
#include carp.h
@@ -2386,7 +2386,13 @@ nd6_storelladdr(const struct ifnet *ifp,
return 0;
}
if (rt-rt_gateway-sa_family != AF_LINK) {
- printf(%s: something odd happens\n, __func__);
+ char gbuf[256];
+ char dbuf[LINK_ADDRSTRLEN];
+ sockaddr_format(rt-rt_gateway, gbuf, sizeof(gbuf));
+ printf(%s: bad gateway address type %s for dst %s
+ through interface %s\n, __func__, gbuf,
+ IN6_PRINT(dbuf, satocsin6(dst)-sin6_addr),
+ if_name(ifp));
m_freem(m);
return 0;
}
CVS commit: src/sys/netinet6
Module Name:src Committed By: christos Date: Tue Feb 17 15:14:28 UTC 2015 Modified Files: src/sys/netinet6: nd6.c Log Message: something odd happens is not a useful error message. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/sys/netinet6/nd6.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/arch/sh3/sh3
Module Name:src Committed By: martin Date: Tue Feb 17 14:40:56 UTC 2015 Modified Files: src/sys/arch/sh3/sh3 [netbsd-7]: locore_subr.S Log Message: Pull up following revision(s) (requested by skrll in ticket #524): sys/arch/sh3/sh3/locore_subr.S: revision 1.55 port-sh3/49613: errno does not set by some systemcall at error case Branch to correct point when error detected. To generate a diff of this commit: cvs rdiff -u -r1.54 -r1.54.30.1 src/sys/arch/sh3/sh3/locore_subr.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Feb 17 15:04:47 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs Log Message: Pull up the following, requested by msaitoh in ticket 528: sys/dev/pci/pcidevs: revision 1.1206-1.1207 - Rename DH89XX_QA to DH89XXCC_IQIA - Modify the description to DH89xxCC PCIe Endpoint and QuickAssist (include typo fix) - Rename DH89xxCC'''s names from DH89XX_ to DH89XXCC_. - Add some DH89xxCC'''s devices. - Add DH89XXCL'''s devices. - Rename PCI_PRODUCT_INTEL_DH89XX_SMB to PCI_PRODUCT_INTEL_DH89XXCC_SMB - Add PCI_PRODUCT_INTEL_DH89XXCL_SMB To generate a diff of this commit: cvs rdiff -u -r1.1199.2.4 -r1.1199.2.5 src/sys/dev/pci/pcidevs Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/pcidevs diff -u src/sys/dev/pci/pcidevs:1.1199.2.4 src/sys/dev/pci/pcidevs:1.1199.2.5 --- src/sys/dev/pci/pcidevs:1.1199.2.4 Wed Feb 4 06:24:58 2015 +++ src/sys/dev/pci/pcidevs Tue Feb 17 15:04:47 2015 @@ -1,4 +1,4 @@ -$NetBSD: pcidevs,v 1.1199.2.4 2015/02/04 06:24:58 snj Exp $ +$NetBSD: pcidevs,v 1.1199.2.5 2015/02/17 15:04:47 martin Exp $ /* * Copyright (c) 1995, 1996 Christopher G. Demetriou @@ -2585,7 +2585,8 @@ product INTEL SRCU42E 0x0408 SCSI RAID product INTEL SRCS28X 0x0409 SATA RAID Controller product INTEL HASWELL_IGD 0x0402 Haswell Integrated Graphics Device product INTEL HASWELL_IGD_1 0x0412 Haswell Integrated Graphics Device -product INTEL DH89XX_QA 0x0434 DH89xx QuiskAssit +product INTEL DH89XXCC_IQIA 0x0434 DH89xxCC PCIe Endpoint and QuickAssist +product INTEL DH89XXCL_IQIA 0x0435 DH89xxCL PCIe Endpoint and QuickAssist product INTEL DH89XXCC_SGMII 0x0438 DH89XXCC SGMII product INTEL DH89XXCC_SERDES 0x043a DH89XXCC SerDes product INTEL DH89XXCC_BPLANE 0x043c DH89XXCC backplane @@ -3076,19 +3077,42 @@ product INTEL C2000_1000KX 0x1f40 C2000 product INTEL C2000_SGMII 0x1f41 C2000 Ethernet(SGMII) product INTEL C2000_DUMMYGBE 0x1f42 C2000 Ethernet(Dummy function) product INTEL C2000_25GBE 0x1f45 C2000 Ethernet(2.5Gbe) -product INTEL DH89XX_LPC 0x2310 DH89xx LPC Controller -product INTEL DH89XX_SATA_1 0x2323 DH89xx SATA Controller -product INTEL DH89XX_SATA_2 0x2326 DH89xx SATA Controller -product INTEL DH89XX_SMB 0x2330 DH89xx SMBus Host Controller -product INTEL DH89XX_THERMAL 0x2332 DH89xx Thermal Subsystem -product INTEL DH89XX_USB 0x2334 DH89xx USB EHCI -product INTEL DH89XX_PCIE_1 0x2342 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_2 0x2344 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_3 0x2346 DH89xx PCIe Root Port -product INTEL DH89XX_PCIE_4 0x2348 DH89xx PCIe Root Port -product INTEL DH89XX_WDT 0x2360 DH89xx Watchdog Timer for Core Reset -product INTEL DH89XX_MEI_1 0x2364 DH89xx MEI Controller -product INTEL DH89XX_MEI_2 0x2365 DH89xx MEI Controller +product INTEL DH89XXCC_LPC 0x2310 DH89xxCC LPC Controller +product INTEL DH89XXCC_SATA_1 0x2323 DH89xxCC SATA Controller +product INTEL DH89XXCC_SATA_2 0x2326 DH89xxCC SATA Controller +product INTEL DH89XXCC_SMB 0x2330 DH89xxCC SMBus Host Controller +product INTEL DH89XXCC_THERMAL 0x2332 DH89xxCC Thermal Subsystem +product INTEL DH89XXCC_USB_1 0x2334 DH89xxCC USB EHCI +product INTEL DH89XXCC_USB_2 0x2335 DH89xxCC USB EHCI +product INTEL DH89XXCC_PCIE_1_1 0x2342 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_1_2 0x2343 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_2_1 0x2344 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_2_2 0x2345 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_3_1 0x2346 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_3_2 0x2347 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_4_1 0x2348 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_PCIE_4_2 0x2349 DH89xxCC PCIe Root Port +product INTEL DH89XXCC_WDT 0x2360 DH89xxCC Watchdog Timer for Core Reset +product INTEL DH89XXCC_MEI_1 0x2364 DH89xxCC MEI Controller +product INTEL DH89XXCC_MEI_2 0x2365 DH89xxCC MEI Controller +product INTEL DH89XXCL_LPC 0x2390 DH89xxCL LPC Controller +product INTEL DH89XXCL_SATA_1 0x23a3 DH89xxCL SATA Controller +product INTEL DH89XXCL_SATA_2 0x23a6 DH89xxCL SATA Controller +product INTEL DH89XXCL_SMB 0x23b0 DH89xxCL SMBus Host Controller +product INTEL DH89XXCL_THERMAL 0x23b2 DH89xxCL Thermal Subsystem +product INTEL DH89XXCL_USB_1 0x23b4 DH89xxCL USB EHCI +product INTEL DH89XXCL_USB_2 0x23b4 DH89xxCL USB EHCI +product INTEL DH89XXCL_PCIE_1_1 0x23c2 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_1_2 0x23c3 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_2_1 0x23c4 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_2_2 0x23c5 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_3_1 0x23c6 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_3_2 0x23c7 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_4_1 0x23c8 DH89xxCL PCIe Root Port +product INTEL DH89XXCL_PCIE_4_2 0x23c9 DH89xxCL PCIe Root Port +product INTEL
CVS commit: [netbsd-7] src/sys/dev/pci
Module Name:src Committed By: martin Date: Tue Feb 17 15:05:48 UTC 2015 Modified Files: src/sys/dev/pci [netbsd-7]: pcidevs.h pcidevs_data.h Log Message: Regen (ticket #528) To generate a diff of this commit: cvs rdiff -u -r1.1192.2.4 -r1.1192.2.5 src/sys/dev/pci/pcidevs.h cvs rdiff -u -r1.1191.2.4 -r1.1191.2.5 src/sys/dev/pci/pcidevs_data.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/stdlib
Module Name:src
Committed By: christos
Date: Tue Feb 17 20:44:42 UTC 2015
Modified Files:
src/lib/libc/stdlib: reallocarray.c
Log Message:
use reallocarr()
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/reallocarray.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/stdlib/reallocarray.c
diff -u src/lib/libc/stdlib/reallocarray.c:1.2 src/lib/libc/stdlib/reallocarray.c:1.3
--- src/lib/libc/stdlib/reallocarray.c:1.2 Tue Feb 17 15:33:40 2015
+++ src/lib/libc/stdlib/reallocarray.c Tue Feb 17 15:44:42 2015
@@ -1,42 +1,48 @@
/* $OpenBSD: reallocarray.c,v 1.1 2014/05/08 21:43:49 deraadt Exp $ */
-/*
- * Copyright (c) 2008 Otto Moerbeek o...@drijf.net
+
+/*-
+ * Copyright (c) 2015 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Christos Zoulas.
*
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
+ * 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.
*
- * THE SOFTWARE IS PROVIDED AS IS AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
*/
#define _OPENBSD_SOURCE
#include sys/cdefs.h
-__RCSID($NetBSD: reallocarray.c,v 1.2 2015/02/17 20:33:40 joerg Exp $);
+__RCSID($NetBSD: reallocarray.c,v 1.3 2015/02/17 20:44:42 christos Exp $);
-#include sys/param.h
-#include sys/types.h
+#define _OPENBSD_SOURCE
#include errno.h
-#include stdint.h
#include stdlib.h
-/*
- * This is sqrt(SIZE_MAX+1), as s1*s2 = SIZE_MAX
- * if both s1 MUL_NO_OVERFLOW and s2 MUL_NO_OVERFLOW
- */
-#define MUL_NO_OVERFLOW ((size_t)1 (sizeof(size_t) * (CHAR_BIT / 2)))
-
void *
reallocarray(void *optr, size_t nmemb, size_t size)
{
- if ((nmemb = MUL_NO_OVERFLOW || size = MUL_NO_OVERFLOW)
- size 0 nmemb 0 SIZE_MAX / nmemb size) {
- errno = ENOMEM;
- return NULL;
- }
- return realloc(optr, size * nmemb);
+ int e = reallocarr(optr, nmemb, size);
+
+ if (e == 0)
+ return optr;
+ errno = e;
+ return NULL;
}
CVS commit: src/lib/libc/stdlib
Module Name:src Committed By: christos Date: Tue Feb 17 20:44:42 UTC 2015 Modified Files: src/lib/libc/stdlib: reallocarray.c Log Message: use reallocarr() To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/lib/libc/stdlib/reallocarray.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/lib/libc/regex
Module Name:src Committed By: joerg Date: Tue Feb 17 20:30:44 UTC 2015 Modified Files: src/lib/libc/regex: regcomp.c Log Message: Use reallocarr and simplify. Document valid reallocation failures. To generate a diff of this commit: cvs rdiff -u -r1.34 -r1.35 src/lib/libc/regex/regcomp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Feb 17 20:29:21 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/include: stdlib.h src/lib/libc/include: namespace.h src/lib/libc/stdlib: Makefile.inc Added Files: src/lib/libc/stdlib: reallocarr.3 reallocarr.c Log Message: Introduce reallocarr(3) for easy (re)allocation of memory with overflow checks. Compared to OpenBSD's reallocarray, makes it easier to avoid memory leaks on allocation failures and it doesn't depend on malloc(0) != NULL for correct error checking. Compared to plain realloc, it also avoids the problem of intermediate integer overflows. The trade-off is the use of void * to side step C type system with regard to generic pointer to pointer. To generate a diff of this commit: cvs rdiff -u -r1.1946 -r1.1947 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.113 -r1.114 src/include/stdlib.h cvs rdiff -u -r1.176 -r1.177 src/lib/libc/include/namespace.h cvs rdiff -u -r1.88 -r1.89 src/lib/libc/stdlib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/stdlib/reallocarr.3 \ src/lib/libc/stdlib/reallocarr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1946 src/distrib/sets/lists/comp/mi:1.1947 --- src/distrib/sets/lists/comp/mi:1.1946 Tue Feb 10 19:11:52 2015 +++ src/distrib/sets/lists/comp/mi Tue Feb 17 20:29:20 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1946 2015/02/10 19:11:52 rjs Exp $ +# $NetBSD: mi,v 1.1947 2015/02/17 20:29:20 joerg Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -8766,6 +8766,7 @@ ./usr/share/man/cat3/re_exec.0 comp-c-catman .cat ./usr/share/man/cat3/readdir.0 comp-c-catman .cat ./usr/share/man/cat3/readdir_r.0 comp-c-catman .cat +./usr/share/man/cat3/reallocarr.0 comp-c-catman .cat ./usr/share/man/cat3/reallocarray.0 comp-c-catman .cat ./usr/share/man/cat3/realloc.0 comp-c-catman .cat ./usr/share/man/cat3/realpath.0 comp-c-catman .cat @@ -15606,6 +15607,7 @@ ./usr/share/man/html3/re_exec.html comp-c-htmlman html ./usr/share/man/html3/readdir.html comp-c-htmlman html ./usr/share/man/html3/readdir_r.html comp-c-htmlman html +./usr/share/man/html3/reallocarr.html comp-c-htmlman html ./usr/share/man/html3/reallocarray.html comp-c-htmlman html ./usr/share/man/html3/realloc.html comp-c-htmlman html ./usr/share/man/html3/realpath.html comp-c-htmlman html @@ -22445,6 +22447,7 @@ ./usr/share/man/man3/re_exec.3 comp-c-man .man ./usr/share/man/man3/readdir.3 comp-c-man .man ./usr/share/man/man3/readdir_r.3 comp-c-man .man +./usr/share/man/man3/reallocarr.3 comp-c-man .man ./usr/share/man/man3/reallocarray.3 comp-c-man .man ./usr/share/man/man3/realloc.3 comp-c-man .man ./usr/share/man/man3/realpath.3 comp-c-man .man Index: src/include/stdlib.h diff -u src/include/stdlib.h:1.113 src/include/stdlib.h:1.114 --- src/include/stdlib.h:1.113 Thu Feb 5 16:05:46 2015 +++ src/include/stdlib.h Tue Feb 17 20:29:20 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.113 2015/02/05 16:05:46 christos Exp $ */ +/* $NetBSD: stdlib.h,v 1.114 2015/02/17 20:29:20 joerg Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -337,6 +337,8 @@ int l64a_r(long, char *, int); size_t shquote(const char *, char *, size_t); size_t shquotev(int, char * const *, char *, size_t); + +int reallocarr(void *, size_t, size_t); #endif /* _NETBSD_SOURCE */ #endif /* _POSIX_C_SOURCE || _XOPEN_SOURCE || _NETBSD_SOURCE */ Index: src/lib/libc/include/namespace.h diff -u src/lib/libc/include/namespace.h:1.176 src/lib/libc/include/namespace.h:1.177 --- src/lib/libc/include/namespace.h:1.176 Fri Sep 26 19:28:03 2014 +++ src/lib/libc/include/namespace.h Tue Feb 17 20:29:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: namespace.h,v 1.176 2014/09/26 19:28:03 christos Exp $ */ +/* $NetBSD: namespace.h,v 1.177 2015/02/17 20:29:21 joerg Exp $ */ /*- * Copyright (c) 1997-2004 The NetBSD Foundation, Inc. @@ -547,6 +547,7 @@ #define readdir _readdir #define readdir_r _readdir_r #define readlink _readlink +#define reallocarr _reallocarr #define realpath _realpath #define regcomp _regcomp #define regerror _regerror Index: src/lib/libc/stdlib/Makefile.inc diff -u src/lib/libc/stdlib/Makefile.inc:1.88 src/lib/libc/stdlib/Makefile.inc:1.89 --- src/lib/libc/stdlib/Makefile.inc:1.88 Thu Feb 5 20:02:28 2015 +++ src/lib/libc/stdlib/Makefile.inc Tue Feb 17 20:29:21 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.88 2015/02/05 20:02:28 christos Exp $ +# $NetBSD: Makefile.inc,v 1.89 2015/02/17 20:29:21 joerg Exp $ # from: @(#)Makefile.inc 8.3 (Berkeley) 2/4/95 # stdlib sources @@ -12,7 +12,7 @@ SRCS+= _env.c _rand48.c \ lcong48.c lrand48.c lsearch.c merge.c mi_vector_hash.c mrand48.c \ nrand48.c putenv.c qabs.c qdiv.c qsort.c posix_openpt.c pty.c \
CVS commit: src/lib/libc/regex
Module Name:src
Committed By: joerg
Date: Tue Feb 17 20:30:44 UTC 2015
Modified Files:
src/lib/libc/regex: regcomp.c
Log Message:
Use reallocarr and simplify. Document valid reallocation failures.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/lib/libc/regex/regcomp.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/regex/regcomp.c
diff -u src/lib/libc/regex/regcomp.c:1.34 src/lib/libc/regex/regcomp.c:1.35
--- src/lib/libc/regex/regcomp.c:1.34 Thu Feb 5 16:04:35 2015
+++ src/lib/libc/regex/regcomp.c Tue Feb 17 20:30:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: regcomp.c,v 1.34 2015/02/05 16:04:35 christos Exp $ */
+/* $NetBSD: regcomp.c,v 1.35 2015/02/17 20:30:44 joerg Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@@ -76,12 +76,11 @@
#if 0
static char sccsid[] = @(#)regcomp.c 8.5 (Berkeley) 3/20/94;
#else
-__RCSID($NetBSD: regcomp.c,v 1.34 2015/02/05 16:04:35 christos Exp $);
+__RCSID($NetBSD: regcomp.c,v 1.35 2015/02/17 20:30:44 joerg Exp $);
#endif
#endif /* LIBC_SCCS and not lint */
#include namespace.h
-#include sys/param.h
#include sys/types.h
#include assert.h
@@ -267,7 +266,7 @@ regcomp(
if (g == NULL)
return(REG_ESPACE);
p-ssize = len/(size_t)2*(size_t)3 + (size_t)1; /* ugh */
- p-strip = reallocarray(NULL, p-ssize, sizeof(sop));
+ p-strip = calloc(p-ssize, sizeof(sop));
p-slen = 0;
if (p-strip == NULL) {
free(g);
@@ -1236,6 +1235,7 @@ allocset(
cset *cs;
size_t css;
size_t i;
+ void *old_ptr;
_DIAGASSERT(p != NULL);
@@ -1248,29 +1248,18 @@ allocset(
nbytes = nc / CHAR_BIT * css;
if (MEMSIZE(p) MEMLIMIT)
goto oomem;
- if (p-g-sets == NULL)
- p-g-sets = reallocarray(NULL, nc, sizeof(cset));
- else
- p-g-sets = reallocarray(p-g-sets, nc, sizeof(cset));
- if (p-g-setbits == NULL)
- p-g-setbits = malloc(nbytes);
- else {
- p-g-setbits = realloc(p-g-setbits, nbytes);
- if (p-g-setbits == NULL)
-goto oomem;
+ if (reallocarr(p-g-sets, nc, sizeof(cset)))
+ goto oomem;
+ old_ptr = p-g-setbits;
+ if (reallocarr(p-g-setbits, nc / CHAR_BIT, css)) {
+ free(old_ptr);
+ goto oomem;
+ }
+ if (old_ptr != p-g-setbits) {
for (i = 0; i no; i++)
p-g-sets[i].ptr = p-g-setbits + css*(i/CHAR_BIT);
}
- if (p-g-sets != NULL p-g-setbits != NULL)
- (void) memset((char *)p-g-setbits + (nbytes - css),
-0, css);
- else {
-oomem:
- no = 0;
- SETERROR(REG_ESPACE);
- /* caller's responsibility not to do set ops */
- return NULL;
- }
+ (void) memset((char *)p-g-setbits + (nbytes - css), 0, css);
}
cs = p-g-sets[no];
@@ -1281,6 +1270,11 @@ oomem:
cs-multis = NULL;
return(cs);
+
+oomem:
+ SETERROR(REG_ESPACE);
+ /* caller's responsibility not to do set ops */
+ return NULL;
}
/*
@@ -1764,30 +1758,18 @@ dofwd(
== static void enlarge(struct parse *p, sopno size);
*/
static int
-enlarge(
-struct parse *p,
-sopno size)
+enlarge(struct parse *p, sopno size)
{
- sop *sp;
- sopno osize;
-
_DIAGASSERT(p != NULL);
if (p-ssize = size)
return 1;
- osize = p-ssize;
- p-ssize = size;
- if (MEMSIZE(p) MEMLIMIT)
- goto oomem;
- sp = reallocarray(p-strip, p-ssize, sizeof(sop));
- if (sp == NULL) {
-oomem:
- p-ssize = osize;
+ if (MEMSIZE(p) MEMLIMIT || reallocarr(p-strip, size, sizeof(sop))) {
SETERROR(REG_ESPACE);
return 0;
}
- p-strip = sp;
+ p-ssize = size;
return 1;
}
@@ -1805,11 +1787,9 @@ stripsnug(
_DIAGASSERT(g != NULL);
g-nstates = p-slen;
- g-strip = reallocarray(p-strip, p-slen, sizeof(sop));
- if (g-strip == NULL) {
- SETERROR(REG_ESPACE);
- g-strip = p-strip;
- }
+ g-strip = p-strip;
+ reallocarr(g-strip, p-slen, sizeof(sop));
+ /* Ignore error as tries to free memory only. */
}
/*
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Feb 17 20:33:40 UTC 2015 Modified Files: src/include: stdlib.h src/lib/libc/stdlib: reallocarray.c Log Message: Move reallocarray under _OPENBSD_SOURCE where it belongs. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/include/stdlib.h cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdlib/reallocarray.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: [netbsd-7] xsrc/external/mit/MesaLib/dist/src/mapi
On Sat, Feb 14, 2015 at 08:14:01AM +, Soren Jacobsen wrote: Module Name: xsrc Committed By: snj Date: Sat Feb 14 08:14:01 UTC 2015 Modified Files: xsrc/external/mit/MesaLib/dist/src/mapi [netbsd-7]: entry.c Log Message: Pull up following revision(s) (requested by mrg in ticket #514): external/mit/MesaLib/dist/src/mapi/entry.c: revision 1.2 disable the use of 32 bit x86 asm code here, it (like the 64 bit code), does not work on netbsd and probably needs an x86 guru to fix. Wouldn't it be more sensible to undefine USE_X86_ASM in the maefile? David -- David Laight: da...@l8s.co.uk
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 17 10:11:25 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Print bit setting of bge_asf_mode if BGE_DEBUG is set. To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/dev/pci/if_bge.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/pci
Module Name:src Committed By: msaitoh Date: Tue Feb 17 10:11:25 UTC 2015 Modified Files: src/sys/dev/pci: if_bge.c Log Message: Print bit setting of bge_asf_mode if BGE_DEBUG is set. To generate a diff of this commit: cvs rdiff -u -r1.278 -r1.279 src/sys/dev/pci/if_bge.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/if_bge.c diff -u src/sys/dev/pci/if_bge.c:1.278 src/sys/dev/pci/if_bge.c:1.279 --- src/sys/dev/pci/if_bge.c:1.278 Wed Feb 11 23:07:13 2015 +++ src/sys/dev/pci/if_bge.c Tue Feb 17 10:11:24 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: if_bge.c,v 1.278 2015/02/11 23:07:13 msaitoh Exp $ */ +/* $NetBSD: if_bge.c,v 1.279 2015/02/17 10:11:24 msaitoh Exp $ */ /* * Copyright (c) 2001 Wind River Systems @@ -79,7 +79,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.278 2015/02/11 23:07:13 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_bge.c,v 1.279 2015/02/17 10:11:24 msaitoh Exp $); #include sys/param.h #include sys/systm.h @@ -6053,6 +6053,7 @@ bge_debug_info(struct bge_softc *sc) if (sc-bge_flags BGEF_TSO) printf( - TSO\n); + /* PHY related */ if (sc-bge_phy_flags BGEPHYF_NO_3LED) printf( - No 3 LEDs\n); if (sc-bge_phy_flags BGEPHYF_CRC_BUG) @@ -6069,6 +6070,14 @@ bge_debug_info(struct bge_softc *sc) printf( - adjust trim\n); if (sc-bge_phy_flags BGEPHYF_NO_WIRESPEED) printf( - no wirespeed\n); + + /* ASF related */ + if (sc-bge_asf_mode ASF_ENABLE) + printf( - ASF enable\n); + if (sc-bge_asf_mode ASF_NEW_HANDSHARE) + printf( - ASF new handshake\n); + if (sc-bge_asf_mode ASF_STACKUP) + printf( - ASF stackup\n); } #endif /* BGE_DEBUG */
CVS commit: src/tests/usr.bin/ld
Module Name:src Committed By: martin Date: Tue Feb 17 11:51:04 UTC 2015 Modified Files: src/tests/usr.bin/ld: t_section.sh Log Message: Make the dummy data that we expect to go into .data section bigger, otherwise on e.g. alpha it goes into the small objects data .sdata section, which confuses the matching done in this test. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/ld/t_section.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/usr.bin/ld
Module Name:src
Committed By: martin
Date: Tue Feb 17 11:51:04 UTC 2015
Modified Files:
src/tests/usr.bin/ld: t_section.sh
Log Message:
Make the dummy data that we expect to go into .data section bigger,
otherwise on e.g. alpha it goes into the small objects data .sdata
section, which confuses the matching done in this test.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/ld/t_section.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/ld/t_section.sh
diff -u src/tests/usr.bin/ld/t_section.sh:1.3 src/tests/usr.bin/ld/t_section.sh:1.4
--- src/tests/usr.bin/ld/t_section.sh:1.3 Sat Nov 15 03:22:29 2014
+++ src/tests/usr.bin/ld/t_section.sh Tue Feb 17 11:51:04 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_section.sh,v 1.3 2014/11/15 03:22:29 uebayasi Exp $
+# $NetBSD: t_section.sh,v 1.4 2015/02/17 11:51:04 martin Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -59,7 +59,7 @@ const char a[] __section(hoge) = hoge
/* read-write orphan */
char b[] __section(fuga) = { 'f', 'u', 'g', 'a', '\0' };
/* .data */
-int c = 123;
+int c[1024] = { 123, 20, 1, 0 };
/* .bss */
int d = 0;
/* .text */
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Feb 17 20:29:21 UTC 2015 Modified Files: src/distrib/sets/lists/comp: mi src/include: stdlib.h src/lib/libc/include: namespace.h src/lib/libc/stdlib: Makefile.inc Added Files: src/lib/libc/stdlib: reallocarr.3 reallocarr.c Log Message: Introduce reallocarr(3) for easy (re)allocation of memory with overflow checks. Compared to OpenBSD's reallocarray, makes it easier to avoid memory leaks on allocation failures and it doesn't depend on malloc(0) != NULL for correct error checking. Compared to plain realloc, it also avoids the problem of intermediate integer overflows. The trade-off is the use of void * to side step C type system with regard to generic pointer to pointer. To generate a diff of this commit: cvs rdiff -u -r1.1946 -r1.1947 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.113 -r1.114 src/include/stdlib.h cvs rdiff -u -r1.176 -r1.177 src/lib/libc/include/namespace.h cvs rdiff -u -r1.88 -r1.89 src/lib/libc/stdlib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/stdlib/reallocarr.3 \ src/lib/libc/stdlib/reallocarr.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src
Module Name:src Committed By: joerg Date: Tue Feb 17 20:33:40 UTC 2015 Modified Files: src/include: stdlib.h src/lib/libc/stdlib: reallocarray.c Log Message: Move reallocarray under _OPENBSD_SOURCE where it belongs. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/include/stdlib.h cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdlib/reallocarray.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/stdlib.h diff -u src/include/stdlib.h:1.114 src/include/stdlib.h:1.115 --- src/include/stdlib.h:1.114 Tue Feb 17 20:29:20 2015 +++ src/include/stdlib.h Tue Feb 17 20:33:40 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: stdlib.h,v 1.114 2015/02/17 20:29:20 joerg Exp $ */ +/* $NetBSD: stdlib.h,v 1.115 2015/02/17 20:33:40 joerg Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -125,6 +125,7 @@ unsigned long strtoul(const char * __restrict, char ** __restrict, int); #ifdef _OPENBSD_SOURCE long long strtonum(const char *, long long, long long, const char **); +void *reallocarray(void *, size_t, size_t); #endif int system(const char *); @@ -366,7 +367,6 @@ unsigned long long int strtoull_l(const char * __restrict, char ** __restrict, int, locale_t); # if defined(_NETBSD_SOURCE) -void *reallocarray(void *, size_t, size_t); quad_t strtoq_l(const char * __restrict, char ** __restrict, int, locale_t); u_quad_t strtouq_l(const char * __restrict, char ** __restrict, int, locale_t); Index: src/lib/libc/stdlib/reallocarray.c diff -u src/lib/libc/stdlib/reallocarray.c:1.1 src/lib/libc/stdlib/reallocarray.c:1.2 --- src/lib/libc/stdlib/reallocarray.c:1.1 Thu Feb 5 16:04:35 2015 +++ src/lib/libc/stdlib/reallocarray.c Tue Feb 17 20:33:40 2015 @@ -14,8 +14,9 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ +#define _OPENBSD_SOURCE #include sys/cdefs.h -__RCSID($NetBSD: reallocarray.c,v 1.1 2015/02/05 16:04:35 christos Exp $); +__RCSID($NetBSD: reallocarray.c,v 1.2 2015/02/17 20:33:40 joerg Exp $); #include sys/param.h #include sys/types.h
CVS commit: src/sys/lib/libunwind
Module Name:src Committed By: joerg Date: Tue Feb 17 21:02:33 UTC 2015 Modified Files: src/sys/lib/libunwind: libunwind.cxx unwind.h Log Message: Provide _Unwind_Find_FDE for libgcc_s compatibility. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libunwind/libunwind.cxx cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libunwind/unwind.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/lib/libunwind
Module Name:src
Committed By: joerg
Date: Tue Feb 17 21:02:33 UTC 2015
Modified Files:
src/sys/lib/libunwind: libunwind.cxx unwind.h
Log Message:
Provide _Unwind_Find_FDE for libgcc_s compatibility.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/lib/libunwind/libunwind.cxx
cvs rdiff -u -r1.2 -r1.3 src/sys/lib/libunwind/unwind.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/lib/libunwind/libunwind.cxx
diff -u src/sys/lib/libunwind/libunwind.cxx:1.8 src/sys/lib/libunwind/libunwind.cxx:1.9
--- src/sys/lib/libunwind/libunwind.cxx:1.8 Sun Apr 13 19:04:01 2014
+++ src/sys/lib/libunwind/libunwind.cxx Tue Feb 17 21:02:33 2015
@@ -11,6 +11,8 @@
//
//===--===//
+#define _UNWIND_GCC_EXTENSIONS
+
#include unwind.h
#include UnwindCursor.hpp
@@ -329,6 +331,23 @@ void *_Unwind_FindEnclosingFunction(void
return info.end_ip ? (void *)info.start_ip : NULL;
}
+void *_Unwind_Find_FDE(void *pc, struct dwarf_eh_bases *bases) {
+ NativeUnwindRegisters registers;
+ ThisUnwindCursor cursor(registers, sThisAddressSpace);
+
+ unw_proc_info_t info;
+ cursor.setIP((uintptr_t)pc);
+ cursor.setInfoBasedOnIPRegister();
+
+ cursor.getInfo(info);
+ if (info.end_ip == 0)
+return NULL;
+ bases-tbase = 0; /* Not supported */
+ bases-dbase = (void *)info.data_base;
+ bases-func = (void *)info.start_ip;
+ return (void *)info.unwind_info;
+}
+
uintptr_t _Unwind_GetDataRelBase(struct _Unwind_Context *context) {
ThisUnwindCursor *cursor = (ThisUnwindCursor *)context;
unw_proc_info_t frameInfo;
Index: src/sys/lib/libunwind/unwind.h
diff -u src/sys/lib/libunwind/unwind.h:1.2 src/sys/lib/libunwind/unwind.h:1.3
--- src/sys/lib/libunwind/unwind.h:1.2 Thu Mar 13 00:28:20 2014
+++ src/sys/lib/libunwind/unwind.h Tue Feb 17 21:02:33 2015
@@ -56,6 +56,14 @@ typedef _Unwind_Reason_Code (*__personal
struct _Unwind_Exception *,
struct _Unwind_Context *);
+#ifdef _UNWIND_GCC_EXTENSIONS
+struct dwarf_eh_bases {
+ void *tbase;
+ void *dbase;
+ void *func;
+};
+#endif
+
__BEGIN_DECLS
_Unwind_Reason_Code _Unwind_RaiseException(struct _Unwind_Exception *);
@@ -85,6 +93,10 @@ void __register_frame_info(const void *,
void __deregister_frame(const void *);
void *__deregister_frame_info(const void *);
+#ifdef _UNWIND_GCC_EXTENSIONS
+void *_Unwind_Find_FDE(void *, struct dwarf_eh_bases *);
+#endif
+
__END_DECLS
#endif // _UNWIND_H
CVS commit: src/sys/arch/mips/mips
Module Name:src
Committed By: macallan
Date: Tue Feb 17 09:58:33 UTC 2015
Modified Files:
src/sys/arch/mips/mips: bus_dma.c
Log Message:
do as others do and mmap() DMA buffers uncached if we get
BUS_DMA_PREFETCHABLE passed in flags
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mips/mips/bus_dma.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/mips/mips/bus_dma.c
diff -u src/sys/arch/mips/mips/bus_dma.c:1.33 src/sys/arch/mips/mips/bus_dma.c:1.34
--- src/sys/arch/mips/mips/bus_dma.c:1.33 Mon Feb 16 14:10:00 2015
+++ src/sys/arch/mips/mips/bus_dma.c Tue Feb 17 09:58:33 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: bus_dma.c,v 1.33 2015/02/16 14:10:00 macallan Exp $ */
+/* $NetBSD: bus_dma.c,v 1.34 2015/02/17 09:58:33 macallan Exp $ */
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
@@ -32,7 +32,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.33 2015/02/16 14:10:00 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: bus_dma.c,v 1.34 2015/02/17 09:58:33 macallan Exp $);
#define _MIPS_BUS_DMA_PRIVATE
@@ -1168,7 +1168,10 @@ _bus_dmamem_mmap(bus_dma_tag_t t, bus_dm
* Needed for X11 on SGI O2, will likely be needed on things like CI20.
*/
#if defined(_MIPS_PADDR_T_64BIT) || defined(_LP64)
- return (mips_btop(pa | PGC_NOCACHE));
+ if (flags BUS_DMA_PREFETCHABLE ) {
+ return (mips_btop(pa | PGC_NOCACHE));
+ } else
+ return mips_btop(pa);
#else
return mips_btop(pa);
#endif
CVS commit: src/sys/arch/mips/mips
Module Name:src Committed By: macallan Date: Tue Feb 17 09:58:33 UTC 2015 Modified Files: src/sys/arch/mips/mips: bus_dma.c Log Message: do as others do and mmap() DMA buffers uncached if we get BUS_DMA_PREFETCHABLE passed in flags To generate a diff of this commit: cvs rdiff -u -r1.33 -r1.34 src/sys/arch/mips/mips/bus_dma.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/pci
Module Name:src
Committed By: nonaka
Date: Tue Feb 17 09:18:45 UTC 2015
Modified Files:
src/sys/dev/pci: if_iwm.c
Log Message:
fix compile failure with IWM_DEBUG on i386.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_iwm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_iwm.c
diff -u src/sys/dev/pci/if_iwm.c:1.8 src/sys/dev/pci/if_iwm.c:1.9
--- src/sys/dev/pci/if_iwm.c:1.8 Mon Feb 16 13:22:19 2015
+++ src/sys/dev/pci/if_iwm.c Tue Feb 17 09:18:45 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_iwm.c,v 1.8 2015/02/16 13:22:19 nonaka Exp $ */
+/* $NetBSD: if_iwm.c,v 1.9 2015/02/17 09:18:45 nonaka Exp $ */
/* OpenBSD: if_iwm.c,v 1.18 2015/02/11 01:12:42 brad Exp */
/*
@@ -105,7 +105,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.8 2015/02/16 13:22:19 nonaka Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_iwm.c,v 1.9 2015/02/17 09:18:45 nonaka Exp $);
#include sys/param.h
#include sys/conf.h
@@ -1767,8 +1767,8 @@ iwm_nic_tx_init(struct iwm_softc *sc)
/* Set physical address of TX ring (256-byte aligned). */
IWM_WRITE(sc, IWM_FH_MEM_CBBC_QUEUE(qid),
txq-desc_dma.paddr 8);
- DPRINTF((loading ring %d descriptors (%p) at %lx\n,
- qid, txq-desc, txq-desc_dma.paddr 8));
+ DPRINTF((loading ring %d descriptors (%p) at %PRIxMAX\n,
+ qid, txq-desc, (uintmax_t)(txq-desc_dma.paddr 8)));
}
iwm_nic_unlock(sc);
@@ -3589,7 +3589,7 @@ iwm_send_cmd(struct iwm_softc *sc, struc
| ((sizeof(cmd-hdr) + paylen) 4));
desc-num_tbs = 1;
- DPRINTFN(8, (iwm_send_cmd 0x%x size=%lu %s\n,
+ DPRINTFN(8, (iwm_send_cmd 0x%x size=%zu %s\n,
code, sizeof(cmd-hdr) + paylen, async ? (async) : ));
if (paylen sizeof(cmd-data)) {
CVS commit: src/sys/dev/pci
Module Name:src Committed By: nonaka Date: Tue Feb 17 09:18:45 UTC 2015 Modified Files: src/sys/dev/pci: if_iwm.c Log Message: fix compile failure with IWM_DEBUG on i386. To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/dev/pci/if_iwm.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
Module Name:src Committed By: nonaka Date: Tue Feb 17 09:21:57 UTC 2015 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 src/sys/arch/i386/conf: XEN3_DOM0 Log Message: Add iwm(4). To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/conf/XEN3_DOM0 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch
Module Name:src Committed By: nonaka Date: Tue Feb 17 09:21:57 UTC 2015 Modified Files: src/sys/arch/amd64/conf: XEN3_DOM0 src/sys/arch/i386/conf: XEN3_DOM0 Log Message: Add iwm(4). To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/sys/arch/amd64/conf/XEN3_DOM0 cvs rdiff -u -r1.93 -r1.94 src/sys/arch/i386/conf/XEN3_DOM0 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/amd64/conf/XEN3_DOM0 diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.112 src/sys/arch/amd64/conf/XEN3_DOM0:1.113 --- src/sys/arch/amd64/conf/XEN3_DOM0:1.112 Sun Nov 16 16:01:40 2014 +++ src/sys/arch/amd64/conf/XEN3_DOM0 Tue Feb 17 09:21:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.112 2014/11/16 16:01:40 manu Exp $ +# $NetBSD: XEN3_DOM0,v 1.113 2015/02/17 09:21:57 nonaka Exp $ include arch/amd64/conf/std.xen @@ -343,6 +343,7 @@ hme* at pci? dev ? function ? # Sun Micr ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx jme* at pci? dev ? function ? # JMicron JMC2[56]0 ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet Index: src/sys/arch/i386/conf/XEN3_DOM0 diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.93 src/sys/arch/i386/conf/XEN3_DOM0:1.94 --- src/sys/arch/i386/conf/XEN3_DOM0:1.93 Sun Nov 16 16:01:41 2014 +++ src/sys/arch/i386/conf/XEN3_DOM0 Tue Feb 17 09:21:57 2015 @@ -1,4 +1,4 @@ -# $NetBSD: XEN3_DOM0,v 1.93 2014/11/16 16:01:41 manu Exp $ +# $NetBSD: XEN3_DOM0,v 1.94 2015/02/17 09:21:57 nonaka Exp $ # # XEN3_0: Xen 3.0 domain0 kernel @@ -320,6 +320,7 @@ hme* at pci? dev ? function ? # Sun Micr ipw* at pci? dev ? function ? # Intel PRO/Wireless 2100 iwi* at pci? dev ? function ? # Intel PRO/Wireless 2200BG iwn* at pci? dev ? function ? # Intel PRO/Wireless 4965AGN +iwm* at pci? dev ? function ? # Intel Wireless WiFi Link 7xxx jme* at pci? dev ? function ? # JMicron JMC2[56]0 Ethernet le* at pci? dev ? function ? # PCnet-PCI Ethernet lii* at pci? dev ? function ? # Atheros L2 Fast-Ethernet
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: isaki Date: Tue Feb 17 09:47:08 UTC 2015 Modified Files: src/tests/lib/libc/gen: t_siginfo.c Log Message: m68k (except sun2) never issue SIGBUS on unaligned accesses. PR lib/49653. Thanks martin@. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/gen/t_siginfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/lib/libc/gen
Module Name:src Committed By: isaki Date: Tue Feb 17 09:47:08 UTC 2015 Modified Files: src/tests/lib/libc/gen: t_siginfo.c Log Message: m68k (except sun2) never issue SIGBUS on unaligned accesses. PR lib/49653. Thanks martin@. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/tests/lib/libc/gen/t_siginfo.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/lib/libc/gen/t_siginfo.c diff -u src/tests/lib/libc/gen/t_siginfo.c:1.28 src/tests/lib/libc/gen/t_siginfo.c:1.29 --- src/tests/lib/libc/gen/t_siginfo.c:1.28 Fri Feb 13 16:56:57 2015 +++ src/tests/lib/libc/gen/t_siginfo.c Tue Feb 17 09:47:08 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: t_siginfo.c,v 1.28 2015/02/13 16:56:57 martin Exp $ */ +/* $NetBSD: t_siginfo.c,v 1.29 2015/02/17 09:47:08 isaki Exp $ */ /*- * Copyright (c) 2010 The NetBSD Foundation, Inc. @@ -466,6 +466,10 @@ ATF_TC_BODY(sigbus_adraln, tc) atf_tc_skip(No SIGBUS signal for unaligned accesses); #endif + /* m68k (except sun2) never issue SIGBUS (PR lib/49653) */ + if (strcmp(MACHINE_ARCH, m68k) == 0) + atf_tc_skip(No SIGBUS signal for unaligned accesses); + sa.sa_flags = SA_SIGINFO; sa.sa_sigaction = sigbus_action; sigemptyset(sa.sa_mask);
CVS commit: src/sys/arch/sgimips/mace
Module Name:src Committed By: macallan Date: Tue Feb 17 11:25:43 UTC 2015 Modified Files: src/sys/arch/sgimips/mace: mavb.c Log Message: move DAC1 output channel to master so things like OSS and kmix work as expected To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/mace/mavb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sgimips/mace/mavb.c diff -u src/sys/arch/sgimips/mace/mavb.c:1.9 src/sys/arch/sgimips/mace/mavb.c:1.10 --- src/sys/arch/sgimips/mace/mavb.c:1.9 Sat Oct 27 17:18:10 2012 +++ src/sys/arch/sgimips/mace/mavb.c Tue Feb 17 11:25:43 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: mavb.c,v 1.9 2012/10/27 17:18:10 chs Exp $ */ +/* $NetBSD: mavb.c,v 1.10 2015/02/17 11:25:43 macallan Exp $ */ /* $OpenBSD: mavb.c,v 1.6 2005/04/15 13:05:14 mickey Exp $ */ /* @@ -723,16 +723,16 @@ mavb_query_devinfo(void *hdl, struct mix case AD1843_DAC1_GAIN: di-type = AUDIO_MIXER_VALUE; - di-mixer_class = AD1843_INPUT_CLASS; + di-mixer_class = AD1843_OUTPUT_CLASS; di-next = AD1843_DAC1_MUTE; - strlcpy(di-label.name, AudioNdac 1, sizeof di-label.name); + strlcpy(di-label.name, AudioNmaster, sizeof di-label.name); di-un.v.num_channels = 2; strlcpy(di-un.v.units.name, AudioNvolume, sizeof di-un.v.units.name); break; case AD1843_DAC1_MUTE: di-type = AUDIO_MIXER_ENUM; - di-mixer_class = AD1843_INPUT_CLASS; + di-mixer_class = AD1843_OUTPUT_CLASS; di-prev = AD1843_DAC1_GAIN; strlcpy(di-label.name, AudioNmute, sizeof di-label.name); di-un.e.num_mem = 2;
CVS commit: src/sys/arch/sgimips/mace
Module Name:src Committed By: macallan Date: Tue Feb 17 11:25:43 UTC 2015 Modified Files: src/sys/arch/sgimips/mace: mavb.c Log Message: move DAC1 output channel to master so things like OSS and kmix work as expected To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 src/sys/arch/sgimips/mace/mavb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
