CVS commit: src/usr.sbin/route6d
Module Name:src Committed By: kardel Date: Mon Apr 15 07:58:36 UTC 2013 Modified Files: src/usr.sbin/route6d: route6d.c Log Message: reenable routing functionality by using RT_ROUNDUP for ROUNDUP when available To generate a diff of this commit: cvs rdiff -u -r1.66 -r1.67 src/usr.sbin/route6d/route6d.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/usr.sbin/route6d/route6d.c diff -u src/usr.sbin/route6d/route6d.c:1.66 src/usr.sbin/route6d/route6d.c:1.67 --- src/usr.sbin/route6d/route6d.c:1.66 Wed Aug 31 16:24:59 2011 +++ src/usr.sbin/route6d/route6d.c Mon Apr 15 07:58:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: route6d.c,v 1.66 2011/08/31 16:24:59 plunky Exp $ */ +/* $NetBSD: route6d.c,v 1.67 2013/04/15 07:58:35 kardel Exp $ */ /* $KAME: route6d.c,v 1.94 2002/10/26 20:08:55 itojun Exp $ */ /* @@ -32,7 +32,7 @@ #include sys/cdefs.h #ifndef lint -__RCSID($NetBSD: route6d.c,v 1.66 2011/08/31 16:24:59 plunky Exp $); +__RCSID($NetBSD: route6d.c,v 1.67 2013/04/15 07:58:35 kardel Exp $); #endif #include stdbool.h @@ -83,8 +83,12 @@ __RCSID($NetBSD: route6d.c,v 1.66 2011/ #endif /* alignment constraint for routing socket */ +#if defined(__NetBSD__) defined(RT_ROUNDUP) +#define ROUNDUP(a) RT_ROUNDUP(a) +#else #define ROUNDUP(a) \ ((a) 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long)) +#endif #define ADVANCE(x, n) (x += ROUNDUP((n)-sa_len)) /*
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Apr 15 08:09:48 UTC 2013 Modified Files: src/sys/dev/mii: mii.h Log Message: Add the following registers from IEEE 802.3-2009 Clause 22. - PSE control register(0x0b) - PSE status register(0x0c) - MMD access control register(0x0d) - MMD access address data register(0x0e) To generate a diff of this commit: cvs rdiff -u -r1.15 -r1.16 src/sys/dev/mii/mii.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/mii.h diff -u src/sys/dev/mii/mii.h:1.15 src/sys/dev/mii/mii.h:1.16 --- src/sys/dev/mii/mii.h:1.15 Wed Apr 3 03:24:27 2013 +++ src/sys/dev/mii/mii.h Mon Apr 15 08:09:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: mii.h,v 1.15 2013/04/03 03:24:27 msaitoh Exp $ */ +/* $NetBSD: mii.h,v 1.16 2013/04/15 08:09:48 msaitoh Exp $ */ /* * Copyright (c) 1997 Manuel Bouyer. All rights reserved. @@ -177,6 +177,41 @@ #define GTSR_LP_ASM_DIR 0x0200 /* link partner asym. pause dir. capable */ #define GTSR_IDLE_ERR 0x00ff /* IDLE error count */ +#define MII_PSECR 0x0b /* PSE control register */ +#define PSECR_PACTLMASK 0x000c /* pair control mask */ +#define PSECR_PSEENMASK 0x0003 /* PSE enable mask */ +#define PSECR_PINOUTB 0x0008 /* PSE pinout Alternative B */ +#define PSECR_PINOUTA 0x0004 /* PSE pinout Alternative A */ +#define PSECR_FOPOWTST 0x0002 /* Force Power Test Mode */ +#define PSECR_PSEEN 0x0001 /* PSE Enabled */ +#define PSECR_PSEDIS 0x /* PSE Disabled */ + +#define MII_PSESR 0x0c /* PSE status register */ +#define PSESR_PWRDENIED 0x1000 /* Power Deined */ +#define PSESR_VALSIG 0x0800 /* Valid PD signature detected */ +#define PSESR_INVALSIG 0x0400 /* Inalid PD signature detected */ +#define PSESR_SHORTCIRC 0x0200 /* Short circuit condition detected */ +#define PSESR_OVERLOAD 0x0100 /* Overload condition detected */ +#define PSESR_MPSABSENT 0x0080 /* MPS absent condition detected */ +#define PSESR_PDCLMASK 0x0070 /* PD Class mask */ +#define PSESR_STATMASK 0x000e /* PSE Status mask */ +#define PSESR_PAIRCTABL 0x0001 /* PAIR Control Ability */ +#define PSESR_PDCL_4 (4 4) /* Class 4 */ +#define PSESR_PDCL_3 (3 4) /* Class 3 */ +#define PSESR_PDCL_2 (2 4) /* Class 2 */ +#define PSESR_PDCL_1 (1 4) /* Class 1 */ +#define PSESR_PDCL_0 (0 4) /* Class 0 */ + +#define MII_MMDACR 0x0d /* MMD access control register */ +#define MMDACR_FUNCMASK 0xc000 /* function */ +#define MMDACR_DADDRMASK 0x001f /* device address */ +#define MMDACR_FN_ADDRESS (0 14) /* address */ +#define MMDACR_FN_DATANPI (1 14) /* data, no post increment */ +#define MMDACR_FN_DATAPIRW (2 14) /* data, post increment on r/w */ +#define MMDACR_FN_DATAPIW (3 14) /* data, post increment on wr only */ + +#define MII_MMDAADR 0x0e /* MMD access address data register */ + #define MII_EXTSR 0x0f /* Extended status register */ #define EXTSR_1000XFDX 0x8000 /* 1000X full-duplex capable */ #define EXTSR_1000XHDX 0x4000 /* 1000X half-duplex capable */
CVS commit: src/distrib/sets/lists/debug
Module Name:src Committed By: njoly Date: Mon Apr 15 09:21:05 UTC 2013 Modified Files: src/distrib/sets/lists/debug: md.i386 Log Message: +./usr/libdata/debug/lib/libm387.so.0.1.debug To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/debug/md.i386 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/md.i386 diff -u src/distrib/sets/lists/debug/md.i386:1.2 src/distrib/sets/lists/debug/md.i386:1.3 --- src/distrib/sets/lists/debug/md.i386:1.2 Wed Jan 16 21:11:08 2013 +++ src/distrib/sets/lists/debug/md.i386 Mon Apr 15 09:21:05 2013 @@ -1,4 +1,5 @@ -# $NetBSD: md.i386,v 1.2 2013/01/16 21:11:08 christos Exp $ +# $NetBSD: md.i386,v 1.3 2013/04/15 09:21:05 njoly Exp $ +./usr/libdata/debug/lib/libm387.so.0.1.debug comp-sys-debug pic,debug ./usr/libdata/debug/sbin/ldconfig.debug comp-sysutil-debug debug,pic ./usr/libdata/debug/usr/bin/fdformat.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/iasl.debug comp-util-debug debug
CVS commit: src/sys/sys
Module Name:src Committed By: joerg Date: Mon Apr 15 11:01:41 UTC 2013 Modified Files: src/sys/sys: ctype_bits.h Log Message: Export C version of classification and conversion table as well. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/sys/ctype_bits.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/sys/ctype_bits.h diff -u src/sys/sys/ctype_bits.h:1.3 src/sys/sys/ctype_bits.h:1.4 --- src/sys/sys/ctype_bits.h:1.3 Sat Apr 13 10:21:21 2013 +++ src/sys/sys/ctype_bits.h Mon Apr 15 11:01:40 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ctype_bits.h,v 1.3 2013/04/13 10:21:21 joerg Exp $ */ +/* $NetBSD: ctype_bits.h,v 1.4 2013/04/15 11:01:40 joerg Exp $ */ /* * Copyright (c) 1989 The Regents of the University of California. @@ -59,4 +59,8 @@ extern const unsigned short *_ctype_tab_ extern const short *_tolower_tab_; extern const short *_toupper_tab_; +extern const unsigned short _C_ctype_tab_[]; +extern const short _C_toupper_tab_[]; +extern const short _C_tolower_tab_[]; + #endif /* !_SYS_CTYPE_BITS_H_ */
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Apr 15 11:48:27 UTC 2013 Added Files: src/sys/dev/mii: mdio.h Log Message: Add new file mii/mdio.h which contain IEEE 802.3 Clause 45 register definitions. From: - IEEE 802.3 2008 - IEEE 802.3at - IEEE 802.3av - IEEE 802.3az Currently, only device addresses and register number are written. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/mii/mdio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/sys/dev/mii/mdio.h diff -u /dev/null src/sys/dev/mii/mdio.h:1.1 --- /dev/null Mon Apr 15 11:48:27 2013 +++ src/sys/dev/mii/mdio.h Mon Apr 15 11:48:27 2013 @@ -0,0 +1,477 @@ +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * This code is derived from software contributed to The NetBSD Foundation + * by + * + * 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 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. + */ + +#ifndef _DEV_MII_MDIO_H_ +#define _DEV_MII_MDIO_H_ + +/* + * IEEE 802.3 Clause 45 definitions. + * From: + * IEEE 802.3 2008 + * IEEE 802.3at + * IEEE 802.3av + * IEEE 802.3az + */ + +/* + * MDIO Manageable Device addresses. + * Table 45-1 + */ +#define MDIO_MMD_PMAPMD 1 +#define MDIO_MMD_WIS 2 +#define MDIO_MMD_PCS 3 +#define MDIO_MMD_PHYXS 4 +#define MDIO_MMD_DTEXS 5 +#define MDIO_MMD_TC 6 +#define MDIO_MMD_AN 7 +#define MDIO_MMD_CL22EXT 29 +#define MDIO_MMD_VNDSP1 30 +#define MDIO_MMD_VNDSP2 31 + +/* + * MDIO PMA/PMD registers. + * Table 45-3 + */ +#define MDIO_PMAPMD_CTRL1 0 /* PMA/PMD control 1 */ +#define MDIO_PMAPMD_STAT1 1 /* PMA/PMD status 1 */ +#define MDIO_PMAPMD_DEVID1 2 /* PMA/PMD device identifier 1 */ +#define MDIO_PMAPMD_DEVID2 3 /* PMA/PMD device identifier 2 */ +#define MDIO_PMAPMD_SPEED 4 /* PMA/PMD speed ability */ +#define MDIO_PMAPMD_DEVS1 5 /* PMA/PMD devices in package 1 */ +#define MDIO_PMAPMD_DEVS2 6 /* PMA/PMD devices in package 2 */ +#define MDIO_PMAPMD_CTRL2 7 /* PMA/PMD control 2 */ +#define MDIO_PMAPMD_10GSTAT2 8 /* 10G PMA/PMD status 2 */ +#define MDIO_PMAPMD_10GTXDIS 9 /* 10G PMA/PMD transmit disable */ +#define MDIO_PMAPMD_RXSIGDTCT 10 /* 10G PMD receive signal detect */ +#define MDIO_PMAPMD_EXTABLTY 11 /* 10G PMA/PMD ext. ability reg */ +#define MDIO_PMAPMD_P2MPABLTY 12 /* P2MP ability register(802.3av)*/ + /* Value 13 is reserved */ +#define MDIO_PMAPMD_PKGID1 14 /* PMA/PMD package identifier 1 */ +#define MDIO_PMAPMD_PKGID2 15 /* PMA/PMD package identifier 2 */ + /* Values 16 to 29 are reserved */ +#define MDIO_PMAPMD_10P2BCTRL 30 /* 10P/2B PMA/PMD control */ +#define MDIO_PMAPMD_10P2BSTAT 31 /* 10P/2B PMA/PMD status */ +#define MDIO_PMAPMD_10P2BLPCTRL 32 /* 10P/2B link partner PMA/D ctrl*/ +#define MDIO_PMAPMD_10P2BLPSTAT 33 /* 10P/2B link partner PMA/D stat*/ + /* Values 34 to 35 are reserved */ +#define MDIO_PMAPMD_10P2BLLOSCNT 36 /* 10P/2B link loss counter */ +#define MDIO_PMAPMD_10P2BRXSNMGN 37 /* 10P/2B RX SNR margin */ +#define MDIO_PMAPMD_10P2BLPRXSNMG 38 /* 10P/2B link partner RX SNR mgn*/ +#define MDIO_PMAPMD_10P2BLINEATTN 39 /* 10P/2B line attenuation */ +#define MDIO_PMAPMD_10P2BLPLINEATTN 40 /* 10P/2B link partner line atten*/ +#define MDIO_PMAPMD_10P2BLQTHRES 41 /* 10P/2B line quality thresholds*/ +#define MDIO_PMAPMD_10P2BLPLQLTHRES 42 /* 10P/2B link partner LQ thresh.*/ +#define MDIO_PMAPMD_10PFECCOERRS 43 /* 10P FEC correctable errors cnt*/ +#define MDIO_PMAPMD_10PFECUNCOERRS 44 /* 10P FEC uncorrectable err cnt*/ +#define MDIO_PMAPMD_10PLPFECCOERRS 45 /* 10P LP FEC correctable err cnt*/ +#define MDIO_PMAPMD_10PLPFECUNCOERRS 46 /* 10P LP FEC uncorrectable
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Apr 15 12:02:47 UTC 2013 Modified Files: src/sys/dev/mii: mdio.h Log Message: Add my name. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/dev/mii/mdio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/mdio.h diff -u src/sys/dev/mii/mdio.h:1.1 src/sys/dev/mii/mdio.h:1.2 --- src/sys/dev/mii/mdio.h:1.1 Mon Apr 15 11:48:27 2013 +++ src/sys/dev/mii/mdio.h Mon Apr 15 12:02:47 2013 @@ -3,7 +3,7 @@ * All rights reserved. * * This code is derived from software contributed to The NetBSD Foundation - * by + * by Masanobu SAITOH. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions
CVS commit: src/sys/fs/msdosfs
Module Name:src
Committed By: jakllsch
Date: Mon Apr 15 14:11:00 UTC 2013
Modified Files:
src/sys/fs/msdosfs: msdosfs_vfsops.c
Log Message:
Don't attempt to mount file system with clusters larger than MAXBSIZE.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/sys/fs/msdosfs/msdosfs_vfsops.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/msdosfs/msdosfs_vfsops.c
diff -u src/sys/fs/msdosfs/msdosfs_vfsops.c:1.100 src/sys/fs/msdosfs/msdosfs_vfsops.c:1.101
--- src/sys/fs/msdosfs/msdosfs_vfsops.c:1.100 Sun Nov 4 17:57:59 2012
+++ src/sys/fs/msdosfs/msdosfs_vfsops.c Mon Apr 15 14:10:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: msdosfs_vfsops.c,v 1.100 2012/11/04 17:57:59 jakllsch Exp $ */
+/* $NetBSD: msdosfs_vfsops.c,v 1.101 2013/04/15 14:10:59 jakllsch Exp $ */
/*-
* Copyright (C) 1994, 1995, 1997 Wolfgang Solfrank.
@@ -48,7 +48,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.100 2012/11/04 17:57:59 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: msdosfs_vfsops.c,v 1.101 2013/04/15 14:10:59 jakllsch Exp $);
#if defined(_KERNEL_OPT)
#include opt_compat_netbsd.h
@@ -727,6 +727,18 @@ msdosfs_mountfs(struct vnode *devvp, str
}
/*
+ * Cluster size must be within limit of MAXBSIZE.
+ * Many FAT filesystems will not have clusters larger than
+ * 32KiB due to limits in Windows versions before Vista.
+ */
+ if (pmp-pm_bpcluster MAXBSIZE) {
+ DPRINTF((bpcluster %lu MAXBSIZE %d\n,
+ pmp-pm_bpcluster, MAXBSIZE));
+ error = EINVAL;
+ goto error_exit;
+ }
+
+ /*
* Release the bootsector buffer.
*/
brelse(bp, BC_AGE);
CVS commit: src/sys/dev/mii
Module Name:src Committed By: msaitoh Date: Mon Apr 15 16:19:48 UTC 2013 Modified Files: src/sys/dev/mii: mdio.h Log Message: Fix typo. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/dev/mii/mdio.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/mii/mdio.h diff -u src/sys/dev/mii/mdio.h:1.2 src/sys/dev/mii/mdio.h:1.3 --- src/sys/dev/mii/mdio.h:1.2 Mon Apr 15 12:02:47 2013 +++ src/sys/dev/mii/mdio.h Mon Apr 15 16:19:48 2013 @@ -33,7 +33,7 @@ /* * IEEE 802.3 Clause 45 definitions. * From: - * IEEE 802.3 2008 + * IEEE 802.3 2009 * IEEE 802.3at * IEEE 802.3av * IEEE 802.3az @@ -112,8 +112,8 @@ #define MDIO_PMAPMD_10PTONESTAT1 65 /* 10P tone status 1 */ #define MDIO_PMAPMD_10PTONESTAT2 66 /* 10P tone status 2 */ #define MDIO_PMAPMD_10PTONESTAT3 67 /* 10P tone status 3 */ -#define MDIO_PMAPMD_10POUTINDICAT 68 /* 10P outgoing indicatior bits */ -#define MDIO_PMAPMD_10PININDICAT 69 /* 10P incoming indicatior bits */ +#define MDIO_PMAPMD_10POUTINDICAT 68 /* 10P outgoing indicator bits */ +#define MDIO_PMAPMD_10PININDICAT 69 /* 10P incoming indicator bits */ #define MDIO_PMAPMD_10PCYCLICEXTCNF 70 /* 10P cyclic extension config. */ #define MDIO_PMAPMD_10PATTAINDSDR 71 /* 10P attainable downstream DR */ /* Values 72 to 79 are reserved */ @@ -167,7 +167,7 @@ #define MDIO_PMAPMD_10GTSKEWDLY1 145 /* 10G-T skew delay 1 */ #define MDIO_PMAPMD_10GTSKEWDLY2 146 /* 10G-T skew delay 2 */ #define MDIO_PMAPMD_10GTFSTRETSTATCTRL 147 /* 10G-T fast retrain statctrl */ -/* Values 148 to 149 are reserved */ + /* Values 148 to 149 are reserved */ #define MDIO_PMAPMD_10GKRPMDCTRL 150 /* 10G-KR PMD control */ #define MDIO_PMAPMD_10GKRPMDSTAT 151 /* 10G-KR PMD status */ #define MDIO_PMAPMD_10GKRLPCOEFUPD 152 /* 10G-KR LP coefficient update */
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Apr 15 18:48:37 UTC 2013
Modified Files:
src/sys/dev/pci: pcireg.h
Log Message:
Add some PCIE capability register bit definitions from FreeBSD.
To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.77 src/sys/dev/pci/pcireg.h:1.78
--- src/sys/dev/pci/pcireg.h:1.77 Fri Apr 12 03:32:28 2013
+++ src/sys/dev/pci/pcireg.h Mon Apr 15 18:48:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.77 2013/04/12 03:32:28 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.78 2013/04/15 18:48:36 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -644,17 +644,51 @@ struct pci_msix_table_entry {
#define PCI_PCIE_XCAP_TYPE_DOWN __SHIFTIN(0x6, PCI_PCIE_XCAP_TYPE_MASK)
#define PCI_PCIE_XCAP_TYPE_PCIE2PCI __SHIFTIN(0x7, PCI_PCIE_XCAP_TYPE_MASK)
#define PCI_PCIE_XCAP_TYPE_PCI2PCIE __SHIFTIN(0x8, PCI_PCIE_XCAP_TYPE_MASK)
+#define PCI_PCIE_XCAP_TYPE_ROOT_INTEP __SHIFTIN(0x9, PCI_PCIE_XCAP_TYPE_MASK)
+#define PCI_PCIE_XCAP_TYPE_ROOT_EVNTC __SHIFTIN(0xa, PCI_PCIE_XCAP_TYPE_MASK)
#define PCI_PCIE_XCAP_SI __SHIFTIN(__BIT(8), PCI_PCIE_XCAP_MASK) /* Slot Implemented */
#define PCI_PCIE_DCAP 0x04 /* Device Capabilities Register */
+#define PCI_PCIE_DCAP_MAX_PAYLOAD __BITS(2, 0)
+#define PCI_PCIE_DCAP_PHANTHOM_FUNCS __BITS(4, 3)
+#define PCI_PCIE_DCAP_EXT_TAG_FIELD __BIT(5)
+#define PCI_PCIE_DCAP_L0S_LATENCY __BITS(8, 6)
+#define PCI_PCIE_DCAP_L1_LATENCY __BITS(11, 9)
+#define PCI_PCIE_DCAP_ROLE_ERR_RPT __BIT(15)
+#define PCI_PCIE_DCAP_SLOT_PWR_LIM_VAL __BITS(25, 18)
+#define PCI_PCIE_DCAP_SLOT_PWR_LIM_SCALE __BITS(27, 26)
+#define PCI_PCIE_DCAP_FLR __BIT(28)
#define PCI_PCIE_DCSR 0x08 /* Device Control Status Register */
-#define PCI_PCIE_DCSR_MAX_READ_REQ __BITS(14, 12)
+#define PCI_PCIE_DCSR_ENA_COR_ERR __BIT(0)
+#define PCI_PCIE_DCSR_ENA_NFER __BIT(1)
+#define PCI_PCIE_DCSR_ENA_FER __BIT(2)
+#define PCI_PCIE_DCSR_ENA_URR __BIT(3)
#define PCI_PCIE_DCSR_ENA_RELAX_ORD __BIT(4)
+#define PCI_PCIE_DCSR_MAX_PAYLOAD __BITS(7, 5)
+#define PCI_PCIE_DCSR_EXT_TAG_FIELD __BIT(8)
+#define PCI_PCIE_DCSR_PHANTOM_FUNCS __BIT(9)
+#define PCI_PCIE_DCSR_AUX_POWER_PM __BIT(10)
#define PCI_PCIE_DCSR_ENA_NO_SNOOP __BIT(11)
-#define PCI_PCIE_DCSR_CED __BIT(0 + 16)
-#define PCI_PCIE_DCSR_NFED __BIT(1 + 16)
-#define PCI_PCIE_DCSR_FED __BIT(2 + 16)
-#define PCI_PCIE_DCSR_URD __BIT(3 + 16)
+#define PCI_PCIE_DCSR_MAX_READ_REQ __BITS(14, 12)
+#define PCI_PCIE_DCSR_BRDG_CFG_RETRY __BIT(15)
+#define PCI_PCIE_DCSR_INITIATE_FLR __BIT(15)
+#define PCI_PCIE_DCSR_CED __BIT(0 + 16)
+#define PCI_PCIE_DCSR_NFED __BIT(1 + 16)
+#define PCI_PCIE_DCSR_FED __BIT(2 + 16)
+#define PCI_PCIE_DCSR_URD __BIT(3 + 16)
+#define PCI_PCIE_DCSR_AUX_PWR __BIT(4 + 16)
+#define PCI_PCIE_DCSR_TRANSACTION_PND __BIT(5 + 16)
#define PCI_PCIE_LCAP 0x0c /* Link Capabilities Register */
+#define PCI_PCIE_LCAP_MAX_SPEED __BITS(3, 0)
+#define PCI_PCIE_LCAP_MAX_WIDTH __BITS(9, 4)
+#define PCI_PCIE_LCAP_ASPM __BITS(11, 10)
+#define PCI_PCIE_LCAP_L0S_EXIT __BITS(14, 12)
+#define PCI_PCIE_LCAP_L1_EXIT __BITS(17, 15)
+#define PCI_PCIE_LCAP_CLOCK_PM __BIT(18)
+#define PCI_PCIE_LCAP_SURPRISE_DOWN __BIT(19)
+#define PCI_PCIE_LCAP_DL_ACTIVE __BIT(20)
+#define PCI_PCIE_LCAP_LINK_BW_NOTIFY __BIT(21)
+#define PCI_PCIE_LCAP_ASPM_COMPLIANCE __BIT(22)
+#define PCI_PCIE_LCAP_PORT __BITS(31, 24)
#define PCI_PCIE_LCSR 0x10 /* Link Control Status Register */
#define PCI_PCIE_LCSR_ASPM_L0S __BIT(0)
#define PCI_PCIE_LCSR_ASPM_L1 __BIT(1)
@@ -664,11 +698,17 @@ struct pci_msix_table_entry {
#define PCI_PCIE_LCSR_COMCLKCFG __BIT(6)
#define PCI_PCIE_LCSR_EXTNDSYNC __BIT(7)
#define PCI_PCIE_LCSR_ENCLKPM __BIT(8)
+#define PCI_PCIE_LCSR_HAWD __BIT(9)
+#define PCI_PCIE_LCSR_LBMIE __BIT(10)
+#define PCI_PCIE_LCSR_LABIE __BIT(11)
#define PCI_PCIE_LCSR_LINKSPEED __BITS(19,16)
#define PCI_PCIE_LCSR_NLW __BITS(25,20)
+#define PCI_PCIE_LCSR_LINKTRAIN_ERR __BIT(26)
#define PCI_PCIE_LCSR_LINKTRAIN __BIT(27)
#define PCI_PCIE_LCSR_SLOTCLKCFG __BIT(28)
#define PCI_PCIE_LCSR_DLACTIVE __BIT(29)
+#define PCI_PCIE_LCSR_LINK_BW_MGMT __BIT(30)
+#define PCI_PCIE_LCSR_LINK_AUTO_BW __BIT(31)
#define PCI_PCIE_SLCAP 0x14 /* Slot Capabilities Register */
#define PCI_PCIE_SLCAP_ABP __BIT(0) /* Attention Button Present */
#define PCI_PCIE_SLCAP_PCP __BIT(1) /* Power Controller Present */
@@ -679,6 +719,11 @@ struct pci_msix_table_entry {
#define PCI_PCIE_SLCAP_PIP __BIT(4) /* Power Indicator Present */
#define PCI_PCIE_SLCAP_HPS __BIT(5) /* Hot-Plug Surprise */
#define PCI_PCIE_SLCAP_HPC __BIT(6) /* Hot-Plug Capable */
+#define PCI_PCIE_SLCAP_SPLV __BITS(14, 7)
+#define PCI_PCIE_SLCAP_SPLS __BITS(16, 15)
+#define PCI_PCIE_SLCAP_EIP __BIT(17)
+#define PCI_PCIE_SLCAP_NCCS __BIT(18)
+#define
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Apr 15 18:51:29 UTC 2013 Modified Files: src/sys/dev/pci: pci_subr.c Log Message: Print some PCIE device type. To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/sys/dev/pci/pci_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/dev/pci/pci_subr.c diff -u src/sys/dev/pci/pci_subr.c:1.95 src/sys/dev/pci/pci_subr.c:1.96 --- src/sys/dev/pci/pci_subr.c:1.95 Sat Oct 27 17:18:35 2012 +++ src/sys/dev/pci/pci_subr.c Mon Apr 15 18:51:29 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_subr.c,v 1.95 2012/10/27 17:18:35 chs Exp $ */ +/* $NetBSD: pci_subr.c,v 1.96 2013/04/15 18:51:29 msaitoh Exp $ */ /* * Copyright (c) 1997 Zubin D. Dittia. All rights reserved. @@ -40,7 +40,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.95 2012/10/27 17:18:35 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: pci_subr.c,v 1.96 2013/04/15 18:51:29 msaitoh Exp $); #ifdef _KERNEL_OPT #include opt_pci.h @@ -842,6 +842,12 @@ pci_conf_print_pcie_cap(const pcireg_t * case 0x8: printf(PCI/PCI-X to PCI Express Bridge\n); break; + case 0x9: + printf(Root Complex Integrated Endpoint\n); + break; + case 0xa: + printf(Root Complex Event Collector\n); + break; default: printf(unknown\n); break;
CVS commit: src/sys/arch/evbarm/beagle
Module Name:src Committed By: bouyer Date: Mon Apr 15 18:56:38 UTC 2013 Modified Files: src/sys/arch/evbarm/beagle: beagle_machdep.c Log Message: include com.h before testing NCOM To generate a diff of this commit: cvs rdiff -u -r1.37 -r1.38 src/sys/arch/evbarm/beagle/beagle_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/beagle/beagle_machdep.c diff -u src/sys/arch/evbarm/beagle/beagle_machdep.c:1.37 src/sys/arch/evbarm/beagle/beagle_machdep.c:1.38 --- src/sys/arch/evbarm/beagle/beagle_machdep.c:1.37 Wed Mar 13 03:03:04 2013 +++ src/sys/arch/evbarm/beagle/beagle_machdep.c Mon Apr 15 18:56:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: beagle_machdep.c,v 1.37 2013/03/13 03:03:04 khorben Exp $ */ +/* $NetBSD: beagle_machdep.c,v 1.38 2013/04/15 18:56:38 bouyer Exp $ */ /* * Machine dependent functions for kernel setup for TI OSK5912 board. @@ -125,7 +125,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.37 2013/03/13 03:03:04 khorben Exp $); +__KERNEL_RCSID(0, $NetBSD: beagle_machdep.c,v 1.38 2013/04/15 18:56:38 bouyer Exp $); #include opt_machdep.h #include opt_ddb.h @@ -135,6 +135,7 @@ __KERNEL_RCSID(0, $NetBSD: beagle_machd #include opt_com.h #include opt_omap.h #include prcm.h +#include com.h #include sys/param.h #include sys/systm.h @@ -241,7 +242,6 @@ static psize_t omap3530_memprobe(void); bs_protos(bs_notimpl); -#include com.h #if NCOM 0 #include dev/ic/comreg.h #include dev/ic/comvar.h
CVS commit: src/sys/compat/linux/common
Module Name:src
Committed By: christos
Date: Mon Apr 15 19:24:04 UTC 2013
Modified Files:
src/sys/compat/linux/common: linux_misc.c
Log Message:
alpha uses standard utimes.
To generate a diff of this commit:
cvs rdiff -u -r1.222 -r1.223 src/sys/compat/linux/common/linux_misc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/compat/linux/common/linux_misc.c
diff -u src/sys/compat/linux/common/linux_misc.c:1.222 src/sys/compat/linux/common/linux_misc.c:1.223
--- src/sys/compat/linux/common/linux_misc.c:1.222 Tue Apr 9 04:00:20 2013
+++ src/sys/compat/linux/common/linux_misc.c Mon Apr 15 15:24:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_misc.c,v 1.222 2013/04/09 08:00:20 pooka Exp $ */
+/* $NetBSD: linux_misc.c,v 1.223 2013/04/15 19:24:04 christos Exp $ */
/*-
* Copyright (c) 1995, 1998, 1999, 2008 The NetBSD Foundation, Inc.
@@ -57,7 +57,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: linux_misc.c,v 1.222 2013/04/09 08:00:20 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: linux_misc.c,v 1.223 2013/04/15 19:24:04 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1379,6 +1379,7 @@ linux_sys_getpriority(struct lwp *l, con
return 0;
}
+#ifndef __alpha__
int
linux_sys_utimes(struct lwp *l, const struct linux_sys_utimes_args *uap, register_t *retval)
{
@@ -1435,4 +1436,5 @@ linux_sys_lutimes(struct lwp *l, const s
return do_sys_utimes(l, NULL, SCARG(uap, path), NOFOLLOW,
tptr, UIO_SYSSPACE);
}
+#endif /* __alpha__ */
#endif /* !COMPAT_LINUX32 */
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: christos Date: Mon Apr 15 19:26:15 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.mips64eb Log Message: fix typo. To generate a diff of this commit: cvs rdiff -u -r1.126 -r1.127 src/distrib/sets/lists/base/ad.mips64eb Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.126 src/distrib/sets/lists/base/ad.mips64eb:1.127 --- src/distrib/sets/lists/base/ad.mips64eb:1.126 Thu Apr 11 13:43:15 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Mon Apr 15 15:26:15 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.126 2013/04/11 17:43:15 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.127 2013/04/15 19:26:15 christos Exp $ ./lib/64 base-compat-shlib compat ./lib/64/npf base-npf-shlib compat ./lib/64/npf/ext_log.sobase-npf-shlib compat,pic @@ -10,7 +10,7 @@ ./lib/64/npf/ext_rndblock.so base-npf-shlib compat,pic ./lib/64/npf/ext_rndblock.so.0 base-npf-shlib compat,pic ./lib/64/npf/ext_rndblock.so.0.0 base-npf-shlib compat,pic -./lib/o32/npf base-compat-shlib compat +./lib/o32 base-compat-shlib compat ./lib/o32/npf base-npf-shlib compat ./lib/o32/npf/ext_log.so base-npf-shlib compat,pic ./lib/o32/npf/ext_log.so.0 base-npf-shlib compat,pic
CVS commit: src/sys/dev/pci/voyager
Module Name:src
Committed By: christos
Date: Mon Apr 15 19:46:16 UTC 2013
Modified Files:
src/sys/dev/pci/voyager: pwmclock.c
Log Message:
make this compile again; macallan, please commit the right fix!
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/dev/pci/voyager/pwmclock.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/voyager/pwmclock.c
diff -u src/sys/dev/pci/voyager/pwmclock.c:1.6 src/sys/dev/pci/voyager/pwmclock.c:1.7
--- src/sys/dev/pci/voyager/pwmclock.c:1.6 Sat Jun 2 17:36:45 2012
+++ src/sys/dev/pci/voyager/pwmclock.c Mon Apr 15 15:46:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $ */
+/* $NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $ */
/*
* Copyright (c) 2011 Michael Lorenz
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pwmclock.c,v 1.6 2012/06/02 21:36:45 dsl Exp $);
+__KERNEL_RCSID(0, $NetBSD: pwmclock.c,v 1.7 2013/04/15 19:46:16 christos Exp $);
#include sys/param.h
#include sys/systm.h
@@ -157,8 +157,10 @@ pwmclock_attach(device_t parent, device_
/* ok, let's see how far the cycle counter gets between interrupts */
DPRINTF(calibrating CPU timer...\n);
for (clk = 1; clk 8; clk++) {
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) ~LS2FCFG_FREQSCALE_MASK) | clk;
+#endif
bus_space_write_4(sc-sc_memt, sc-sc_regh, SM502_PWM1,
sc-sc_reg);
acc = 0;
@@ -234,8 +236,10 @@ pwmclock_shutdown(void *cookie)
/* just in case the interrupt handler runs again after this */
sc-sc_step_wanted = 7;
/* set the clock to full speed */
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) ~LS2FCFG_FREQSCALE_MASK) | 7;
+#endif
}
void
@@ -292,9 +296,11 @@ pwmclock_intr(void *cookie)
* we only change sc_step after doing that
*/
if (sc-sc_step_wanted != sc-sc_step) {
+#if 0
REGVAL(LS2F_CHIPCFG0) =
(REGVAL(LS2F_CHIPCFG0) ~LS2FCFG_FREQSCALE_MASK) |
sc-sc_step_wanted;
+#endif
}
now = mips3_cp0_count_read();
CVS commit: src/usr.bin/netstat
Module Name:src
Committed By: christos
Date: Mon Apr 15 21:20:39 UTC 2013
Modified Files:
src/usr.bin/netstat: fast_ipsec.c
Log Message:
PR/47744: Frank Kardel: netstat -s stops output prematurely when ipsec is not
compiled.
If the first sysctl fails return silently.
XXX: pullup-6
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/netstat/fast_ipsec.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/netstat/fast_ipsec.c
diff -u src/usr.bin/netstat/fast_ipsec.c:1.19 src/usr.bin/netstat/fast_ipsec.c:1.20
--- src/usr.bin/netstat/fast_ipsec.c:1.19 Thu Mar 22 16:34:43 2012
+++ src/usr.bin/netstat/fast_ipsec.c Mon Apr 15 17:20:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fast_ipsec.c,v 1.19 2012/03/22 20:34:43 drochner Exp $ */
+/* $NetBSD: fast_ipsec.c,v 1.20 2013/04/15 21:20:39 christos Exp $ */
/* $FreeBSD: src/tools/tools/crypto/ipsecstats.c,v 1.1.4.1 2003/06/03 00:13:13 sam Exp $ */
/*-
@@ -33,7 +33,7 @@
#include sys/cdefs.h
#ifndef lint
#ifdef __NetBSD__
-__RCSID($NetBSD: fast_ipsec.c,v 1.19 2012/03/22 20:34:43 drochner Exp $);
+__RCSID($NetBSD: fast_ipsec.c,v 1.20 2013/04/15 21:20:39 christos Exp $);
#endif
#endif /* not lint*/
@@ -152,8 +152,12 @@ fast_ipsec_stats(u_long off, const char
slen = sizeof(ipsecstats);
status = sysctlbyname(net.inet.ipsec.ipsecstats, ipsecstats, slen,
NULL, 0);
- if (status 0 errno != ENOMEM)
- err(1, net.inet.ipsec.ipsecstats);
+ if (status 0) {
+ if (errno == ENOENT)
+ return;
+ if (errno != ENOMEM)
+ err(1, net.inet.ipsec.ipsecstats);
+ }
slen = sizeof (ahstats);
status = sysctlbyname(net.inet.ah.ah_stats, ahstats, slen, NULL, 0);
CVS commit: src/share/man/man5
Module Name:src Committed By: jdf Date: Mon Apr 15 22:46:52 UTC 2013 Modified Files: src/share/man/man5: boot.cfg.5 Log Message: Remove superfluous '.Pp' macro (fixes mandoc(1) warning). Patch supplied by Bug Hunting. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/share/man/man5/boot.cfg.5 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/man5/boot.cfg.5 diff -u src/share/man/man5/boot.cfg.5:1.25 src/share/man/man5/boot.cfg.5:1.26 --- src/share/man/man5/boot.cfg.5:1.25 Sat Mar 3 15:14:03 2012 +++ src/share/man/man5/boot.cfg.5 Mon Apr 15 22:46:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: boot.cfg.5,v 1.25 2012/03/03 15:14:03 nonaka Exp $ +.\ $NetBSD: boot.cfg.5,v 1.26 2013/04/15 22:46:52 jdf Exp $ .\ .\ Copyright (c) 2007 Stephen Borrill .\ All rights reserved. @@ -54,7 +54,6 @@ are comments and will be ignored. Some keywords can be present multiple times in the file to define additional items. Such keywords are noted below. -.Pp .Bl -tag -width timeout .It Sy banner (may be present multiple times)
