CVS commit: src/external/mit/xorg/lib/pixman
Module Name:src
Committed By: skrll
Date: Sat Sep 7 09:22:37 UTC 2013
Modified Files:
src/external/mit/xorg/lib/pixman: Makefile
Log Message:
Disable USE_ARM_SIMD for now. It crashes Xorg.
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/external/mit/xorg/lib/pixman/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/lib/pixman/Makefile
diff -u src/external/mit/xorg/lib/pixman/Makefile:1.24 src/external/mit/xorg/lib/pixman/Makefile:1.25
--- src/external/mit/xorg/lib/pixman/Makefile:1.24 Wed Jun 5 09:04:16 2013
+++ src/external/mit/xorg/lib/pixman/Makefile Sat Sep 7 09:22:37 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2013/06/05 09:04:16 mrg Exp $
+# $NetBSD: Makefile,v 1.25 2013/09/07 09:22:37 skrll Exp $
NOLINT= 1 # defined
@@ -67,10 +67,10 @@ MKDEPFLAGS+= -maltivec
.if ${MACHINE_ARCH} == earm || ${MACHINE_ARCH} == earmhf
# ARM SIMD
-SRCS+= pixman-arm-simd.c \
- pixman-arm-simd-asm.S \
- pixman-arm-simd-asm-scaled.S
-CPPFLAGS+= -DUSE_ARM_SIMD
+#SRCS+= pixman-arm-simd.c \
+# pixman-arm-simd-asm.S \
+# pixman-arm-simd-asm-scaled.S
+#CPPFLAGS+= -DUSE_ARM_SIMD
# ARM NEON
SRCS+= pixman-arm-neon.c \
pixman-arm-neon-asm.S \
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sat Sep 7 10:46:18 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
Log Message:
ECHI - EHCI in printf
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.5 src/sys/arch/arm/allwinner/awin_usb.c:1.6
--- src/sys/arch/arm/allwinner/awin_usb.c:1.5 Sat Sep 7 10:45:53 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c Sat Sep 7 10:46:18 2013
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.5 2013/09/07 10:45:53 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.6 2013/09/07 10:46:18 jmcneill Exp $);
#include sys/bus.h
#include sys/device.h
@@ -224,7 +224,7 @@ ehci_awinusb_attach(device_t parent, dev
strlcpy(sc-sc_vendor, Allwinner, sizeof(sc-sc_vendor));
aprint_naive(: EHCI USB controller\n);
- aprint_normal(: ECHI USB controller\n);
+ aprint_normal(: EHCI USB controller\n);
int error = ehci_init(sc);
if (error != USBD_NORMAL_COMPLETION) {
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sat Sep 7 10:45:53 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
Log Message:
usb irq handler should be IPL_SCHED
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.4 src/sys/arch/arm/allwinner/awin_usb.c:1.5
--- src/sys/arch/arm/allwinner/awin_usb.c:1.4 Sat Sep 7 02:32:53 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c Sat Sep 7 10:45:53 2013
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.4 2013/09/07 02:32:53 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.5 2013/09/07 10:45:53 jmcneill Exp $);
#include sys/bus.h
#include sys/device.h
@@ -155,7 +155,7 @@ ohci_awinusb_attach(device_t parent, dev
}
const int irq = awinusb_ohci_irqs[usbaa-usbaa_port];
- usbsc-usbsc_ohci_ih = intr_establish(irq, IPL_USB,
+ usbsc-usbsc_ohci_ih = intr_establish(irq, IPL_SCHED,
IST_LEVEL, ohci_intr, sc);
if (usbsc-usbsc_ohci_ih == NULL) {
aprint_error_dev(self, failed to establish interrupt %d\n,
@@ -235,7 +235,7 @@ ehci_awinusb_attach(device_t parent, dev
}
const int irq = awinusb_ehci_irqs[usbaa-usbaa_port];
- usbsc-usbsc_ehci_ih = intr_establish(irq, IPL_USB,
+ usbsc-usbsc_ehci_ih = intr_establish(irq, IPL_SCHED,
IST_LEVEL, ehci_intr, sc);
if (usbsc-usbsc_ehci_ih == NULL) {
aprint_error_dev(self, failed to establish interrupt %d\n,
CVS commit: [netbsd-6] src/sys/fs/udf
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 15:57:35 UTC 2013
Modified Files:
src/sys/fs/udf [netbsd-6]: udf_allocation.c
Log Message:
Pull up following revision(s) (requested by reinoud in ticket #930):
sys/fs/udf/udf_allocation.c: revision 1.34
Fix 32 bit issue in main file read-in function. On both 32 bit and 64 bit
hosts a missing cast would result in `garbage' after the 4Gbyte limit.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.8.1 src/sys/fs/udf/udf_allocation.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/udf/udf_allocation.c
diff -u src/sys/fs/udf/udf_allocation.c:1.32 src/sys/fs/udf/udf_allocation.c:1.32.8.1
--- src/sys/fs/udf/udf_allocation.c:1.32 Thu Jun 16 09:21:02 2011
+++ src/sys/fs/udf/udf_allocation.c Sat Sep 7 15:57:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_allocation.c,v 1.32 2011/06/16 09:21:02 hannken Exp $ */
+/* $NetBSD: udf_allocation.c,v 1.32.8.1 2013/09/07 15:57:35 bouyer Exp $ */
/*
* Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -28,7 +28,7 @@
#include sys/cdefs.h
#ifndef lint
-__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.32 2011/06/16 09:21:02 hannken Exp $);
+__KERNEL_RCSID(0, $NetBSD: udf_allocation.c,v 1.32.8.1 2013/09/07 15:57:35 bouyer Exp $);
#endif /* not lint */
@@ -586,7 +586,7 @@ translate_again:
end_foffset = foffset + len;
- if (end_foffset lb_num * lb_size)
+ if (end_foffset (uint64_t) lb_num * lb_size)
break; /* found */
foffset = end_foffset;
slot++;
@@ -724,13 +724,13 @@ udf_translate_file_extent(struct udf_nod
end_foffset = foffset + len;
- if (end_foffset from * lb_size)
+ if (end_foffset (uint64_t) from * lb_size)
break; /* found */
foffset = end_foffset;
slot++;
}
/* found overlapping slot */
- ext_offset = from * lb_size - foffset;
+ ext_offset = (uint64_t) from * lb_size - foffset;
for (;;) {
udf_get_adslot(udf_node, slot, s_ad, eof);
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:01:03 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-6]: virtio.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #931):
sys/dev/pci/virtio.c: revision 1.4
Make sure to check if the driver has a valid intr handler in virtio_detach().
Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio,
as reported in PR kern/48105 by Richard Hansen.
Should be pulled up to netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.8.1 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.3 src/sys/dev/pci/virtio.c:1.3.8.1
--- src/sys/dev/pci/virtio.c:1.3 Wed Nov 2 23:05:52 2011
+++ src/sys/dev/pci/virtio.c Sat Sep 7 16:01:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
+/* $NetBSD: virtio.c,v 1.3.8.1 2013/09/07 16:01:03 bouyer Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3.8.1 2013/09/07 16:01:03 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -199,8 +199,10 @@ virtio_detach(device_t self, int flags)
}
KASSERT(sc-sc_child == 0 || sc-sc_child == (void*)1);
KASSERT(sc-sc_vqs == 0);
- pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
- sc-sc_ih = 0;
+ if (sc-sc_ih != NULL) {
+ pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
+ sc-sc_ih = NULL;
+ }
if (sc-sc_iosize)
bus_space_unmap(sc-sc_iot, sc-sc_ioh, sc-sc_iosize);
sc-sc_iosize = 0;
CVS commit: [netbsd-6-0] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:01:25 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-6-0]: virtio.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #931):
sys/dev/pci/virtio.c: revision 1.4
Make sure to check if the driver has a valid intr handler in virtio_detach().
Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio,
as reported in PR kern/48105 by Richard Hansen.
Should be pulled up to netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.14.1 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.3 src/sys/dev/pci/virtio.c:1.3.14.1
--- src/sys/dev/pci/virtio.c:1.3 Wed Nov 2 23:05:52 2011
+++ src/sys/dev/pci/virtio.c Sat Sep 7 16:01:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
+/* $NetBSD: virtio.c,v 1.3.14.1 2013/09/07 16:01:25 bouyer Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3.14.1 2013/09/07 16:01:25 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -199,8 +199,10 @@ virtio_detach(device_t self, int flags)
}
KASSERT(sc-sc_child == 0 || sc-sc_child == (void*)1);
KASSERT(sc-sc_vqs == 0);
- pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
- sc-sc_ih = 0;
+ if (sc-sc_ih != NULL) {
+ pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
+ sc-sc_ih = NULL;
+ }
if (sc-sc_iosize)
bus_space_unmap(sc-sc_iot, sc-sc_ioh, sc-sc_iosize);
sc-sc_iosize = 0;
CVS commit: [netbsd-6-1] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:01:28 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-6-1]: virtio.c
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #931):
sys/dev/pci/virtio.c: revision 1.4
Make sure to check if the driver has a valid intr handler in virtio_detach().
Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio,
as reported in PR kern/48105 by Richard Hansen.
Should be pulled up to netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.3.22.1 src/sys/dev/pci/virtio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/virtio.c
diff -u src/sys/dev/pci/virtio.c:1.3 src/sys/dev/pci/virtio.c:1.3.22.1
--- src/sys/dev/pci/virtio.c:1.3 Wed Nov 2 23:05:52 2011
+++ src/sys/dev/pci/virtio.c Sat Sep 7 16:01:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $ */
+/* $NetBSD: virtio.c,v 1.3.22.1 2013/09/07 16:01:28 bouyer Exp $ */
/*
* Copyright (c) 2010 Minoura Makoto.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3 2011/11/02 23:05:52 njoly Exp $);
+__KERNEL_RCSID(0, $NetBSD: virtio.c,v 1.3.22.1 2013/09/07 16:01:28 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -199,8 +199,10 @@ virtio_detach(device_t self, int flags)
}
KASSERT(sc-sc_child == 0 || sc-sc_child == (void*)1);
KASSERT(sc-sc_vqs == 0);
- pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
- sc-sc_ih = 0;
+ if (sc-sc_ih != NULL) {
+ pci_intr_disestablish(sc-sc_pc, sc-sc_ih);
+ sc-sc_ih = NULL;
+ }
if (sc-sc_iosize)
bus_space_unmap(sc-sc_iot, sc-sc_ioh, sc-sc_iosize);
sc-sc_iosize = 0;
CVS commit: [netbsd-6] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:05:59 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-6]: mpii.c
Log Message:
Pull up following revision(s) (requested by kardel in ticket #932):
sys/dev/pci/mpii.c: revision 1.2
sys/dev/pci/mpii.c: revision 1.3
Allow 8 luns instead of 1. This enables access to the changer device on
a Dell PV-124T:
ch0 at scsibus0 target 9 lun 1: DELL, PV-124T, 0086 changer removable
ch0: 16 slots, 1 drive, 1 picker, 0 portals
fix issues when reading variable block sized tapes.
symptoms:
generic HBA error on console when reading
with a larger blocksize. blocks read
are padded to requested block size with
a 5a... a5... pattern.
problems fixed:
- controller scsi_status values did not match
the ones used by the spsipi layer.
a mapping function was introduced.
- when experiencing an underrun (read 64k and
get a 63k block) the controller posted
not a SUCCESS status but CHECK status. handle
that like SUCCESS adjusting xs-resid and set
XS_SENSE.
now the correct data amount is returned and
nothing is 'added' and no 'generic HBA error'
occurs.
- make decisions using variables and constants
from the controller domain.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/sys/dev/pci/mpii.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/mpii.c
diff -u src/sys/dev/pci/mpii.c:1.1.2.2 src/sys/dev/pci/mpii.c:1.1.2.3
--- src/sys/dev/pci/mpii.c:1.1.2.2 Mon Apr 23 16:31:36 2012
+++ src/sys/dev/pci/mpii.c Sat Sep 7 16:05:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: mpii.c,v 1.1.2.2 2012/04/23 16:31:36 riz Exp $ */
+/* $NetBSD: mpii.c,v 1.1.2.3 2013/09/07 16:05:59 bouyer Exp $ */
/* OpenBSD: mpii.c,v 1.51 2012/04/11 13:29:14 naddy Exp */
/*
* Copyright (c) 2010 Mike Belopuhov m...@crypt.org.ru
@@ -20,7 +20,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: mpii.c,v 1.1.2.2 2012/04/23 16:31:36 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: mpii.c,v 1.1.2.3 2013/09/07 16:05:59 bouyer Exp $);
#include bio.h
@@ -790,18 +790,18 @@ struct mpii_msg_scsi_io_error {
u_int16_t reserved3;
u_int8_t scsi_status;
- /* XXX JPG validate this */
-#if notyet
-#define MPII_SCSIIO_ERR_STATUS_SUCCESS
-#define MPII_SCSIIO_ERR_STATUS_CHECK_COND
-#define MPII_SCSIIO_ERR_STATUS_BUSY
-#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE
-#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET
-#define MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT
-#define MPII_SCSIIO_ERR_STATUS_CMD_TERM
-#define MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL
-#define MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE
-#endif
+
+#define MPII_SCSIIO_ERR_STATUS_SUCCESS (0x00)
+#define MPII_SCSIIO_ERR_STATUS_CHECK_COND (0x02)
+#define MPII_SCSIIO_ERR_STATUS_BUSY (0x04)
+#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE (0x08)
+#define MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET (0x10)
+#define MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT (0x14)
+#define MPII_SCSIIO_ERR_STATUS_CMD_TERM (0x22)
+#define MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL (0x28)
+#define MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE (0x30)
+#define MPII_SCSIIO_ERR_STATUS_TASK_ABORTED (0x40)
+
u_int8_t scsi_state;
#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_VALID (10)
#define MPII_SCSIIO_ERR_STATE_AUTOSENSE_FAILED (11)
@@ -2296,7 +2296,7 @@ mpii_attach(device_t parent, device_t se
chan-chan_bustype = scsi_sas_bustype;
chan-chan_channel = 0;
chan-chan_flags = 0;
- chan-chan_nluns = 1;
+ chan-chan_nluns = 8;
chan-chan_ntargets = sc-sc_max_devices;
chan-chan_id = -1;
@@ -4682,6 +4682,58 @@ mpii_scsi_cmd_tmo_done(struct mpii_ccb *
mpii_put_ccb(tccb-ccb_sc, tccb);
}
+static u_int8_t
+map_scsi_status(u_int8_t mpii_scsi_status)
+{
+ u_int8_t scsi_status;
+
+ switch (mpii_scsi_status)
+ {
+ case MPII_SCSIIO_ERR_STATUS_SUCCESS:
+ scsi_status = SCSI_OK;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_CHECK_COND:
+ scsi_status = SCSI_CHECK;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_BUSY:
+ scsi_status = SCSI_BUSY;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_INTERMEDIATE:
+ scsi_status = SCSI_INTERM;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_INTERMEDIATE_CONDMET:
+ scsi_status = SCSI_INTERM;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_RESERVATION_CONFLICT:
+ scsi_status = SCSI_RESV_CONFLICT;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_CMD_TERM:
+ case MPII_SCSIIO_ERR_STATUS_TASK_ABORTED:
+ scsi_status = SCSI_TERMINATED;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_TASK_SET_FULL:
+ scsi_status = SCSI_QUEUE_FULL;
+ break;
+
+ case MPII_SCSIIO_ERR_STATUS_ACA_ACTIVE:
+ scsi_status = SCSI_ACA_ACTIVE;
+ break;
+
+ default:
+ /* XXX: for the lack of anything better and other than OK */
+ scsi_status = 0xFF;
+ break;
+ }
+
+ return scsi_status;
+}
CVS commit: [netbsd-6] src/sys/nfs
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:08:13 UTC 2013
Modified Files:
src/sys/nfs [netbsd-6]: nfs_bio.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #933):
sys/nfs/nfs_bio.c: revision 1.189
Function nfs_vinvalbuf() ignores errors from vinvalbuf() and therefore
delayed write errors may get lost.
Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or =
close().
=20
Presented on tech-kern@
=20
Fix for PR kern/47980 (NFS over-quota not detected if utimes() called
before fsync()/close())
=20
=20
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.188.8.1 src/sys/nfs/nfs_bio.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/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.188 src/sys/nfs/nfs_bio.c:1.188.8.1
--- src/sys/nfs/nfs_bio.c:1.188 Tue Sep 27 01:07:38 2011
+++ src/sys/nfs/nfs_bio.c Sat Sep 7 16:08:13 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.188.8.1 2013/09/07 16:08:13 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188.8.1 2013/09/07 16:08:13 bouyer Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -614,7 +614,7 @@ nfs_vinvalbuf(struct vnode *vp, int flag
{
struct nfsnode *np = VTONFS(vp);
struct nfsmount *nmp = VFSTONFS(vp-v_mount);
- int error = 0, slptimeo;
+ int error = 0, allerror = 0, slptimeo;
bool catch;
if ((nmp-nm_flag NFSMNT_INT) == 0)
@@ -647,6 +647,8 @@ nfs_vinvalbuf(struct vnode *vp, int flag
mutex_exit(vp-v_interlock);
error = vinvalbuf(vp, flags, cred, l, catch, 0);
while (error) {
+ if (allerror == 0)
+ allerror = error;
if (intrflg nfs_sigintr(nmp, NULL, l)) {
error = EINTR;
break;
@@ -654,6 +656,13 @@ nfs_vinvalbuf(struct vnode *vp, int flag
error = vinvalbuf(vp, flags, cred, l, 0, slptimeo);
}
mutex_enter(vp-v_interlock);
+ if (allerror != 0) {
+ /*
+ * Keep error from vinvalbuf so fsync/close will know.
+ */
+ np-n_error = allerror;
+ np-n_flag |= NWRITEERR;
+ }
if (error == 0)
np-n_flag = ~NMODIFIED;
np-n_flag = ~NFLUSHINPROG;
CVS commit: [netbsd-6-0] src/sys/nfs
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:08:20 UTC 2013
Modified Files:
src/sys/nfs [netbsd-6-0]: nfs_bio.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #933):
sys/nfs/nfs_bio.c: revision 1.189
Function nfs_vinvalbuf() ignores errors from vinvalbuf() and therefore
delayed write errors may get lost.
Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or =
close().
=20
Presented on tech-kern@
=20
Fix for PR kern/47980 (NFS over-quota not detected if utimes() called
before fsync()/close())
=20
=20
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.188.14.1 src/sys/nfs/nfs_bio.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/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.188 src/sys/nfs/nfs_bio.c:1.188.14.1
--- src/sys/nfs/nfs_bio.c:1.188 Tue Sep 27 01:07:38 2011
+++ src/sys/nfs/nfs_bio.c Sat Sep 7 16:08:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.188.14.1 2013/09/07 16:08:20 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188.14.1 2013/09/07 16:08:20 bouyer Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -614,7 +614,7 @@ nfs_vinvalbuf(struct vnode *vp, int flag
{
struct nfsnode *np = VTONFS(vp);
struct nfsmount *nmp = VFSTONFS(vp-v_mount);
- int error = 0, slptimeo;
+ int error = 0, allerror = 0, slptimeo;
bool catch;
if ((nmp-nm_flag NFSMNT_INT) == 0)
@@ -647,6 +647,8 @@ nfs_vinvalbuf(struct vnode *vp, int flag
mutex_exit(vp-v_interlock);
error = vinvalbuf(vp, flags, cred, l, catch, 0);
while (error) {
+ if (allerror == 0)
+ allerror = error;
if (intrflg nfs_sigintr(nmp, NULL, l)) {
error = EINTR;
break;
@@ -654,6 +656,13 @@ nfs_vinvalbuf(struct vnode *vp, int flag
error = vinvalbuf(vp, flags, cred, l, 0, slptimeo);
}
mutex_enter(vp-v_interlock);
+ if (allerror != 0) {
+ /*
+ * Keep error from vinvalbuf so fsync/close will know.
+ */
+ np-n_error = allerror;
+ np-n_flag |= NWRITEERR;
+ }
if (error == 0)
np-n_flag = ~NMODIFIED;
np-n_flag = ~NFLUSHINPROG;
CVS commit: [netbsd-6-1] src/sys/nfs
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:08:28 UTC 2013
Modified Files:
src/sys/nfs [netbsd-6-1]: nfs_bio.c
Log Message:
Pull up following revision(s) (requested by hannken in ticket #933):
sys/nfs/nfs_bio.c: revision 1.189
Function nfs_vinvalbuf() ignores errors from vinvalbuf() and therefore
delayed write errors may get lost.
Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or =
close().
=20
Presented on tech-kern@
=20
Fix for PR kern/47980 (NFS over-quota not detected if utimes() called
before fsync()/close())
=20
=20
To generate a diff of this commit:
cvs rdiff -u -r1.188 -r1.188.22.1 src/sys/nfs/nfs_bio.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/nfs/nfs_bio.c
diff -u src/sys/nfs/nfs_bio.c:1.188 src/sys/nfs/nfs_bio.c:1.188.22.1
--- src/sys/nfs/nfs_bio.c:1.188 Tue Sep 27 01:07:38 2011
+++ src/sys/nfs/nfs_bio.c Sat Sep 7 16:08:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $ */
+/* $NetBSD: nfs_bio.c,v 1.188.22.1 2013/09/07 16:08:28 bouyer Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188 2011/09/27 01:07:38 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: nfs_bio.c,v 1.188.22.1 2013/09/07 16:08:28 bouyer Exp $);
#ifdef _KERNEL_OPT
#include opt_nfs.h
@@ -614,7 +614,7 @@ nfs_vinvalbuf(struct vnode *vp, int flag
{
struct nfsnode *np = VTONFS(vp);
struct nfsmount *nmp = VFSTONFS(vp-v_mount);
- int error = 0, slptimeo;
+ int error = 0, allerror = 0, slptimeo;
bool catch;
if ((nmp-nm_flag NFSMNT_INT) == 0)
@@ -647,6 +647,8 @@ nfs_vinvalbuf(struct vnode *vp, int flag
mutex_exit(vp-v_interlock);
error = vinvalbuf(vp, flags, cred, l, catch, 0);
while (error) {
+ if (allerror == 0)
+ allerror = error;
if (intrflg nfs_sigintr(nmp, NULL, l)) {
error = EINTR;
break;
@@ -654,6 +656,13 @@ nfs_vinvalbuf(struct vnode *vp, int flag
error = vinvalbuf(vp, flags, cred, l, 0, slptimeo);
}
mutex_enter(vp-v_interlock);
+ if (allerror != 0) {
+ /*
+ * Keep error from vinvalbuf so fsync/close will know.
+ */
+ np-n_error = allerror;
+ np-n_flag |= NWRITEERR;
+ }
if (error == 0)
np-n_flag = ~NMODIFIED;
np-n_flag = ~NFLUSHINPROG;
CVS commit: [netbsd-6] src/lib/libc/locale
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:11:41 UTC 2013 Modified Files: src/lib/libc/locale [netbsd-6]: global_locale.c Log Message: Apply patch, requested by joerg in ticket #934: lib/libc/locale/global_locale.c: patch provide consistent and correct data for the C locale. To generate a diff of this commit: cvs rdiff -u -r1.12 -r1.12.2.1 src/lib/libc/locale/global_locale.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/locale/global_locale.c diff -u src/lib/libc/locale/global_locale.c:1.12 src/lib/libc/locale/global_locale.c:1.12.2.1 --- src/lib/libc/locale/global_locale.c:1.12 Fri Jan 20 16:31:29 2012 +++ src/lib/libc/locale/global_locale.c Sat Sep 7 16:11:41 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $ */ +/* $NetBSD: global_locale.c,v 1.12.2.1 2013/09/07 16:11:41 bouyer Exp $ */ /*- * Copyright (c)2008 Citrus Project, @@ -28,7 +28,7 @@ #include sys/cdefs.h #if defined(LIBC_SCCS) !defined(lint) -__RCSID($NetBSD: global_locale.c,v 1.12 2012/01/20 16:31:29 joerg Exp $); +__RCSID($NetBSD: global_locale.c,v 1.12.2.1 2013/09/07 16:11:41 bouyer Exp $); #endif /* LIBC_SCCS and not lint */ #include sys/types.h @@ -77,44 +77,44 @@ static const char *_global_items[(size_t [(size_t)T_FMT_AMPM ] = %I:%M:%S %p, [(size_t)AM_STR ] = AM, [(size_t)PM_STR ] = PM, - [(size_t)DAY_1 ] = Sun, - [(size_t)DAY_2 ] = Mon, - [(size_t)DAY_3 ] = Tue, - [(size_t)DAY_4 ] = Wed, - [(size_t)DAY_5 ] = Thu, - [(size_t)DAY_6 ] = Fri, - [(size_t)DAY_7 ] = Sat, - [(size_t)ABDAY_1] = Sunday, - [(size_t)ABDAY_2] = Monday, - [(size_t)ABDAY_3] = Tuesday, - [(size_t)ABDAY_4] = Wednesday, - [(size_t)ABDAY_5] = Thursday, - [(size_t)ABDAY_6] = Friday, - [(size_t)ABDAY_7] = Saturday, - [(size_t)MON_1 ] = Jan, - [(size_t)MON_2 ] = Feb, - [(size_t)MON_3 ] = Mar, - [(size_t)MON_4 ] = Apr, + [(size_t)DAY_1 ] = Sunday, + [(size_t)DAY_2 ] = Monday, + [(size_t)DAY_3 ] = Tuesday, + [(size_t)DAY_4 ] = Wednesday, + [(size_t)DAY_5 ] = Thursday, + [(size_t)DAY_6 ] = Friday, + [(size_t)DAY_7 ] = Saturday, + [(size_t)ABDAY_1] = Sun, + [(size_t)ABDAY_2] = Mon, + [(size_t)ABDAY_3] = Tue, + [(size_t)ABDAY_4] = Wed, + [(size_t)ABDAY_5] = Thu, + [(size_t)ABDAY_6] = Fri, + [(size_t)ABDAY_7] = Sat, + [(size_t)MON_1 ] = January, + [(size_t)MON_2 ] = February, + [(size_t)MON_3 ] = March, + [(size_t)MON_4 ] = April, [(size_t)MON_5 ] = May, - [(size_t)MON_6 ] = Jun, - [(size_t)MON_7 ] = Jul, - [(size_t)MON_8 ] = Aug, - [(size_t)MON_9 ] = Sep, - [(size_t)MON_10 ] = Oct, - [(size_t)MON_11 ] = Nov, - [(size_t)MON_12 ] = Dec, - [(size_t)ABMON_1] = January, - [(size_t)ABMON_2] = February, - [(size_t)ABMON_3] = March, - [(size_t)ABMON_4] = April, + [(size_t)MON_6 ] = June, + [(size_t)MON_7 ] = July, + [(size_t)MON_8 ] = August, + [(size_t)MON_9 ] = September, + [(size_t)MON_10 ] = October, + [(size_t)MON_11 ] = November, + [(size_t)MON_12 ] = December, + [(size_t)ABMON_1] = Jan, + [(size_t)ABMON_2] = Feb, + [(size_t)ABMON_3] = Mar, + [(size_t)ABMON_4] = Apr, [(size_t)ABMON_5] = May, - [(size_t)ABMON_6] = June, - [(size_t)ABMON_7] = July, - [(size_t)ABMON_8] = August, - [(size_t)ABMON_9] = September, - [(size_t)ABMON_10 ] = October, - [(size_t)ABMON_11 ] = November, - [(size_t)ABMON_12 ] = December, + [(size_t)ABMON_6] = Jun, + [(size_t)ABMON_7] = Jul, + [(size_t)ABMON_8] = Aug, + [(size_t)ABMON_9] = Sep, + [(size_t)ABMON_10 ] = Oct, + [(size_t)ABMON_11 ] = Nov, + [(size_t)ABMON_12 ] = Dec, [(size_t)RADIXCHAR ] = ., [(size_t)THOUSEP] = , [(size_t)YESSTR ] = yes,
CVS commit: [netbsd-6] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:16:00 UTC 2013
Modified Files:
src/sys/arch/amiga/amiga [netbsd-6]: amiga_init.c
src/sys/arch/m68k/m68k [netbsd-6]: pmap_motorola.c
Log Message:
Pull up following revision(s) (requested by rkujawa in ticket #935):
sys/arch/amiga/amiga/amiga_init.c: revision 1.127
sys/arch/m68k/m68k/pmap_motorola.c: revision 1.66
Set user page table base address dynamically on amiga. This unbreaks =
machines
with large Zorro III I/O spaces. Patch originally by Michael L. Hitch.
Test on an A4000.
=20
=20
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.126.2.1 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.65 -r1.65.2.1 src/sys/arch/m68k/m68k/pmap_motorola.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/amiga_init.c
diff -u src/sys/arch/amiga/amiga/amiga_init.c:1.126 src/sys/arch/amiga/amiga/amiga_init.c:1.126.2.1
--- src/sys/arch/amiga/amiga/amiga_init.c:1.126 Sun Feb 12 16:34:06 2012
+++ src/sys/arch/amiga/amiga/amiga_init.c Sat Sep 7 16:16:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.126 2012/02/12 16:34:06 matt Exp $ */
+/* $NetBSD: amiga_init.c,v 1.126.2.1 2013/09/07 16:16:00 bouyer Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -38,7 +38,7 @@
#include ser.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amiga_init.c,v 1.126 2012/02/12 16:34:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: amiga_init.c,v 1.126.2.1 2013/09/07 16:16:00 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -73,7 +73,8 @@ __KERNEL_RCSID(0, $NetBSD: amiga_init.c
extern u_int lowram;
extern u_int Umap;
extern u_long boot_partition;
-vaddr_t amiga_uptbase;
+extern vaddr_t m68k_uptbase;
+
#ifdef P5PPC68KBOARD
extern int p5ppc;
#endif
@@ -705,7 +706,7 @@ start_c(int id, u_int fphystart, u_int f
* XXX 16 MB instead of 256 MB should be enough, but...
* we need to fix the fastmem loading first. (see comment at line 375)
*/
- RELOC(amiga_uptbase, vaddr_t) =
+ RELOC(m68k_uptbase, vaddr_t) =
roundup(vstart + 0x1000, 0x1000);
/*
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.65 src/sys/arch/m68k/m68k/pmap_motorola.c:1.65.2.1
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.65 Fri Jan 27 19:48:38 2012
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sat Sep 7 16:16:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.65 2012/01/27 19:48:38 para Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.65.2.1 2013/09/07 16:16:00 bouyer Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include opt_m68k_arch.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.65 2012/01/27 19:48:38 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.65.2.1 2013/09/07 16:16:00 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -256,6 +256,8 @@ int page_cnt; /* number of pages manage
bool pmap_initialized = false; /* Has pmap_init completed? */
+vaddr_t m68k_uptbase = M68K_PTBASE;
+
struct pv_header {
struct pv_entry pvh_first; /* first PV entry */
uint16_t pvh_attrs; /* attributes:
@@ -514,7 +516,7 @@ pmap_init(void)
st_map = uvm_km_suballoc(kernel_map, addr, addr2, s, 0, false,
st_map_store);
- addr = M68K_PTBASE;
+ addr = m68k_uptbase;
if ((M68K_PTMAXSIZE / M68K_MAX_PTSIZE) maxproc) {
s = M68K_PTMAXSIZE;
/*
CVS commit: [netbsd-6-1] src/sys/arch
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:16:10 UTC 2013
Modified Files:
src/sys/arch/amiga/amiga [netbsd-6-1]: amiga_init.c
src/sys/arch/m68k/m68k [netbsd-6-1]: pmap_motorola.c
Log Message:
Pull up following revision(s) (requested by rkujawa in ticket #935):
sys/arch/amiga/amiga/amiga_init.c: revision 1.127
sys/arch/m68k/m68k/pmap_motorola.c: revision 1.66
Set user page table base address dynamically on amiga. This unbreaks =
machines
with large Zorro III I/O spaces. Patch originally by Michael L. Hitch.
Test on an A4000.
=20
=20
To generate a diff of this commit:
cvs rdiff -u -r1.126 -r1.126.8.1 src/sys/arch/amiga/amiga/amiga_init.c
cvs rdiff -u -r1.65 -r1.65.8.1 src/sys/arch/m68k/m68k/pmap_motorola.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/amiga_init.c
diff -u src/sys/arch/amiga/amiga/amiga_init.c:1.126 src/sys/arch/amiga/amiga/amiga_init.c:1.126.8.1
--- src/sys/arch/amiga/amiga/amiga_init.c:1.126 Sun Feb 12 16:34:06 2012
+++ src/sys/arch/amiga/amiga/amiga_init.c Sat Sep 7 16:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: amiga_init.c,v 1.126 2012/02/12 16:34:06 matt Exp $ */
+/* $NetBSD: amiga_init.c,v 1.126.8.1 2013/09/07 16:16:10 bouyer Exp $ */
/*
* Copyright (c) 1994 Michael L. Hitch
@@ -38,7 +38,7 @@
#include ser.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amiga_init.c,v 1.126 2012/02/12 16:34:06 matt Exp $);
+__KERNEL_RCSID(0, $NetBSD: amiga_init.c,v 1.126.8.1 2013/09/07 16:16:10 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -73,7 +73,8 @@ __KERNEL_RCSID(0, $NetBSD: amiga_init.c
extern u_int lowram;
extern u_int Umap;
extern u_long boot_partition;
-vaddr_t amiga_uptbase;
+extern vaddr_t m68k_uptbase;
+
#ifdef P5PPC68KBOARD
extern int p5ppc;
#endif
@@ -705,7 +706,7 @@ start_c(int id, u_int fphystart, u_int f
* XXX 16 MB instead of 256 MB should be enough, but...
* we need to fix the fastmem loading first. (see comment at line 375)
*/
- RELOC(amiga_uptbase, vaddr_t) =
+ RELOC(m68k_uptbase, vaddr_t) =
roundup(vstart + 0x1000, 0x1000);
/*
Index: src/sys/arch/m68k/m68k/pmap_motorola.c
diff -u src/sys/arch/m68k/m68k/pmap_motorola.c:1.65 src/sys/arch/m68k/m68k/pmap_motorola.c:1.65.8.1
--- src/sys/arch/m68k/m68k/pmap_motorola.c:1.65 Fri Jan 27 19:48:38 2012
+++ src/sys/arch/m68k/m68k/pmap_motorola.c Sat Sep 7 16:16:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pmap_motorola.c,v 1.65 2012/01/27 19:48:38 para Exp $*/
+/* $NetBSD: pmap_motorola.c,v 1.65.8.1 2013/09/07 16:16:10 bouyer Exp $*/
/*-
* Copyright (c) 1999 The NetBSD Foundation, Inc.
@@ -119,7 +119,7 @@
#include opt_m68k_arch.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.65 2012/01/27 19:48:38 para Exp $);
+__KERNEL_RCSID(0, $NetBSD: pmap_motorola.c,v 1.65.8.1 2013/09/07 16:16:10 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -256,6 +256,8 @@ int page_cnt; /* number of pages manage
bool pmap_initialized = false; /* Has pmap_init completed? */
+vaddr_t m68k_uptbase = M68K_PTBASE;
+
struct pv_header {
struct pv_entry pvh_first; /* first PV entry */
uint16_t pvh_attrs; /* attributes:
@@ -514,7 +516,7 @@ pmap_init(void)
st_map = uvm_km_suballoc(kernel_map, addr, addr2, s, 0, false,
st_map_store);
- addr = M68K_PTBASE;
+ addr = m68k_uptbase;
if ((M68K_PTMAXSIZE / M68K_MAX_PTSIZE) maxproc) {
s = M68K_PTMAXSIZE;
/*
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Sep 7 16:17:12 UTC 2013
Modified Files:
src/sys/dev/usb: uhci.c
Log Message:
Deal with control transfers better by
- removing the UHCI_PTR_VF flag for the setup and status stages
which means they are scheduled less aggressively. Some devices
appear to require this (blymn@ has one). The flag was
introduced as a performance improvement for bulk transfers.
- Checking for short reads and making sure the status stage runs
if they're encountered.
PR/47522 Enumeration of LUFA/Atmel devices on UHCI fails
Thanks to jak@ and blymn@ for testing and mlelstv@ for comments.
To generate a diff of this commit:
cvs rdiff -u -r1.257 -r1.258 src/sys/dev/usb/uhci.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/uhci.c
diff -u src/sys/dev/usb/uhci.c:1.257 src/sys/dev/usb/uhci.c:1.258
--- src/sys/dev/usb/uhci.c:1.257 Thu Apr 4 13:27:56 2013
+++ src/sys/dev/usb/uhci.c Sat Sep 7 16:17:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhci.c,v 1.257 2013/04/04 13:27:56 skrll Exp $ */
+/* $NetBSD: uhci.c,v 1.258 2013/09/07 16:17:12 skrll Exp $ */
/*
* Copyright (c) 1998, 2004, 2011, 2012 The NetBSD Foundation, Inc.
@@ -42,7 +42,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.257 2013/04/04 13:27:56 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhci.c,v 1.258 2013/09/07 16:17:12 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1430,11 +1430,6 @@ uhci_check_intr(uhci_softc_t *sc, uhci_i
return;
}
#endif
- /*
- * If the last TD is still active we need to check whether there
- * is an error somewhere in the middle, or whether there was a
- * short packet (SPD and not ACTIVE).
- */
usb_syncmem(lstd-dma,
lstd-offs + offsetof(uhci_td_t, td_status),
sizeof(lstd-td.td_status),
@@ -1444,41 +1439,80 @@ uhci_check_intr(uhci_softc_t *sc, uhci_i
lstd-offs + offsetof(uhci_td_t, td_status),
sizeof(lstd-td.td_status),
BUS_DMASYNC_PREREAD);
- if (status UHCI_TD_ACTIVE) {
- DPRINTFN(12, (uhci_check_intr: active ii=%p\n, ii));
- for (std = ii-stdstart; std != lstd; std = std-link.std) {
- usb_syncmem(std-dma,
- std-offs + offsetof(uhci_td_t, td_status),
- sizeof(std-td.td_status),
- BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
- status = le32toh(std-td.td_status);
- usb_syncmem(std-dma,
- std-offs + offsetof(uhci_td_t, td_status),
- sizeof(std-td.td_status), BUS_DMASYNC_PREREAD);
- /* If there's an active TD the xfer isn't done. */
- if (status UHCI_TD_ACTIVE)
-break;
- /* Any kind of error makes the xfer done. */
- if (status UHCI_TD_STALLED)
-goto done;
- /* We want short packets, and it is short: it's done */
- usb_syncmem(std-dma,
- std-offs + offsetof(uhci_td_t, td_token),
- sizeof(std-td.td_token),
- BUS_DMASYNC_POSTWRITE);
- if ((status UHCI_TD_SPD)
- UHCI_TD_GET_ACTLEN(status)
- UHCI_TD_GET_MAXLEN(le32toh(std-td.td_token)))
-goto done;
- }
- DPRINTFN(12, (uhci_check_intr: ii=%p std=%p still active\n,
- ii, ii-stdstart));
+
+ /* If the last TD is not marked active we can complete */
+ if (!(status UHCI_TD_ACTIVE)) {
+ done:
+ DPRINTFN(12, (uhci_check_intr: ii=%p done\n, ii));
+ callout_stop(ii-xfer-timeout_handle);
+ uhci_idone(ii);
return;
}
- done:
- DPRINTFN(12, (uhci_check_intr: ii=%p done\n, ii));
- callout_stop(ii-xfer-timeout_handle);
- uhci_idone(ii);
+
+ /*
+ * If the last TD is still active we need to check whether there
+ * is an error somewhere in the middle, or whether there was a
+ * short packet (SPD and not ACTIVE).
+ */
+ DPRINTFN(12, (uhci_check_intr: active ii=%p\n, ii));
+ for (std = ii-stdstart; std != lstd; std = std-link.std) {
+ usb_syncmem(std-dma,
+ std-offs + offsetof(uhci_td_t, td_status),
+ sizeof(std-td.td_status),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+ status = le32toh(std-td.td_status);
+ usb_syncmem(std-dma,
+ std-offs + offsetof(uhci_td_t, td_status),
+ sizeof(std-td.td_status), BUS_DMASYNC_PREREAD);
+
+ /* If there's an active TD the xfer isn't done. */
+ if (status UHCI_TD_ACTIVE) {
+ DPRINTFN(12, (%s: ii=%p std=%p still active\n,
+ __func__, ii, std));
+ return;
+ }
+
+ /* Any kind of error makes the xfer done. */
+ if (status UHCI_TD_STALLED)
+ goto done;
+
+ /*
+ * If the data phase of a control transfer is short, we need
+ * to complete the status stage
+ */
+ usbd_xfer_handle xfer = ii-xfer;
+ usb_endpoint_descriptor_t *ed = xfer-pipe-endpoint-edesc;
+ uint8_t xfertype = UE_GET_XFERTYPE(ed-bmAttributes);
+
+ if ((status UHCI_TD_SPD) xfertype == UE_CONTROL) {
+ struct uhci_pipe *upipe =
+ (struct uhci_pipe *)xfer-pipe;
+ uhci_soft_qh_t *sqh = upipe-u.ctl.sqh;
+ uhci_soft_td_t *stat =
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:22:29 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-6]: u3g.c usbdevs
Log Message:
Pull up following revision(s) (requested by dholland in ticket #937):
sys/dev/usb/u3g.c: revision 1.30
sys/dev/usb/usbdevs: revision 1.653
PR/48172: Reinhard Speyerer: u3g(4): add 4G Systems XS Stick W14 support
To generate a diff of this commit:
cvs rdiff -u -r1.24.2.1 -r1.24.2.2 src/sys/dev/usb/u3g.c
cvs rdiff -u -r1.607.2.8 -r1.607.2.9 src/sys/dev/usb/usbdevs
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/u3g.c
diff -u src/sys/dev/usb/u3g.c:1.24.2.1 src/sys/dev/usb/u3g.c:1.24.2.2
--- src/sys/dev/usb/u3g.c:1.24.2.1 Mon Feb 11 21:44:22 2013
+++ src/sys/dev/usb/u3g.c Sat Sep 7 16:22:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $ */
+/* $NetBSD: u3g.c,v 1.24.2.2 2013/09/07 16:22:29 bouyer Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -50,7 +50,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.24.2.1 2013/02/11 21:44:22 riz Exp $);
+__KERNEL_RCSID(0, $NetBSD: u3g.c,v 1.24.2.2 2013/09/07 16:22:29 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -251,6 +251,7 @@ static const struct usb_devno u3g_devs[]
/* 4G Systems */
{ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14 },
+ { USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_W14 },
};
static int
Index: src/sys/dev/usb/usbdevs
diff -u src/sys/dev/usb/usbdevs:1.607.2.8 src/sys/dev/usb/usbdevs:1.607.2.9
--- src/sys/dev/usb/usbdevs:1.607.2.8 Sun May 19 21:51:00 2013
+++ src/sys/dev/usb/usbdevs Sat Sep 7 16:22:29 2013
@@ -1,4 +1,4 @@
-$NetBSD: usbdevs,v 1.607.2.8 2013/05/19 21:51:00 riz Exp $
+$NetBSD: usbdevs,v 1.607.2.9 2013/09/07 16:22:29 bouyer Exp $
/*
* Copyright (c) 1998-2004 The NetBSD Foundation, Inc.
@@ -583,6 +583,7 @@ product 3COMUSR HOMECONN 0x009d 3Com Hom
product 3COMUSR USR56K 0x3021 U.S.Robotics 56000 Voice Faxmodem Pro
/* 4G Systems products */
+product 4GSYSTEMS XSSTICK_W14 0x9603 4G Systems XSStick W14
product 4GSYSTEMS XSSTICK_P14 0x9605 4G Systems XSStick P14
product 4GSYSTEMS XSSTICK_P14_INSTALLER 0xf000 4G Systems XSStick P14 - Windows driver
CVS commit: [netbsd-6] src/sys/dev/usb
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:23:24 UTC 2013
Modified Files:
src/sys/dev/usb [netbsd-6]: usbdevs.h usbdevs_data.h
Log Message:
Regen for ticket 937
To generate a diff of this commit:
cvs rdiff -u -r1.600.2.8 -r1.600.2.9 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.601.2.8 -r1.601.2.9 src/sys/dev/usb/usbdevs_data.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/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.600.2.8 src/sys/dev/usb/usbdevs.h:1.600.2.9
--- src/sys/dev/usb/usbdevs.h:1.600.2.8 Sun May 19 21:51:46 2013
+++ src/sys/dev/usb/usbdevs.h Sat Sep 7 16:23:24 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.600.2.8 2013/05/19 21:51:46 riz Exp $ */
+/* $NetBSD: usbdevs.h,v 1.600.2.9 2013/09/07 16:23:24 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.607.2.8 2013/05/19 21:51:00 riz Exp
+ * NetBSD
*/
/*
@@ -590,6 +590,7 @@
#define USB_PRODUCT_3COMUSR_USR56K 0x3021 /* U.S.Robotics 56000 Voice Faxmodem Pro */
/* 4G Systems products */
+#define USB_PRODUCT_4GSYSTEMS_XSSTICK_W14 0x9603 /* 4G Systems XSStick W14 */
#define USB_PRODUCT_4GSYSTEMS_XSSTICK_P14 0x9605 /* 4G Systems XSStick P14 */
#define USB_PRODUCT_4GSYSTEMS_XSSTICK_P14_INSTALLER 0xf000 /* 4G Systems XSStick P14 - Windows driver */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.601.2.8 src/sys/dev/usb/usbdevs_data.h:1.601.2.9
--- src/sys/dev/usb/usbdevs_data.h:1.601.2.8 Sun May 19 21:51:46 2013
+++ src/sys/dev/usb/usbdevs_data.h Sat Sep 7 16:23:24 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.601.2.8 2013/05/19 21:51:46 riz Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.601.2.9 2013/09/07 16:23:24 bouyer Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.607.2.8 2013/05/19 21:51:00 riz Exp
+ * NetBSD
*/
/*
@@ -2107,6 +2107,10 @@ const struct usb_product usb_products[]
U.S.Robotics 56000 Voice Faxmodem Pro,
},
{
+ USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_W14,
+ 4G Systems XSStick W14,
+ },
+ {
USB_VENDOR_4GSYSTEMS, USB_PRODUCT_4GSYSTEMS_XSSTICK_P14,
4G Systems XSStick P14,
},
@@ -9139,4 +9143,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1769;
+const int usb_nproducts = 1770;
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Sep 7 16:39:15 UTC 2013
Modified Files:
src/sys/dev/usb: usb_subr.c
Log Message:
Reload the full device descriptor after re-establishing the default pipe
with the new address.
Some HCDs, e.g. dwc2, need wMaxPacketSize to be the value returned from
the device to complete transfers after the set address. Opening the pipe
again gives the HCD access to the correct value.
To generate a diff of this commit:
cvs rdiff -u -r1.191 -r1.192 src/sys/dev/usb/usb_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/usb/usb_subr.c
diff -u src/sys/dev/usb/usb_subr.c:1.191 src/sys/dev/usb/usb_subr.c:1.192
--- src/sys/dev/usb/usb_subr.c:1.191 Wed Aug 21 17:59:40 2013
+++ src/sys/dev/usb/usb_subr.c Sat Sep 7 16:39:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_subr.c,v 1.191 2013/08/21 17:59:40 jakllsch Exp $ */
+/* $NetBSD: usb_subr.c,v 1.192 2013/09/07 16:39:15 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.18 1999/11/17 22:33:47 n_hibma Exp $ */
/*
@@ -32,7 +32,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.191 2013/08/21 17:59:40 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: usb_subr.c,v 1.192 2013/09/07 16:39:15 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -1253,14 +1253,6 @@ usbd_new_device(device_t parent, usbd_bu
dev-address = addr; /* new device address now */
bus-devices[addr] = dev;
- err = usbd_reload_device_desc(dev);
- if (err) {
- DPRINTFN(-1, (usbd_new_device: addr=%d, getting full desc
- failed\n, addr));
- usbd_remove_device(dev, up);
- return (err);
- }
-
/* Re-establish the default pipe with the new address. */
usbd_kill_pipe(dev-default_pipe);
err = usbd_setup_pipe_flags(dev, 0, dev-def_ep, USBD_DEFAULT_INTERVAL,
@@ -1271,6 +1263,14 @@ usbd_new_device(device_t parent, usbd_bu
return err;
}
+ err = usbd_reload_device_desc(dev);
+ if (err) {
+ DPRINTFN(-1, (usbd_new_device: addr=%d, getting full desc
+ failed\n, addr));
+ usbd_remove_device(dev, up);
+ return (err);
+ }
+
/* Assume 100mA bus powered for now. Changed when configured. */
dev-power = USB_MIN_POWER;
dev-self_powered = 0;
CVS commit: [netbsd-6] src/sys/dev/mii
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 16:41:08 UTC 2013
Modified Files:
src/sys/dev/mii [netbsd-6]: miidevs.h miidevs_data.h
Log Message:
regen for ticket 939
To generate a diff of this commit:
cvs rdiff -u -r1.108.4.1 -r1.108.4.2 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.96.4.1 -r1.96.4.2 src/sys/dev/mii/miidevs_data.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/miidevs.h
diff -u src/sys/dev/mii/miidevs.h:1.108.4.1 src/sys/dev/mii/miidevs.h:1.108.4.2
--- src/sys/dev/mii/miidevs.h:1.108.4.1 Wed Oct 24 03:42:25 2012
+++ src/sys/dev/mii/miidevs.h Sat Sep 7 16:41:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.108.4.1 2012/10/24 03:42:25 riz Exp $ */
+/* $NetBSD: miidevs.h,v 1.108.4.2 2013/09/07 16:41:08 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp
+ * NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp
*/
/*-
@@ -225,8 +225,12 @@
#define MII_STR_BROADCOM2_BCM5482 BCM5482 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5755 0x000c
#define MII_STR_BROADCOM2_BCM5755 BCM5755 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5756 0x000d
+#define MII_STR_BROADCOM2_BCM5756 BCM5756 1000BASE-T media interface XXX
#define MII_MODEL_BROADCOM2_BCM5754 0x000e
#define MII_STR_BROADCOM2_BCM5754 BCM5754/5787 1000BASE-T media interface
+#define MII_MODEL_BROADCOM2_BCM5708S 0x0015
+#define MII_STR_BROADCOM2_BCM5708S BCM5708S 1000/2500baseSX PHY
#define MII_MODEL_BROADCOM2_BCM5785 0x0016
#define MII_STR_BROADCOM2_BCM5785 BCM5785 1000BASE-T media interface
#define MII_MODEL_BROADCOM2_BCM5709CAX 0x002c
@@ -241,8 +245,16 @@
#define MII_STR_BROADCOM2_BCM5761 BCM5761 10/100/1000baseT PHY
#define MII_MODEL_BROADCOM2_BCM5709S 0x003f
#define MII_STR_BROADCOM2_BCM5709S BCM5709S 1000/2500baseSX PHY
+#define MII_MODEL_BROADCOM3_BCM57780 0x0019
+#define MII_STR_BROADCOM3_BCM57780 BCM57780 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5717C 0x0020
+#define MII_STR_BROADCOM3_BCM5717C BCM5717C 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5719C 0x0022
+#define MII_STR_BROADCOM3_BCM5719C BCM5719C 1000BASE-T media interface
#define MII_MODEL_BROADCOM3_BCM57765 0x0024
#define MII_STR_BROADCOM3_BCM57765 BCM57765 1000BASE-T media interface
+#define MII_MODEL_BROADCOM3_BCM5720C 0x0036
+#define MII_STR_BROADCOM3_BCM5720C BCM5720C 1000BASE-T media interface
#define MII_MODEL_xxBROADCOM_ALT1_BCM5906 0x0004
#define MII_STR_xxBROADCOM_ALT1_BCM5906 BCM5906 10/100baseTX media interface
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.96.4.1 src/sys/dev/mii/miidevs_data.h:1.96.4.2
--- src/sys/dev/mii/miidevs_data.h:1.96.4.1 Wed Oct 24 03:42:25 2012
+++ src/sys/dev/mii/miidevs_data.h Sat Sep 7 16:41:08 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.96.4.1 2012/10/24 03:42:25 riz Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.96.4.2 2013/09/07 16:41:08 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.105.4.1 2012/10/24 03:41:51 riz Exp
+ * NetBSD: miidevs,v 1.105.4.2 2013/09/07 16:39:32 bouyer Exp
*/
/*-
@@ -83,7 +83,9 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5481, MII_STR_BROADCOM2_BCM5481 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5482, MII_STR_BROADCOM2_BCM5482 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5755, MII_STR_BROADCOM2_BCM5755 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5756, MII_STR_BROADCOM2_BCM5756 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5754, MII_STR_BROADCOM2_BCM5754 },
+ { MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5708S, MII_STR_BROADCOM2_BCM5708S },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5785, MII_STR_BROADCOM2_BCM5785 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709CAX, MII_STR_BROADCOM2_BCM5709CAX },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5722, MII_STR_BROADCOM2_BCM5722 },
@@ -91,7 +93,11 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709C, MII_STR_BROADCOM2_BCM5709C },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5761, MII_STR_BROADCOM2_BCM5761 },
{ MII_OUI_BROADCOM2, MII_MODEL_BROADCOM2_BCM5709S, MII_STR_BROADCOM2_BCM5709S },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57780, MII_STR_BROADCOM3_BCM57780 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5717C, MII_STR_BROADCOM3_BCM5717C },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5719C, MII_STR_BROADCOM3_BCM5719C },
{ MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM57765, MII_STR_BROADCOM3_BCM57765 },
+ { MII_OUI_BROADCOM3, MII_MODEL_BROADCOM3_BCM5720C, MII_STR_BROADCOM3_BCM5720C },
{ MII_OUI_xxBROADCOM_ALT1, MII_MODEL_xxBROADCOM_ALT1_BCM5906, MII_STR_xxBROADCOM_ALT1_BCM5906 },
{
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sat Sep 7 16:43:48 UTC 2013 Modified Files: src/sys/dev/usb: ehci.c Log Message: Typo. To generate a diff of this commit: cvs rdiff -u -r1.209 -r1.210 src/sys/dev/usb/ehci.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/ehci.c diff -u src/sys/dev/usb/ehci.c:1.209 src/sys/dev/usb/ehci.c:1.210 --- src/sys/dev/usb/ehci.c:1.209 Sun Aug 25 06:16:19 2013 +++ src/sys/dev/usb/ehci.c Sat Sep 7 16:43:48 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci.c,v 1.209 2013/08/25 06:16:19 skrll Exp $ */ +/* $NetBSD: ehci.c,v 1.210 2013/09/07 16:43:48 skrll Exp $ */ /* * Copyright (c) 2004-2012 The NetBSD Foundation, Inc. @@ -53,7 +53,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.209 2013/08/25 06:16:19 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.210 2013/09/07 16:43:48 skrll Exp $); #include ohci.h #include uhci.h @@ -809,7 +809,7 @@ ehci_check_qh_intr(ehci_softc_t *sc, str #endif /* * If the last TD is still active we need to check whether there - * is a an error somewhere in the middle, or whether there was a + * is an error somewhere in the middle, or whether there was a * short packet (SPD and not ACTIVE). */ usb_syncmem(lsqtd-dma,
CVS commit: [netbsd-6-0] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:44:29 UTC 2013 Modified Files: src/doc [netbsd-6-0]: CHANGES-6.0.3 Log Message: tickets 930 931 933 To generate a diff of this commit: cvs rdiff -u -r1.1.2.17 -r1.1.2.18 src/doc/CHANGES-6.0.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.0.3 diff -u src/doc/CHANGES-6.0.3:1.1.2.17 src/doc/CHANGES-6.0.3:1.1.2.18 --- src/doc/CHANGES-6.0.3:1.1.2.17 Thu Aug 8 21:56:59 2013 +++ src/doc/CHANGES-6.0.3 Sat Sep 7 16:44:29 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.0.3,v 1.1.2.17 2013/08/08 21:56:59 snj Exp $ +# $NetBSD: CHANGES-6.0.3,v 1.1.2.18 2013/09/07 16:44:29 bouyer Exp $ A complete list of changes from the NetBSD 6.0.2 release to the NetBSD 6.0.3 release: @@ -175,3 +175,26 @@ sys/netinet6/nd6_rtr.c1.86 PR/47576. [msaitoh, ticket #926] +sys/fs/udf/udf_allocation.c 1.34 + + Fix 32 bit issue in main file read-in function. On both 32 bit and + 64 bit hosts a missing cast would result in `garbage' after the + 4Gbyte limit. + [reinoud, ticket #930] + +sys/dev/pci/virtio.c1.4 + + Make sure to check if the driver has a valid intr handler in + virtio_detach(). + Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio, + as reported in PR kern/48105 by Richard Hansen. + [tsutsui, ticket #931] + +sys/nfs/nfs_bio.c1.189 + + Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or + close(). + Fix for PR kern/47980 (NFS over-quota not detected if utimes() called + before fsync()/close()) + [hannken, ticket #933] +
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:44:13 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: tickets 930 931 932 933 934 935 937 938 939 To generate a diff of this commit: cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.32 src/doc/CHANGES-6.2:1.1.2.33 --- src/doc/CHANGES-6.2:1.1.2.32 Mon Aug 26 04:06:25 2013 +++ src/doc/CHANGES-6.2 Sat Sep 7 16:44:13 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.32 2013/08/26 04:06:25 msaitoh Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.33 2013/09/07 16:44:13 bouyer Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -497,3 +497,185 @@ sys/dev/pci/if_bgereg.h1.57 Add support for BCM57762 and BCM57765, found in Apple's Thunderbolt to Gigabit Ethernet adapter. PR kern/46961 [tsutsui, ticket #652] +sys/fs/udf/udf_allocation.c 1.34 + + Fix 32 bit issue in main file read-in function. On both 32 bit and + 64 bit hosts a missing cast would result in `garbage' after the + 4Gbyte limit. + [reinoud, ticket #930] + +sys/dev/pci/virtio.c1.4 + + Make sure to check if the driver has a valid intr handler in + virtio_detach(). + Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio, + as reported in PR kern/48105 by Richard Hansen. + [tsutsui, ticket #931] + +sys/dev/pci/mpii.c1.2, 1.3 + + allow more than 1 LUN (changers on LUN 1 can now be found) + fix short read (underruns) + [kardel, ticket #932] + +sys/nfs/nfs_bio.c1.189 + + Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or + close(). + Fix for PR kern/47980 (NFS over-quota not detected if utimes() called + before fsync()/close()) + [hannken, ticket #933] + +lib/libc/locale/global_locale.c patch + + provide consistent and correct data for the C locale. + [joerg, ticket #934] + +sys/arch/amiga/amiga/amiga_init.c 1.127 +sys/arch/m68k/m68k/pmap_motorola.c 1.66 + + Set user page table base address dynamically on amiga. This unbreaks + machines with large Zorro III I/O spaces. + Patch originally by Michael L. Hitch. + [rkujawa, ticket #935] + +sys/dev/usb/u3g.c1.30 +sys/dev/usb/usbdevs1.653 +sys/dev/usb/usbdevs.hregen +sys/dev/usb/usbdevs_data.h regen + + PR/48172: Reinhard Speyerer: + u3g(4): add 4G Systems XS Stick W14 support + [dholland, ticket #937] + +external/ibm-public/postfix/dist/HISTORY patch +external/ibm-public/postfix/dist/src/global/mail_version.h patch +external/ibm-public/postfix/dist/src/smtp/smtp_connect.c patch +external/ibm-public/postfix/dist/src/smtp/smtp_reuse.c patch +external/ibm-public/postfix/dist/src/tls/tls_misc.c patch +external/ibm-public/postfix/dist/src/trivial-rewrite/resolve.c patch +external/ibm-public/postfix/dist/src/util/exec_command.c patch + + Update postfix to 2.8.15, fixing several bugs + [tron, ticket #938] + +sys/dev/pci/if_bge.c 1.203-1.237, 1.239-1.241, 1.243-1.258 via patch +sys/dev/pci/if_bgereg.h 1.58-1.74, 1.76-1.83 via patch +sys/dev/pci/if_bgevar.h 1.10-1.16 via patch +sys/dev/pci/pcidevs 1.1149 via patch +sys/dev/pci/pcidevs.h regen +sys/dev/pci/pcidevs_data.h regen +sys/dev/mii/brgphy.c 1.61-1.63, 1.65, 1.67 via patch +sys/dev/mii/miivar.h 1.61 via patch +sys/dev/mii/miidevs 1.112-1.113 via patch +sys/dev/mii/miidevs.h regen +sys/dev/mii/miidevs_data.h regen +share/man/man4/bge.4 1.13-1.15 via patch + + Add some device support, fix a lot of bugs and add some enahcements. + - Add Altima AC1003, APPLE BCM5701, Broadcom BCM5785F, + BCM5785G, BCM5787F, BCM5719, BCM5720, BCM57766, BCM57782 and BCM57786. + - brgphy(4): Add BCM5756, BCM5717C, BCM5719C, BCM5720C and BCM57780. + - Add some bugfixes and enhancement from FreeBSD: + - Workaround for BCM5906 silicon bug. When auto-negotiation results in + half-duplex operation, excess collision on the ethernet link may + cause internal chip delays that may result in subsequent valid + frames being dropped due to insufficient receive buffer resources. + (FreeBSD: r214219, r214251, r214292) + - Allow write DMA to request larger DMA burst size to get better + performance on BCM5785. + (FreeBSD r21: OpenBSD 1.294) + - Enable TX MAC state machine lockup fix for both BCM5755 or higher + and BCM5906. Publicly available data sheet just says it may happen + due to corrupted TxMbuf. + (FreeBSD r214216) + - Follow Broadcom datasheet: + Delay 100 microseconds after enabling transmit MAC. + Delay 10 microseconds after enabling receive MAC. + (FreeBSD r241220) + - Insert the completion barrier between register write and the + consecutive delay(). It will fix some device timeout problems + we have seen before. + - Add DELAY(40) after turning on write DMA state machine. + - Add some workarounds for 5717 A0 and 5776[56] to be
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Sep 7 16:47:23 UTC 2013
Modified Files:
src/sys/dev/usb: usbdi.h usbdivar.h
Log Message:
Some lock comments.
To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.103 -r1.104 src/sys/dev/usb/usbdivar.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.h
diff -u src/sys/dev/usb/usbdi.h:1.87 src/sys/dev/usb/usbdi.h:1.88
--- src/sys/dev/usb/usbdi.h:1.87 Tue Jan 22 13:27:59 2013
+++ src/sys/dev/usb/usbdi.h Sat Sep 7 16:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdi.h,v 1.87 2013/01/22 13:27:59 jmcneill Exp $ */
+/* $NetBSD: usbdi.h,v 1.88 2013/09/07 16:47:23 skrll Exp $ */
/* $FreeBSD: src/sys/dev/usb/usbdi.h,v 1.18 1999/11/17 22:33:49 n_hibma Exp $ */
/*
@@ -278,9 +278,16 @@ struct usbif_attach_arg {
/* No match */
#define UMATCH_NONE 0
+
+/*
+ * IPL_USB is defined as IPL_VM for drivers that have not been made MP safe.
+ * IPL_VM (currently) takes the kernel lock.
+ *
+ * Eventually, IPL_USB can/should be changed
+ */
#define splusb splsoftnet
-#define splhardusb splbio
-#define IPL_USB IPL_BIO
+#define splhardusb splvm
#define IPL_SOFTUSB IPL_SOFTNET
+#define IPL_USB IPL_VM
#endif /* _USBDI_H_ */
Index: src/sys/dev/usb/usbdivar.h
diff -u src/sys/dev/usb/usbdivar.h:1.103 src/sys/dev/usb/usbdivar.h:1.104
--- src/sys/dev/usb/usbdivar.h:1.103 Sun Mar 24 22:38:45 2013
+++ src/sys/dev/usb/usbdivar.h Sat Sep 7 16:47:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usbdivar.h,v 1.103 2013/03/24 22:38:45 skrll Exp $ */
+/* $NetBSD: usbdivar.h,v 1.104 2013/09/07 16:47:23 skrll Exp $ */
/*
* Copyright (c) 1998, 2012 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
/*
* Discussion about locking in the USB code:
*
- * The host controller presents one lock at IPL_SOFTUSB.
+ * The host controller presents one lock at IPL_SOFTUSB (aka IPL_SOFTNET).
*
* List of hardware interface methods, and whether the lock is held
* when each is called by this module:
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:56:48 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: tickets 930, 931, 933, 935 To generate a diff of this commit: cvs rdiff -u -r1.1.2.1 -r1.1.2.2 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.1 src/doc/CHANGES-6.1.2:1.1.2.2 --- src/doc/CHANGES-6.1.2:1.1.2.1 Sat Sep 7 16:55:43 2013 +++ src/doc/CHANGES-6.1.2 Sat Sep 7 16:56:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.1 2013/09/07 16:55:43 bouyer Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.2 2013/09/07 16:56:48 bouyer Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -10,3 +10,34 @@ sys/sys/param.h patched by hand Welcome to 6.1.1_PATCH. [bouyer] +sys/fs/udf/udf_allocation.c 1.34 + + Fix 32 bit issue in main file read-in function. On both 32 bit and + 64 bit hosts a missing cast would result in `garbage' after the + 4Gbyte limit. + [reinoud, ticket #930] + +sys/dev/pci/virtio.c1.4 + + Make sure to check if the driver has a valid intr handler in + virtio_detach(). + Fixes a panic during shutdown on KVM under ubuntu 13.04 with virtio, + as reported in PR kern/48105 by Richard Hansen. + [tsutsui, ticket #931] + +sys/nfs/nfs_bio.c1.189 + + Change nfs_vinvalbuf() to keep errors from vinvalbuf() for fsync() or + close(). + Fix for PR kern/47980 (NFS over-quota not detected if utimes() called + before fsync()/close()) + [hannken, ticket #933] + +sys/arch/amiga/amiga/amiga_init.c 1.127 +sys/arch/m68k/m68k/pmap_motorola.c 1.66 + + Set user page table base address dynamically on amiga. This unbreaks + machines with large Zorro III I/O spaces. + Patch originally by Michael L. Hitch. + [rkujawa, ticket #935] +
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:55:44 UTC 2013 Added Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Welcome to 6.1.1_PATCH. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1.2.1 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Added files: Index: src/doc/CHANGES-6.1.2 diff -u /dev/null src/doc/CHANGES-6.1.2:1.1.2.1 --- /dev/null Sat Sep 7 16:55:44 2013 +++ src/doc/CHANGES-6.1.2 Sat Sep 7 16:55:43 2013 @@ -0,0 +1,12 @@ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.1 2013/09/07 16:55:43 bouyer Exp $ + +A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 +release: + +doc/README.filespatched by hand +gnu/usr.bin/groff/tmac/mdoc.local patched by hand +sys/sys/param.h patched by hand + + Welcome to 6.1.1_PATCH. + [bouyer] +
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: bouyer Date: Sat Sep 7 16:55:04 UTC 2013 Modified Files: src/doc [netbsd-6-1]: README.files src/gnu/usr.bin/groff/tmac [netbsd-6-1]: mdoc.local src/sys/sys [netbsd-6-1]: param.h Log Message: Welcome to 6.1.1_PATCH To generate a diff of this commit: cvs rdiff -u -r1.4.20.2.2.2 -r1.4.20.2.2.3 src/doc/README.files cvs rdiff -u -r1.66.2.2.2.1 -r1.66.2.2.2.2 \ src/gnu/usr.bin/groff/tmac/mdoc.local cvs rdiff -u -r1.408.2.12.2.2 -r1.408.2.12.2.3 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/README.files diff -u src/doc/README.files:1.4.20.2.2.2 src/doc/README.files:1.4.20.2.2.3 --- src/doc/README.files:1.4.20.2.2.2 Thu Aug 15 03:27:37 2013 +++ src/doc/README.files Sat Sep 7 16:55:04 2013 @@ -1,7 +1,9 @@ -# $NetBSD: README.files,v 1.4.20.2.2.2 2013/08/15 03:27:37 snj Exp $ +# $NetBSD: README.files,v 1.4.20.2.2.3 2013/09/07 16:55:04 bouyer Exp $ What's in this directory: +CHANGES-6.1.2 Changes between the 6.1.1 and 6.1.2 releases. + CHANGES-6.1.1 Changes between the 6.1 and 6.1.1 releases. CHANGES-6.1 Changes between the 6.0 and 6.1 releases. @@ -33,7 +35,7 @@ source/patches/ Post-release source code In addition to the files and directories listed above, there is one directory per architecture, for each of the architectures for which -NetBSD 6.1.1 has a binary distribution. The contents of each +NetBSD 6.1.2 has a binary distribution. The contents of each architecture's directory are described in an INSTALL file found in that directory. Index: src/gnu/usr.bin/groff/tmac/mdoc.local diff -u src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.1 src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.2 --- src/gnu/usr.bin/groff/tmac/mdoc.local:1.66.2.2.2.1 Sun May 19 21:44:51 2013 +++ src/gnu/usr.bin/groff/tmac/mdoc.local Sat Sep 7 16:55:04 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: mdoc.local,v 1.66.2.2.2.1 2013/05/19 21:44:51 riz Exp $ +.\ $NetBSD: mdoc.local,v 1.66.2.2.2.2 2013/09/07 16:55:04 bouyer Exp $ .\ .\ Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -44,9 +44,9 @@ .as doc-str-St--ieee1275-94 (\*[Lq]\*[doc-Tn-font-size]Open Firmware\*[doc-str-St]\*[Rq]) . .\ Default .Os value -.ds doc-operating-system NetBSD\~6.1.1 +.ds doc-operating-system NetBSD\~6.1.2 .\ Default footer operating system value -.ds doc-default-operating-system NetBSD\~6.1.1 +.ds doc-default-operating-system NetBSD\~6.1.2 .\ Other known versions, not yet in groff distribution .ds doc-operating-system-NetBSD-1.3.3 1.3.3 .ds doc-operating-system-NetBSD-1.6.3 1.6.3 @@ -61,6 +61,7 @@ .ds doc-operating-system-NetBSD-6.06.0 .ds doc-operating-system-NetBSD-6.16.1 .ds doc-operating-system-NetBSD-6.1.1 6.1.1 +.ds doc-operating-system-NetBSD-6.1.2 6.1.2 .ds doc-operating-system-FreeBSD-4.11 4.11 .ds doc-operating-system-FreeBSD-5.4 5.4 .ds doc-operating-system-FreeBSD-5.5 5.5 Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.12.2.2 src/sys/sys/param.h:1.408.2.12.2.3 --- src/sys/sys/param.h:1.408.2.12.2.2 Thu Aug 15 03:27:37 2013 +++ src/sys/sys/param.h Sat Sep 7 16:55:04 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.12.2.2 2013/08/15 03:27:37 snj Exp $ */ +/* $NetBSD: param.h,v 1.408.2.12.2.3 2013/09/07 16:55:04 bouyer Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 601000100 /* NetBSD 6.1.1 */ +#define __NetBSD_Version__ 601000101 /* NetBSD 6.1.1_PATCH */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 17:10:18 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-5]: if_wm.c if_wmreg.h if_wmvar.h pcidevs
Log Message:
sys/dev/pci/if_wm.c 1.246-1.247, 1.249-1.258
sys/dev/pci/if_wmreg.h 1.51, 1.53
sys/dev/pci/if_wmvar.h 1.15-1.16
sys/dev/pci/pcidevs 1.1152-1.1153
sys/dev/pci/pcidevs.h regen
sys/dev/pci/pcidevs_data.h regen
Add I21[0178] support.
Fix a bug that wm_attach() may fail on some PCH2 or newer system.
wm_valid_nvm_bank_detect_ich8lan() misunderstood the NVM's bank
number. Fixes PR#47878.
Fix a bug that the check of reset complete fails on Intel 8 series
with wm_lan_init_done: lan_init_done failed to complete message.
The broken code was used for ICH8, 9... and PCH2.
The wm_linkintr_gmii() function is called from interrupt. That's
not tick, so call mii_pollstat() instead of mii_tick().
Add ECC support for the packet buffer. Only 82571 and I21[78] support
ECC.
Fix a bug that wrong semaphore is used in wm_gmii_hv_{read,write}reg.
Add comments, fix some comments, use macros and remove trailing
whitespaces.
[msaitoh, ticket #1867]
To generate a diff of this commit:
cvs rdiff -u -r1.162.4.18 -r1.162.4.19 src/sys/dev/pci/if_wm.c
cvs rdiff -u -r1.24.20.7 -r1.24.20.8 src/sys/dev/pci/if_wmreg.h
cvs rdiff -u -r1.2.46.5 -r1.2.46.6 src/sys/dev/pci/if_wmvar.h
cvs rdiff -u -r1.962.4.18 -r1.962.4.19 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/if_wm.c
diff -u src/sys/dev/pci/if_wm.c:1.162.4.18 src/sys/dev/pci/if_wm.c:1.162.4.19
--- src/sys/dev/pci/if_wm.c:1.162.4.18 Wed Jun 19 07:50:15 2013
+++ src/sys/dev/pci/if_wm.c Sat Sep 7 17:10:18 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.162.4.18 2013/06/19 07:50:15 bouyer Exp $ */
+/* $NetBSD: if_wm.c,v 1.162.4.19 2013/09/07 17:10:18 bouyer Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -37,32 +37,32 @@
/***
- Copyright (c) 2001-2005, Intel Corporation
+ Copyright (c) 2001-2005, Intel Corporation
All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
+
+ 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,
+
+ 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
+
+ 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.
-
- 3. Neither the name of the Intel Corporation nor the names of its
- contributors may be used to endorse or promote products derived from
+
+ 3. Neither the name of the Intel Corporation nor the names of its
+ contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
-
+
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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)
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER 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
CVS commit: [netbsd-5] src/sys/dev/pci
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 17:11:30 UTC 2013
Modified Files:
src/sys/dev/pci [netbsd-5]: pcidevs.h pcidevs_data.h
Log Message:
Regen for ticket 1867
To generate a diff of this commit:
cvs rdiff -u -r1.963.4.18 -r1.963.4.19 src/sys/dev/pci/pcidevs.h
cvs rdiff -u -r1.962.4.18 -r1.962.4.19 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.
Modified files:
Index: src/sys/dev/pci/pcidevs.h
diff -u src/sys/dev/pci/pcidevs.h:1.963.4.18 src/sys/dev/pci/pcidevs.h:1.963.4.19
--- src/sys/dev/pci/pcidevs.h:1.963.4.18 Wed Jun 19 07:50:54 2013
+++ src/sys/dev/pci/pcidevs.h Sat Sep 7 17:11:18 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs.h,v 1.963.4.18 2013/06/19 07:50:54 bouyer Exp $ */
+/* $NetBSD: pcidevs.h,v 1.963.4.19 2013/09/07 17:11:18 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.18 2013/06/19 07:50:15 bouyer Exp
+ * NetBSD: pcidevs,v 1.962.4.19 2013/09/07 17:10:18 bouyer Exp
*/
/*
@@ -2320,6 +2320,17 @@
#define PCI_PRODUCT_INTEL_I350_SGMII 0x1524 /* I350 Gigabit Connection */
#define PCI_PRODUCT_INTEL_82801J_D_BM_V 0x1525 /* 82567V LAN Controller */
#define PCI_PRODUCT_INTEL_82580_QUAD_FIBER 0x1527 /* 82580 quad-1000BaseX Ethernet */
+#define PCI_PRODUCT_INTEL_I210_T1 0x1533 /* I210-T1 Ethernet Server Adapter */
+#define PCI_PRODUCT_INTEL_I210_COPPER_OEM1 0x1534 /* I210 Ethernet (COPPER OEM) */
+#define PCI_PRODUCT_INTEL_I210_COPPER_IT 0x1535 /* I210 Ethernet (COPPER IT) */
+#define PCI_PRODUCT_INTEL_I210_FIBER 0x1536 /* I210 Ethernet (FIBER) */
+#define PCI_PRODUCT_INTEL_I210_SERDES 0x1537 /* I210 Ethernet (SERDES) */
+#define PCI_PRODUCT_INTEL_I210_SGMII 0x1538 /* I210 Ethernet (SGMII) */
+#define PCI_PRODUCT_INTEL_I211_COPPER 0x1539 /* I211 Ethernet (COPPER) */
+#define PCI_PRODUCT_INTEL_I217_LM 0x153a /* I217-LM Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I217_V 0x153b /* I217-V Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I218_V 0x1559 /* I218-V Ethernet Connection */
+#define PCI_PRODUCT_INTEL_I218_LM 0x155a /* I218-LM Ethernet Connection */
#define PCI_PRODUCT_INTEL_80960_RP 0x1960 /* ROB-in i960RP Microprocessor */
#define PCI_PRODUCT_INTEL_80960RM_2 0x1962 /* i960 RM PCI-PCI */
#define PCI_PRODUCT_INTEL_82840_HB 0x1a21 /* 82840 Host */
Index: src/sys/dev/pci/pcidevs_data.h
diff -u src/sys/dev/pci/pcidevs_data.h:1.962.4.18 src/sys/dev/pci/pcidevs_data.h:1.962.4.19
--- src/sys/dev/pci/pcidevs_data.h:1.962.4.18 Wed Jun 19 07:50:54 2013
+++ src/sys/dev/pci/pcidevs_data.h Sat Sep 7 17:11:18 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: pcidevs_data.h,v 1.962.4.18 2013/06/19 07:50:54 bouyer Exp $ */
+/* $NetBSD: pcidevs_data.h,v 1.962.4.19 2013/09/07 17:11:18 bouyer Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: pcidevs,v 1.962.4.18 2013/06/19 07:50:15 bouyer Exp
+ * NetBSD: pcidevs,v 1.962.4.19 2013/09/07 17:10:18 bouyer Exp
*/
/*
@@ -8108,6 +8108,50 @@ static const struct pci_product pci_prod
82580 quad-1000BaseX Ethernet,
},
{
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_T1,
+ I210-T1 Ethernet Server Adapter,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_COPPER_OEM1,
+ I210 Ethernet (COPPER OEM),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_COPPER_IT,
+ I210 Ethernet (COPPER IT),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_FIBER,
+ I210 Ethernet (FIBER),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_SERDES,
+ I210 Ethernet (SERDES),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I210_SGMII,
+ I210 Ethernet (SGMII),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I211_COPPER,
+ I211 Ethernet (COPPER),
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_LM,
+ I217-LM Ethernet Connection,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I217_V,
+ I217-V Ethernet Connection,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_V,
+ I218-V Ethernet Connection,
+ },
+ {
+ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_I218_LM,
+ I218-LM Ethernet Connection,
+ },
+ {
PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_80960_RP,
ROB-in i960RP Microprocessor,
},
@@ -15120,4 +15164,4 @@ static const struct pci_product pci_prod
Video Controller,
},
};
-const int pci_nproducts = 3179;
+const int pci_nproducts = 3190;
CVS commit: [netbsd-5] src
Module Name:src Committed By: bouyer Date: Sat Sep 7 17:17:36 UTC 2013 Modified Files: src/doc [netbsd-5]: 3RDPARTY src/share/zoneinfo [netbsd-5]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/iso3166.tab patch share/zoneinfo/southamerica patch share/zoneinfo/zone.tab patch Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). [apb, ticket #1870] To generate a diff of this commit: cvs rdiff -u -r1.647.2.24 -r1.647.2.25 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.2.5 -r1.1.1.27.2.6 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.2.9 -r1.1.1.44.2.10 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.8 -r1.17.2.9 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.5 -r1.1.1.38.2.6 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.17.2.2 -r1.1.1.17.2.3 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.42.2.8 -r1.1.1.42.2.9 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.6 -r1.1.1.33.2.7 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.24 src/doc/3RDPARTY:1.647.2.25 --- src/doc/3RDPARTY:1.647.2.24 Thu Mar 14 19:59:49 2013 +++ src/doc/3RDPARTY Sat Sep 7 17:17:35 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.24 2013/03/14 19:59:49 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.25 2013/09/07 17:17:35 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2013b -Current Vers: tzcode2013b / tzdata2013b +Version: tzcode2004a / tzdata2013d +Current Vers: tzcode2013d / tzdata2013d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.2.5 src/share/zoneinfo/africa:1.1.1.27.2.6 --- src/share/zoneinfo/africa:1.1.1.27.2.5 Fri Mar 15 18:48:07 2013 +++ src/share/zoneinfo/africa Sat Sep 7 17:17:35 2013 @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20 2:00 1:00 S -Rule Morocco 2013 only - Jul 9 3:00 0 -
CVS commit: [netbsd-5-1] src
Module Name:src Committed By: bouyer Date: Sat Sep 7 17:18:25 UTC 2013 Modified Files: src/doc [netbsd-5-1]: 3RDPARTY src/share/zoneinfo [netbsd-5-1]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/iso3166.tab patch share/zoneinfo/southamerica patch share/zoneinfo/zone.tab patch Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). [apb, ticket #1870] To generate a diff of this commit: cvs rdiff -u -r1.647.2.12.2.10 -r1.647.2.12.2.11 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.10.5 -r1.1.1.27.10.6 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.10.9 -r1.1.1.44.10.10 src/share/zoneinfo/asia cvs rdiff -u -r1.17.10.8 -r1.17.10.9 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.10.5 -r1.1.1.38.10.6 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.17.10.2 -r1.1.1.17.10.3 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.42.10.8 -r1.1.1.42.10.9 src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.10.6 -r1.1.1.33.10.7 src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.12.2.10 src/doc/3RDPARTY:1.647.2.12.2.11 --- src/doc/3RDPARTY:1.647.2.12.2.10 Thu Mar 14 20:03:20 2013 +++ src/doc/3RDPARTY Sat Sep 7 17:18:25 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.12.2.10 2013/03/14 20:03:20 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.12.2.11 2013/09/07 17:18:25 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2013b -Current Vers: tzcode2013b / tzdata2013b +Version: tzcode2004a / tzdata2013d +Current Vers: tzcode2013d / tzdata2013d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.10.5 src/share/zoneinfo/africa:1.1.1.27.10.6 --- src/share/zoneinfo/africa:1.1.1.27.10.5 Fri Mar 15 18:48:45 2013 +++ src/share/zoneinfo/africa Sat Sep 7 17:18:25 2013 @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul 20 3:00 0 - Rule Morocco 2012 only - Aug 20
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 17:19:02 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1870 To generate a diff of this commit: cvs rdiff -u -r1.1.2.44 -r1.1.2.45 src/doc/CHANGES-5.1.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.44 src/doc/CHANGES-5.1.3:1.1.2.45 --- src/doc/CHANGES-5.1.3:1.1.2.44 Tue Jul 30 02:30:34 2013 +++ src/doc/CHANGES-5.1.3 Sat Sep 7 17:19:02 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.44 2013/07/30 02:30:34 msaitoh Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.45 2013/09/07 17:19:02 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2480,3 +2480,43 @@ usr.bin/netstat/netstat.h 1.47 pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. [christos, ticket #1868] +doc/3RDPARTY patch +share/zoneinfo/africa patch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch +share/zoneinfo/europe patch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tab patch + + Import tzdata2013d from + ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz + Summary of changes from tzdata2013c to tzdata2013d: + Changes affecting current and future time stamps: + Morocco's midsummer transitions this year are July 7 and August 10, + not July 9 and August 8. (Thanks to Andrew Paprocki.) + + Israel now falls back on the last Sunday of October. + (Thanks to Ephraim Silverberg.) + + Changes affecting past time stamps: + Specify Jerusalem's location more precisely; this changes the + pre-1880 times by 2 s. + + Changing affecting metadata only: + Fix typos in the entries for country codes BQ and SX. + + Changes affecting documentation and commentary: + Deemphasize the significance of national borders. + + Update the zdump man page. + + Remove obsolete NOID comment (thanks to Denis Excoffier). + + Update several URLs and comments in the web pages. + + Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). + + Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). + [apb, ticket #1870] +
CVS commit: [netbsd-5-2] src
Module Name:src Committed By: bouyer Date: Sat Sep 7 17:18:37 UTC 2013 Modified Files: src/doc [netbsd-5-2]: 3RDPARTY src/share/zoneinfo [netbsd-5-2]: africa asia australasia europe iso3166.tab southamerica zone.tab Log Message: doc/3RDPARTYpatch share/zoneinfo/africa patch share/zoneinfo/asia patch share/zoneinfo/australasia patch share/zoneinfo/europe patch share/zoneinfo/iso3166.tab patch share/zoneinfo/southamerica patch share/zoneinfo/zone.tab patch Import tzdata2013d from ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz Summary of changes from tzdata2013c to tzdata2013d: Changes affecting current and future time stamps: Morocco's midsummer transitions this year are July 7 and August 10, not July 9 and August 8. (Thanks to Andrew Paprocki.) Israel now falls back on the last Sunday of October. (Thanks to Ephraim Silverberg.) Changes affecting past time stamps: Specify Jerusalem's location more precisely; this changes the pre-1880 times by 2 s. Changing affecting metadata only: Fix typos in the entries for country codes BQ and SX. Changes affecting documentation and commentary: Deemphasize the significance of national borders. Update the zdump man page. Remove obsolete NOID comment (thanks to Denis Excoffier). Update several URLs and comments in the web pages. Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). [apb, ticket #1870] To generate a diff of this commit: cvs rdiff -u -r1.647.2.23.2.1 -r1.647.2.23.2.2 src/doc/3RDPARTY cvs rdiff -u -r1.1.1.27.2.3.2.2 -r1.1.1.27.2.3.2.3 src/share/zoneinfo/africa cvs rdiff -u -r1.1.1.44.2.7.2.2 -r1.1.1.44.2.7.2.3 src/share/zoneinfo/asia cvs rdiff -u -r1.17.2.6.2.2 -r1.17.2.6.2.3 src/share/zoneinfo/australasia cvs rdiff -u -r1.1.1.38.2.4.2.1 -r1.1.1.38.2.4.2.2 src/share/zoneinfo/europe cvs rdiff -u -r1.1.1.17.2.2 -r1.1.1.17.2.2.2.1 src/share/zoneinfo/iso3166.tab cvs rdiff -u -r1.1.1.42.2.5.2.3 -r1.1.1.42.2.5.2.4 \ src/share/zoneinfo/southamerica cvs rdiff -u -r1.1.1.33.2.4.2.2 -r1.1.1.33.2.4.2.3 \ src/share/zoneinfo/zone.tab Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.647.2.23.2.1 src/doc/3RDPARTY:1.647.2.23.2.2 --- src/doc/3RDPARTY:1.647.2.23.2.1 Thu Mar 14 20:01:26 2013 +++ src/doc/3RDPARTY Sat Sep 7 17:18:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.647.2.23.2.1 2013/03/14 20:01:26 riz Exp $ +# $NetBSD: 3RDPARTY,v 1.647.2.23.2.2 2013/09/07 17:18:37 bouyer Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -924,8 +924,8 @@ License: BSD (4-clause) Notes: Package: tz -Version: tzcode2004a / tzdata2013b -Current Vers: tzcode2013b / tzdata2013b +Version: tzcode2004a / tzdata2013d +Current Vers: tzcode2013d / tzdata2013d Maintainer: Paul Eggert egg...@cs.ucla.edu Archive Site: ftp://ftp.iana.org/tz/releases/ Archive Site: ftp://munnari.oz.au/pub/oldtz/ Index: src/share/zoneinfo/africa diff -u src/share/zoneinfo/africa:1.1.1.27.2.3.2.2 src/share/zoneinfo/africa:1.1.1.27.2.3.2.3 --- src/share/zoneinfo/africa:1.1.1.27.2.3.2.2 Fri Mar 15 18:49:08 2013 +++ src/share/zoneinfo/africa Sat Sep 7 17:18:37 2013 @@ -852,12 +852,18 @@ Zone Indian/Mayotte 3:00:56 - LMT 1911 J # announced that year's Ramadan daylight-saving transitions would be # 2012-07-20 and 2012-08-20; see # http://www.mmsp.gov.ma/fr/actualites.aspx?id=288. -# + +# From Andrew Paprocki (2013-07-02): +# Morocco announced that the year's Ramadan daylight-savings +# transitions would be 2013-07-07 and 2013-08-10; see: +# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 + +# From Paul Eggert (2013-07-03): # To estimate what the Moroccan government will do in future years, -# transition dates for 2013 through 2021 were determined by running +# transition dates for 2014 through 2021 were determined by running # the following program under GNU Emacs 24.3: # -# (let ((islamic-year 1434)) +# (let ((islamic-year 1435)) # (while ( islamic-year 1444) # (let ((a # (calendar-gregorian-from-absolute @@ -910,8 +916,8 @@ Rule Morocco 2012 2019 - Apr lastSun 2: Rule Morocco 2012 max - Sep lastSun 3:00 0 - Rule Morocco 2012 only - Jul
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Sat Sep 7 17:19:19 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: ticket 1870 To generate a diff of this commit: cvs rdiff -u -r1.1.2.12 -r1.1.2.13 src/doc/CHANGES-5.2.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.12 src/doc/CHANGES-5.2.1:1.1.2.13 --- src/doc/CHANGES-5.2.1:1.1.2.12 Tue Jul 30 02:30:13 2013 +++ src/doc/CHANGES-5.2.1 Sat Sep 7 17:19:19 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.12 2013/07/30 02:30:13 msaitoh Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.13 2013/09/07 17:19:19 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -194,3 +194,43 @@ usr.bin/netstat/netstat.h 1.47 pcb first! Not all pointers are 64bit - use uintptr_t instead of uint64_t. [christos, ticket #1868] +doc/3RDPARTY patch +share/zoneinfo/africa patch +share/zoneinfo/asia patch +share/zoneinfo/australasia patch +share/zoneinfo/europe patch +share/zoneinfo/iso3166.tab patch +share/zoneinfo/southamerica patch +share/zoneinfo/zone.tab patch + + Import tzdata2013d from + ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz + Summary of changes from tzdata2013c to tzdata2013d: + Changes affecting current and future time stamps: + Morocco's midsummer transitions this year are July 7 and August 10, + not July 9 and August 8. (Thanks to Andrew Paprocki.) + + Israel now falls back on the last Sunday of October. + (Thanks to Ephraim Silverberg.) + + Changes affecting past time stamps: + Specify Jerusalem's location more precisely; this changes the + pre-1880 times by 2 s. + + Changing affecting metadata only: + Fix typos in the entries for country codes BQ and SX. + + Changes affecting documentation and commentary: + Deemphasize the significance of national borders. + + Update the zdump man page. + + Remove obsolete NOID comment (thanks to Denis Excoffier). + + Update several URLs and comments in the web pages. + + Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler). + + Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka). + [apb, ticket #1870] +
CVS commit: src/sys/dev
Module Name:src Committed By: rkujawa Date: Sat Sep 7 17:23:55 UTC 2013 Modified Files: src/sys/dev: DEVNAMES Log Message: Add forgotten xsh device. To generate a diff of this commit: cvs rdiff -u -r1.284 -r1.285 src/sys/dev/DEVNAMES 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/DEVNAMES diff -u src/sys/dev/DEVNAMES:1.284 src/sys/dev/DEVNAMES:1.285 --- src/sys/dev/DEVNAMES:1.284 Tue Jan 29 00:54:13 2013 +++ src/sys/dev/DEVNAMES Sat Sep 7 17:23:55 2013 @@ -1,4 +1,4 @@ -# $NetBSD: DEVNAMES,v 1.284 2013/01/29 00:54:13 rkujawa Exp $ +# $NetBSD: DEVNAMES,v 1.285 2013/09/07 17:23:55 rkujawa Exp $ # # This file contains all used device names and defined attributes in # alphabetical order. New devices added to the system somewhere should first @@ -1531,6 +1531,8 @@ xge MI xhci MI xi MI xmi MI +xsh amiga +xsh amigappc xsii pmax xvif xen xy MI
CVS commit: [netbsd-5] src/sys/arch/i386/stand/boot
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 17:23:39 UTC 2013
Modified Files:
src/sys/arch/i386/stand/boot [netbsd-5]: boot2.c
Log Message:
Pull up following revision(s) (requested by he in ticket #1872):
sys/arch/i386/stand/lib/bootmenu.c: revision 1.11 via patch
sys/arch/i386/stand/lib/bootmenu.h: revision 1.3 via patch
sys/arch/i386/stand/boot/boot2.c: revision 1.59 via patch
Two changes for the i386 boot loader related to the boot menu which
can be defined in boot.cfg:
* Add a menu command which re-displays the menu and initiates
the timed countdown
* Use any default command defined in boot.cfg as default args
if the user runs boot with no arguments
This is useful in circumstances where you e.g. need to interrupt
the normal boot process to switch to serial console, and where
simply boot netbsd is no longer sufficient (e.g. as with install
media which needs the miniroot kernel module loaded).
To generate a diff of this commit:
cvs rdiff -u -r1.38.4.2 -r1.38.4.3 src/sys/arch/i386/stand/boot/boot2.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/i386/stand/boot/boot2.c
diff -u src/sys/arch/i386/stand/boot/boot2.c:1.38.4.2 src/sys/arch/i386/stand/boot/boot2.c:1.38.4.3
--- src/sys/arch/i386/stand/boot/boot2.c:1.38.4.2 Sun Feb 14 14:01:08 2010
+++ src/sys/arch/i386/stand/boot/boot2.c Sat Sep 7 17:23:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: boot2.c,v 1.38.4.2 2010/02/14 14:01:08 bouyer Exp $ */
+/* $NetBSD: boot2.c,v 1.38.4.3 2013/09/07 17:23:39 bouyer Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -131,9 +131,16 @@ void command_quit(char *);
void command_boot(char *);
void command_dev(char *);
void command_consdev(char *);
+#ifndef SMALL
+void command_menu(char *);
+#endif
void command_modules(char *);
void command_load(char *);
void command_multiboot(char *);
+#ifndef SMALL
+void bootdefault(void);
+void docommandchoice(int);
+#endif
const struct bootblk_command commands[] = {
{ help, command_help },
@@ -143,6 +150,9 @@ const struct bootblk_command commands[]
{ boot, command_boot },
{ dev, command_dev },
{ consdev, command_consdev },
+#ifndef SMALL
+ { menu, command_menu },
+#endif
{ modules, command_modules },
{ load, command_load },
{ multiboot, command_multiboot },
@@ -508,10 +518,58 @@ static int getchoicefrominput(char *inpu
}
void
+docommandchoice(int choice)
+{
+ char input[80], *ic, *oc;
+
+ ic = bootconf.command[choice];
+ /* Split command string at ; into separate commands */
+ do {
+ oc = input;
+ /* Look for ; separator */
+ for (; *ic *ic != COMMAND_SEPARATOR; ic++)
+ *oc++ = *ic;
+ if (*input == '\0')
+ continue;
+ /* Strip out any trailing spaces */
+ oc--;
+ for (; *oc == ' ' oc input; oc--);
+ *++oc = '\0';
+ if (*ic == COMMAND_SEPARATOR)
+ ic++;
+ /* Stop silly command strings like ;;; */
+ if (*input != '\0')
+ docommand(input);
+ /* Skip leading spaces */
+ for (; *ic == ' '; ic++);
+ } while (*ic);
+}
+
+void
+bootdefault(void)
+{
+int choice;
+static int entered;
+
+if (bootconf.nummenu 0) {
+if (entered) {
+printf(default boot twice, skipping...\n);
+return;
+}
+entered = 1;
+choice = bootconf.def;
+printf(command(s): %s\n, bootconf.command[choice]);
+docommandchoice(choice);
+}
+}
+
+
+
+void
doboottypemenu(void)
{
int choice;
- char input[80], *ic, *oc;
+ char input[80];
printf(\n);
/* Display menu */
@@ -567,27 +625,7 @@ doboottypemenu(void)
printf(type \?\ or \help\ for help.\n);
bootmenu(); /* does not return */
} else {
- ic = bootconf.command[choice];
- /* Split command string at ; into separate commands */
- do {
-oc = input;
-/* Look for ; separator */
-for (; *ic *ic != COMMAND_SEPARATOR; ic++)
- *oc++ = *ic;
-if (*input == '\0')
- continue;
-/* Strip out any trailing spaces */
-oc--;
-for (; *oc ==' ' oc input; oc--);
-*++oc = '\0';
-if (*ic == COMMAND_SEPARATOR)
- ic++;
-/* Stop silly command strings like ;;; */
-if (*input != '\0')
- docommand(input);
-/* Skip leading spaces */
-for (; *ic == ' '; ic++);
- } while (*ic);
+ docommandchoice(choice);
}
}
@@ -707,6 +745,9 @@ command_help(char *arg)
dev xd[N[x]]:\n
consdev {pc|com[0123]|com[0123]kbd|auto}\n
modules {enabled|disabled}\n
+#ifndef SMALL
+ menu (reenters boot menu, if defined in boot.cfg)\n
+#endif
load {path_to_module}\n
multiboot [xdNx:][filename] [args]\n
help|?\n
@@ -740,10 +781,25 @@ void
command_boot(char *arg)
{
char *filename;
- int howto;
+ int howto, tell;
- if (parseboot(arg, filename, howto))
-
CVS commit: [netbsd-5] src/doc
Module Name:src
Committed By: bouyer
Date: Sat Sep 7 17:30:22 UTC 2013
Modified Files:
src/doc [netbsd-5]: CHANGES-5.3
Log Message:
ticket 1867, 1870, 1872
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.23 -r1.1.2.24 src/doc/CHANGES-5.3
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/doc/CHANGES-5.3
diff -u src/doc/CHANGES-5.3:1.1.2.23 src/doc/CHANGES-5.3:1.1.2.24
--- src/doc/CHANGES-5.3:1.1.2.23 Tue Jul 30 02:29:49 2013
+++ src/doc/CHANGES-5.3 Sat Sep 7 17:30:22 2013
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-5.3,v 1.1.2.23 2013/07/30 02:29:49 msaitoh Exp $
+# $NetBSD: CHANGES-5.3,v 1.1.2.24 2013/09/07 17:30:22 bouyer Exp $
A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3
release:
@@ -461,3 +461,82 @@ usr.bin/mklocale/mklocaledb.c 1.3
Swap order of _CITRUS_LC_MONETARY_SYM_INT_N_CS_PRECEDES and
_CITRUS_LC_MONETARY_SYM_INT_P_SEP_BY_SPACE to match data files.
[joerg, ticket #1869]
+sys/dev/pci/if_wm.c 1.246-1.247, 1.249-1.258 via patch
+sys/dev/pci/if_wmreg.h 1.51, 1.53 via patch
+sys/dev/pci/if_wmvar.h 1.15-1.16 via patch
+sys/dev/pci/pcidevs 1.1152-1.1153 via patch
+sys/dev/pci/pcidevs.h regen
+sys/dev/pci/pcidevs_data.h regen
+
+ Add I21[0178] support.
+ Fix a bug that wm_attach() may fail on some PCH2 or newer system.
+ wm_valid_nvm_bank_detect_ich8lan() misunderstood the NVM's bank
+ number. Fixes PR#47878.
+ Fix a bug that the check of reset complete fails on Intel 8 series
+ with wm_lan_init_done: lan_init_done failed to complete message.
+ The broken code was used for ICH8, 9... and PCH2.
+ The wm_linkintr_gmii() function is called from interrupt. That's
+ not tick, so call mii_pollstat() instead of mii_tick().
+ Add ECC support for the packet buffer. Only 82571 and I21[78] support
+ ECC.
+ Fix a bug that wrong semaphore is used in wm_gmii_hv_{read,write}reg.
+ Add comments, fix some comments, use macros and remove trailing
+ whitespaces.
+ [msaitoh, ticket #1867]
+
+doc/3RDPARTY patch
+share/zoneinfo/africa patch
+share/zoneinfo/asia patch
+share/zoneinfo/australasia patch
+share/zoneinfo/europe patch
+share/zoneinfo/iso3166.tab patch
+share/zoneinfo/southamerica patch
+share/zoneinfo/zone.tab patch
+
+ Import tzdata2013d from
+ ftp://ftp.iana.org/tz/releases/tzdata2013d.tar.gz
+ Summary of changes from tzdata2013c to tzdata2013d:
+ Changes affecting current and future time stamps:
+ Morocco's midsummer transitions this year are July 7 and August 10,
+ not July 9 and August 8. (Thanks to Andrew Paprocki.)
+
+ Israel now falls back on the last Sunday of October.
+ (Thanks to Ephraim Silverberg.)
+
+ Changes affecting past time stamps:
+ Specify Jerusalem's location more precisely; this changes the
+ pre-1880 times by 2 s.
+
+ Changing affecting metadata only:
+ Fix typos in the entries for country codes BQ and SX.
+
+ Changes affecting documentation and commentary:
+ Deemphasize the significance of national borders.
+
+ Update the zdump man page.
+
+ Remove obsolete NOID comment (thanks to Denis Excoffier).
+
+ Update several URLs and comments in the web pages.
+
+ Spelling fixes (thanks to Kevin Lyda and Jonathan Leffler).
+
+ Update URL for CLDR Zone-Tzid table (thanks to Yoshito Umaoka).
+ [apb, ticket #1870]
+
+sys/arch/i386/stand/boot/boot2.c 1.59 via patch
+
+ Two changes for the i386 boot loader related to the boot menu which
+ can be defined in boot.cfg:
+
+ * Add a menu command which re-displays the menu and initiates
+ the timed countdown
+ * Use any default command defined in boot.cfg as default args
+ if the user runs boot with no arguments
+
+ This is useful in circumstances where you e.g. need to interrupt
+ the normal boot process to switch to serial console, and where
+ simply boot netbsd is no longer sufficient (e.g. as with install
+ media which needs the miniroot kernel module loaded).
+ [he, ticket #1872]
+
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sat Sep 7 17:58:00 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: Makefile.rumpkern rump.c rump_private.h
Added Files:
src/sys/rump/librump/rumpkern: cons.c
Log Message:
Add an initial console device and open fd's 0/1/2 for initproc. This is
again useful in standalone-type environments such as Xen, where all
printf/etc calls go through the rump kernel.
To generate a diff of this commit:
cvs rdiff -u -r1.131 -r1.132 src/sys/rump/librump/rumpkern/Makefile.rumpkern
cvs rdiff -u -r0 -r1.1 src/sys/rump/librump/rumpkern/cons.c
cvs rdiff -u -r1.273 -r1.274 src/sys/rump/librump/rumpkern/rump.c
cvs rdiff -u -r1.75 -r1.76 src/sys/rump/librump/rumpkern/rump_private.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/rump/librump/rumpkern/Makefile.rumpkern
diff -u src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.131 src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.132
--- src/sys/rump/librump/rumpkern/Makefile.rumpkern:1.131 Tue Sep 3 21:32:21 2013
+++ src/sys/rump/librump/rumpkern/Makefile.rumpkern Sat Sep 7 17:58:00 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.rumpkern,v 1.131 2013/09/03 21:32:21 pooka Exp $
+# $NetBSD: Makefile.rumpkern,v 1.132 2013/09/07 17:58:00 pooka Exp $
#
.include ${RUMPTOP}/Makefile.rump
@@ -19,7 +19,7 @@ LIB= rump
#
# Source modules, first the ones specifically implemented for librump.
#
-SRCS+= rump.c rumpcopy.c emul.c intr.c lwproc.c klock.c \
+SRCS+= rump.c rumpcopy.c cons.c emul.c intr.c lwproc.c klock.c \
kobj_rename.c ltsleep.c scheduler.c \
signals.c sleepq.c threads.c vm.c cprng_stub.c
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.273 src/sys/rump/librump/rumpkern/rump.c:1.274
--- src/sys/rump/librump/rumpkern/rump.c:1.273 Wed Sep 4 17:56:08 2013
+++ src/sys/rump/librump/rumpkern/rump.c Sat Sep 7 17:58:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.273 2013/09/04 17:56:08 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.274 2013/09/07 17:58:00 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -26,7 +26,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.273 2013/09/04 17:56:08 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: rump.c,v 1.274 2013/09/07 17:58:00 pooka Exp $);
#include sys/systm.h
#define ELFSIZE ARCH_ELFSIZE
@@ -251,7 +251,7 @@ rump_init(void)
struct timespec ts;
int64_t sec;
long nsec;
- struct lwp *l;
+ struct lwp *l, *initlwp;
int i, numcpu;
/* not reentrant */
@@ -471,10 +471,10 @@ rump_init(void)
vmem_rehash_start();
/*
- * Create init, used to attach implicit threads in rump.
+ * Create init (proc 1), used to attach implicit threads in rump.
* (note: must be done after vfsinit to get cwdi)
*/
- (void)rump__lwproc_alloclwp(NULL); /* dummy thread for initproc */
+ initlwp = rump__lwproc_alloclwp(NULL);
mutex_enter(proc_lock);
initproc = proc_find_raw(1);
mutex_exit(proc_lock);
@@ -542,8 +542,14 @@ rump_init(void)
rump_component_init(RUMP_COMPONENT_POSTINIT);
- /* release cpu */
+ /* component inits done */
bootlwp = NULL;
+
+ /* open 0/1/2 for init */
+ rump_lwproc_switch(initlwp);
+ rump_consdev_init();
+
+ /* release cpu */
rump_unschedule();
return 0;
Index: src/sys/rump/librump/rumpkern/rump_private.h
diff -u src/sys/rump/librump/rumpkern/rump_private.h:1.75 src/sys/rump/librump/rumpkern/rump_private.h:1.76
--- src/sys/rump/librump/rumpkern/rump_private.h:1.75 Tue Sep 3 19:55:13 2013
+++ src/sys/rump/librump/rumpkern/rump_private.h Sat Sep 7 17:58:00 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rump_private.h,v 1.75 2013/09/03 19:55:13 pooka Exp $ */
+/* $NetBSD: rump_private.h,v 1.76 2013/09/07 17:58:00 pooka Exp $ */
/*
* Copyright (c) 2007-2011 Antti Kantee. All Rights Reserved.
@@ -145,4 +145,6 @@ void rump_xc_highpri(struct cpu_info *);
void rump_thread_init(void);
void rump_thread_allow(void);
+void rump_consdev_init(void);
+
#endif /* _SYS_RUMP_PRIVATE_H_ */
Added files:
Index: src/sys/rump/librump/rumpkern/cons.c
diff -u /dev/null src/sys/rump/librump/rumpkern/cons.c:1.1
--- /dev/null Sat Sep 7 17:58:00 2013
+++ src/sys/rump/librump/rumpkern/cons.c Sat Sep 7 17:58:00 2013
@@ -0,0 +1,133 @@
+/* $NetBSD: cons.c,v 1.1 2013/09/07 17:58:00 pooka Exp $ */
+
+/*
+ * Copyright (c) 2013 Antti Kantee. All Rights Reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sat Sep 7 18:17:35 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: cons.c
Log Message:
fix -Wuninitialized
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/rump/librump/rumpkern/cons.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/rump/librump/rumpkern/cons.c
diff -u src/sys/rump/librump/rumpkern/cons.c:1.1 src/sys/rump/librump/rumpkern/cons.c:1.2
--- src/sys/rump/librump/rumpkern/cons.c:1.1 Sat Sep 7 17:58:00 2013
+++ src/sys/rump/librump/rumpkern/cons.c Sat Sep 7 18:17:35 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.1 2013/09/07 17:58:00 pooka Exp $ */
+/* $NetBSD: cons.c,v 1.2 2013/09/07 18:17:35 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.1 2013/09/07 17:58:00 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.2 2013/09/07 18:17:35 pooka Exp $);
#include sys/param.h
#include sys/file.h
@@ -102,7 +102,7 @@ rumpcons_write(struct file *fp, off_t *o
{
char *buf;
size_t len, n;
- int error;
+ int error = 0;
buf = kmem_alloc(PAGE_SIZE, KM_SLEEP);
while (uio-uio_resid 0) {
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: chs
Date: Sat Sep 7 18:55:29 UTC 2013
Modified Files:
src/sys/dev/ic: smc91cxx.c
Log Message:
apply changes from Robert Sprowson in PR 47765 and PR 47788:
- make sure we wait long enough after resetting the chip.
- add the necessary delay after changing the FIFO pointer.
- add a missing interrupt ACK.
- fix padding of short and odd-length packets.
and a few more changes from me:
- do 2-byte writes in most places even if SMC91CXX_NO_BYTE_WRITE
is not defined. the only ones still conditionalized are
writing to the interrupt ack/mask registers.
- the only big-endian front-end of this driver (on mac68k) uses
a bus_space that does all the byte-swapping in that layer,
so remove the explicit byte-swapping in the MI part.
tested on mac68k.
To generate a diff of this commit:
cvs rdiff -u -r1.84 -r1.85 src/sys/dev/ic/smc91cxx.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/ic/smc91cxx.c
diff -u src/sys/dev/ic/smc91cxx.c:1.84 src/sys/dev/ic/smc91cxx.c:1.85
--- src/sys/dev/ic/smc91cxx.c:1.84 Tue Jun 11 16:57:05 2013
+++ src/sys/dev/ic/smc91cxx.c Sat Sep 7 18:55:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: smc91cxx.c,v 1.84 2013/06/11 16:57:05 msaitoh Exp $ */
+/* $NetBSD: smc91cxx.c,v 1.85 2013/09/07 18:55:29 chs Exp $ */
/*-
* Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -71,7 +71,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: smc91cxx.c,v 1.84 2013/06/11 16:57:05 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: smc91cxx.c,v 1.85 2013/09/07 18:55:29 chs Exp $);
#include opt_inet.h
@@ -126,7 +126,7 @@ __KERNEL_RCSID(0, $NetBSD: smc91cxx.c,v
/* XXX Hardware padding doesn't work yet(?) */
#define SMC91CXX_SW_PAD
-const char *smc91cxx_idstrs[] = {
+static const char *smc91cxx_idstrs[] = {
NULL,/* 0 */
NULL,/* 1 */
NULL,/* 2 */
@@ -146,7 +146,7 @@ const char *smc91cxx_idstrs[] = {
};
/* Supported media types. */
-const int smc91cxx_media[] = {
+static const int smc91cxx_media[] = {
IFM_ETHER|IFM_10_T,
IFM_ETHER|IFM_10_5,
};
@@ -158,7 +158,7 @@ const int smc91cxx_media[] = {
u_int32_t smc91cxx_mii_bitbang_read(device_t);
void smc91cxx_mii_bitbang_write(device_t, u_int32_t);
-const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = {
+static const struct mii_bitbang_ops smc91cxx_mii_bitbang_ops = {
smc91cxx_mii_bitbang_read,
smc91cxx_mii_bitbang_write,
{
@@ -208,12 +208,8 @@ smc91cxx_intr_mask_write(bus_space_tag_t
{
KDASSERT((mask IM_ERCV_INT) == 0);
#ifdef SMC91CXX_NO_BYTE_WRITE
-#if BYTE_ORDER == LITTLE_ENDIAN
bus_space_write_2(bst, bsh, INTR_STAT_REG_B, mask 8);
#else
- bus_space_write_2(bst, bsh, INTR_STAT_REG_B, mask);
-#endif
-#else
bus_space_write_1(bst, bsh, INTR_MASK_REG_B, mask);
#endif
KDASSERT(!(bus_space_read_1(bst, bsh, INTR_MASK_REG_B) IM_ERCV_INT));
@@ -221,18 +217,12 @@ smc91cxx_intr_mask_write(bus_space_tag_t
static inline void
smc91cxx_intr_ack_write(bus_space_tag_t bst, bus_space_handle_t bsh,
- uint8_t mask)
+ uint8_t ack, uint8_t mask)
{
#ifdef SMC91CXX_NO_BYTE_WRITE
-#if BYTE_ORDER == LITTLE_ENDIAN
- bus_space_write_2(bst, bsh, INTR_ACK_REG_B,
- mask | (bus_space_read_2(bst, bsh, INTR_ACK_REG_B) 0xff00));
+ bus_space_write_2(bst, bsh, INTR_ACK_REG_B, ack | (mask 8));
#else
- bus_space_write_2(bst, bsh, INTR_ACK_REG_B,
- (mask 8) | (bus_space_read_2(bst, bsh, INTR_ACK_REG_B) 0xff));
-#endif
-#else
- bus_space_write_1(bst, bsh, INTR_ACK_REG_B, mask);
+ bus_space_write_1(bst, bsh, INTR_ACK_REG_B, ack);
#endif
KDASSERT(!(bus_space_read_1(bst, bsh, INTR_MASK_REG_B) IM_ERCV_INT));
}
@@ -254,7 +244,8 @@ smc91cxx_attach(struct smc91cxx_softc *s
tmp = bus_space_read_2(bst, bsh, BANK_SELECT_REG_W);
/* check magic number */
if ((tmp BSR_DETECT_MASK) != BSR_DETECT_VALUE) {
- aprint_error_dev(sc-sc_dev, failed to detect chip, bsr=%04x\n, tmp);
+ aprint_error_dev(sc-sc_dev,
+ failed to detect chip, bsr=%04x\n, tmp);
return;
}
@@ -285,7 +276,8 @@ smc91cxx_attach(struct smc91cxx_softc *s
scale = MIR_SCALE_91C111;
}
memsize = bus_space_read_2(bst, bsh, MEM_INFO_REG_W) MIR_TOTAL_MASK;
- if (memsize == 255) memsize++;
+ if (memsize == 255)
+ memsize++;
memsize *= scale * mult;
format_bytes(pbuf, sizeof(pbuf), memsize);
@@ -344,7 +336,8 @@ smc91cxx_attach(struct smc91cxx_softc *s
if (tmp CR_MII_SELECT) {
aprint_normal(default media MII);
if (sc-sc_chipid == CHIP_91C111) {
-aprint_normal( (%s PHY)\n, (tmp CR_AUI_SELECT) ?
+aprint_normal( (%s PHY)\n,
+(tmp CR_AUI_SELECT) ?
external : internal);
sc-sc_internal_phy = !(tmp CR_AUI_SELECT);
} else
@@ -373,7 +366,8 @@ smc91cxx_attach(struct smc91cxx_softc *s
}
/*FALLTHROUGH*/
default:
- aprint_normal(default media %s\n, (aui = (tmp CR_AUI_SELECT)) ?
+ aprint_normal(default media %s\n,
+ (aui = (tmp
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Sat Sep 7 19:47:28 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_gpio.c awin_reg.h awin_var.h
src/sys/arch/evbarm/cubie: cubie_machdep.c
Log Message:
Finish off GPIO handler. Add hook for other driver to access a named gpio.
Add two input gpio's for usb0.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/arm/allwinner/awin_gpio.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_reg.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_var.h
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/cubie/cubie_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/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.3 src/sys/arch/arm/allwinner/awin_gpio.c:1.4
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.3 Sat Sep 7 02:09:23 2013
+++ src/sys/arch/arm/allwinner/awin_gpio.c Sat Sep 7 19:47:28 2013
@@ -28,15 +28,17 @@
*/
#include locators.h
+#include gpio.h
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.3 2013/09/07 02:09:23 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.4 2013/09/07 19:47:28 matt Exp $);
#include sys/bus.h
#include sys/device.h
#include sys/intr.h
#include sys/systm.h
+#include sys/kmem.h
#include sys/gpio.h
@@ -48,6 +50,10 @@ __KERNEL_RCSID(1, $NetBSD: awin_gpio.c,
static int awin_gpio_match(device_t, cfdata_t, void *);
static void awin_gpio_attach(device_t, device_t, void *);
+static int awin_gpio_pin_read(void *, int);
+static void awin_gpio_pin_write(void *, int, int);
+static void awin_gpio_pin_ctl(void *, int, int);
+
static const int ist_maps[] = {
[IST_LEVEL_LOW] = AWIN_PIO_EINT_LOW_LEVEL,
[IST_LEVEL_HIGH] = AWIN_PIO_EINT_HIGH_LEVEL,
@@ -57,7 +63,9 @@ static const int ist_maps[] = {
};
struct awin_gpio_pin_cfg {
- uint32_t val[4];
+ uint32_t cfg[4];
+ uint32_t drv[2];
+ uint32_t pul[2];
};
static struct awin_gpio_pin_group {
@@ -65,21 +73,101 @@ static struct awin_gpio_pin_group {
uint32_t grp_pin_inuse_mask;
bus_space_handle_t grp_bsh;
struct awin_gpio_pin_cfg grp_cfg;
+ struct gpio_chipset_tag grp_gc_tag;
+ const char grp_nc_name[6];
} pin_groups[] = {
- [0] = { .grp_pin_mask = __BIT(AWIN_PIO_PA_PINS) - 1 },
- [1] = { .grp_pin_mask = __BIT(AWIN_PIO_PB_PINS) - 1 },
- [2] = { .grp_pin_mask = __BIT(AWIN_PIO_PC_PINS) - 1 },
- [3] = { .grp_pin_mask = __BIT(AWIN_PIO_PD_PINS) - 1 },
- [4] = { .grp_pin_mask = __BIT(AWIN_PIO_PE_PINS) - 1 },
- [5] = { .grp_pin_mask = __BIT(AWIN_PIO_PF_PINS) - 1 },
- [6] = { .grp_pin_mask = __BIT(AWIN_PIO_PG_PINS) - 1 },
- [7] = { .grp_pin_mask = __BIT(AWIN_PIO_PH_PINS) - 1 },
- [8] = { .grp_pin_mask = __BIT(AWIN_PIO_PI_PINS) - 1 },
+ [0] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PA_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[0],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pa,
+ },
+ [1] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PB_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[1],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pb,
+ },
+ [2] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PC_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[2],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pc,
+ },
+ [3] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PD_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[3],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pd,
+ },
+ [4] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PE_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[4],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pe,
+ },
+ [5] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PF_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[5],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pf,
+ },
+ [6] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PG_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[6],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-pg,
+ },
+ [7] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PH_PINS) - 1,
+ .grp_gc_tag = {
+ .gp_cookie = pin_groups[7],
+ .gp_pin_read = awin_gpio_pin_read,
+ .gp_pin_write = awin_gpio_pin_write,
+ .gp_pin_ctl = awin_gpio_pin_ctl,
+ },
+ .grp_nc_name = nc-ph,
+ },
+ [8] = {
+ .grp_pin_mask = __BIT(AWIN_PIO_PI_PINS) - 1,
+
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sat Sep 7 19:48:57 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_ahcisata.c awin_usb.c
Added Files:
src/sys/arch/arm/allwinner: sdxcreg.h
Log Message:
Add more initialization code for AHCI and USB.
Alas, neither still is coming up.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_ahcisata.c
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/allwinner/awin_usb.c
cvs rdiff -u -r0 -r1.1 src/sys/arch/arm/allwinner/sdxcreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_ahcisata.c
diff -u src/sys/arch/arm/allwinner/awin_ahcisata.c:1.4 src/sys/arch/arm/allwinner/awin_ahcisata.c:1.5
--- src/sys/arch/arm/allwinner/awin_ahcisata.c:1.4 Sat Sep 7 02:10:02 2013
+++ src/sys/arch/arm/allwinner/awin_ahcisata.c Sat Sep 7 19:48:57 2013
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.4 2013/09/07 02:10:02 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.5 2013/09/07 19:48:57 matt Exp $);
#include sys/param.h
#include sys/bus.h
@@ -50,6 +50,7 @@ static void awin_ahci_attach(device_t, d
struct awin_ahci_softc {
struct ahci_softc asc_sc;
+ struct awin_gpio_pindata asc_gpio_pin;
void *asc_ih;
};
@@ -73,6 +74,70 @@ awin_ahci_match(device_t parent, cfdata_
}
static void
+awin_ahci_phy_init(struct awin_ahci_softc *asc)
+{
+ bus_space_tag_t bst = asc-asc_sc.sc_ahcit;
+ bus_space_handle_t bsh = asc-asc_sc.sc_ahcih;
+ u_int timeout;
+ uint32_t v;
+
+ /*
+ * This is dark magic.
+ */
+ bus_space_write_4(bst, bsh, AWIN_AHCI_RWCR_REG, 0);
+ delay(2);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG, __BIT(19), 0);
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
+ __BIT(23)|__BIT(18)|__SHIFTIN(5, __BITS(26,24)),
+ __BITS(26,24));
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
+ __BIT(17)|__BITS(10,9)|__BIT(7),
+ __BIT(16)|__BITS(12,11)|__BIT(8)|__BIT(6));
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
+ __BIT(28)|__BIT(15), 0);
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG, 0, __BIT(19));
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS0R_REG,
+ __BITS(21,20), __BIT(22));
+ delay(1);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS2R_REG,
+ __BITS(9,8)|__BIT(5), __BITS(7,6));
+ delay(2);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS0R_REG, __BIT(19), 0);
+ delay(2);
+
+ timeout = 10;
+ do {
+ delay(1);
+ v = bus_space_read_4(bst, bsh, AWIN_AHCI_PHYCS0R_REG);
+ } while (--timeout __SHIFTOUT(v, __BITS(30,28)) != 2);
+
+ if (!timeout) {
+ aprint_error_dev(
+ asc-asc_sc.sc_atac.atac_dev,
+ SATA PHY power failed (%#x)\n, v);
+ }
+
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS2R_REG, __BIT(24), 0);
+ timeout = 10;
+ do {
+ delay(1);
+ v = bus_space_read_4(bst, bsh, AWIN_AHCI_PHYCS0R_REG);
+ } while (--timeout (v __BIT(24)));
+
+ if (!timeout) {
+ aprint_error_dev(
+ asc-asc_sc.sc_atac.atac_dev,
+ SATA PHY calibration failed (%#x)\n, v);
+ }
+ bus_space_write_4(bst, bsh, AWIN_AHCI_RWCR_REG, 7);
+}
+
+static void
awin_ahci_enable(bus_space_tag_t bst, bus_space_handle_t bsh)
{
/*
@@ -85,7 +150,7 @@ awin_ahci_enable(bus_space_tag_t bst, bu
*/
awin_reg_set_clear(bst, bsh, AWIN_AHB_GATING0_REG,
AWIN_AHB_GATING0_SATA, 0);
- delay(1);
+ delay(1000);
/*
* Now turn it on.
@@ -114,6 +179,28 @@ awin_ahci_attach(device_t parent, device
aprint_naive(: AHCI SATA controller\n);
aprint_normal(: AHCI SATA controller\n);
+ /*
+ * Bring up the PHY.
+ */
+ awin_ahci_phy_init(asc);
+
+ /*
+ * If there is a GPIO to turn on power, do it now.
+ */
+ const char *pin_name;
+ prop_dictionary_t dict = device_properties(self);
+ if (prop_dictionary_get_cstring_nocopy(dict, power-gpio, pin_name)) {
+ if (awin_gpio_pin_reserve(pin_name, asc-asc_gpio_pin)) {
+ awin_gpio_pindata_write(asc-asc_gpio_pin, 1);
+ } else {
+ aprint_error_dev(self,
+ failed to reserve GPIO \%s\\n, pin_name);
+ }
+ }
+
+ /*
+ * Establish the interrupt
+ */
asc-asc_ih = intr_establish(loc-loc_intr, IPL_VM, IST_LEVEL,
ahci_intr, sc);
if (asc-asc_ih == NULL) {
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.6 src/sys/arch/arm/allwinner/awin_usb.c:1.7
--- src/sys/arch/arm/allwinner/awin_usb.c:1.6 Sat Sep 7 10:46:18 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c Sat Sep 7 19:48:57 2013
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.6 2013/09/07 10:46:18 jmcneill Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.7 2013/09/07 19:48:57 matt Exp $);
#include sys/bus.h
#include sys/device.h
@@ -67,6 +67,9 @@ struct awinusb_softc {
bus_space_tag_t usbsc_bst;
bus_space_handle_t
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: matt
Date: Sat Sep 7 19:53:24 UTC 2013
Modified Files:
src/sys/dev/usb: ehci.c
Log Message:
Fix a typo in a comment.
To generate a diff of this commit:
cvs rdiff -u -r1.210 -r1.211 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.210 src/sys/dev/usb/ehci.c:1.211
--- src/sys/dev/usb/ehci.c:1.210 Sat Sep 7 16:43:48 2013
+++ src/sys/dev/usb/ehci.c Sat Sep 7 19:53:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.210 2013/09/07 16:43:48 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.211 2013/09/07 19:53:24 matt Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.210 2013/09/07 16:43:48 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.211 2013/09/07 19:53:24 matt Exp $);
#include ohci.h
#include uhci.h
@@ -358,8 +358,10 @@ ehci_init(ehci_softc_t *sc)
sc-sc_doorbell_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
ehci_doorbell, sc);
+ KASSERT(sc-sc_doorbell_si != NULL);
sc-sc_pcd_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
ehci_pcd, sc);
+ KASSERT(sc-sc_pcd_si != NULL);
sc-sc_offs = EREAD1(sc, EHCI_CAPLENGTH);
@@ -653,6 +655,7 @@ ehci_intr1(ehci_softc_t *sc)
if (eintrs EHCI_STS_IAA) {
DPRINTF((ehci_intr1: door bell\n));
kpreempt_disable();
+ KASSERT(sc-sc_doorbell_si != NULL);
softint_schedule(sc-sc_doorbell_si);
kpreempt_enable();
eintrs = ~EHCI_STS_IAA;
@@ -671,6 +674,7 @@ ehci_intr1(ehci_softc_t *sc)
}
if (eintrs EHCI_STS_PCD) {
kpreempt_disable();
+ KASSERT(sc-sc_pcd_si != NULL);
softint_schedule(sc-sc_pcd_si);
kpreempt_enable();
eintrs = ~EHCI_STS_PCD;
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: matt Date: Sat Sep 7 22:51:03 UTC 2013 Modified Files: src/sys/arch/arm/allwinner: awin_reg.h Log Message: start adding NFC registers fix AWIN_AHB_GATING0_USB_OHCI0 To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.5 src/sys/arch/arm/allwinner/awin_reg.h:1.6 --- src/sys/arch/arm/allwinner/awin_reg.h:1.5 Sat Sep 7 19:47:28 2013 +++ src/sys/arch/arm/allwinner/awin_reg.h Sat Sep 7 22:51:03 2013 @@ -224,6 +224,87 @@ #define AWIN_DRAM_HPCR_PRIORITY_LEVEL __BIT(2) #define AWIN_DRAM_HPCR_ACCESS_EN __BIT(0) +#define AWIN_NFC_CTL_REG 0x +#define AWIN_NFC_ST_REG 0x0004 +#define AWIN_NFC_INT_REG 0x0008 +#define AWIN_NFC_TIMING_CTL_REG 0x000C +#define AWIN_NFC_TIMING_CFG_REG 0x0010 +#define AWIN_NFC_ADDR_LOW_REG 0x0014 +#define AWIN_NFC_ADDR_HIGH_REG 0x0018 +#define AWIN_NFC_SECTOR_NUM_REG 0x001C +#define AWIN_NFC_CNT_REG 0x0020 +#define AWIN_NFC_CMD_REG 0x0024 +#define AWIN_NFC_READ_CMD_SET_REG 0x0028 +#define AWIN_NFC_WRITE_CMD_SET_REG 0x002C +#define AWIN_NFC_IO_DATA_REG 0x0030 +#define AWIN_NFC_ECC_CTL_REG 0x0034 +#define AWIN_NFC_ECC_ST_REG 0x0038 +#define AWIN_NFC_DEBUG_REG 0x003C +#define AWIN_NFC_ECC_CNT0_REG 0x0040 +#define AWIN_NFC_ECC_CNT1_REG 0x0044 +#define AWIN_NFC_ECC_CNT2_REG 0x0048 +#define AWIN_NFC_ECC_CNT3_REG 0x004C +#define AWIN_NFC_USER_DB_REG 0x0050 +#define AWIN_NFC_RAM0_REG 0x0400 +#define AWIN_NFC_RAM1_REG 0x0800 + +#define AWIN_NFC_CTL_DEBUG __BIT(31) +#define AWIN_NFC_CTL_CE_SEL __BITS(26,24) +#define AWIN_NFC_CTL_RAM_METHOD __BIT(14) +#define AWIN_NFC_CTL_SAM __BIT(12) +#define AWIN_NFC_CTL_PAGE_SIZE __BITS(11,8) +#define AWIN_NFC_CTL_PAGE_SIZE_1K 0 +#define AWIN_NFC_CTL_PAGE_SIZE_2K 1 +#define AWIN_NFC_CTL_PAGE_SIZE_4K 2 +#define AWIN_NFC_CTL_PAGE_SIZE_8K 3 +#define AWIN_NFC_CTL_PAGE_SIZE_16K 4 +#define AWIN_NFC_CTL_CE_CTL1 __BIT(7) +#define AWIN_NFC_CTL_CE_CTL0 __BIT(6) +#define AWIN_NFC_CTL_RB_SEL1 __BIT(3) +#define AWIN_NFC_CTL_BUS_WIDTH16 __BIT(2) +#define AWIN_NFC_CTL_RESET __BIT(1) +#define AWIN_NFC_CTL_EN __BIT(0) + +#define AWIN_NFC_ST_STATE3 __BIT(11) +#define AWIN_NFC_ST_STATE2 __BIT(10) +#define AWIN_NFC_ST_STATE1 __BIT(9) +#define AWIN_NFC_ST_STATE0 __BIT(8) +#define AWIN_NFC_ST_MATCH_INT __BIT(5) +#define AWIN_NFC_ST_STAT __BIT(4) +#define AWIN_MFC_ST_CMD_FIFO __BIT(3) +#define AWIN_MFC_ST_DMA_INT __BIT(2) +#define AWIN_MFC_ST_CMD_INT __BIT(1) +#define AWIN_MFC_ST_RB_B2R __BIT(0) + +#define AWIN_NFC_INT_DMA_EN __BIT(2) +#define AWIN_NFC_INT_CMD_EN __BIT(1) +#define AWIN_NFC_INT_B2R_EN __BIT(0) + +#define AWIN_NFC_CMD_CMD_TYPE __BITS(31,30) +#define AWIN_NFC_CMD_SEND_CMD3 __BIT(29) +#define AWIN_NFC_CMD_SEND_CMD2 __BIT(28) +#define AWIN_NFC_CMD_ROW_AUTO_INC __BIT(27) +#define AWIN_NFC_CMD_DATA_SWAP __BIT(26) +#define AWIN_NFC_CMD_SEQ __BIT(25) +#define AWIN_NFC_CMD_SEND_CMD1 __BIT(24) +#define AWIN_NFC_CMD_WAIT_FLAG __BIT(23) +#define AWIN_NFC_CMD_SEND_CMD0 __BIT(22) +#define AWIN_NFC_CMD_DATA_TRANS __BIT(21) +#define AWIN_NFC_CMD_XS_DIR __BIT(20) +#define AWIN_NFC_CMD_SEND_ADDR __BIT(19) +#define AWIN_NFC_CMD_ADDR_NUM __BITS(18,16) +#define AWIN_NFC_CMD_HIGH __BITS(15,8) +#define AWIN_NFC_CMD_LOW __BITS(7,0) + +#define AWIN_NFC_READ_CMD_SET_RAMDOM_CMD1 __BITS(23,16) +#define AWIN_NFC_READ_CMD_SET_RANDOM_CMD0 __BITS(15,8) +#define AWIN_NFC_READ_CMD_SET_CMD __BITS(7,0) + +#define AWIN_NFC_WRITE_CMD_SET_RANDOM_CMD0 __BITS(15,8) +#define AWIN_NFC_WRITE_CMD_SET_CMD __BITS(7,0) + +#define AWIN_ECC_CTL_EN __BIT(0) + #define AWIN_EMAC_CTL_REG 0x #define AWIN_EMAC_TX_MODE_REG 0x0004 #define AWIN_EMAC_TX_FLOW_REG 0x0008 @@ -416,7 +497,7 @@ #define AWIN_AHB_GATING0_SS __BIT(5) #define AWIN_AHB_GATING0_USB_OHCI1 __BIT(4) #define AWIN_AHB_GATING0_USB_EHCI1 __BIT(3) -#define AWIN_AHB_GATING0_USB_OHCI0 __BIT(1) +#define AWIN_AHB_GATING0_USB_OHCI0 __BIT(2) #define AWIN_AHB_GATING0_USB_EHCI0 __BIT(1) #define AWIN_AHB_GATING0_USB0 __BIT(0) @@ -532,7 +613,7 @@ #define AWIN_EHCI_SIZE 0x0400 #define AWIN_OHCI_OFFSET 0x0400 #define AWIN_OHCI_SIZE 0x0400 -#define AWIN_USB_PMU_IRQ_REG 0x0800 +#define AWIN_USB_PMU_IRQ_REG 0x0800 #define AWIN_USB0_PHY_CSR_ADDR __BITS(15,8) #define AWIN_USB0_PHY_CSR_DAT __BIT(7) @@ -540,10 +621,10 @@ #define AWIN_USB0_PHY_CSR_CLK1 __BIT(1) #define AWIN_USB0_PHY_CSR_CLK0 __BIT(0) -#define AWIN_USB_PMU_IRQ_AHB_INCR8 __BIT(10) -#define AWIN_USB_PMU_IRQ_AHB_INCR4 __BIT(9) -#define AWIN_USB_PMU_IRQ_AHB_INCRX __BIT(8) -#define AWIN_USB_PMU_IRQ_ULPI_BYPASS __BIT(0) +#define AWIN_USB_PMU_IRQ_AHB_INCR8 __BIT(10) +#define AWIN_USB_PMU_IRQ_AHB_INCR4 __BIT(9) +#define AWIN_USB_PMU_IRQ_AHB_INCRX __BIT(8) +#define AWIN_USB_PMU_IRQ_ULPI_BYPASS
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sat Sep 7 22:51:41 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
Log Message:
Simplify USB initialization.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.7 src/sys/arch/arm/allwinner/awin_usb.c:1.8
--- src/sys/arch/arm/allwinner/awin_usb.c:1.7 Sat Sep 7 19:48:57 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c Sat Sep 7 22:51:41 2013
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.7 2013/09/07 19:48:57 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.8 2013/09/07 22:51:41 matt Exp $);
#include sys/bus.h
#include sys/device.h
@@ -89,14 +89,6 @@ struct awinusb_attach_args {
#if NOHCI 0
static const int awinusb_ohci_irqs[2] = { AWIN_IRQ_USB3, AWIN_IRQ_USB4 };
-static const uint32_t awinusb_ohci_ahb_gating[2] = {
- AWIN_AHB_GATING0_USB_OHCI0, AWIN_AHB_GATING0_USB_OHCI1,
-};
-static const uint32_t awinusb_ohci_usb_clk_set[2] = {
- AWIN_USB_CLK_OHCI0_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
- AWIN_USB_CLK_OHCI1_ENABLE|AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
-};
-
#ifdef OHCI_DEBUG
#define OHCI_DPRINTF(x) if (ohcidebug) printf x
@@ -131,12 +123,6 @@ ohci_awinusb_attach(device_t parent, dev
sc-sc_dev = self;
- awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
- AWIN_AHB_GATING0_REG, awinusb_ohci_ahb_gating[usbaa-usbaa_port],
- 0);
- awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
- AWIN_USB_CLK_REG, awinusb_ohci_usb_clk_set[usbaa-usbaa_port], 0);
-
sc-iot = usbaa-usbaa_bst;
sc-ioh = usbaa-usbaa_bsh;
sc-sc_size = usbaa-usbaa_size;
@@ -181,9 +167,6 @@ static int ehci_awinusb_match(device_t,
static void ehci_awinusb_attach(device_t, device_t, void *);
static const int awinusb_ehci_irqs[2] = { AWIN_IRQ_USB1, AWIN_IRQ_USB2 };
-static const uint32_t awinusb_ehci_ahb_gating[2] = {
- AWIN_AHB_GATING0_USB_EHCI0, AWIN_AHB_GATING0_USB_EHCI1,
-};
CFATTACH_DECL_NEW(ehci_awinusb, sizeof(struct ehci_softc),
ehci_awinusb_match, ehci_awinusb_attach, NULL, NULL);
@@ -208,10 +191,6 @@ ehci_awinusb_attach(device_t parent, dev
sc-sc_dev = self;
- awin_reg_set_clear(usbaa-usbaa_bst, usbaa-usbaa_ccm_bsh,
- AWIN_AHB_GATING0_REG, awinusb_ehci_ahb_gating[usbaa-usbaa_port],
- 0);
-
sc-iot = usbaa-usbaa_bst;
sc-ioh = usbaa-usbaa_bsh;
sc-sc_size = usbaa-usbaa_size;
@@ -298,6 +277,26 @@ static const bus_size_t awinusb_dram_hpc
AWIN_DRAM_HPCR_USB1_REG,
AWIN_DRAM_HPCR_USB2_REG,
};
+static const uint32_t awinusb_ahb_gating[2] = {
+#if NOHCI 0
+ AWIN_AHB_GATING0_USB_OHCI0 |
+#endif
+ AWIN_AHB_GATING0_USB_EHCI0,
+#if NOHCI 0
+ AWIN_AHB_GATING0_USB_OHCI1 |
+#endif
+ AWIN_AHB_GATING0_USB_EHCI1,
+};
+static const uint32_t awinusb_usb_clk_set[2] = {
+#if NOHCI 0
+ AWIN_USB_CLK_OHCI0_ENABLE |
+#endif
+ AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY1_ENABLE,
+#if NOHCI 0
+ AWIN_USB_CLK_OHCI1_ENABLE |
+#endif
+ AWIN_USB_CLK_USBPHY_ENABLE|AWIN_USB_CLK_PHY2_ENABLE,
+};
int
awinusb_match(device_t parent, cfdata_t cf, void *aux)
@@ -344,17 +343,24 @@ awinusb_attach(device_t parent, device_t
* Access to the USB phy is off USB0 so make sure it's on.
*/
awin_reg_set_clear(usbsc-usbsc_bst, aio-aio_ccm_bsh,
- AWIN_AHB_GATING0_REG, AWIN_AHB_GATING0_USB0, 0);
+ AWIN_AHB_GATING0_REG,
+ AWIN_AHB_GATING0_USB0 | awinusb_ahb_gating[loc-loc_port], 0);
+
+
+ /*
+ * Enable the USB phy for this port.
+ */
+ awin_reg_set_clear(usbsc-usbsc_bst, aio-aio_ccm_bsh,
+ AWIN_USB_CLK_REG, awinusb_usb_clk_set[loc-loc_port], 0);
+ /*
+ * Allow USB DMA engine access to the DRAM.
+ */
awin_reg_set_clear(usbsc-usbsc_bst, aio-aio_core_bsh,
loc-loc_offset + AWIN_USB_PMU_IRQ_REG,
AWIN_USB_PMU_IRQ_AHB_INCR8 | AWIN_USB_PMU_IRQ_AHB_INCR4
| AWIN_USB_PMU_IRQ_AHB_INCRX | AWIN_USB_PMU_IRQ_ULPI_BYPASS,
0);
-
- /*
- * Allow USB DMA engine access to the DRAM.
- */
awin_reg_set_clear(usbsc-usbsc_bst, aio-aio_core_bsh,
AWIN_DRAM_OFFSET + awinusb_dram_hpcr_regs[loc-loc_port],
AWIN_DRAM_HPCR_ACCESS_EN, 0);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sat Sep 7 22:52:12 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: CUBIEBOARD Log Message: Reenable OHCI To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/evbarm/conf/CUBIEBOARD Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/CUBIEBOARD diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.5 src/sys/arch/evbarm/conf/CUBIEBOARD:1.6 --- src/sys/arch/evbarm/conf/CUBIEBOARD:1.5 Sat Sep 7 02:46:26 2013 +++ src/sys/arch/evbarm/conf/CUBIEBOARD Sat Sep 7 22:52:12 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: CUBIEBOARD,v 1.5 2013/09/07 02:46:26 matt Exp $ +# $NetBSD: CUBIEBOARD,v 1.6 2013/09/07 22:52:12 matt Exp $ # # CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel # @@ -251,9 +251,9 @@ awinwdt* at awinio? # On-board USB awinusb0 at awinio0 port 0 awinusb1 at awinio0 port 1 -#ohci* at awinusb? +ohci* at awinusb? ehci* at awinusb? -#usb* at ohci? +usb* at ohci? usb* at ehci? # SATA (A20)
CVS commit: src/sys/arch/arm
Module Name:src Committed By: matt Date: Sat Sep 7 23:10:03 UTC 2013 Modified Files: src/sys/arch/arm/arm32: arm32_machdep.c cpu.c src/sys/arch/arm/include: locore.h Log Message: Add a machdep.hwdiv_present sysctl (cortex A7 and A15 have hwdiv instructions) To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/sys/arch/arm/arm32/arm32_machdep.c cvs rdiff -u -r1.98 -r1.99 src/sys/arch/arm/arm32/cpu.c cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/include/locore.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/arm32/arm32_machdep.c diff -u src/sys/arch/arm/arm32/arm32_machdep.c:1.96 src/sys/arch/arm/arm32/arm32_machdep.c:1.97 --- src/sys/arch/arm/arm32/arm32_machdep.c:1.96 Sun Aug 18 06:28:18 2013 +++ src/sys/arch/arm/arm32/arm32_machdep.c Sat Sep 7 23:10:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: arm32_machdep.c,v 1.96 2013/08/18 06:28:18 matt Exp $ */ +/* $NetBSD: arm32_machdep.c,v 1.97 2013/09/07 23:10:02 matt Exp $ */ /* * Copyright (c) 1994-1998 Mark Brinicombe. @@ -42,7 +42,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.96 2013/08/18 06:28:18 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: arm32_machdep.c,v 1.97 2013/09/07 23:10:02 matt Exp $); #include opt_modular.h #include opt_md.h @@ -100,6 +100,7 @@ extern paddr_t msgbufphys; int kernel_debug = 0; int cpu_fpu_present; +int cpu_hwdiv_present; int cpu_neon_present; int cpu_simd_present; int cpu_simdex_present; @@ -433,6 +434,11 @@ SYSCTL_SETUP(sysctl_machdep_setup, sysc CTL_MACHDEP, CTL_CREATE, CTL_EOL); sysctl_createv(clog, 0, NULL, NULL, CTLFLAG_PERMANENT|CTLFLAG_READONLY, + CTLTYPE_INT, hwdiv_present, NULL, + NULL, 0, cpu_hwdiv_present, 0, + CTL_MACHDEP, CTL_CREATE, CTL_EOL); + sysctl_createv(clog, 0, NULL, NULL, + CTLFLAG_PERMANENT|CTLFLAG_READONLY, CTLTYPE_INT, neon_present, NULL, NULL, 0, cpu_neon_present, 0, CTL_MACHDEP, CTL_CREATE, CTL_EOL); Index: src/sys/arch/arm/arm32/cpu.c diff -u src/sys/arch/arm/arm32/cpu.c:1.98 src/sys/arch/arm/arm32/cpu.c:1.99 --- src/sys/arch/arm/arm32/cpu.c:1.98 Sat Sep 7 00:32:54 2013 +++ src/sys/arch/arm/arm32/cpu.c Sat Sep 7 23:10:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: cpu.c,v 1.98 2013/09/07 00:32:54 matt Exp $ */ +/* $NetBSD: cpu.c,v 1.99 2013/09/07 23:10:02 matt Exp $ */ /* * Copyright (c) 1995 Mark Brinicombe. @@ -46,7 +46,7 @@ #include sys/param.h -__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.98 2013/09/07 00:32:54 matt Exp $); +__KERNEL_RCSID(0, $NetBSD: cpu.c,v 1.99 2013/09/07 23:10:02 matt Exp $); #include sys/systm.h #include sys/conf.h @@ -772,6 +772,8 @@ identify_features(device_t dv) cpu_instruction_set_attributes[4] = armreg_isar4_read(); cpu_instruction_set_attributes[5] = armreg_isar5_read(); + cpu_hwdiv_present = + ((cpu_instruction_set_attributes[0] 24) 0x0f) = 2; cpu_simd_present = ((cpu_instruction_set_attributes[3] 4) 0x0f) = 3; cpu_simdex_present = cpu_simd_present Index: src/sys/arch/arm/include/locore.h diff -u src/sys/arch/arm/include/locore.h:1.4 src/sys/arch/arm/include/locore.h:1.5 --- src/sys/arch/arm/include/locore.h:1.4 Fri Aug 23 05:22:01 2013 +++ src/sys/arch/arm/include/locore.h Sat Sep 7 23:10:02 2013 @@ -150,6 +150,7 @@ void cpu_attach(device_t, cpuid_t); /* 1 == use cpu_sleep(), 0 == don't */ extern int cpu_do_powersave; extern int cpu_fpu_present; +extern int cpu_hwdiv_present; #if !defined(CPU_ARMV7) #define CPU_IS_ARMV7_P() false
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: jmcneill
Date: Sat Sep 7 23:47:34 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_gpio.c
Log Message:
correct a typo in awin_gpio_pin_ctl that would have prevented configuring
output pins
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_gpio.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_gpio.c
diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.4 src/sys/arch/arm/allwinner/awin_gpio.c:1.5
--- src/sys/arch/arm/allwinner/awin_gpio.c:1.4 Sat Sep 7 19:47:28 2013
+++ src/sys/arch/arm/allwinner/awin_gpio.c Sat Sep 7 23:47:33 2013
@@ -32,7 +32,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.4 2013/09/07 19:47:28 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.5 2013/09/07 23:47:33 jmcneill Exp $);
#include sys/bus.h
#include sys/device.h
@@ -569,7 +569,7 @@ awin_gpio_pin_ctl(void *cookie, int pin,
if (flags GPIO_PIN_INPUT) {
awin_gpio_set_pin_func(ncfg, pin, AWIN_PIO_FUNC_INPUT);
} else if (flags GPIO_PIN_OUTPUT) {
- awin_gpio_set_pin_func(ncfg, pin, AWIN_PIO_FUNC_INPUT);
+ awin_gpio_set_pin_func(ncfg, pin, AWIN_PIO_FUNC_OUTPUT);
}
/*
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sun Sep 8 00:03:59 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: files.awin
Log Message:
Add mii attr to ethernet devices
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/files.awin
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/allwinner/files.awin
diff -u src/sys/arch/arm/allwinner/files.awin:1.4 src/sys/arch/arm/allwinner/files.awin:1.5
--- src/sys/arch/arm/allwinner/files.awin:1.4 Sat Sep 7 00:35:52 2013
+++ src/sys/arch/arm/allwinner/files.awin Sun Sep 8 00:03:59 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.awin,v 1.4 2013/09/07 00:35:52 matt Exp $
+# $NetBSD: files.awin,v 1.5 2013/09/08 00:03:59 matt Exp $
#
# Configuration info for Allwinner ARM Peripherals
#
@@ -72,12 +72,12 @@ attach awincrypto at awinio with awin_cr
file arch/arm/allwinner/awin_crypto.c awin_crypto
# A10/A20 EMAC
-device awinfe { } : ether, ifnet, arp
+device awinfe { } : ether, ifnet, arp, mii
attach awinfe at awinio with awin_eth
file arch/arm/allwinner/awin_eth.c awin_eth
# A20 GMAC
-device awinge { } : ether, ifnet, arp
+device awinge { } : ether, ifnet, arp, mii
attach awinge at awinio with awin_gige
file arch/arm/allwinner/awin_gige.c awin_gige
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sun Sep 8 00:05:27 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_eth.c
Log Message:
Add mii support and some initialization.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_eth.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.1 src/sys/arch/arm/allwinner/awin_eth.c:1.2
--- src/sys/arch/arm/allwinner/awin_eth.c:1.1 Wed Sep 4 02:39:01 2013
+++ src/sys/arch/arm/allwinner/awin_eth.c Sun Sep 8 00:05:27 2013
@@ -31,39 +31,74 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.1 2013/09/04 02:39:01 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.2 2013/09/08 00:05:27 matt Exp $);
#include sys/bus.h
#include sys/device.h
#include sys/intr.h
+#include sys/mutex.h
#include sys/systm.h
+#include net/if.h
+#include net/if_ether.h
+#include net/if_media.h
+
+#include dev/mii/miivar.h
+
#include arm/allwinner/awin_reg.h
#include arm/allwinner/awin_var.h
static int awin_eth_match(device_t, cfdata_t, void *);
static void awin_eth_attach(device_t, device_t, void *);
+static int awin_eth_miibus_read_reg(device_t, int, int);
+static void awin_eth_miibus_write_reg(device_t, int, int, int);
+static void awin_eth_miibus_statchg(struct ifnet *);
+
struct awin_eth_softc {
device_t sc_dev;
bus_space_tag_t sc_bst;
bus_space_handle_t sc_bsh;
bus_dma_tag_t sc_dmat;
+ struct ethercom sc_ec;
+ struct mii_data sc_mii;
+ kmutex_t sc_mdio_lock;
};
CFATTACH_DECL_NEW(awin_eth, sizeof(struct awin_eth_softc),
awin_eth_match, awin_eth_attach, NULL, NULL);
+static const struct awin_gpio_pinset awin_eth_pinsets[2] = {
+[0] = { 'A', AWIN_PIO_PA_EMAC_FUNC, AWIN_PIO_PA_EMAC_PINS },
+[1] = { 'H', AWIN_PIO_PH_EMAC_FUNC, AWIN_PIO_PH_EMAC_PINS },
+};
+
+static inline uint32_t
+awin_eth_read_4(struct awin_eth_softc *sc, bus_size_t o)
+{
+ return bus_space_read_4(sc-sc_bst, sc-sc_bsh, o);
+}
+
+static inline void
+awin_eth_write_4(struct awin_eth_softc *sc, bus_size_t o, uint32_t v)
+{
+ return bus_space_write_4(sc-sc_bst, sc-sc_bsh, o, v);
+}
+
static int
awin_eth_match(device_t parent, cfdata_t cf, void *aux)
{
struct awinio_attach_args * const aio = aux;
const struct awin_locators * const loc = aio-aio_loc;
+ const struct awin_gpio_pinset * const pinset =
+ awin_eth_pinsets[cf-cf_flags 1];
- if (strcmp(cf-cf_name, loc-loc_name))
- return 0;
+ KASSERT(!strcmp(cf-cf_name, loc-loc_name));
+ KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
+ || cf-cf_loc[AWINIOCF_PORT] == loc-loc_port);
- KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT);
+ if (!awin_gpio_pinset_available(pinset))
+ return 0;
return 1;
}
@@ -71,12 +106,21 @@ awin_eth_match(device_t parent, cfdata_t
static void
awin_eth_attach(device_t parent, device_t self, void *aux)
{
+ cfdata_t cf = device_cfdata(self);
struct awin_eth_softc * const sc = device_private(self);
struct awinio_attach_args * const aio = aux;
const struct awin_locators * const loc = aio-aio_loc;
+ const struct awin_gpio_pinset * const pinset =
+ awin_eth_pinsets[cf-cf_flags 1];
+ struct ifnet * const ifp = sc-sc_ec.ec_if;
+ struct mii_data * const mii = sc-sc_mii;
sc-sc_dev = self;
+ awin_gpio_pinset_acquire(pinset);
+
+ mutex_init(sc-sc_mdio_lock, MUTEX_DEFAULT, IPL_NET);
+
sc-sc_bst = aio-aio_core_bst;
sc-sc_dmat = aio-aio_dmat;
bus_space_subregion(sc-sc_bst, aio-aio_core_bsh,
@@ -84,4 +128,80 @@ awin_eth_attach(device_t parent, device_
aprint_naive(\n);
aprint_normal(\n);
+
+ ifp-if_softc = sc;
+
+ ifmedia_init(mii-mii_media, 0, ether_mediachange, ether_mediastatus);
+
+mii-mii_ifp = ifp;
+mii-mii_readreg = awin_eth_miibus_read_reg;
+mii-mii_writereg = awin_eth_miibus_write_reg;
+mii-mii_statchg = awin_eth_miibus_statchg;
+
+ int mii_flags = 0;
+
+mii_attach(self, mii, 0x, MII_PHY_ANY, MII_OFFSET_ANY, mii_flags);
+
+if (LIST_EMPTY(mii-mii_phys)) {
+aprint_error_dev(self, no PHY found!\n);
+ifmedia_add(mii-mii_media, IFM_ETHER|IFM_MANUAL, 0, NULL);
+ifmedia_set(mii-mii_media, IFM_ETHER|IFM_MANUAL);
+} else {
+ifmedia_set(mii-mii_media, IFM_ETHER|IFM_AUTO);
+}
+}
+
+int
+awin_eth_miibus_read_reg(device_t self, int phy, int reg)
+{
+ struct awin_eth_softc * const sc = device_private(self);
+
+ mutex_enter(sc-sc_mdio_lock);
+
+ awin_eth_write_4(sc, AWIN_EMAC_MAC_MADR_REG, (phy 8) | reg);
+ awin_eth_write_4(sc, AWIN_EMAC_MAC_MCMD_REG, 1);
+
+ delay(100);
+
+ awin_eth_write_4(sc, AWIN_EMAC_MAC_MCMD_REG, 0);
+ const uint32_t rv = awin_eth_read_4(sc, AWIN_EMAC_MAC_MRDD_REG);
+
+ mutex_exit(sc-sc_mdio_lock);
+
+ return rv;
+}
+
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: matt Date: Sun Sep 8 00:04:33 UTC 2013 Modified Files: src/sys/arch/arm/allwinner: awin_reg.h Log Message: Add some comments To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/arm/allwinner/awin_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.6 src/sys/arch/arm/allwinner/awin_reg.h:1.7 --- src/sys/arch/arm/allwinner/awin_reg.h:1.6 Sat Sep 7 22:51:03 2013 +++ src/sys/arch/arm/allwinner/awin_reg.h Sun Sep 8 00:04:33 2013 @@ -336,12 +336,12 @@ #define AWIN_EMAC_MAC_MAXF_REG 0x0070 #define AWIN_EMAC_MAC_SUPP_REG 0x0074 #define AWIN_EMAC_MAC_TEST_REG 0x0078 -#define AWIN_EMAC_MAC_MCFG_REG 0x007C -#define AWIN_EMAC_MAC_MCMD_REG 0x0080 -#define AWIN_EMAC_MAC_MADR_REG 0x0084 -#define AWIN_EMAC_MAC_MWTD_REG 0x0088 -#define AWIN_EMAC_MAC_MRDD_REG 0x008C -#define AWIN_EMAC_MAC_MIND_REG 0x0090 +#define AWIN_EMAC_MAC_MCFG_REG 0x007C // MDIO +#define AWIN_EMAC_MAC_MCMD_REG 0x0080 // MDIO +#define AWIN_EMAC_MAC_MADR_REG 0x0084 // MDIO +#define AWIN_EMAC_MAC_MWTD_REG 0x0088 // MDIO +#define AWIN_EMAC_MAC_MRDD_REG 0x008C // MDIO +#define AWIN_EMAC_MAC_MIND_REG 0x0090 // MDIO #define AWIN_EMAC_MAC_SSRR_REG 0x0094 #define AWIN_EMAC_MAC_A0_REG 0x0098 #define AWIN_EMAC_MAC_A1_REG 0x009C
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: matt Date: Sun Sep 8 00:03:40 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: CUBIEBOARD Log Message: Add rlphy To generate a diff of this commit: cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/conf/CUBIEBOARD Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/evbarm/conf/CUBIEBOARD diff -u src/sys/arch/evbarm/conf/CUBIEBOARD:1.6 src/sys/arch/evbarm/conf/CUBIEBOARD:1.7 --- src/sys/arch/evbarm/conf/CUBIEBOARD:1.6 Sat Sep 7 22:52:12 2013 +++ src/sys/arch/evbarm/conf/CUBIEBOARD Sun Sep 8 00:03:40 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: CUBIEBOARD,v 1.6 2013/09/07 22:52:12 matt Exp $ +# $NetBSD: CUBIEBOARD,v 1.7 2013/09/08 00:03:40 matt Exp $ # # CUBIEBOARD -- Allwinner A10/A20 Eval Board Kernel # @@ -271,6 +271,7 @@ awinge0 at awinio0 include dev/usb/usbdevices.config +rlphy* at mii? phy ? ukphy* at mii? phy ? # Pseudo-Devices
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: matt Date: Sun Sep 8 00:55:25 UTC 2013 Modified Files: src/sys/arch/arm/allwinner: awin_gpio.c Log Message: Make sure to actual push the configuration of the GPIO to its registers. With this change, USB now works. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_gpio.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_gpio.c diff -u src/sys/arch/arm/allwinner/awin_gpio.c:1.5 src/sys/arch/arm/allwinner/awin_gpio.c:1.6 --- src/sys/arch/arm/allwinner/awin_gpio.c:1.5 Sat Sep 7 23:47:33 2013 +++ src/sys/arch/arm/allwinner/awin_gpio.c Sun Sep 8 00:55:25 2013 @@ -32,7 +32,7 @@ #include sys/cdefs.h -__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.5 2013/09/07 23:47:33 jmcneill Exp $); +__KERNEL_RCSID(1, $NetBSD: awin_gpio.c,v 1.6 2013/09/08 00:55:25 matt Exp $); #include sys/bus.h #include sys/device.h @@ -609,6 +609,11 @@ awin_gpio_pin_reserve(const char *name, awin_gpio_set_pin_func(ncfg, pin, pin_data[0] == '' ? AWIN_PIO_FUNC_INPUT : AWIN_PIO_FUNC_OUTPUT); + /* + * Now update any config register that changed. + */ + awin_gpio_update_cfg_regs(sc-sc_bst, grp, ncfg); + grp-grp_pin_inuse_mask = ~__BIT(pin); pd-pd_gc = grp-grp_gc_tag;
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sun Sep 8 01:01:33 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_usb.c
Log Message:
Move interrupts back to IPL_USB
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/arm/allwinner/awin_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_usb.c
diff -u src/sys/arch/arm/allwinner/awin_usb.c:1.8 src/sys/arch/arm/allwinner/awin_usb.c:1.9
--- src/sys/arch/arm/allwinner/awin_usb.c:1.8 Sat Sep 7 22:51:41 2013
+++ src/sys/arch/arm/allwinner/awin_usb.c Sun Sep 8 01:01:33 2013
@@ -34,7 +34,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.8 2013/09/07 22:51:41 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_usb.c,v 1.9 2013/09/08 01:01:33 matt Exp $);
#include sys/bus.h
#include sys/device.h
@@ -144,7 +144,7 @@ ohci_awinusb_attach(device_t parent, dev
}
const int irq = awinusb_ohci_irqs[usbaa-usbaa_port];
- usbsc-usbsc_ohci_ih = intr_establish(irq, IPL_SCHED,
+ usbsc-usbsc_ohci_ih = intr_establish(irq, IPL_USB,
IST_LEVEL, ohci_intr, sc);
if (usbsc-usbsc_ohci_ih == NULL) {
aprint_error_dev(self, failed to establish interrupt %d\n,
@@ -217,7 +217,7 @@ ehci_awinusb_attach(device_t parent, dev
}
const int irq = awinusb_ehci_irqs[usbaa-usbaa_port];
- usbsc-usbsc_ehci_ih = intr_establish(irq, IPL_SCHED,
+ usbsc-usbsc_ehci_ih = intr_establish(irq, IPL_USB,
IST_LEVEL, ehci_intr, sc);
if (usbsc-usbsc_ehci_ih == NULL) {
aprint_error_dev(self, failed to establish interrupt %d\n,
CVS commit: src/sys/arch/arm/allwinner
Module Name:src Committed By: matt Date: Sun Sep 8 01:29:42 UTC 2013 Modified Files: src/sys/arch/arm/allwinner: awin_reg.h Log Message: Add more nand #define's To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/allwinner/awin_reg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/arm/allwinner/awin_reg.h diff -u src/sys/arch/arm/allwinner/awin_reg.h:1.7 src/sys/arch/arm/allwinner/awin_reg.h:1.8 --- src/sys/arch/arm/allwinner/awin_reg.h:1.7 Sun Sep 8 00:04:33 2013 +++ src/sys/arch/arm/allwinner/awin_reg.h Sun Sep 8 01:29:42 2013 @@ -303,6 +303,22 @@ #define AWIN_NFC_WRITE_CMD_SET_RANDOM_CMD0 __BITS(15,8) #define AWIN_NFC_WRITE_CMD_SET_CMD __BITS(7,0) +#define AWIN_ECC_CTL_RANDOM_SEED __BITS(31,16) +#define AWIN_ECC_CTL_MODE __BITS(15,12) +#define AWIN_ECC_CTL_MODE_16BITS 0 +#define AWIN_ECC_CTL_MODE_24BITS 1 +#define AWIN_ECC_CTL_MODE_28BITS 2 +#define AWIN_ECC_CTL_MODE_32BITS 3 +#define AWIN_ECC_CTL_MODE_40BITS 4 +#define AWIN_ECC_CTL_MODE_48BITS 5 +#define AWIN_ECC_CTL_MODE_56BITS 6 +#define AWIN_ECC_CTL_MODE_60BITS 7 +#define AWIN_ECC_CTL_MODE_64BITS 8 +#define AWIN_ECC_CTL_RANDOM_DIR __BIT(10) +#define AWIN_ECC_CTL_RANDOM __BIT(9) +#define AWIN_ECC_CTL_BLOCK_SIZE __BIT(5) +#define AWIN_ECC_CTL_EXCEPTION __BIT(4) +#define AWIN_ECC_CTL_PIPELINE __BIT(3) #define AWIN_ECC_CTL_EN __BIT(0) #define AWIN_EMAC_CTL_REG 0x @@ -375,10 +391,9 @@ #define AWIN_AHCI_IDR_REG 0x00FC #define AWIN_AHCI_RWCR_REG 0x00FC -#define AWIN_AHCI_P0DMACR_REG 0x0170 -#define AWIN_AHCI_P0PHYCR_REG 0x0178 -#define AWIN_AHCI_P0PHYSR_REG 0x017C - +#define AWIN_AHCI_P0DMACR_REG 0x0170 +#define AWIN_AHCI_P0PHYCR_REG 0x0178 +#define AWIN_AHCI_P0PHYSR_REG 0x017C #define AWIN_PLL1_CFG_REG 0x #define AWIN_PLL1_TUN_REG 0x0004
CVS commit: src/sys/dev/pci
Module Name:src
Committed By: msaitoh
Date: Sun Sep 8 03:17:02 UTC 2013
Modified Files:
src/sys/dev/pci: if_wm.c
Log Message:
Remove extra debug message.
To generate a diff of this commit:
cvs rdiff -u -r1.262 -r1.263 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.262 src/sys/dev/pci/if_wm.c:1.263
--- src/sys/dev/pci/if_wm.c:1.262 Tue Jul 16 10:30:27 2013
+++ src/sys/dev/pci/if_wm.c Sun Sep 8 03:17:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $ */
+/* $NetBSD: if_wm.c,v 1.263 2013/09/08 03:17:02 msaitoh Exp $ */
/*
* Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc.
@@ -76,7 +76,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.262 2013/07/16 10:30:27 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.263 2013/09/08 03:17:02 msaitoh Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1687,10 +1687,8 @@ wm_attach(device_t parent, device_t self
case WM_T_PCH:
case WM_T_PCH2:
case WM_T_PCH_LPT:
- if (wm_check_mng_mode(sc) != 0) {
- printf (get hw control (1)\n);
+ if (wm_check_mng_mode(sc) != 0)
wm_get_hw_control(sc);
- }
break;
default:
break;
CVS commit: src/sys/arch
Module Name:src
Committed By: matt
Date: Sun Sep 8 04:06:44 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_eth.c awin_gige.c awin_io.c files.awin
src/sys/arch/evbarm/conf: CUBIEBOARD
src/sys/arch/evbarm/cubie: cubie_machdep.c
Log Message:
Rename awinfe to awe and awinge to awge.
Allow properties in awinio0 to disable devices.
Use such a property to disable probing of gige.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/allwinner/awin_eth.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/allwinner/awin_gige.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/allwinner/awin_io.c
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/files.awin
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/evbarm/conf/CUBIEBOARD
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/cubie/cubie_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/arm/allwinner/awin_eth.c
diff -u src/sys/arch/arm/allwinner/awin_eth.c:1.2 src/sys/arch/arm/allwinner/awin_eth.c:1.3
--- src/sys/arch/arm/allwinner/awin_eth.c:1.2 Sun Sep 8 00:05:27 2013
+++ src/sys/arch/arm/allwinner/awin_eth.c Sun Sep 8 04:06:44 2013
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.2 2013/09/08 00:05:27 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_eth.c,v 1.3 2013/09/08 04:06:44 matt Exp $);
#include sys/bus.h
#include sys/device.h
@@ -89,7 +89,9 @@ static int
awin_eth_match(device_t parent, cfdata_t cf, void *aux)
{
struct awinio_attach_args * const aio = aux;
+#ifdef DIAGNOSTIC
const struct awin_locators * const loc = aio-aio_loc;
+#endif
const struct awin_gpio_pinset * const pinset =
awin_eth_pinsets[cf-cf_flags 1];
@@ -127,7 +129,7 @@ awin_eth_attach(device_t parent, device_
loc-loc_offset, loc-loc_size, sc-sc_bsh);
aprint_naive(\n);
- aprint_normal(\n);
+ aprint_normal(: 10/100 Ethernet Controller\n);
ifp-if_softc = sc;
Index: src/sys/arch/arm/allwinner/awin_gige.c
diff -u src/sys/arch/arm/allwinner/awin_gige.c:1.1 src/sys/arch/arm/allwinner/awin_gige.c:1.2
--- src/sys/arch/arm/allwinner/awin_gige.c:1.1 Wed Sep 4 02:39:01 2013
+++ src/sys/arch/arm/allwinner/awin_gige.c Sun Sep 8 04:06:44 2013
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.1 2013/09/04 02:39:01 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_gige.c,v 1.2 2013/09/08 04:06:44 matt Exp $);
#include sys/bus.h
#include sys/device.h
@@ -51,6 +51,10 @@ struct awin_gige_softc {
bus_dma_tag_t sc_dmat;
};
+static const struct awin_gpio_pinset awin_gige_gpio_pinset = {
+ 'A', AWIN_PIO_PA_GMAC_FUNC, AWIN_PIO_PA_GMAC_PINS,
+};
+
CFATTACH_DECL_NEW(awin_gige, sizeof(struct awin_gige_softc),
awin_gige_match, awin_gige_attach, NULL, NULL);
@@ -58,12 +62,18 @@ static int
awin_gige_match(device_t parent, cfdata_t cf, void *aux)
{
struct awinio_attach_args * const aio = aux;
+#ifdef DIAGNOSTIC
const struct awin_locators * const loc = aio-aio_loc;
-
- if (strcmp(cf-cf_name, loc-loc_name))
+#endif
+ if (cf-cf_flags 1)
return 0;
- KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT);
+ KASSERT(!strcmp(cf-cf_name, loc-loc_name));
+ KASSERT(cf-cf_loc[AWINIOCF_PORT] == AWINIOCF_PORT_DEFAULT
+ || cf-cf_loc[AWINIOCF_PORT] == loc-loc_port);
+
+ if (!awin_gpio_pinset_available(awin_gige_pinset))
+ return 0;
return 1;
}
@@ -77,11 +87,13 @@ awin_gige_attach(device_t parent, device
sc-sc_dev = self;
+ awin_gpio_pinset_acquire(awin_gige_pinset);
+
sc-sc_bst = aio-aio_core_bst;
sc-sc_dmat = aio-aio_dmat;
bus_space_subregion(sc-sc_bst, aio-aio_core_bsh,
loc-loc_offset, loc-loc_size, sc-sc_bsh);
aprint_naive(\n);
- aprint_normal(\n);
+ aprint_normal(: Gigabit Ethernet Controller\n);
}
Index: src/sys/arch/arm/allwinner/awin_io.c
diff -u src/sys/arch/arm/allwinner/awin_io.c:1.4 src/sys/arch/arm/allwinner/awin_io.c:1.5
--- src/sys/arch/arm/allwinner/awin_io.c:1.4 Sat Sep 7 02:46:06 2013
+++ src/sys/arch/arm/allwinner/awin_io.c Sun Sep 8 04:06:44 2013
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.4 2013/09/07 02:46:06 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_io.c,v 1.5 2013/09/08 04:06:44 matt Exp $);
#include sys/bus.h
#include sys/cpu.h
@@ -118,8 +118,8 @@ static const struct awin_locators awin_l
{ spi, OFFANDSIZE(SPI1), 1, AWIN_IRQ_SPI1, AANY },
{ spi, OFFANDSIZE(SPI2), 1, AWIN_IRQ_SPI2, AANY },
{ spi, OFFANDSIZE(SPI3), 3, AWIN_IRQ_SPI3, AANY },
- { awinfe, OFFANDSIZE(EMAC), NOPORT, AWIN_IRQ_EMAC, AANY },
- { awinge, AWIN_GMAC_OFFSET, AWIN_GMAC_SIZE, NOPORT, AWIN_IRQ_GMAC, A20 },
+ { awe, OFFANDSIZE(EMAC), NOPORT, AWIN_IRQ_EMAC, AANY },
+ { awge, AWIN_GMAC_OFFSET, AWIN_GMAC_SIZE, NOPORT, AWIN_IRQ_GMAC, A20 },
{ awincrypto, OFFANDSIZE(SS), NOPORT, AWIN_IRQ_SS, AANY },
};
@@ -143,6 +143,7 @@ awinio_attach(device_t parent, device_t
CVS commit: src/sys/arch/arm/allwinner
Module Name:src
Committed By: matt
Date: Sun Sep 8 04:07:46 UTC 2013
Modified Files:
src/sys/arch/arm/allwinner: awin_ahcisata.c
Log Message:
Improve phy_init a little. Still doesn't work.
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/sys/arch/arm/allwinner/awin_ahcisata.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/allwinner/awin_ahcisata.c
diff -u src/sys/arch/arm/allwinner/awin_ahcisata.c:1.5 src/sys/arch/arm/allwinner/awin_ahcisata.c:1.6
--- src/sys/arch/arm/allwinner/awin_ahcisata.c:1.5 Sat Sep 7 19:48:57 2013
+++ src/sys/arch/arm/allwinner/awin_ahcisata.c Sun Sep 8 04:07:45 2013
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.5 2013/09/07 19:48:57 matt Exp $);
+__KERNEL_RCSID(1, $NetBSD: awin_ahcisata.c,v 1.6 2013/09/08 04:07:45 matt Exp $);
#include sys/param.h
#include sys/bus.h
@@ -84,35 +84,40 @@ awin_ahci_phy_init(struct awin_ahci_soft
/*
* This is dark magic.
*/
+ delay(5000);
bus_space_write_4(bst, bsh, AWIN_AHCI_RWCR_REG, 0);
- delay(2);
+ delay(10);
+
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG, __BIT(19), 0);
- delay(1);
- awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
- __BIT(23)|__BIT(18)|__SHIFTIN(5, __BITS(26,24)),
- __BITS(26,24));
- delay(1);
+ delay(10);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS0R_REG,
+ __BIT(26)|__BIT(24)|__BIT(23)|__BIT(18),
+ __BIT(25));
+ delay(10);
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
- __BIT(17)|__BITS(10,9)|__BIT(7),
- __BIT(16)|__BITS(12,11)|__BIT(8)|__BIT(6));
- delay(1);
+ __BIT(17)|__BIT(10)|__BIT(9)|__BIT(7),
+ __BIT(16)|__BIT(12)|__BIT(11)|__BIT(8)|__BIT(6));
+ delay(10);
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG,
__BIT(28)|__BIT(15), 0);
- delay(1);
+ delay(10);
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS1R_REG, 0, __BIT(19));
- delay(1);
+ delay(10);
+
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS0R_REG,
- __BITS(21,20), __BIT(22));
- delay(1);
+ __BIT(21)|__BIT(20), __BIT(22));
+ delay(10);
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS2R_REG,
- __BITS(9,8)|__BIT(5), __BITS(7,6));
- delay(2);
+ __BIT(9)|__BIT(8)|__BIT(5), __BIT(7)|__BIT(6));
+ delay(20);
+
+ delay(5000);
awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS0R_REG, __BIT(19), 0);
- delay(2);
+ delay(20);
- timeout = 10;
+ timeout = 1000;
do {
- delay(1);
+ delay(10);
v = bus_space_read_4(bst, bsh, AWIN_AHCI_PHYCS0R_REG);
} while (--timeout __SHIFTOUT(v, __BITS(30,28)) != 2);
@@ -120,20 +125,23 @@ awin_ahci_phy_init(struct awin_ahci_soft
aprint_error_dev(
asc-asc_sc.sc_atac.atac_dev,
SATA PHY power failed (%#x)\n, v);
- }
+ } else {
- awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS2R_REG, __BIT(24), 0);
- timeout = 10;
- do {
- delay(1);
- v = bus_space_read_4(bst, bsh, AWIN_AHCI_PHYCS0R_REG);
- } while (--timeout (v __BIT(24)));
-
- if (!timeout) {
- aprint_error_dev(
- asc-asc_sc.sc_atac.atac_dev,
- SATA PHY calibration failed (%#x)\n, v);
+ awin_reg_set_clear(bst, bsh, AWIN_AHCI_PHYCS2R_REG,
+ __BIT(24), 0);
+ timeout = 1000;
+ do {
+ delay(10);
+ v = bus_space_read_4(bst, bsh, AWIN_AHCI_PHYCS0R_REG);
+ } while (--timeout (v __BIT(24)));
+
+ if (!timeout) {
+ aprint_error_dev(
+ asc-asc_sc.sc_atac.atac_dev,
+ SATA PHY calibration failed (%#x)\n, v);
+ }
}
+ delay(15000);
bus_space_write_4(bst, bsh, AWIN_AHCI_RWCR_REG, 7);
}
@@ -153,7 +161,7 @@ awin_ahci_enable(bus_space_tag_t bst, bu
delay(1000);
/*
- * Now turn it on.
+ * Now turn it on (forcing it to use PLL6).
*/
bus_space_write_4(bst, bsh, AWIN_SATA_CLK_REG, AWIN_CLK_ENABLE);
}
CVS commit: src/sys/dev/marvell
Module Name:src Committed By: kiyohara Date: Sun Sep 8 04:10:23 UTC 2013 Modified Files: src/sys/dev/marvell: ehci_mv.c Log Message: Fix size of EHCI register space. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sys/dev/marvell/ehci_mv.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/marvell/ehci_mv.c diff -u src/sys/dev/marvell/ehci_mv.c:1.3 src/sys/dev/marvell/ehci_mv.c:1.4 --- src/sys/dev/marvell/ehci_mv.c:1.3 Wed May 1 12:30:02 2013 +++ src/sys/dev/marvell/ehci_mv.c Sun Sep 8 04:10:23 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ehci_mv.c,v 1.3 2013/05/01 12:30:02 rkujawa Exp $ */ +/* $NetBSD: ehci_mv.c,v 1.4 2013/09/08 04:10:23 kiyohara Exp $ */ /* * Copyright (c) 2008 KIYOHARA Takashi * All rights reserved. @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ehci_mv.c,v 1.3 2013/05/01 12:30:02 rkujawa Exp $); +__KERNEL_RCSID(0, $NetBSD: ehci_mv.c,v 1.4 2013/09/08 04:10:23 kiyohara Exp $); #include sys/param.h #include sys/bus.h @@ -55,7 +55,7 @@ extern int ehcidebug; #endif -#define MARVELL_USB_SIZE 0x2000 +#define MARVELL_USB_SIZE 0x1000 #define MARVELL_USB_NWINDOW 4 @@ -70,7 +70,7 @@ extern int ehcidebug; /* ehci generic registers */ #define MARVELL_USB_EHCI_BASE 0x100 -#define MARVELL_USB_EHCI_SIZE 0x1000 +#define MARVELL_USB_EHCI_SIZE 0x100 /* ehci vendor extension registers */ #define MARVELL_USB_EHCI_PS_PSPD 0x0c00 /* Port speed */
CVS commit: src/sys/rump/librump/rumpkern
Module Name:src
Committed By: pooka
Date: Sun Sep 8 04:37:17 UTC 2013
Modified Files:
src/sys/rump/librump/rumpkern: cons.c
Log Message:
Fool isatty() into thinking we're a tty.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/rump/librump/rumpkern/cons.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/rump/librump/rumpkern/cons.c
diff -u src/sys/rump/librump/rumpkern/cons.c:1.2 src/sys/rump/librump/rumpkern/cons.c:1.3
--- src/sys/rump/librump/rumpkern/cons.c:1.2 Sat Sep 7 18:17:35 2013
+++ src/sys/rump/librump/rumpkern/cons.c Sun Sep 8 04:37:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cons.c,v 1.2 2013/09/07 18:17:35 pooka Exp $ */
+/* $NetBSD: cons.c,v 1.3 2013/09/08 04:37:17 pooka Exp $ */
/*
* Copyright (c) 2013 Antti Kantee. All Rights Reserved.
@@ -31,19 +31,22 @@
* environments where there is no Unix-like host (e.g. Xen DomU).
* It's currently a truly half duplex console since there is support
* only for writing to the console (there is no hypercall for reading
- * the host console).
+ * the host console). The driver attempts to look like a tty just
+ * enough to fool isatty(). Let's see how far that gets us.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.2 2013/09/07 18:17:35 pooka Exp $);
+__KERNEL_RCSID(0, $NetBSD: cons.c,v 1.3 2013/09/08 04:37:17 pooka Exp $);
#include sys/param.h
#include sys/file.h
#include sys/filedesc.h
+#include sys/ioctl.h
#include sys/kernel.h
#include sys/kmem.h
#include sys/proc.h
#include sys/stat.h
+#include sys/termios.h
#include rump/rumpuser.h
@@ -51,12 +54,13 @@ __KERNEL_RCSID(0, $NetBSD: cons.c,v 1.2
static int rumpcons_write(struct file *, off_t *, struct uio *,
kauth_cred_t, int);
+static int rumpcons_ioctl(struct file *, u_long, void *);
static int rumpcons_stat(struct file *, struct stat *);
static const struct fileops rumpcons_fileops = {
.fo_read = (void *)nullop,
.fo_write = rumpcons_write,
- .fo_ioctl = fbadop_ioctl,
+ .fo_ioctl = rumpcons_ioctl,
.fo_fcntl = fnullop_fcntl,
.fo_poll = fnullop_poll,
.fo_stat = rumpcons_stat,
@@ -121,11 +125,21 @@ rumpcons_write(struct file *fp, off_t *o
}
static int
+rumpcons_ioctl(struct file *fp, u_long cmd, void *data)
+{
+
+ if (cmd == TIOCGETA)
+ return 0;
+
+ return ENOTTY; /* considering how we are cheating, lol */
+}
+
+static int
rumpcons_stat(struct file *fp, struct stat *sb)
{
memset(sb, 0, sizeof(*sb));
- sb-st_mode = 0600;
+ sb-st_mode = 0600 | _S_IFCHR;
sb-st_atimespec = sb-st_mtimespec = sb-st_ctimespec = boottime;
sb-st_birthtimespec = boottime;
