CVS commit: src/sys/arch/mips/include
Module Name:src Committed By: matt Date: Sun Jun 7 07:14:47 UTC 2015 Modified Files: src/sys/arch/mips/include: cache.h Log Message: Multiple inclusion protection To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sys/arch/mips/include/cache.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/mips/include/cache.h diff -u src/sys/arch/mips/include/cache.h:1.11 src/sys/arch/mips/include/cache.h:1.12 --- src/sys/arch/mips/include/cache.h:1.11 Tue Mar 15 07:39:22 2011 +++ src/sys/arch/mips/include/cache.h Sun Jun 7 07:14:47 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cache.h,v 1.11 2011/03/15 07:39:22 matt Exp $ */ +/* $NetBSD: cache.h,v 1.12 2015/06/07 07:14:47 matt Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#ifndef _MIPS_CACHE_H_ +#define _MIPS_CACHE_H_ + /* * Cache operations. * @@ -287,3 +290,5 @@ void mips_config_cache(void); void mips_dcache_compute_align(void); #include + +#endif /* _MIPS_CACHE_H_ */
CVS commit: src/sys/arch/evbmips/malta/dev
Module Name:src Committed By: matt Date: Sun Jun 7 07:19:21 UTC 2015 Modified Files: src/sys/arch/evbmips/malta/dev: gt.c Log Message: #include To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/arch/evbmips/malta/dev/gt.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/evbmips/malta/dev/gt.c diff -u src/sys/arch/evbmips/malta/dev/gt.c:1.13 src/sys/arch/evbmips/malta/dev/gt.c:1.14 --- src/sys/arch/evbmips/malta/dev/gt.c:1.13 Mon Jun 6 17:13:05 2011 +++ src/sys/arch/evbmips/malta/dev/gt.c Sun Jun 7 07:19:21 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: gt.c,v 1.13 2011/06/06 17:13:05 matt Exp $ */ +/* $NetBSD: gt.c,v 1.14 2015/06/07 07:19:21 matt Exp $ */ /* * Copyright 2002 Wasabi Systems, Inc. @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 2011/06/06 17:13:05 matt Exp $"); +__KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.14 2015/06/07 07:19:21 matt Exp $"); #include #include @@ -44,6 +44,8 @@ __KERNEL_RCSID(0, "$NetBSD: gt.c,v 1.13 #include +#include + #include #include
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Jun 7 07:55:30 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usb.h
Log Message:
More definitions from USB 3.1.
Mostly from t-hash, but slightly updated by me
To generate a diff of this commit:
cvs rdiff -u -r1.111.2.7 -r1.111.2.8 src/sys/dev/usb/usb.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/usb/usb.h
diff -u src/sys/dev/usb/usb.h:1.111.2.7 src/sys/dev/usb/usb.h:1.111.2.8
--- src/sys/dev/usb/usb.h:1.111.2.7 Thu May 28 06:15:47 2015
+++ src/sys/dev/usb/usb.h Sun Jun 7 07:55:30 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usb.h,v 1.111.2.7 2015/05/28 06:15:47 skrll Exp $ */
+/* $NetBSD: usb.h,v 1.111.2.8 2015/06/07 07:55:30 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */
/*
@@ -395,15 +395,26 @@ typedef struct {
} UPACKED usb_devcap_platform_descriptor_t;
#define USB_DEVCAP_PLATFORM_DESCRIPTOR_SIZE 20
+/* usb 3.1 ch 9.6.2.5 */
typedef struct {
uByte bLength;
uByte bDescriptorType;
uByte bDevCapabilityType;
uByte bReserved;
uDWord bmAttributes;
+#define USB_DEVCAP_SSP_SSAC(x) __SHIFTOUT(x, __BITS(4,0))
+#define USB_DEVCAP_SSP_SSIC(x) __SHIFTOUT(x, __BITS(8,5))
uWord wFunctionalitySupport;
+#define USB_DEVCAP_SSP_SSID(x) __SHIFTOUT(x, __BITS(3,0))
+#define USB_DEVCAP_SSP_MIN_RXLANE_COUNT(x) __SHIFTOUT(x, __BITS(11,8))
+#define USB_DEVCAP_SSP_MIN_TXLANE_COUNT(x) __SHIFTOUT(x, __BITS(15,12))
uWord wReserved;
uDWord bmSublinkSpeedAttr[0];
+#define USB_DEVCAP_SSP_SSID(x) __SHIFTOUT(x, __BITS(3,0))
+#define USB_DEVCAP_SSP_LSE(x) __SHIFTOUT(x, __BITS(5,4))
+#define USB_DEVCAP_SSP_ST(x) __SHIFTOUT(x, __BITS(7,6))
+#define USB_DEVCAP_SSP_LP(x) __SHIFTOUT(x, __BITS(15,14))
+#define USB_DEVCAP_SSP_LSM(x) __SHIFTOUT(x, __BITS(31,16))
} UPACKED usb_devcap_ssp_descriptor_t;
#define USB_DEVCAP_SSP_DESCRIPTOR_SIZE 12 /* variable length */
@@ -424,6 +435,10 @@ typedef struct {
#define UR_STOP_TT 0x0b
#define UR_SET_HUB_DEPTH 0x0c
#define UR_GET_PORT_ERR_COUNT 0x0d
+/* Port Status Type for GET_STATUS, USB 3.1 10.16.2.6 and Table 10-12 */
+#define UR_PST_PORT_STATUS 0
+#define UR_PST_PD_STATUS 1
+#define UR_PST_EXT_PORT_STATUS 2
/*
* Hub features from USB 2.0 spec, table 11-17 and updated by the
@@ -597,6 +612,14 @@ typedef struct {
#define UPS_C_PORT_CONFIG_ERROR 0x0080
} UPACKED usb_port_status_t;
+/* 10.16.2.6 */
+/* Valid when port status type is UR_PST_EXT_PORT_STATUS. */
+typedef struct {
+ uWord wPortStatus;
+ uWord wPortChange;
+ uDWord dwExtPortStatus;
+} UPACKED usb_port_status_ext_t;
+
/* Device class codes */
#define UDCLASS_IN_INTERFACE 0x00
#define UDCLASS_COMM 0x02
@@ -854,7 +877,8 @@ struct usb_device_info {
#define USB_SPEED_FULL 2
#define USB_SPEED_HIGH 3
#define USB_SPEED_SUPER 4
-#define USB_IS_SS(X) ((X) == USB_SPEED_SUPER)
+#define USB_SPEED_SUPER_PLUS 5
+#define USB_IS_SS(X) ((X) == USB_SPEED_SUPER || (X) == USB_SPEED_SUPER_PLUS)
int udi_power; /* power consumption in mA, 0 if selfpowered */
int udi_nports;
char udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN];
CVS commit: src/sys/arch/mips
Module Name:src Committed By: matt Date: Sun Jun 7 08:03:10 UTC 2015 Modified Files: src/sys/arch/mips/include: cpuregs.h src/sys/arch/mips/mips: locore.S locore_mips3.S locore_octeon.S mipsX_subr.S src/sys/arch/mips/rmi: rmixl_subr.S Log Message: Define COP0 register that use select value in Use those new definitions To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/sys/arch/mips/include/cpuregs.h cvs rdiff -u -r1.195 -r1.196 src/sys/arch/mips/mips/locore.S cvs rdiff -u -r1.107 -r1.108 src/sys/arch/mips/mips/locore_mips3.S cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/mips/locore_octeon.S cvs rdiff -u -r1.59 -r1.60 src/sys/arch/mips/mips/mipsX_subr.S cvs rdiff -u -r1.5 -r1.6 src/sys/arch/mips/rmi/rmixl_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/mips/include/cpuregs.h diff -u src/sys/arch/mips/include/cpuregs.h:1.91 src/sys/arch/mips/include/cpuregs.h:1.92 --- src/sys/arch/mips/include/cpuregs.h:1.91 Mon Jun 1 22:55:12 2015 +++ src/sys/arch/mips/include/cpuregs.h Sun Jun 7 08:03:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: cpuregs.h,v 1.91 2015/06/01 22:55:12 matt Exp $ */ +/* $NetBSD: cpuregs.h,v 1.92 2015/06/07 08:03:10 matt Exp $ */ /* * Copyright (c) 2009 Miodrag Vallat. @@ -494,6 +494,7 @@ * 4 MIPS_COP_0_TLB_CONTEXT 3636 TLB Context. * 4/2 MIPS_COP_0_USERLOCAL ..36 UserLocal. * 5 MIPS_COP_0_TLB_PG_MASK .333 TLB Page Mask register. + * 5/1 MIPS_COP_0_PG_GRAIN ..33 PageGrain register * 6 MIPS_COP_0_TLB_WIRED .333 Wired TLB number. * 7 MIPS_COP_0_HWRENA ..33 rdHWR Enable. * 8 MIPS_COP_0_BAD_VADDR 3636 Bad virtual address. @@ -512,6 +513,8 @@ * 16/1 MIPS_COP_0_CONFIG1 ..33 Configuration register 1. * 16/2 MIPS_COP_0_CONFIG2 ..33 Configuration register 2. * 16/3 MIPS_COP_0_CONFIG3 ..33 Configuration register 3. + * 16/4 MIPS_COP_0_CONFIG4 ..33 Configuration register 6. + * 16/5 MIPS_COP_0_CONFIG5 ..33 Configuration register 7. * 16/6 MIPS_COP_0_CONFIG6 ..33 Configuration register 6. * 16/7 MIPS_COP_0_CONFIG7 ..33 Configuration register 7. * 17 MIPS_COP_0_LLADDR .336 Load Linked Address. @@ -580,8 +583,35 @@ #define MIPS_COP_0_ERROR_PC _(30) /* MIPS32/64 */ +#define MIPS_COP_0_CONTEXT _(4) +#define MIPS_COP_0_CTXCONFIG _(4), 1 +#define MIPS_COP_0_USERLOCAL _(4), 2 +#define MIPS_COP_0_XCTXCONFIG _(4), 3 /* MIPS64 */ +#define MIPS_COP_0_PGGRAIN _(5), 1 +#define MIPS_COP_0_SEGCTL0 _(5), 2 +#define MIPS_COP_0_SEGCTL1 _(5), 3 +#define MIPS_COP_0_SEGCTL2 _(5), 4 +#define MIPS_COP_0_PWBASE _(5), 5 +#define MIPS_COP_0_PWFIELD _(5), 6 +#define MIPS_COP_0_PWSIZE _(5), 7 +#define MIPS_COP_0_PWCTL _(6), 6 #define MIPS_COP_0_HWRENA _(7) -#define MIPS_COP_0_OSSCRATCH _(22) +#define MIPS_COP_0_BADINSTR _(8), 1 +#define MIPS_COP_0_BADINSTRP _(8), 2 +#define MIPS_COP_0_INTCTL _(12), 1 +#define MIPS_COP_0_SRSCTL _(12), 2 +#define MIPS_COP_0_SRSMAP _(12), 3 +#define MIPS_COP_0_NESTEDEXC _(13), 5 +#define MIPS_COP_0_NESTED_EPC _(14), 2 +#define MIPS_COP_0_EBASE _(15), 1 +#define MIPS_COP_0_CDMMBASE _(15), 2 +#define MIPS_COP_0_CMGCRBASE _(15), 3 +#define MIPS_COP_0_CONFIG1 _(16), 1 +#define MIPS_COP_0_CONFIG2 _(16), 2 +#define MIPS_COP_0_CONFIG3 _(16), 3 +#define MIPS_COP_0_CONFIG4 _(16), 4 +#define MIPS_COP_0_CONFIG5 _(16), 5 +#define MIPS_COP_0_OSSCRATCH _(22) /* RMI */ #define MIPS_COP_0_DIAG _(22) #define MIPS_COP_0_DEBUG _(23) #define MIPS_COP_0_DEPC _(24) Index: src/sys/arch/mips/mips/locore.S diff -u src/sys/arch/mips/mips/locore.S:1.195 src/sys/arch/mips/mips/locore.S:1.196 --- src/sys/arch/mips/mips/locore.S:1.195 Sat Jun 6 20:55:45 2015 +++ src/sys/arch/mips/mips/locore.S Sun Jun 7 08:03:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.S,v 1.195 2015/06/06 20:55:45 matt Exp $ */ +/* $NetBSD: locore.S,v 1.196 2015/06/07 08:03:10 matt Exp $ */ /* * Copyright (c) 1992, 1993 @@ -98,7 +98,7 @@ _C_LABEL(kernel_text): // octeon_cpu_spinup if MP or loop using the wait instruction since // non-primary CPUs can't do anything useful. // - mfc0 a0, MIPS_COP_0_PRID, 1 # EBASE + mfc0 a0, MIPS_COP_0_EBASE # EBASE COP0_SYNC ext a1, a0, 0, 10 # get CPU number beqz a1, 2f# normal startup if 0 Index: src/sys/arch/mips/mips/locore_mips3.S diff -u src/sys/arch/mips/mips/locore_mips3.S:1.107 src/sys/arch/mips/mips/locore_mips3.S:1.108 --- src/sys/arch/mips/mips/locore_mips3.S:1.107 Sat Jun 6 21:45:40 2015 +++ src/sys/arch/mips/mips/locore_mips3.S Sun Jun 7 08:03:10 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: locore_mips3.S,v 1.107 2015/06/06 21:45:40 matt Exp $ */ +/* $NetBSD: locore_mips3.S,v 1.108 2015/06/07 08:03:10 matt Exp $ */ /* * Copyright (c) 1997 Jonathan Stone (hereinafter referred to as the author) @@ -432,7 +432,7 @@ END(mipsNN_cp0_watchhi_write) */ LEAF(mipsNN_cp0_ebase_read) jr ra - mfc0 v0, MIPS_COP_0_PRID, 1 + mfc0 v0, MIPS_COP_0_EBASE END(mipsNN_cp0_ebase_read) /* @@
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sun Jun 7 08:04:36 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: usbdi_util.c usbdi_util.h
Log Message:
Add usbd_get_port_status_ext
>From t-hash
To generate a diff of this commit:
cvs rdiff -u -r1.63.2.9 -r1.63.2.10 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.45.6.7 -r1.45.6.8 src/sys/dev/usb/usbdi_util.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/usb/usbdi_util.c
diff -u src/sys/dev/usb/usbdi_util.c:1.63.2.9 src/sys/dev/usb/usbdi_util.c:1.63.2.10
--- src/sys/dev/usb/usbdi_util.c:1.63.2.9 Sat Jun 6 15:27:38 2015
+++ src/sys/dev/usb/usbdi_util.c Sun Jun 7 08:04:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.c,v 1.63.2.9 2015/06/06 15:27:38 skrll Exp $ */
+/* $NetBSD: usbdi_util.c,v 1.63.2.10 2015/06/07 08:04:36 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.9 2015/06/06 15:27:38 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usbdi_util.c,v 1.63.2.10 2015/06/07 08:04:36 skrll Exp $");
#ifdef _KERNEL_OPT
#include "opt_usb.h"
@@ -190,6 +190,21 @@ usbd_get_port_status(struct usbd_device
return usbd_do_request(dev, &req, ps);
}
+/* USB 3.1 10.16.2.6, 10.16.2.6.3 */
+usbd_status
+usbd_get_port_status_ext(struct usbd_device *dev, int port,
+usb_port_status_ext_t *pse)
+{
+ usb_device_request_t req;
+
+ req.bmRequestType = UT_READ_CLASS_OTHER;
+ req.bRequest = UR_GET_STATUS;
+ USETW2(req.wValue, 0, UR_PST_EXT_PORT_STATUS);
+ USETW(req.wIndex, port);
+ USETW(req.wLength, sizeof *pse);
+ return (usbd_do_request(dev, &req, pse));
+}
+
usbd_status
usbd_clear_hub_feature(struct usbd_device *dev, int sel)
{
Index: src/sys/dev/usb/usbdi_util.h
diff -u src/sys/dev/usb/usbdi_util.h:1.45.6.7 src/sys/dev/usb/usbdi_util.h:1.45.6.8
--- src/sys/dev/usb/usbdi_util.h:1.45.6.7 Sat Jun 6 15:27:38 2015
+++ src/sys/dev/usb/usbdi_util.h Sun Jun 7 08:04:36 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi_util.h,v 1.45.6.7 2015/06/06 15:27:38 skrll Exp $ */
+/* $NetBSD: usbdi_util.h,v 1.45.6.8 2015/06/07 08:04:36 skrll Exp $ */
/*
* Copyright (c) 1998, 2004 The NetBSD Foundation, Inc.
@@ -48,6 +48,8 @@ usbd_status usbd_get_device_desc(struct
usbd_status usbd_set_address(struct usbd_device *, int);
usbd_status usbd_get_port_status(struct usbd_device *,
int, usb_port_status_t *);
+usbd_status usbd_get_port_status_ext(struct usbd_device *,
+ int, usb_port_status_ext_t *);
usbd_status usbd_set_hub_feature(struct usbd_device *, int);
usbd_status usbd_clear_hub_feature(struct usbd_device *, int);
usbd_status usbd_set_port_feature(struct usbd_device *, int, int);
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Jun 7 08:04:52 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: xhci.c Log Message: Update comment. >From t-hash. To generate a diff of this commit: cvs rdiff -u -r1.28.2.27 -r1.28.2.28 src/sys/dev/usb/xhci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/xhci.c diff -u src/sys/dev/usb/xhci.c:1.28.2.27 src/sys/dev/usb/xhci.c:1.28.2.28 --- src/sys/dev/usb/xhci.c:1.28.2.27 Thu May 28 06:15:47 2015 +++ src/sys/dev/usb/xhci.c Sun Jun 7 08:04:52 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: xhci.c,v 1.28.2.27 2015/05/28 06:15:47 skrll Exp $ */ +/* $NetBSD: xhci.c,v 1.28.2.28 2015/06/07 08:04:52 skrll Exp $ */ /* * Copyright (c) 2013 Jonathan A. Kollasch @@ -36,7 +36,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.27 2015/05/28 06:15:47 skrll Exp $"); +__KERNEL_RCSID(0, "$NetBSD: xhci.c,v 1.28.2.28 2015/06/07 08:04:52 skrll Exp $"); #include "opt_usb.h" @@ -1005,11 +1005,14 @@ xhci_intr1(struct xhci_softc * const sc) * port_status speed * definition: UPS_*_SPEED in usb.h * They are used in usb_port_status_t and valid only for USB 2.0. - * Speed value is 0 for Super Speed or more. + * Speed value is always 0 for Super Speed or more, and dwExtPortStatus + * of usb_port_status_ext_t indicates port speed. * Note that some 3.0 values overlap with 2.0 values. * (e.g. 0x200 means UPS_POER_POWER_SS in SS and * means UPS_LOW_SPEED in HS.) - * port status sent from hub also uses these values. + * port status returned from hub also uses these values. + * On NetBSD UPS_OTHER_SPEED indicates port speed is super speed + * or more. * xspeed: * definition: Protocol Speed ID (PSI) (xHCI 1.1 7.2.1) * They are used in only slot context and PORTSC reg of xhci.
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src Committed By: joerg Date: Sun Jun 7 11:41:59 UTC 2015 Modified Files: src/common/lib/libc/arch/arm/string: memcpy.S Log Message: Add ARM EABI aliases for aligned arguments. To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/common/lib/libc/arch/arm/string/memcpy.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/common/lib/libc/arch/arm/string/memcpy.S diff -u src/common/lib/libc/arch/arm/string/memcpy.S:1.7 src/common/lib/libc/arch/arm/string/memcpy.S:1.8 --- src/common/lib/libc/arch/arm/string/memcpy.S:1.7 Thu Mar 26 13:34:51 2015 +++ src/common/lib/libc/arch/arm/string/memcpy.S Sun Jun 7 11:41:59 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: memcpy.S,v 1.7 2015/03/26 13:34:51 justin Exp $ */ +/* $NetBSD: memcpy.S,v 1.8 2015/06/07 11:41:59 joerg Exp $ */ #include @@ -10,4 +10,6 @@ #if defined(__ARM_EABI__) && !defined(_RUMPKERNEL) STRONG_ALIAS(__aeabi_memcpy, memcpy) +STRONG_ALIAS(__aeabi_memcpy4, memcpy) +STRONG_ALIAS(__aeabi_memcpy8, memcpy) #endif
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: joerg
Date: Sun Jun 7 11:46:56 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Log Message:
Require ARMv5TE to assemble.
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/common/lib/libc/arch/arm/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.27 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.28
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.27 Sun May 17 22:08:24 2015
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sun Jun 7 11:46:56 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.27 2015/05/17 22:08:24 justin Exp $
+# $NetBSD: Makefile.inc,v 1.28 2015/06/07 11:46:56 joerg Exp $
.ifnmake obj
.include "${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk"
@@ -68,6 +68,7 @@ CPUFLAGS.atomic_simplelock.c+= -marm
.if "${FEAT_LDREX}" == "no"
SRCS.atomic+= atomic_init_testset.c
SRCS.atomic+= atomic_cas_up.S
+AFLAGS.atomic_cas_up.S+= -march=armv5te
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP
CVS commit: src/sys/arch/arm/arm
Module Name:src Committed By: skrll Date: Sun Jun 7 12:01:41 UTC 2015 Modified Files: src/sys/arch/arm/arm: cpufunc_asm_armv7.S Log Message: Dont use magic number. No functional change. To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/sys/arch/arm/arm/cpufunc_asm_armv7.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/cpufunc_asm_armv7.S diff -u src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.24 src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.25 --- src/sys/arch/arm/arm/cpufunc_asm_armv7.S:1.24 Sat May 30 21:25:22 2015 +++ src/sys/arch/arm/arm/cpufunc_asm_armv7.S Sun Jun 7 12:01:41 2015 @@ -45,12 +45,31 @@ ENTRY(armv7_wait) bx lr END(armv7_wait) + +#define TTBR_C (1 << 0) +#define TTBR_S (1 << 1) +#define TTBR_IMP (1 << 2) +#define TTBR_RGN_MASK (3 << 3) +#define TTBR_RGN_NC (0 << 3) +#define TTBR_RGN_WBWA (1 << 3) +#define TTBR_RGN_WT (2 << 3) +#define TTBR_RGN_WBNWA (3 << 3) +#define TTBR_NOS (1 << 5) +#define TTBR_IRGN_MASK ((1 << 6) | (1 << 0)) +#define TTBR_IRGN_NC ((0 << 6) | (0 << 0)) +#define TTBR_IRGN_WBWA ((0 << 6) | (1 << 0)) +#define TTBR_IRGN_WT ((1 << 6) | (0 << 0)) +#define TTBR_IRGN_WBNWA ((1 << 6) | (1 << 0)) + +#define TTBR_UPATTR (TTBR_S | TTBR_RGN_WBNWA | TTBR_C) +#define TTBR_MPATTR (TTBR_S | TTBR_RGN_WBNWA /* | TTBR_NOS */ | TTBR_IRGN_WBNWA) + ENTRY(armv7_context_switch) dsb@ data synchronization barrier mrc p15, 0, ip, c0, c0, 5 @ get MPIDR cmp ip, #0 - orrlt r0, r0, #0x5b @ MP, cachable (Normal WB) - orrge r0, r0, #0x1b @ Non-MP, cacheable, normal WB + orrlt r0, r0, #TTBR_MPATTR @ MP, cachable (Normal WB) + orrge r0, r0, #TTBR_UPATTR @ Non-MP, cacheable, normal WB mcr p15, 0, r0, c2, c0, 0 @ set the new TTBR 0 #ifdef ARM_MMU_EXTENDED cmp r1, #0 @@ -126,8 +145,8 @@ END(armv7_tlb_flushID) ENTRY_NP(armv7_setttb) mrc p15, 0, ip, c0, c0, 5 @ get MPIDR cmp ip, #0 - orrlt r0, r0, #0x5b @ MP, cachable (Normal WB) - orrge r0, r0, #0x1b @ Non-MP, cacheable, normal WB + orrlt r0, r0, #TTBR_MPATTR @ MP, cachable (Normal WB) + orrge r0, r0, #TTBR_UPATTR @ Non-MP, cacheable, normal WB mcr p15, 0, r0, c2, c0, 0 @ load new TTBR 0 #ifdef ARM_MMU_EXTENDED cmp r1, #0
CVS commit: src/sys/ufs/lfs
Module Name:src
Committed By: hannken
Date: Sun Jun 7 13:39:49 UTC 2015
Modified Files:
src/sys/ufs/lfs: lfs_segment.c lfs_vfsops.c lfs_vnops.c
Log Message:
Fix copy and paste errors from last commits.
- Kernel i386/ALL and amd64/ALL compile again.
- Resolves CID 1304138 (DEADCODE) and 1304139 (IDENTICAL_BRANCHES).
To generate a diff of this commit:
cvs rdiff -u -r1.240 -r1.241 src/sys/ufs/lfs/lfs_segment.c
cvs rdiff -u -r1.324 -r1.325 src/sys/ufs/lfs/lfs_vfsops.c
cvs rdiff -u -r1.272 -r1.273 src/sys/ufs/lfs/lfs_vnops.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/ufs/lfs/lfs_segment.c
diff -u src/sys/ufs/lfs/lfs_segment.c:1.240 src/sys/ufs/lfs/lfs_segment.c:1.241
--- src/sys/ufs/lfs/lfs_segment.c:1.240 Sun May 31 15:48:03 2015
+++ src/sys/ufs/lfs/lfs_segment.c Sun Jun 7 13:39:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_segment.c,v 1.240 2015/05/31 15:48:03 hannken Exp $ */
+/* $NetBSD: lfs_segment.c,v 1.241 2015/06/07 13:39:48 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.240 2015/05/31 15:48:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_segment.c,v 1.241 2015/06/07 13:39:48 hannken Exp $");
#define _VFS_VNODE_PRIVATE /* XXX: check for VI_MARKER, this has to go */
@@ -479,7 +479,7 @@ lfs_writevnodes(struct lfs *fs, struct m
{
struct inode *ip;
struct vnode *vp;
- int inodes_written = 0, only_cleaning;
+ int inodes_written = 0;
int error = 0;
ASSERT_SEGLOCK(fs);
@@ -547,14 +547,10 @@ lfs_writevnodes(struct lfs *fs, struct m
continue;
}
- only_cleaning = 0;
/*
* Write the inode/file if dirty and it's not the IFILE.
*/
if ((ip->i_flag & IN_ALLMOD) || !VPISEMPTY(vp)) {
- only_cleaning =
- ((ip->i_flag & IN_ALLMOD) == IN_CLEANING);
-
if (ip->i_number != LFS_IFILE_INUM) {
error = lfs_writefile(fs, sp, vp);
if (error) {
@@ -598,10 +594,7 @@ lfs_writevnodes(struct lfs *fs, struct m
}
}
- if (lfs_clean_vnhead && only_cleaning)
- vrele(vp);
- else
- vrele(vp);
+ vrele(vp);
mutex_enter(&mntvnode_lock);
}
Index: src/sys/ufs/lfs/lfs_vfsops.c
diff -u src/sys/ufs/lfs/lfs_vfsops.c:1.324 src/sys/ufs/lfs/lfs_vfsops.c:1.325
--- src/sys/ufs/lfs/lfs_vfsops.c:1.324 Sun May 31 15:48:03 2015
+++ src/sys/ufs/lfs/lfs_vfsops.c Sun Jun 7 13:39:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vfsops.c,v 1.324 2015/05/31 15:48:03 hannken Exp $ */
+/* $NetBSD: lfs_vfsops.c,v 1.325 2015/06/07 13:39:48 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003, 2007, 2007
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.324 2015/05/31 15:48:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vfsops.c,v 1.325 2015/06/07 13:39:48 hannken Exp $");
#if defined(_KERNEL_OPT)
#include "opt_lfs.h"
@@ -1720,7 +1720,7 @@ lfs_newvnode(struct mount *mp, struct vn
error = lfs_chkiq(ip, 1, cred, 0);
if (error) {
lfs_vfree(dvp, ino, mode);
- ffs_deinit_vnode(ump, vp);
+ lfs_deinit_vnode(ump, vp);
return error;
}
@@ -1738,10 +1738,10 @@ lfs_newvnode(struct mount *mp, struct vn
*/
if (ump->um_fstype == ULFS1)
ip->i_ffs1_rdev = ulfs_rw32(vap->va_rdev,
- ULFS_MPNEEDSWAP(ump));
+ ULFS_MPNEEDSWAP(fs));
else
ip->i_ffs2_rdev = ulfs_rw64(vap->va_rdev,
- ULFS_MPNEEDSWAP(ump));
+ ULFS_MPNEEDSWAP(fs));
}
lfs_vinit(mp, &vp);
Index: src/sys/ufs/lfs/lfs_vnops.c
diff -u src/sys/ufs/lfs/lfs_vnops.c:1.272 src/sys/ufs/lfs/lfs_vnops.c:1.273
--- src/sys/ufs/lfs/lfs_vnops.c:1.272 Sun May 31 15:48:03 2015
+++ src/sys/ufs/lfs/lfs_vnops.c Sun Jun 7 13:39:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: lfs_vnops.c,v 1.272 2015/05/31 15:48:03 hannken Exp $ */
+/* $NetBSD: lfs_vnops.c,v 1.273 2015/06/07 13:39:48 hannken Exp $ */
/*-
* Copyright (c) 1999, 2000, 2001, 2002, 2003 The NetBSD Foundation, Inc.
@@ -125,7 +125,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.272 2015/05/31 15:48:03 hannken Exp $");
+__KERNEL_RCSID(0, "$NetBSD: lfs_vnops.c,v 1.273 2015/06/07 13:39:48 hannken Exp $");
#ifdef _KERNEL_OPT
#include "opt_compat_netbsd.h"
@@ -784,10 +784,7 @@ lfs_mknod(void *v)
}
fstrans_done(ap->a_dvp->v_mount);
- if (error != 0) {
- *vpp = NULL;
- return (error);
- }
+ KASSERT(error == 0);
VOP_UNLOCK(*vpp);
return (0);
}
@@ -1017,9 +1014,6 @@ lfs_mkdir(void *v)
out:
fstrans_done(dvp->v_mount);
-#if defined(LFS_QUOTA) || defined(LFS_QUOTA2)
-out2:
-#endif
UNMARK_VNODE(dvp);
UNMARK_VNODE(*vpp);
CVS commit: src/share/mk
Module Name:src
Committed By: matt
Date: Sun Jun 7 15:04:28 UTC 2015
Modified Files:
src/share/mk: bsd.gcc.mk bsd.prog.mk
Log Message:
Make LIBCRT* depend on the right files if MLIBDIR from MKCOMPAT is defined.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/share/mk/bsd.gcc.mk
cvs rdiff -u -r1.291 -r1.292 src/share/mk/bsd.prog.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.gcc.mk
diff -u src/share/mk/bsd.gcc.mk:1.10 src/share/mk/bsd.gcc.mk:1.11
--- src/share/mk/bsd.gcc.mk:1.10 Mon Dec 10 23:49:39 2012
+++ src/share/mk/bsd.gcc.mk Sun Jun 7 15:04:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.gcc.mk,v 1.10 2012/12/10 23:49:39 pooka Exp $
+# $NetBSD: bsd.gcc.mk,v 1.11 2015/06/07 15:04:28 matt Exp $
.if !defined(_BSD_GCC_MK_)
_BSD_GCC_MK_=1
@@ -21,14 +21,14 @@ _GCC_CRTN!= ${CC} --print-file-name=crt
_GCC_CRTDIR!= dirname ${_GCC_CRTBEGIN}
_GCC_LIBGCCDIR!= dirname `${CC} --print-libgcc-file-name`
.else
-_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/crtbegin.o
-_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/crtbeginS.o
-_GCC_CRTEND?= ${DESTDIR}/usr/lib/crtend.o
-_GCC_CRTENDS?= ${DESTDIR}/usr/lib/crtendS.o
-_GCC_CRTI?= ${DESTDIR}/usr/lib/crti.o
-_GCC_CRTN?= ${DESTDIR}/usr/lib/crtn.o
-_GCC_CRTDIR?= ${DESTDIR}/usr/lib
-_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib
+_GCC_CRTBEGIN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbegin.o
+_GCC_CRTBEGINS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtbeginS.o
+_GCC_CRTEND?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtend.o
+_GCC_CRTENDS?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtendS.o
+_GCC_CRTI?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
+_GCC_CRTN?= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
+_GCC_CRTDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
+_GCC_LIBGCCDIR?= ${DESTDIR}/usr/lib${MLIBDIR:D/${MLIBDIR}}
.endif
.endif # ! defined(_BSD_GCC_MK_)
Index: src/share/mk/bsd.prog.mk
diff -u src/share/mk/bsd.prog.mk:1.291 src/share/mk/bsd.prog.mk:1.292
--- src/share/mk/bsd.prog.mk:1.291 Mon Dec 1 01:34:30 2014
+++ src/share/mk/bsd.prog.mk Sun Jun 7 15:04:28 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prog.mk,v 1.291 2014/12/01 01:34:30 erh Exp $
+# $NetBSD: bsd.prog.mk,v 1.292 2015/06/07 15:04:28 matt Exp $
# @(#)bsd.prog.mk 8.2 (Berkeley) 4/2/94
.ifndef HOSTPROG
@@ -72,22 +72,22 @@ CTFMFLAGS+= -g
# ELF platforms depend on crti.o, crtbegin.o, crtend.o, and crtn.o
.ifndef LIBCRTBEGIN
-LIBCRTBEGIN= ${DESTDIR}/usr/lib/crti.o ${_GCC_CRTBEGIN}
+LIBCRTBEGIN= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o ${_GCC_CRTBEGIN}
.MADE: ${LIBCRTBEGIN}
.endif
.ifndef LIBCRTEND
-LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/crtn.o
+LIBCRTEND= ${_GCC_CRTEND} ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crtn.o
.MADE: ${LIBCRTEND}
.endif
_SHLINKER= ${SHLINKDIR}/ld.elf_so
.ifndef LIBCRT0
-LIBCRT0= ${DESTDIR}/usr/lib/crt0.o
+LIBCRT0= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crt0.o
.MADE: ${LIBCRT0}
.endif
.ifndef LIBCRTI
-LIBCRTI= ${DESTDIR}/usr/lib/crti.o
+LIBCRTI= ${DESTDIR}/usr/lib/${MLIBDIR:D${MLIBDIR}/}crti.o
.MADE: ${LIBCRTI}
.endif
CVS commit: src/common/lib/libc/arch/arm
Module Name:src
Committed By: matt
Date: Sun Jun 7 15:05:34 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm: features.mk
Log Message:
Use ${COPT} so it properly emits the right features doing MKCOMPAT
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/common/lib/libc/arch/arm/features.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/features.mk
diff -u src/common/lib/libc/arch/arm/features.mk:1.1 src/common/lib/libc/arch/arm/features.mk:1.2
--- src/common/lib/libc/arch/arm/features.mk:1.1 Thu Feb 27 09:37:02 2014
+++ src/common/lib/libc/arch/arm/features.mk Sun Jun 7 15:05:34 2015
@@ -1,9 +1,9 @@
-# $NetBSD: features.mk,v 1.1 2014/02/27 09:37:02 matt Exp $
+# $NetBSD: features.mk,v 1.2 2015/06/07 15:05:34 matt Exp $
.ifnmake obj
TESTFILE=${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.c
-FEAT_EABI!=if ${COMPILE.c} -fsyntax-only -DEABI_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_LDREX!=if ${COMPILE.c} -fsyntax-only -DLDREX_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_LDRD!=if ${COMPILE.c} -fsyntax-only -DLDRD_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
-FEAT_THUMB2!=if ${COMPILE.c} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_EABI!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DEABI_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_LDREX!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DLDREX_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_LDRD!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DLDRD_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
+FEAT_THUMB2!=if ${COMPILE.c} ${COPTS} -fsyntax-only -DTHUMB2_TEST ${TESTFILE} >/dev/null 2>/dev/null; then echo yes; else echo no; fi
.endif
CVS commit: src/common/lib/libc/arch/arm/atomic
Module Name:src
Committed By: matt
Date: Sun Jun 7 15:06:24 UTC 2015
Modified Files:
src/common/lib/libc/arch/arm/atomic: Makefile.inc
Log Message:
Back out last change; fixed in the correct place.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/common/lib/libc/arch/arm/atomic/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/common/lib/libc/arch/arm/atomic/Makefile.inc
diff -u src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.28 src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.29
--- src/common/lib/libc/arch/arm/atomic/Makefile.inc:1.28 Sun Jun 7 11:46:56 2015
+++ src/common/lib/libc/arch/arm/atomic/Makefile.inc Sun Jun 7 15:06:24 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.28 2015/06/07 11:46:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.29 2015/06/07 15:06:24 matt Exp $
.ifnmake obj
.include "${NETBSDSRCDIR}/common/lib/libc/arch/arm/features.mk"
@@ -68,7 +68,6 @@ CPUFLAGS.atomic_simplelock.c+= -marm
.if "${FEAT_LDREX}" == "no"
SRCS.atomic+= atomic_init_testset.c
SRCS.atomic+= atomic_cas_up.S
-AFLAGS.atomic_cas_up.S+= -march=armv5te
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_UP
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_16_UP
CPPFLAGS+= -D__HAVE_ASM_ATOMIC_CAS_8_UP
CVS commit: src/sys/arch/amiga/amiga
Module Name:src Committed By: mlelstv Date: Sun Jun 7 20:00:11 UTC 2015 Modified Files: src/sys/arch/amiga/amiga: machdep.c Log Message: Fix space calculation for dump header. Round up to clicks to avoid disk alignment issues. To generate a diff of this commit: cvs rdiff -u -r1.243 -r1.244 src/sys/arch/amiga/amiga/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/amiga/amiga/machdep.c diff -u src/sys/arch/amiga/amiga/machdep.c:1.243 src/sys/arch/amiga/amiga/machdep.c:1.244 --- src/sys/arch/amiga/amiga/machdep.c:1.243 Mon Mar 24 20:06:31 2014 +++ src/sys/arch/amiga/amiga/machdep.c Sun Jun 7 20:00:11 2015 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $ */ +/* $NetBSD: machdep.c,v 1.244 2015/06/07 20:00:11 mlelstv Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -50,7 +50,7 @@ #include "empm.h" #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.243 2014/03/24 20:06:31 christos Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.244 2015/06/07 20:00:11 mlelstv Exp $"); #include #include @@ -535,7 +535,7 @@ cpu_dumpconf(void) else if (dumplo == 0) dumplo = nblks - btodb(ctob(dumpsize)); } - --dumplo; /* XXX assume header fits in one block */ + dumplo -= btodb(ctob(btoc(MDHDRSIZE + ctob(1) - 1))); /* * Don't dump on the first PAGE_SIZE (why PAGE_SIZE?) * in case the dump device includes a disk label.
CVS commit: src/sys/arch/evbmips/conf
Module Name:src Committed By: matt Date: Sun Jun 7 21:05:33 UTC 2015 Modified Files: src/sys/arch/evbmips/conf: files.malta Log Message: Add bluetooth To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/sys/arch/evbmips/conf/files.malta 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/evbmips/conf/files.malta diff -u src/sys/arch/evbmips/conf/files.malta:1.19 src/sys/arch/evbmips/conf/files.malta:1.20 --- src/sys/arch/evbmips/conf/files.malta:1.19 Sun Jul 20 10:22:54 2014 +++ src/sys/arch/evbmips/conf/files.malta Sun Jun 7 21:05:33 2015 @@ -1,4 +1,4 @@ -# $NetBSD: files.malta,v 1.19 2014/07/20 10:22:54 alnsn Exp $ +# $NetBSD: files.malta,v 1.20 2015/06/07 21:05:33 matt Exp $ file arch/evbmips/malta/malta_bus_io.c file arch/evbmips/malta/malta_bus_mem.c @@ -41,6 +41,9 @@ include "dev/ata/files.ata" # Machine-independent PC-style keyboard controller drivers include "dev/pckbport/files.pckbport" +# Machine-independent bluetooth device support +include "dev/bluetooth/files.bluetooth" + # Machine-independent USB device support include "dev/usb/files.usb"
CVS commit: src
Module Name:src
Committed By: rmind
Date: Mon Jun 8 01:00:43 UTC 2015
Modified Files:
src/sys/net/npf: npf_ctl.c
src/usr.sbin/npf/npfctl: npf_bpf_comp.c npf_build.c
Log Message:
- npfctl: fix the confusion in the parser (0/0 case with no other filter).
- Always populate the error dictionary, not only for DEBUG/DIAGNOSTIC.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/net/npf/npf_ctl.c
cvs rdiff -u -r1.7 -r1.8 src/usr.sbin/npf/npfctl/npf_bpf_comp.c
cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/npf/npfctl/npf_build.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/net/npf/npf_ctl.c
diff -u src/sys/net/npf/npf_ctl.c:1.41 src/sys/net/npf/npf_ctl.c:1.42
--- src/sys/net/npf/npf_ctl.c:1.41 Fri Mar 20 23:36:28 2015
+++ src/sys/net/npf/npf_ctl.c Mon Jun 8 01:00:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_ctl.c,v 1.41 2015/03/20 23:36:28 rmind Exp $ */
+/* $NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $ */
/*-
* Copyright (c) 2009-2014 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.41 2015/03/20 23:36:28 rmind Exp $");
+__KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v 1.42 2015/06/08 01:00:43 rmind Exp $");
#include
#include
@@ -49,13 +49,9 @@ __KERNEL_RCSID(0, "$NetBSD: npf_ctl.c,v
#include "npf_impl.h"
#include "npf_conn.h"
-#if defined(DEBUG) || defined(DIAGNOSTIC)
#define NPF_ERR_DEBUG(e) \
prop_dictionary_set_cstring_nocopy((e), "source-file", __FILE__); \
prop_dictionary_set_uint32((e), "source-line", __LINE__);
-#else
-#define NPF_ERR_DEBUG(e)
-#endif
/*
* npfctl_switch: enable or disable packet inspection.
Index: src/usr.sbin/npf/npfctl/npf_bpf_comp.c
diff -u src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.7 src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.8
--- src/usr.sbin/npf/npfctl/npf_bpf_comp.c:1.7 Sun Jun 29 00:05:24 2014
+++ src/usr.sbin/npf/npfctl/npf_bpf_comp.c Mon Jun 8 01:00:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_bpf_comp.c,v 1.7 2014/06/29 00:05:24 rmind Exp $ */
+/* $NetBSD: npf_bpf_comp.c,v 1.8 2015/06/08 01:00:43 rmind Exp $ */
/*-
* Copyright (c) 2010-2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__RCSID("$NetBSD: npf_bpf_comp.c,v 1.7 2014/06/29 00:05:24 rmind Exp $");
+__RCSID("$NetBSD: npf_bpf_comp.c,v 1.8 2015/06/08 01:00:43 rmind Exp $");
#include
#include
@@ -189,6 +189,10 @@ npfctl_bpf_complete(npf_bpf_t *ctx)
struct bpf_program *bp = &ctx->prog;
const u_int retoff = bp->bf_len;
+ /* No instructions (optimised out). */
+ if (!bp->bf_len)
+ return NULL;
+
/* Add the return fragment (success and failure paths). */
struct bpf_insn insns_ret[] = {
BPF_STMT(BPF_RET+BPF_K, NPF_BPF_SUCCESS),
Index: src/usr.sbin/npf/npfctl/npf_build.c
diff -u src/usr.sbin/npf/npfctl/npf_build.c:1.39 src/usr.sbin/npf/npfctl/npf_build.c:1.40
--- src/usr.sbin/npf/npfctl/npf_build.c:1.39 Sat Mar 21 00:49:07 2015
+++ src/usr.sbin/npf/npfctl/npf_build.c Mon Jun 8 01:00:43 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: npf_build.c,v 1.39 2015/03/21 00:49:07 rmind Exp $ */
+/* $NetBSD: npf_build.c,v 1.40 2015/06/08 01:00:43 rmind Exp $ */
/*-
* Copyright (c) 2011-2014 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include
-__RCSID("$NetBSD: npf_build.c,v 1.39 2015/03/21 00:49:07 rmind Exp $");
+__RCSID("$NetBSD: npf_build.c,v 1.40 2015/06/08 01:00:43 rmind Exp $");
#include
#include
@@ -368,6 +368,10 @@ npfctl_build_code(nl_rule_t *rl, sa_fami
/* Complete BPF byte-code and pass to the rule. */
struct bpf_program *bf = npfctl_bpf_complete(bc);
+ if (bf == NULL) {
+ npfctl_bpf_destroy(bc);
+ return true;
+ }
len = bf->bf_len * sizeof(struct bpf_insn);
if (npf_rule_setcode(rl, NPF_CODE_BPF, bf->bf_insns, len) == -1) {
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Mon Jun 8 03:45:19 UTC 2015
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Call wm_pll_workaround_i210() at the end of the wm_reset() function, too.
To generate a diff of this commit:
cvs rdiff -u -r1.331 -r1.332 src/sys/dev/pci/if_wm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.331 src/sys/dev/pci/if_wm.c:1.332
--- src/sys/dev/pci/if_wm.c:1.331 Sat Jun 6 17:36:50 2015
+++ src/sys/dev/pci/if_wm.c Mon Jun 8 03:45:19 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.331 2015/06/06 17:36:50 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.332 2015/06/08 03:45:19 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -81,7 +81,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.331 2015/06/06 17:36:50 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_wm.c,v 1.332 2015/06/08 03:45:19 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_net_mpsafe.h"
@@ -3319,7 +3319,7 @@ void
wm_initialize_hardware_bits(struct wm_softc *sc)
{
uint32_t tarc0, tarc1, reg;
-
+
/* For 82571 variant, 80003 and ICHs */
if (((sc->sc_type >= WM_T_82571) && (sc->sc_type <= WM_T_82583))
|| (sc->sc_type >= WM_T_80003)) {
@@ -3885,6 +3885,9 @@ wm_reset(struct wm_softc *sc)
CSR_WRITE(sc, WMREG_WUC, 0);
wm_reset_mdicnfg_82580(sc);
+
+ if ((sc->sc_flags & WM_F_PLL_WA_I210) != 0)
+ wm_pll_workaround_i210(sc);
}
/*
@@ -6166,7 +6169,7 @@ wm_linkintr(struct wm_softc *sc, uint32_
if (sc->sc_flags & WM_F_HAS_MII)
wm_linkintr_gmii(sc, icr);
else if ((sc->sc_mediatype == WM_MEDIATYPE_SERDES)
- && (sc->sc_type >= WM_T_82575))
+ && (sc->sc_type >= WM_T_82575))
wm_linkintr_serdes(sc, icr);
else
wm_linkintr_tbi(sc, icr);
@@ -8450,7 +8453,7 @@ wm_nvm_read_uwire(struct wm_softc *sc, i
delay(2);
}
/* XXX: end of workaround */
-
+
/* Set CHIP SELECT. */
reg |= EECD_CS;
CSR_WRITE(sc, WMREG_EECD, reg);
@@ -9836,7 +9839,6 @@ wm_init_manageability(struct wm_softc *s
manc |= MANC_EN_MNG2HOST;
manc2h |= MANC2H_PORT_623| MANC2H_PORT_624;
CSR_WRITE(sc, WMREG_MANC2H, manc2h);
-
}
CSR_WRITE(sc, WMREG_MANC, manc);
@@ -10363,7 +10365,7 @@ wm_pll_workaround_i210(struct wm_softc *
for (i = 0; i < WM_MAX_PLL_TRIES; i++) {
phyval = wm_gmii_gs40g_readreg(sc->sc_dev, 1,
GS40G_PHY_PLL_FREQ_PAGE | GS40G_PHY_PLL_FREQ_REG);
-
+
if ((phyval & GS40G_PHY_PLL_UNCONF) != GS40G_PHY_PLL_UNCONF) {
break; /* OK */
}
@@ -10380,7 +10382,7 @@ wm_pll_workaround_i210(struct wm_softc *
CSR_WRITE(sc, WMREG_WUC, 0);
reg = (INVM_AUTOLOAD << 4) | (tmp_nvmword << 16);
CSR_WRITE(sc, WMREG_EEARBC_I210, reg);
-
+
pcireg = pci_conf_read(sc->sc_pc, sc->sc_pcitag,
pmreg + PCI_PMCSR);
pcireg |= PCI_PMCSR_STATE_D3;
@@ -10393,11 +10395,11 @@ wm_pll_workaround_i210(struct wm_softc *
reg = (INVM_AUTOLOAD << 4) | (nvmword << 16);
CSR_WRITE(sc, WMREG_EEARBC_I210, reg);
-
+
/* Restore WUC register */
CSR_WRITE(sc, WMREG_WUC, wuc);
}
-
+
/* Restore MDICNFG setting */
CSR_WRITE(sc, WMREG_MDICNFG, mdicnfg);
if (wa_done)
CVS commit: src/lib/libarch
Module Name:src
Committed By: matt
Date: Mon Jun 8 04:08:30 UTC 2015
Modified Files:
src/lib/libarch: Makefile
src/lib/libarch/i386: Makefile.inc
src/lib/libarch/x86_64: Makefile.inc
Log Message:
Avoid defining MLIBDIR. Use ${MLIBDIR:Unone} instead.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/lib/libarch/Makefile
cvs rdiff -u -r1.14 -r1.15 src/lib/libarch/i386/Makefile.inc
cvs rdiff -u -r1.4 -r1.5 src/lib/libarch/x86_64/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libarch/Makefile
diff -u src/lib/libarch/Makefile:1.28 src/lib/libarch/Makefile:1.29
--- src/lib/libarch/Makefile:1.28 Sun Aug 10 23:25:49 2014
+++ src/lib/libarch/Makefile Mon Jun 8 04:08:30 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2014/08/10 23:25:49 matt Exp $
+# $NetBSD: Makefile,v 1.29 2015/06/08 04:08:30 matt Exp $
.include
@@ -18,7 +18,7 @@ LIBC_MACHINE_CPU?= ${MACHINE_CPU}
# Build the library if SRCS is now defined ...
.if defined(SRCS)
-.if defined(MLIBDIR) && ${MLIBDIR} != "none" && ${LIBC_MACHINE_CPU} != "arm"
+.if defined(MLIBDIR) && ${LIBC_MACHINE_CPU} != "arm"
LIB= ${MLIBDIR}
.else
LIB= ${LIBC_MACHINE_CPU}
Index: src/lib/libarch/i386/Makefile.inc
diff -u src/lib/libarch/i386/Makefile.inc:1.14 src/lib/libarch/i386/Makefile.inc:1.15
--- src/lib/libarch/i386/Makefile.inc:1.14 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/i386/Makefile.inc Mon Jun 8 04:08:30 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.14 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.15 2015/06/08 04:08:30 matt Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR} == "i386")
+.if (${MACHINE_ARCH} == "i386" || ${MLIBDIR:Unone} == "i386")
SRCS+= i386_get_ldt.c i386_set_ldt.c \
i386_iopl.c i386_get_ioperm.c i386_set_ioperm.c \
i386_vm86.c i386_pmc.c i386_mtrr.c
Index: src/lib/libarch/x86_64/Makefile.inc
diff -u src/lib/libarch/x86_64/Makefile.inc:1.4 src/lib/libarch/x86_64/Makefile.inc:1.5
--- src/lib/libarch/x86_64/Makefile.inc:1.4 Sun Dec 13 08:25:20 2009
+++ src/lib/libarch/x86_64/Makefile.inc Mon Jun 8 04:08:30 2015
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile.inc,v 1.4 2009/12/13 08:25:20 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.5 2015/06/08 04:08:30 matt Exp $
-MLIBDIR?= none
-
-.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR} != "i386")
+.if (${MACHINE_ARCH} == "x86_64" && ${MLIBDIR:Unone} != "i386")
SRCS+= x86_64_mtrr.c x86_64_iopl.c
.endif
CVS commit: src/usr.bin/midirecord
Module Name:src Committed By: mrg Date: Mon Jun 8 06:33:35 UTC 2015 Modified Files: src/usr.bin/midirecord: midirecord.1 Log Message: midirecord first appears in netbsd 7. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/usr.bin/midirecord/midirecord.1 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/midirecord/midirecord.1 diff -u src/usr.bin/midirecord/midirecord.1:1.3 src/usr.bin/midirecord/midirecord.1:1.4 --- src/usr.bin/midirecord/midirecord.1:1.3 Tue Dec 30 18:52:47 2014 +++ src/usr.bin/midirecord/midirecord.1 Mon Jun 8 06:33:35 2015 @@ -1,4 +1,4 @@ -.\" $NetBSD: midirecord.1,v 1.3 2014/12/30 18:52:47 mrg Exp $ +.\" $NetBSD: midirecord.1,v 1.4 2015/06/08 06:33:35 mrg Exp $ .\" .\" Copyright (c) 1998, 1999, 2001, 2002, 2010 Matthew R. Green .\" All rights reserved. @@ -112,7 +112,7 @@ the midi device to be used. The .Nm program was first seen in -.Nx 8 . +.Nx 7 . .Sh AUTHORS The .Nm
