CVS commit: src/sys/arch/ia64/pci
Module Name:src
Committed By: kiyohara
Date: Sat Jan 12 08:40:51 UTC 2013
Modified Files:
src/sys/arch/ia64/pci: pci_machdep.c
Log Message:
Check return status from ia64_sal_entry().
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/pci/pci_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/ia64/pci/pci_machdep.c
diff -u src/sys/arch/ia64/pci/pci_machdep.c:1.2 src/sys/arch/ia64/pci/pci_machdep.c:1.3
--- src/sys/arch/ia64/pci/pci_machdep.c:1.2 Mon Jun 28 12:14:08 2010
+++ src/sys/arch/ia64/pci/pci_machdep.c Sat Jan 12 08:40:51 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_machdep.c,v 1.2 2010/06/28 12:14:08 kiyohara Exp $ */
+/* $NetBSD: pci_machdep.c,v 1.3 2013/01/12 08:40:51 kiyohara Exp $ */
/*
* Copyright (c) 2009, 2010 KIYOHARA Takashi
* All rights reserved.
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.2 2010/06/28 12:14:08 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: pci_machdep.c,v 1.3 2013/01/12 08:40:51 kiyohara Exp $);
#include machine/bus.h
#include machine/sal.h
@@ -89,7 +89,10 @@ pci_conf_read(pci_chipset_tag_t pc, pcit
void
pci_conf_write(pci_chipset_tag_t pc, pcitag_t tag, int reg, pcireg_t val)
{
+ struct ia64_sal_result res;
- (void) ia64_sal_entry(SAL_PCI_CONFIG_WRITE,
+ res = ia64_sal_entry(SAL_PCI_CONFIG_WRITE,
tag | reg, sizeof(pcireg_t), val, 0, 0, 0, 0);
+ if (res.sal_status 0)
+ printf(pci configuration write failed\n);
}
CVS commit: src/sys/arch/ia64/ia64
Module Name:src
Committed By: kiyohara
Date: Sat Jan 12 08:42:53 UTC 2013
Modified Files:
src/sys/arch/ia64/ia64: trap.c
Log Message:
Add some vector process from FreeBSD.
Remove and add null-line.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/arch/ia64/ia64/trap.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/ia64/ia64/trap.c
diff -u src/sys/arch/ia64/ia64/trap.c:1.11 src/sys/arch/ia64/ia64/trap.c:1.12
--- src/sys/arch/ia64/ia64/trap.c:1.11 Sun Jan 6 11:25:13 2013
+++ src/sys/arch/ia64/ia64/trap.c Sat Jan 12 08:42:53 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: trap.c,v 1.11 2013/01/06 11:25:13 kiyohara Exp $ */
+/* $NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $ */
/*-
* Copyright (c) 2005 Marcel Moolenaar
@@ -61,7 +61,7 @@
#include sys/cdefs.h /* RCS ID Copyright macro defns */
-__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.11 2013/01/06 11:25:13 kiyohara Exp $);
+__KERNEL_RCSID(0, $NetBSD: trap.c,v 1.12 2013/01/12 08:42:53 kiyohara Exp $);
#include sys/param.h
#include sys/systm.h
@@ -414,6 +414,7 @@ trap(int vector, struct trapframe *tf)
*/
trap_panic(vector, tf);
break;
+
case IA64_VEC_ITLB:
case IA64_VEC_DTLB:
case IA64_VEC_EXT_INTR:
@@ -526,7 +527,6 @@ trap(int vector, struct trapframe *tf)
} else if (ucode == 0x10) {
break_syscall(tf);
return; /* do_ast() already called. */
-
} else if (ucode == 0x18) {
mcontext_t mc;
@@ -547,6 +547,63 @@ trap(int vector, struct trapframe *tf)
}
break;
+ case IA64_VEC_PAGE_NOT_PRESENT:
+ case IA64_VEC_INST_ACCESS_RIGHTS:
+ case IA64_VEC_DATA_ACCESS_RIGHTS: {
+ struct pcb * const pcb = lwp_getpcb(l);
+ vaddr_t va;
+ struct vm_map *map;
+ vm_prot_t ftype;
+ uint64_t onfault;
+ int error = 0;
+
+ va = trunc_page(tf-tf_special.ifa);
+
+ if (va = VM_MAXUSER_ADDRESS) {
+ /*
+ * Don't allow user-mode faults for kernel virtual
+ * addresses, including the gateway page.
+ */
+ if (user)
+goto no_fault_in;
+ map = kernel_map;
+ } else {
+ map = (p != NULL) ? p-p_vmspace-vm_map : NULL;
+ if (map == NULL)
+goto no_fault_in;
+ }
+
+ if (tf-tf_special.isr IA64_ISR_X)
+ ftype = VM_PROT_EXECUTE;
+ else if (tf-tf_special.isr IA64_ISR_W)
+ ftype = VM_PROT_WRITE;
+ else
+ ftype = VM_PROT_READ;
+
+ onfault = pcb-pcb_onfault;
+ pcb-pcb_onfault = 0;
+ error = uvm_fault(map, va, ftype);
+ pcb-pcb_onfault = onfault;
+
+ if (error == 0)
+ goto out;
+
+no_fault_in:
+ if (!user) {
+ /* Check for copyin/copyout fault. */
+ if (pcb-pcb_onfault != 0) {
+tf-tf_special.iip = pcb-pcb_onfault;
+tf-tf_special.psr = ~IA64_PSR_RI;
+tf-tf_scratch.gr8 = error;
+goto out;
+ }
+ trap_panic(vector, tf);
+ }
+ ucode = va;
+ sig = (error == EACCES) ? SIGBUS : SIGSEGV;
+ break;
+ }
+
/* XXX: Fill in the rest */
case IA64_VEC_SPECULATION:
CVS commit: src/sbin/devpubd
Module Name:src Committed By: wiz Date: Sat Jan 12 10:19:01 UTC 2013 Modified Files: src/sbin/devpubd: devpubd.8 Log Message: Bump date for previous. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 src/sbin/devpubd/devpubd.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/devpubd/devpubd.8 diff -u src/sbin/devpubd/devpubd.8:1.3 src/sbin/devpubd/devpubd.8:1.4 --- src/sbin/devpubd/devpubd.8:1.3 Fri Jan 11 23:49:23 2013 +++ src/sbin/devpubd/devpubd.8 Sat Jan 12 10:19:01 2013 @@ -1,6 +1,6 @@ -.\ $NetBSD: devpubd.8,v 1.3 2013/01/11 23:49:23 mlelstv Exp $ +.\ $NetBSD: devpubd.8,v 1.4 2013/01/12 10:19:01 wiz Exp $ .\ -.\ Copyright (c) 2011 The NetBSD Foundation, Inc. +.\ Copyright (c) 2011-2013 The NetBSD Foundation, Inc. .\ All rights reserved. .\ .\ This code is derived from software contributed to The NetBSD Foundation @@ -27,7 +27,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd November 22, 2012 +.Dd January 12, 2013 .Dt DEVPUBD 8 .Os .Sh NAME
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Jan 12 12:31:06 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Misc cleanup
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.11 src/sys/dev/usb/dwc_otg.c:1.12
--- src/sys/dev/usb/dwc_otg.c:1.11 Fri Jan 11 20:35:51 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 12:31:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.11 2013/01/11 20:35:51 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.12 2013/01/12 12:31:06 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.11 2013/01/11 20:35:51 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.12 2013/01/12 12:31:06 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -1322,19 +1322,12 @@ dwc_otg_device_ctrl_close(usbd_pipe_hand
Static void
dwc_otg_device_ctrl_done(usbd_xfer_handle xfer)
{
-// struct dwc_otg_pipe *dpipe = DWC_OTG_XFER2DPIPE(xfer);
struct dwc_otg_softc *sc = DWC_OTG_XFER2SC(xfer);
-// struct dwc_otg_xfer *next;
DPRINTF(xfer=%p\n, xfer);
KASSERT(mutex_owned(sc-sc_lock));
dwc_otg_xfer_end(xfer);
- /* dequeue transfer and start next transfer */
-// next = TAILQ_FIRST(sc-sc_xferhead);
-// if (next)
-// TAILQ_REMOVE(sc-sc_xferhead, next, xnext);
-
}
/***/
@@ -1372,10 +1365,7 @@ dwc_otg_device_bulk_start(usbd_xfer_hand
struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
struct dwc_otg_softc *sc = xfer-pipe-device-bus-hci_private;
- DPRINTF(\n);
-#if 0
- printf(%s, xfer = %p\n, __func__, xfer);
-#endif
+ DPRINTF(xfer=%p\n, xfer);
mutex_enter(sc-sc_lock);
xfer-status = USBD_IN_PROGRESS;
@@ -1457,7 +1447,6 @@ dwc_otg_device_intr_start(usbd_xfer_hand
struct dwc_otg_softc *sc = dev-bus-hci_private;
DPRINTF(\n);
-// printf(%s: xfer = %p\n, __func__, xfer);
mutex_enter(sc-sc_lock);
xfer-status = USBD_IN_PROGRESS;
@@ -3601,7 +3590,6 @@ dwc_otg_interrupt(struct dwc_otg_softc *
uint8_t x;
uint8_t y;
-// DPRINTFN(5, SOF interrupt\n);
for (x = y = 0; x != sc-sc_host_ch_max; x++) {
if (sc-sc_chan_state[x].wait_sof != 0) {
if (--(sc-sc_chan_state[x].wait_sof) != 0)
@@ -4112,17 +4100,6 @@ dwc_otg_standard_done(usbd_xfer_handle x
dxfer-td_transfer_cache = dxfer-td_transfer_first;
td = dxfer-td_transfer_first;
- if (xfertype == UE_CONTROL) {
- if (1 /*xfer-flags_int.control_hdr*/) {
-
- err = dwc_otg_standard_done_sub(xfer);
- }
-// xfer-aframes = 1;
-
- if (dxfer-td_transfer_cache == NULL) {
- goto done;
- }
- }
while (td != NULL) {
err = dwc_otg_standard_done_sub(xfer);
if (dxfer-td_transfer_cache == NULL) {
@@ -4248,10 +4225,6 @@ dwc_otg_init(struct dwc_otg_softc *sc)
temp = ~GAHBCFG_GLBLINTRMSK;
DWC_OTG_WRITE_4(sc, DOTG_GAHBCFG, temp);
- /* */
- /*
- * taken from dwc_otg_core_init
- */
temp = DWC_OTG_READ_4(sc, DOTG_GUSBCFG);
temp = ~GUSBCFG_ULPIEXTVBUSDRV;
temp = ~GUSBCFG_TERMSELDLPULSE;
@@ -4262,14 +4235,14 @@ dwc_otg_init(struct dwc_otg_softc *sc)
/* */
- DWC_OTG_WRITE_4(sc, DOTG_PCGCCTL, 0); /* dwc_otg_core_host_init */
+ DWC_OTG_WRITE_4(sc, DOTG_PCGCCTL, 0);
temp = 0;
// temp = DWC_OTG_READ_4(sc, DOTG_HCFG);
temp = ~HCFG_FSLSPCLKSEL_MASK;
temp |= 1; /* 30 or 60 Mhz */
- DWC_OTG_WRITE_4(sc, DOTG_HCFG, temp); /* init_fslspclksel */
+ DWC_OTG_WRITE_4(sc, DOTG_HCFG, temp);
/* enable PORT reset */
temp = DWC_OTG_READ_4(sc, DOTG_HPRT);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Jan 12 12:41:43 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Remove unused locals
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.12 src/sys/dev/usb/dwc_otg.c:1.13
--- src/sys/dev/usb/dwc_otg.c:1.12 Sat Jan 12 12:31:06 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 12:41:43 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.12 2013/01/12 12:31:06 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.13 2013/01/12 12:41:43 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.12 2013/01/12 12:31:06 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.13 2013/01/12 12:41:43 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -4085,9 +4085,6 @@ Static void
dwc_otg_standard_done(usbd_xfer_handle xfer)
{
struct dwc_otg_xfer *dxfer = DWC_OTG_XFER2DXFER(xfer);
- struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)xfer-pipe;
- usb_endpoint_descriptor_t *ed = dpipe-pipe.endpoint-edesc;
- uint8_t xfertype = UE_GET_XFERTYPE(ed-bmAttributes);
struct dwc_otg_td *td;
usbd_status err = 0;
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 13:19:34 UTC 2013 Modified Files: src/share/misc: airport Log Message: Fix spelling: Sormovo. To generate a diff of this commit: cvs rdiff -u -r1.43 -r1.44 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.43 src/share/misc/airport:1.44 --- src/share/misc/airport:1.43 Fri Jan 11 20:42:20 2013 +++ src/share/misc/airport Sat Jan 12 13:19:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.43 2013/01/11 20:42:20 mbalmer Exp $ +# $NetBSD: airport,v 1.44 2013/01/12 13:19:34 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -2650,7 +2650,7 @@ GOE:Gonaila, Papua New Guinea GOF:San Angelo (Goodfellow AFB), TX, USA GOH:Godthab, Nuuk, Greenland GOI:Goa, India -GOJ:Nizhniy Novgorod (Sormavo), Russia +GOJ:Nizhniy Novgorod (Sormovo), Russia GOK:Guthrie Municipal Airport, OK, USA GOL:Gold Beach Municipal Airport, OR, USA GOM:Goma, Dem. Rep. of the Congo
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 13:23:34 UTC 2013 Modified Files: src/share/misc: airport Log Message: URWW (VOG) is in Gumrak, not in Stalingrad (if you're talking about history). To generate a diff of this commit: cvs rdiff -u -r1.44 -r1.45 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.44 src/share/misc/airport:1.45 --- src/share/misc/airport:1.44 Sat Jan 12 13:19:34 2013 +++ src/share/misc/airport Sat Jan 12 13:23:33 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.44 2013/01/12 13:19:34 asau Exp $ +# $NetBSD: airport,v 1.45 2013/01/12 13:23:33 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -8215,7 +8215,7 @@ VNS:Varanasi, India VNW:Van Wert County Airport, OH, USA VNX:Vilanculos, Mozambique VNY:Los Angeles (Van Nuys Airport), CA, USA -VOG:Volgograd (Stalingrad), Russia +VOG:Volgograd (Gumrak, Stalingrad), Russia VOH:Vohemar, Madagascar VOI:Voinjama, Liberia VOK:Camp Douglas (Volk Field), WI, USA
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 13:27:01 UTC 2013 Modified Files: src/share/misc: airport Log Message: UWWW (KUF) is in Kurumoch. To generate a diff of this commit: cvs rdiff -u -r1.45 -r1.46 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.45 src/share/misc/airport:1.46 --- src/share/misc/airport:1.45 Sat Jan 12 13:23:33 2013 +++ src/share/misc/airport Sat Jan 12 13:27:01 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.45 2013/01/12 13:23:33 asau Exp $ +# $NetBSD: airport,v 1.46 2013/01/12 13:27:01 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -3990,7 +3990,7 @@ KUB:Kuala Belait, Brunei KUC:Kuria, Kiribati KUD:Kudat, Sabah, Malaysia KUE:Kukundu, Solomon Islands -KUF:Samara, Russia +KUF:Samara (Kurumoch), Russia KUG:Kubin Island, Australia KUH:Kushiro, Japan KUI:Kawau Island, New Zealand
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 13:32:10 UTC 2013 Modified Files: src/share/misc: airport Log Message: There's no Simbirsk for a century, it is Ulyanovsk. UWLL (ULV) is in Barataevka. To generate a diff of this commit: cvs rdiff -u -r1.46 -r1.47 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.46 src/share/misc/airport:1.47 --- src/share/misc/airport:1.46 Sat Jan 12 13:27:01 2013 +++ src/share/misc/airport Sat Jan 12 13:32:10 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.46 2013/01/12 13:27:01 asau Exp $ +# $NetBSD: airport,v 1.47 2013/01/12 13:32:10 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -7994,7 +7994,7 @@ ULP:Quilpie, Queensland, Australia ULQ:Tulua, Colombia ULS:Mulatos, Colombia ULU:Gulu, Uganda -ULY:Simbirsk (Ulyanovsk), Russia +ULV:Ulyanovsk (Barataevka), Russia UMA:Punta de Maisi, Cuba UMB:Umnak, AK, USA UMC:Umba, Papua New Guinea
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 13:42:48 UTC 2013 Modified Files: src/share/misc: airport Log Message: UUOO (VOZ) is also known as Chertovitskoe. No need to repeat Voronezh twice, it is large city and it is region centre. To generate a diff of this commit: cvs rdiff -u -r1.48 -r1.49 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.48 src/share/misc/airport:1.49 --- src/share/misc/airport:1.48 Sat Jan 12 13:38:22 2013 +++ src/share/misc/airport Sat Jan 12 13:42:48 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.48 2013/01/12 13:38:22 asau Exp $ +# $NetBSD: airport,v 1.49 2013/01/12 13:42:48 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -8221,7 +8221,7 @@ VOI:Voinjama, Liberia VOK:Camp Douglas (Volk Field), WI, USA VOL:Volos, Greece VOT:Votuporanga, SP, Brazil -VOZ:Voronezh, Voronezh, Russia +VOZ:Voronezh (Chertovitskoe), Russia VPC:Cartersville Airport, GA, USA VPE:Ondjiva (Ngiva), Angola VPN:Vopnafjordur, Iceland
CVS commit: src/share/misc
Module Name:src Committed By: asau Date: Sat Jan 12 14:03:42 UTC 2013 Modified Files: src/share/misc: airport Log Message: URRR (ROV) is in Rostov-na-Donu (lower Don) rather than in Rostov (lake Nero) which is far away from lower Don. To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 src/share/misc/airport Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/misc/airport diff -u src/share/misc/airport:1.49 src/share/misc/airport:1.50 --- src/share/misc/airport:1.49 Sat Jan 12 13:42:48 2013 +++ src/share/misc/airport Sat Jan 12 14:03:42 2013 @@ -1,4 +1,4 @@ -# $NetBSD: airport,v 1.49 2013/01/12 13:42:48 asau Exp $ +# $NetBSD: airport,v 1.50 2013/01/12 14:03:42 asau Exp $ # @(#)airport 8.1 (Berkeley) 6/8/93 # # Some of this information is from http://www.mapping.com/airportcodes.html. @@ -6706,7 +6706,7 @@ ROR:Koror (Airai), Palau ROS:Rosario, Argentina ROT:Rotorua, New Zealand ROU:Ruse, Bulgaria -ROV:Rostov, Russia +ROV:Rostov-na-Donu, Russia ROW:Roswell (Industrial Air Center), NM, USA ROX:Roseau Municipal Airport, MN, USA ROY:Rio Mayo, Argentina
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sat Jan 12 16:18:42 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: need to wait for intr in dwc_otg_device_bulk_start if polling To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/dwc_otg.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/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.13 src/sys/dev/usb/dwc_otg.c:1.14 --- src/sys/dev/usb/dwc_otg.c:1.13 Sat Jan 12 12:41:43 2013 +++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 16:18:42 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.13 2013/01/12 12:41:43 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.14 2013/01/12 16:18:42 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.13 2013/01/12 12:41:43 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.14 2013/01/12 16:18:42 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -1376,6 +1376,9 @@ dwc_otg_device_bulk_start(usbd_xfer_hand } mutex_exit(sc-sc_lock); + if (sc-sc_bus.use_polling) + dwc_otg_waitintr(sc, xfer); + return USBD_IN_PROGRESS; }
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Sat Jan 12 16:32:16 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
split out some common code from device_foo_start to dwc_otg_xfer_start
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.14 src/sys/dev/usb/dwc_otg.c:1.15
--- src/sys/dev/usb/dwc_otg.c:1.14 Sat Jan 12 16:18:42 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 16:32:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.14 2013/01/12 16:18:42 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.15 2013/01/12 16:32:16 jmcneill Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.14 2013/01/12 16:18:42 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.15 2013/01/12 16:32:16 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -216,6 +216,7 @@ Static void dwc_otg_timeout(void *);
Static void dwc_otg_timeout_task(void *);
Static void dwc_otg_xfer_setup(usbd_xfer_handle);
+Static void dwc_otg_xfer_start(usbd_xfer_handle);
Static void dwc_otg_xfer_end(usbd_xfer_handle);
// static dwc_otg_cmd_t dwc_otg_setup_rx;
@@ -1285,9 +1286,7 @@ dwc_otg_device_ctrl_start(usbd_xfer_hand
mutex_enter(sc-sc_lock);
xfer-status = USBD_IN_PROGRESS;
-
- dwc_otg_start_standard_chain(xfer);
-
+ dwc_otg_xfer_start(xfer);
mutex_exit(sc-sc_lock);
if (sc-sc_bus.use_polling)
@@ -1362,18 +1361,13 @@ dwc_otg_device_bulk_transfer(usbd_xfer_h
Static usbd_status
dwc_otg_device_bulk_start(usbd_xfer_handle xfer)
{
- struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
struct dwc_otg_softc *sc = xfer-pipe-device-bus-hci_private;
DPRINTF(xfer=%p\n, xfer);
mutex_enter(sc-sc_lock);
xfer-status = USBD_IN_PROGRESS;
- if (sc-sc_bus.use_polling) {
- dwc_otg_start_standard_chain(xfer);
- } else {
- workqueue_enqueue(sc-sc_wq, (struct work *)dxfer-work, NULL);
- }
+ dwc_otg_xfer_start(xfer);
mutex_exit(sc-sc_lock);
if (sc-sc_bus.use_polling)
@@ -1444,7 +1438,6 @@ dwc_otg_device_intr_transfer(usbd_xfer_h
Static usbd_status
dwc_otg_device_intr_start(usbd_xfer_handle xfer)
{
- struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)xfer-pipe;
usbd_device_handle dev = dpipe-pipe.device;
struct dwc_otg_softc *sc = dev-bus-hci_private;
@@ -1453,11 +1446,7 @@ dwc_otg_device_intr_start(usbd_xfer_hand
mutex_enter(sc-sc_lock);
xfer-status = USBD_IN_PROGRESS;
- if (sc-sc_bus.use_polling) {
- dwc_otg_start_standard_chain(xfer);
- } else {
- workqueue_enqueue(sc-sc_wq, (struct work *)dxfer-work, NULL);
- }
+ dwc_otg_xfer_start(xfer);
mutex_exit(sc-sc_lock);
if (sc-sc_bus.use_polling)
@@ -1499,8 +1488,6 @@ dwc_otg_device_intr_close(usbd_pipe_hand
Static void
dwc_otg_device_intr_done(usbd_xfer_handle xfer)
{
- struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
- struct dwc_otg_softc *sc = xfer-pipe-device-bus-hci_private;
DPRINTF(\n);
#if 0
@@ -1511,16 +1498,10 @@ dwc_otg_device_intr_done(usbd_xfer_handl
/* XXX JDM */
dwc_otg_xfer_end(xfer);
dwc_otg_xfer_setup(xfer);
-
+ dwc_otg_setup_intr_chain(xfer);
xfer-actlen = 0;
xfer-status = USBD_IN_PROGRESS;
- dwc_otg_setup_intr_chain(xfer);
- if (sc-sc_bus.use_polling) {
- dwc_otg_start_standard_chain(xfer);
- } else {
- workqueue_enqueue(sc-sc_wq,
- (struct work *)dxfer-work, NULL);
- }
+ dwc_otg_xfer_start(xfer);
} else {
dwc_otg_xfer_end(xfer);
}
@@ -4446,6 +4427,23 @@ done:
}
Static void
+dwc_otg_xfer_start(usbd_xfer_handle xfer)
+{
+ struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
+ struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)xfer-pipe;
+ struct dwc_otg_softc *sc = dpipe-pipe.device-bus-hci_private;
+
+ KASSERT(mutex_owned(sc-sc_lock));
+
+ if (sc-sc_bus.use_polling) {
+ dwc_otg_start_standard_chain(xfer);
+ } else {
+ workqueue_enqueue(sc-sc_wq,
+ (struct work *)dxfer-work, NULL);
+ }
+}
+
+Static void
dwc_otg_xfer_end(usbd_xfer_handle xfer)
{
struct dwc_otg_xfer *dxfer = (struct dwc_otg_xfer *)xfer;
CVS commit: src/sys/arch/amd64/amd64
Module Name:src Committed By: chs Date: Sat Jan 12 16:56:11 UTC 2013 Modified Files: src/sys/arch/amd64/amd64: machdep.c Log Message: enable sparse dumps by default. To generate a diff of this commit: cvs rdiff -u -r1.191 -r1.192 src/sys/arch/amd64/amd64/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/amd64/amd64/machdep.c diff -u src/sys/arch/amd64/amd64/machdep.c:1.191 src/sys/arch/amd64/amd64/machdep.c:1.192 --- src/sys/arch/amd64/amd64/machdep.c:1.191 Tue Nov 13 14:09:36 2012 +++ src/sys/arch/amd64/amd64/machdep.c Sat Jan 12 16:56:11 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.191 2012/11/13 14:09:36 chs Exp $ */ +/* $NetBSD: machdep.c,v 1.192 2013/01/12 16:56:11 chs Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2006, 2007, 2008, 2011 @@ -111,7 +111,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.191 2012/11/13 14:09:36 chs Exp $); +__KERNEL_RCSID(0, $NetBSD: machdep.c,v 1.192 2013/01/12 16:56:11 chs Exp $); /* #define XENDEBUG_LOW */ @@ -238,7 +238,7 @@ int cpu_class; int use_pae; #ifndef NO_SPARSE_DUMP -int sparse_dump = 0; +int sparse_dump = 1; paddr_t max_paddr = 0; unsigned char *sparse_dump_physmap;
CVS commit: src/include
Module Name:src Committed By: dholland Date: Sat Jan 12 17:17:26 UTC 2013 Modified Files: src/include: unistd.h Log Message: Remove #if defined(_KERNEL) around a userlevel function. To generate a diff of this commit: cvs rdiff -u -r1.137 -r1.138 src/include/unistd.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/include/unistd.h diff -u src/include/unistd.h:1.137 src/include/unistd.h:1.138 --- src/include/unistd.h:1.137 Sat Dec 1 13:28:18 2012 +++ src/include/unistd.h Sat Jan 12 17:17:26 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: unistd.h,v 1.137 2012/12/01 13:28:18 skrll Exp $ */ +/* $NetBSD: unistd.h,v 1.138 2013/01/12 17:17:26 dholland Exp $ */ /*- * Copyright (c) 1998, 1999, 2008 The NetBSD Foundation, Inc. @@ -308,7 +308,7 @@ int readlinkat(int, const char *, char * int symlinkat(const char *, int, const char *); int unlinkat(int, const char *, int); #endif -#if defined(_INCOMPLETE_XOPEN_C063) || defined(_KERNEL) +#if defined(_INCOMPLETE_XOPEN_C063) int fexecve(int, char * const *, char * const *); #endif
CVS commit: src/sys/arch/xen
Module Name:src
Committed By: bouyer
Date: Sat Jan 12 17:39:46 UTC 2013
Modified Files:
src/sys/arch/xen/include: evtchn.h hypervisor.h
src/sys/arch/xen/x86: hypervisor_machdep.c
src/sys/arch/xen/xen: evtchn.c
Log Message:
Back out this commit:
http://mail-index.netbsd.org/source-changes/2012/12/28/msg039950.html
which cause a panic when running tests on amd64, as shown on:
http://www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/
(i386 hangs for unrelated reasons).
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/xen/include/evtchn.h
cvs rdiff -u -r1.40 -r1.41 src/sys/arch/xen/include/hypervisor.h
cvs rdiff -u -r1.24 -r1.25 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.66 -r1.67 src/sys/arch/xen/xen/evtchn.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/xen/include/evtchn.h
diff -u src/sys/arch/xen/include/evtchn.h:1.21 src/sys/arch/xen/include/evtchn.h:1.22
--- src/sys/arch/xen/include/evtchn.h:1.21 Fri Dec 28 06:29:56 2012
+++ src/sys/arch/xen/include/evtchn.h Sat Jan 12 17:39:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: evtchn.h,v 1.21 2012/12/28 06:29:56 cherry Exp $ */
+/* $NetBSD: evtchn.h,v 1.22 2013/01/12 17:39:46 bouyer Exp $ */
/*
*
@@ -33,9 +33,6 @@
extern struct evtsource *evtsource[];
-#include sys/mutex.h
-extern kmutex_t evtlock[];
-
void events_default_setup(void);
void events_init(void);
bool events_suspend(void);
Index: src/sys/arch/xen/include/hypervisor.h
diff -u src/sys/arch/xen/include/hypervisor.h:1.40 src/sys/arch/xen/include/hypervisor.h:1.41
--- src/sys/arch/xen/include/hypervisor.h:1.40 Fri Dec 28 06:29:56 2012
+++ src/sys/arch/xen/include/hypervisor.h Sat Jan 12 17:39:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.h,v 1.40 2012/12/28 06:29:56 cherry Exp $ */
+/* $NetBSD: hypervisor.h,v 1.41 2013/01/12 17:39:46 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -142,7 +142,6 @@ void hypervisor_unmask_event(unsigned in
void hypervisor_mask_event(unsigned int);
void hypervisor_clear_event(unsigned int);
void hypervisor_enable_ipl(unsigned int);
-void hypervisor_do_iplpending(unsigned int, void *);
void hypervisor_set_ipending(uint32_t, int, int);
void hypervisor_machdep_attach(void);
void hypervisor_machdep_resume(void);
Index: src/sys/arch/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.24 src/sys/arch/xen/x86/hypervisor_machdep.c:1.25
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.24 Fri Dec 28 06:29:56 2012
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Sat Jan 12 17:39:46 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.24 2012/12/28 06:29:56 cherry Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.25 2013/01/12 17:39:46 bouyer Exp $ */
/*
*
@@ -54,7 +54,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.24 2012/12/28 06:29:56 cherry Exp $);
+__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.25 2013/01/12 17:39:46 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -187,7 +187,7 @@ stipending(void)
*/
while (vci-evtchn_upcall_pending) {
- x86_disable_intr();
+ cli();
vci-evtchn_upcall_pending = 0;
@@ -195,7 +195,7 @@ stipending(void)
s-evtchn_pending, s-evtchn_mask,
evt_set_pending, ret);
- x86_enable_intr();
+ sti();
}
#if 0
@@ -284,82 +284,6 @@ do_hypervisor_callback(struct intrframe
#endif
}
-/* Iterate through pending events and call the event handler */
-struct splargs {
- int ipl;
- struct intrframe *regs;
-};
-
-static inline void
-evt_do_iplcallback(unsigned int evtch, unsigned int l1i,
-unsigned int l2i, void *args)
-{
- KASSERT(args != NULL);
- struct splargs *sargs = args;
-
- struct intrhand *ih;
- int (*ih_fun)(void *, void *);
-
- int ipl = sargs-ipl;
- struct cpu_info *ci = curcpu();
- struct intrframe *regs = sargs-regs;
-
- KASSERT(evtsource[evtch] != 0);
-
- KASSERT(ci-ci_ilevel == ipl);
-
- KASSERT(x86_read_psl() != 0);
- x86_enable_intr();
- mutex_spin_enter(evtlock[evtch]);
- ih = evtsource[evtch]-ev_handlers;
- while (ih != NULL) {
- if (ih-ih_cpu != ci) { /* Skip non-local handlers */
- ih = ih-ih_evt_next;
- continue;
- }
- if (ih-ih_level == ipl) {
- KASSERT(x86_read_psl() == 0);
- x86_disable_intr();
- ci-ci_ilevel = ih-ih_level;
- x86_enable_intr();
- ih_fun = (void *)ih-ih_fun;
- ih_fun(ih-ih_arg, regs);
- if (ci-ci_ilevel != ipl) {
- printf(evtchn_do_event:
- handler %p didn't lower
- ipl %d %d\n,
- ih_fun, ci-ci_ilevel, ipl);
- }
- }
- ih = ih-ih_evt_next;
- }
- mutex_spin_exit(evtlock[evtch]);
- hypervisor_enable_event(evtch);
- x86_disable_intr();
-
- KASSERT(ci-ci_ilevel == ipl);
-}
-
-/*
- * Iterate through all pending interrupt handlers at 'ipl', on current
- * cpu.
- */
-void
-hypervisor_do_iplpending(unsigned int ipl, void *regs)
-{
- struct
CVS commit: src/external/mit/xorg/server/drivers/xf86-input-keyboard
Module Name:src
Committed By: macallan
Date: Sat Jan 12 18:32:12 UTC 2013
Modified Files:
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
Log Message:
default to swkbd mode on evbarm as well, now X without config should work
properly on BeagleBoard, RPi and the like
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/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/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.14 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.15
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.14 Mon Jul 16 12:48:42 2012
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Sat Jan 12 18:32:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2012/07/16 12:48:42 abs Exp $
+# $NetBSD: Makefile,v 1.15 2013/01/12 18:32:12 macallan Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -15,7 +15,8 @@ CPPFLAGS+= -DPCVT_SUPPORT
.if ${MACHINE_ARCH} == powerpc || ${MACHINE} == sparc || \
${MACHINE} == sparc64 || ${MACHINE} == sgimips || \
-${MACHINE} == shark || ${MACHINE} == vax
+${MACHINE} == shark || ${MACHINE} == vax || \
+${MACHINE} == evbarm
CPPFLAGS+= -DDEFAULT_TO_WSKBD
.endif
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Sat Jan 12 18:37:10 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
traverse active list with TAILQ_FOREACH_SAFE in dwc_otg_interrupt_poll so the
process doesnt get restarted whenever a transfer completes
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.15 src/sys/dev/usb/dwc_otg.c:1.16
--- src/sys/dev/usb/dwc_otg.c:1.15 Sat Jan 12 16:32:16 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 18:37:09 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.15 2013/01/12 16:32:16 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.16 2013/01/12 18:37:09 jmcneill Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.15 2013/01/12 16:32:16 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.16 2013/01/12 18:37:09 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -3255,7 +3255,7 @@ dwc_otg_interrupt_poll(struct dwc_otg_so
uint8_t ch;
uint32_t temp;
uint32_t intrs;
- struct dwc_otg_xfer *dxfer;
+ struct dwc_otg_xfer *dxfer, *tmp;
uint8_t got_rx_status;
// DPRINTF(\n);
@@ -3344,11 +3344,8 @@ repeat:
got_rx_status = 1;
}
- TAILQ_FOREACH(dxfer, sc-sc_active, xnext) {
- if (!dwc_otg_xfer_do_fifo(dxfer-xfer)) {
- /* queue has been modified */
- goto repeat;
- }
+ TAILQ_FOREACH_SAFE(dxfer, sc-sc_active, xnext, tmp) {
+ dwc_otg_xfer_do_fifo(dxfer-xfer);
}
if (got_rx_status) {
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sat Jan 12 18:53:22 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: correct a bad length parameter for a bus_space_barrier call (takes number of bytes, not number of dwords) To generate a diff of this commit: cvs rdiff -u -r1.16 -r1.17 src/sys/dev/usb/dwc_otg.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/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.16 src/sys/dev/usb/dwc_otg.c:1.17 --- src/sys/dev/usb/dwc_otg.c:1.16 Sat Jan 12 18:37:09 2013 +++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 18:53:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.16 2013/01/12 18:37:09 jmcneill Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.17 2013/01/12 18:53:21 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.16 2013/01/12 18:37:09 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.17 2013/01/12 18:53:21 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -3093,7 +3093,7 @@ send_pkt_sync: DOTG_DFIFO(td-channel), sc-sc_tx_bounce_buffer, (count + 3) / 4); bus_space_barrier(sc-sc_iot, sc-sc_ioh, - DOTG_DFIFO(td-channel), (count + 3) /4, + DOTG_DFIFO(td-channel), ((count + 3) / 4) * 4, BUS_SPACE_BARRIER_READ|BUS_SPACE_BARRIER_WRITE); }
CVS commit: src/lib/libc/sys
Module Name:src Committed By: dholland Date: Sat Jan 12 19:19:24 UTC 2013 Modified Files: src/lib/libc/sys: access.2 Log Message: Rewrite heavily. This was originally going to be just an improvement of some wording related to the *at form... but it needed a general overhaul. Add some missing errors for the *at form... plus EINVAL for the traditional form for when you pass a bogus check mode. Note that the AT_EACCESS flag is useless and strengthen the security warning. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/lib/libc/sys/access.2 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/sys/access.2 diff -u src/lib/libc/sys/access.2:1.29 src/lib/libc/sys/access.2:1.30 --- src/lib/libc/sys/access.2:1.29 Sat Dec 1 20:46:54 2012 +++ src/lib/libc/sys/access.2 Sat Jan 12 19:19:24 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: access.2,v 1.29 2012/12/01 20:46:54 wiz Exp $ +.\ $NetBSD: access.2,v 1.30 2013/01/12 19:19:24 dholland Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\ .\ @(#)access.2 8.2 (Berkeley) 4/1/94 .\ -.Dd November 18, 2012 +.Dd January 12, 2013 .Dt ACCESS 2 .Os .Sh NAME @@ -44,97 +44,148 @@ .Fn access const char *path int mode .In fcntl.h .Ft int -.Fn faccessat int fd const char *path int mode int flag +.Fn faccessat int fd const char *path int mode int flags .Sh DESCRIPTION The .Fn access function checks the accessibility of the file named by +.Fa path . +The +.Fn faccessat +function checks the accessibility of the file named by .Fa path -for the access permissions indicated by -.Fa mode . -The value of -.Fa mode -is the bitwise inclusive OR of the access permissions to be -checked -.Pf ( Dv R_OK -for read permission, -.Dv W_OK -for write permission and -.Dv X_OK -for execute/search permission) or the existence test, -.Dv F_OK . +using +.Fa fd +as the starting point for relative pathnames. +If +.Fa fd +is +.Dv AT_FDCWD +the current directory is used. +.Pp +The form of access to check is specified by the bitwise or of the +following values for +.Fa mode : +.Bl -tag -width W_OK +.It Dv R_OK +Check for read permission. +.It Dv W_OK +Check for write permission. +.It Dv X_OK +Check for execute/search permission. +.It Dv F_OK +Check only for existence. +.El +.Pp All components of the pathname .Fa path -are checked for access permissions (including -.Dv F_OK ) . +are checked for access permissions as well. .Pp -.Fn faccessat -works the same way as -.Fn access -except if -.Fa path -is relative. -In that case, it is looked up from a directory whose file -descriptor was passed as -.Fa fd . -Search permission is required on +.\ Maybe this paragraph should be removed... +The owner of a file has permission checked with respect to the +.Dq owner +read, write, and execute mode bits, members of the file's group +other than the owner have permission checked with respect to the +.Dq group +mode bits, and all others have permissions checked with respect to +the +.Dq other +mode bits. +.Pp +The file descriptor +.Fa fd +must name a directory. +Search permission is required on this directory except if .Fa fd -except if that file descriptor was opened with the +was opened with the .Dv O_SEARCH flag. -.Fa fd -can be set to -.Dv AT_FDCWD -in order to specify the current directory. .Pp -The real user ID is used in place of the effective user ID -and the real group access list -(including the real group ID) are -used in place of the effective ID for verifying permission. +The +.Fa flags +argument to .Fn faccessat -can use the -effective user ID and effective group ID if the +can specify the following optional behavior: +.Bl -tag -width AT_SYMLINK_NOFOLLOW +.It AT_EACCESS +Use the effective user and group IDs instead of the real user and +group IDs for checking permission. +See discussion below. +.It AT_SYMLINK_NOFOLLOW +Do not follow a symbolic link encountered as the last component in +.Fa path . +.El +.Pp +For +.Fn access , +and +.Fn faccessat +when the .Dv AT_EACCESS -flag is passed in -.Fa flag . +flag is not passed, the real user ID and the real group ID are used +for checking permission in place of the effective user ID and +effective group ID. +This affects only set-user-ID and set-group-ID programs, which should +not use these functions. +(For other programs, the real and effective IDs are the same.) .Pp -If a process has super-user privileges and indicates success for -.Dv R_OK -or -.Dv W_OK , -the file may not actually have read or write permission bits set. -If a process has super-user privileges and indicates success for -.Dv X_OK , -at least one of the user, group, or other execute bits is set. -(However, the file may still not be executable. +For processes running with super-user privileges, these functions may +return success for read and write checks
CVS commit: src/lib/libc/sys
Module Name:src Committed By: dholland Date: Sat Jan 12 19:21:48 UTC 2013 Modified Files: src/lib/libc/sys: access.2 Log Message: One more bit: explicitly state what calls to faccessat() are equivalent to access(). To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 src/lib/libc/sys/access.2 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/sys/access.2 diff -u src/lib/libc/sys/access.2:1.30 src/lib/libc/sys/access.2:1.31 --- src/lib/libc/sys/access.2:1.30 Sat Jan 12 19:19:24 2013 +++ src/lib/libc/sys/access.2 Sat Jan 12 19:21:48 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: access.2,v 1.30 2013/01/12 19:19:24 dholland Exp $ +.\ $NetBSD: access.2,v 1.31 2013/01/12 19:21:48 dholland Exp $ .\ .\ Copyright (c) 1980, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -63,6 +63,17 @@ If is .Dv AT_FDCWD the current directory is used. +Calling +.Fn access +is equivalent to calling +.Fn faccessat +with +.Fa fd +set to +.Dv AT_FDCWD +and +.Fa flags +set to 0. .Pp The form of access to check is specified by the bitwise or of the following values for
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Sat Jan 12 20:04:02 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Rename vendor SMC2 to SMSC to better match the reality that SMC Networks makes assembled networking products, where as SMSC designs silicon. To generate a diff of this commit: cvs rdiff -u -r1.632 -r1.633 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.632 src/sys/dev/usb/usbdevs:1.633 --- src/sys/dev/usb/usbdevs:1.632 Mon Nov 26 17:34:45 2012 +++ src/sys/dev/usb/usbdevs Sat Jan 12 20:04:02 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.632 2012/11/26 17:34:45 christos Exp $ +$NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -78,7 +78,7 @@ vendor CREATIVE 0x041e Creative Labs vendor NOKIA 0x0421 Nokia vendor ADI 0x0422 ADI Systems vendor CATC 0x0423 Computer Access Technology -vendor SMC2 0x0424 Standard Microsystems +vendor SMSC 0x0424 SMSC vendor GRAVIS 0x0428 Advanced Gravis Computer vendor SUN 0x0430 Sun Microsystems vendor TAUGA 0x0436 Taugagreining HF @@ -2881,29 +2881,10 @@ product SITECOMEU WL113R2 0x9712 WL-113 product SMARTBRIDGES SMARTLINK 0x0001 SmartLink USB ethernet adapter product SMARTBRIDGES SMARTNIC 0x0003 smartNIC 2 PnP Adapter -/* SMC products */ +/* SMC Networks products */ product SMC 2102USB 0x0100 10Mbps ethernet adapter product SMC 2202USB 0x0200 10/100 ethernet adapter product SMC 2206USB 0x0201 EZ Connect USB Ethernet Adapter -product SMC2 2020HUB 0x2020 USB Hub -product SMC2 SMSC9500 0x9500 SMSC9500 Ethernet device -product SMC2 SMSC9505 0x9505 SMSC9505 Ethernet device -product SMC2 SMSC9500A 0x9e00 SMSC9500A Ethernet device -product SMC2 SMSC9505A 0x9e01 SMSC9505A Ethernet device -product SMC2 SMSC9512_14 0xec00 SMSC9512/9514 USB Hub Ethernet device -product SMC2 SMSC9500_SAL10 0x9900 SMSC9500 Ethernet device (SAL10) -product SMC2 SMSC9505_SAL10 0x9901 SMSC9505 Ethernet device (SAL10) -product SMC2 SMSC9500A_SAL10 0x9902 SMSC9500A Ethernet device (SAL10) -product SMC2 SMSC9505A_SAL10 0x9903 SMSC9505A Ethernet device (SAL10) -product SMC2 SMSC9512_14_SAL10 0x9904 SMSC9512/14 Hub Ethernet Device (SAL10) -product SMC2 SMSC9500A_HAL 0x9905 SMSC9500A Ethernet Device (HAL) -product SMC2 SMSC9505A_HAL 0x9906 SMSC9505A Ethernet Device (HAL) -product SMC2 SMSC9500_ALT 0x9907 SMSC9500 Ethernet Device -product SMC2 SMSC9500A_ALT 0x9908 SMSC9500A Ethernet Device -product SMC2 SMSC9512_14_ALT 0x9909 SMSC9512 Hub Ethernet Device -product SMC2 LAN9530 0x9530 LAN9530 Ethernet Device -product SMC2 LAN9730 0x9730 LAN9730 Ethernet Device -product SMC2 LAN89530 0x9e08 LAN89530 product SMC3 2662WV1 0xa001 EZ Connect 11Mbps product SMC3 2662WV2 0xa002 EZ Connect 11Mbps v2 product SMC 2862WG 0xee13 EZ Connect 54Mbps @@ -2911,6 +2892,27 @@ product SMC 2862WG 0xee13 EZ Connect 54 /* SMK products */ product SMK MCE_IR 0x031d eHome Infrared Transceiver +/* SMSC products */ +product SMSC 2020HUB 0x2020 USB Hub +product SMSC SMSC9500 0x9500 SMSC9500 Ethernet device +product SMSC SMSC9505 0x9505 SMSC9505 Ethernet device +product SMSC SMSC9500A 0x9e00 SMSC9500A Ethernet device +product SMSC SMSC9505A 0x9e01 SMSC9505A Ethernet device +product SMSC SMSC9512_14 0xec00 SMSC9512/9514 USB Hub Ethernet device +product SMSC SMSC9500_SAL10 0x9900 SMSC9500 Ethernet device (SAL10) +product SMSC SMSC9505_SAL10 0x9901 SMSC9505 Ethernet device (SAL10) +product SMSC SMSC9500A_SAL10 0x9902 SMSC9500A Ethernet device (SAL10) +product SMSC SMSC9505A_SAL10 0x9903 SMSC9505A Ethernet device (SAL10) +product SMSC SMSC9512_14_SAL10 0x9904 SMSC9512/14 Hub Ethernet Device (SAL10) +product SMSC SMSC9500A_HAL 0x9905 SMSC9500A Ethernet Device (HAL) +product SMSC SMSC9505A_HAL 0x9906 SMSC9505A Ethernet Device (HAL) +product SMSC SMSC9500_ALT 0x9907 SMSC9500 Ethernet Device +product SMSC SMSC9500A_ALT 0x9908 SMSC9500A Ethernet Device +product SMSC SMSC9512_14_ALT 0x9909 SMSC9512 Hub Ethernet Device +product SMSC LAN9530 0x9530 LAN9530 Ethernet Device +product SMSC LAN9730 0x9730 LAN9730 Ethernet Device +product SMSC LAN89530 0x9e08 LAN89530 + /* SOHOware products */ product SOHOWARE NUB100 0x9100 10/100 USB Ethernet product SOHOWARE NUB110 0x9110 NUB110 Ethernet
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Sat Jan 12 20:06:48 UTC 2013
Modified Files:
src/sys/dev/usb: if_smsc.c usbdevs.h usbdevs_data.h
Log Message:
Regen usbdevs and catch up to VENDOR_SMC2 to VENDOR_SMSC change.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/dev/usb/if_smsc.c
cvs rdiff -u -r1.625 -r1.626 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.626 -r1.627 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/if_smsc.c
diff -u src/sys/dev/usb/if_smsc.c:1.1 src/sys/dev/usb/if_smsc.c:1.2
--- src/sys/dev/usb/if_smsc.c:1.1 Wed Jan 9 23:02:59 2013
+++ src/sys/dev/usb/if_smsc.c Sat Jan 12 20:06:47 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_smsc.c,v 1.1 2013/01/09 23:02:59 skrll Exp $ */
+/* $NetBSD: if_smsc.c,v 1.2 2013/01/12 20:06:47 jakllsch Exp $ */
/* $OpenBSD: if_smsc.c,v 1.4 2012/09/27 12:38:11 jsg Exp $ */
/* $FreeBSD: src/sys/dev/usb/net/if_smsc.c,v 1.1 2012/08/15 04:03:55 gonzo Exp $ */
@@ -114,24 +114,24 @@ int smsc_debug = 0;
* Various supported device vendors/products.
*/
static const struct usb_devno smsc_devs[] = {
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN89530 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9530 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_LAN9730 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_ALT },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_HAL },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500A_SAL10 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_ALT },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9500_SAL10 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_HAL },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505A_SAL10 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9505_SAL10 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14 },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_ALT },
- { USB_VENDOR_SMC2, USB_PRODUCT_SMC2_SMSC9512_14_SAL10 }
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN89530 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_ALT },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_HAL },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A_SAL10 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_ALT },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_HAL },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A_SAL10 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505_SAL10 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14 },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_ALT },
+ { USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14_SAL10 }
};
#ifdef USB_DEBUG
Index: src/sys/dev/usb/usbdevs.h
diff -u src/sys/dev/usb/usbdevs.h:1.625 src/sys/dev/usb/usbdevs.h:1.626
--- src/sys/dev/usb/usbdevs.h:1.625 Mon Nov 26 17:36:35 2012
+++ src/sys/dev/usb/usbdevs.h Sat Jan 12 20:06:47 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.625 2012/11/26 17:36:35 christos Exp $ */
+/* $NetBSD: usbdevs.h,v 1.626 2013/01/12 20:06:47 jakllsch Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.632 2012/11/26 17:34:45 christos Exp
+ * NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp
*/
/*
@@ -85,7 +85,7 @@
#define USB_VENDOR_NOKIA 0x0421 /* Nokia */
#define USB_VENDOR_ADI 0x0422 /* ADI Systems */
#define USB_VENDOR_CATC 0x0423 /* Computer Access Technology */
-#define USB_VENDOR_SMC2 0x0424 /* Standard Microsystems */
+#define USB_VENDOR_SMSC 0x0424 /* SMSC */
#define USB_VENDOR_GRAVIS 0x0428 /* Advanced Gravis Computer */
#define USB_VENDOR_SUN 0x0430 /* Sun Microsystems */
#define USB_VENDOR_TAUGA 0x0436 /* Taugagreining HF */
@@ -2888,29 +2888,10 @@
#define USB_PRODUCT_SMARTBRIDGES_SMARTLINK 0x0001 /* SmartLink USB ethernet adapter */
#define USB_PRODUCT_SMARTBRIDGES_SMARTNIC 0x0003 /* smartNIC 2 PnP Adapter */
-/* SMC products */
+/* SMC Networks products */
#define USB_PRODUCT_SMC_2102USB 0x0100 /* 10Mbps ethernet adapter */
#define USB_PRODUCT_SMC_2202USB 0x0200 /* 10/100 ethernet adapter */
#define USB_PRODUCT_SMC_2206USB 0x0201 /* EZ Connect USB Ethernet Adapter */
-#define USB_PRODUCT_SMC2_2020HUB 0x2020 /* USB Hub */
-#define USB_PRODUCT_SMC2_SMSC9500 0x9500 /* SMSC9500 Ethernet device */
-#define USB_PRODUCT_SMC2_SMSC9505 0x9505 /* SMSC9505 Ethernet device */
-#define USB_PRODUCT_SMC2_SMSC9500A 0x9e00 /* SMSC9500A Ethernet device */
-#define
CVS commit: src/common/lib/libc/arch/arm/string
Module Name:src
Committed By: matt
Date: Sat Jan 12 20:27:13 UTC 2013
Added Files:
src/common/lib/libc/arch/arm/string: memset_arm.S
Log Message:
A version of memset that can do NEON, VFP as well as normal arm instructions
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/common/lib/libc/arch/arm/string/memset_arm.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/common/lib/libc/arch/arm/string/memset_arm.S
diff -u /dev/null src/common/lib/libc/arch/arm/string/memset_arm.S:1.1
--- /dev/null Sat Jan 12 20:27:13 2013
+++ src/common/lib/libc/arch/arm/string/memset_arm.S Sat Jan 12 20:27:13 2013
@@ -0,0 +1,173 @@
+/* $NetBSD: memset_arm.S,v 1.1 2013/01/12 20:27:13 matt Exp $ */
+
+/*-
+ * Copyright (c) 2012 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Matt Thomas of 3am Software Foundry.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+#include machine/asm.h
+
+#if defined(NEON)
+#define STORE8 vst1.32 {d0}, [ip:64]!
+#define STORE16 vst1.32 {d0-d1}, [ip:64]!
+#define STORE32 vst1.32 {d0-d3}, [ip:64]!
+#elif defined(VFP)
+#define STORE8 vstmia ip!, {d0}
+#define STORE16 vstmia ip!, {d0-d1}
+#define STORE32 vstmia ip!, {d0-d3}
+#elif defined(_ARM_ARCH_DWORD_OK)
+#define STORE8 strd r2, [ip], #8
+#define STORE16 STORE8; STORE8
+#define STORE32 STORE16; STORE16
+#else
+#define STORE8 stmia ip!, {r2,r3}
+#define STORE16 STORE8; STORE8
+#define STORE32 STORE16; STORE16
+#endif
+/*
+ * memset: Sets a block of memory to the specified value
+ * Using NEON instructions
+ *
+ * On entry:
+ * r0 - dest address
+ * r1 - byte to write
+ * r2 - number of bytes to write
+ *
+ * On exit:
+ * r0 - dest address
+ */
+/* LINTSTUB: Func: void *memset(void *, int, size_t) */
+ENTRY(memset)
+ ands r3, r1, #0xff /* We deal with bytes */
+ orrne r3, r3, r3, lsl #8 /* replicate to all bytes */
+ orrne r3, r3, r3, lsl #16 /* replicate to all bytes */
+ movs r1, r2 /* we need r2 r3 */
+ RETc(eq) /* return if length is 0 */
+ mov ip, r0 /* r0 needs to stay the same */
+
+ cmp r1, #12 /* is this a small memset? *?
+ blt .Lbyte_by_byte /* then do it byte by byte */
+
+ /* Ok first we will dword align the address */
+ ands r2, ip, #7 /* grab the bottom three bits */
+ beq .Lmemset_dwordaligned /* The addr is dword aligned */
+
+ rsb r2, r2, #8 /* how far until dword aligned? */
+ sub r1, r1, r2 /* subtract it from remaining length */
+ mov r2, r3 /* duplicate fill value */
+
+ tst ip, #1 /* halfword aligned? */
+ strneb r3, [ip], #1 /* no, write a byte */
+ tst ip, #2 /* word aligned? */
+ strneh r3, [ip], #2 /* no, write a halfword */
+ tst ip, #4 /* dword aligned? */
+ strne r3, [ip], #4 /* no, write a word */
+
+ /* We are now doubleword aligned */
+.Lmemset_dwordaligned:
+#if defined(NEON)
+ vdup.8 q0, r3 /* move fill to SIMD */
+ vmov q1, q0 /* put fill in q1 (d2-d3) */
+#elif defined(VFP)
+ mov r2, r3 /* duplicate fill value */
+ vmov d0, r2, r3 /* move to VFP */
+ vmov d1, r2, r3
+ vmov d2, r2, r3
+ vmov d3, r2, r3
+#endif
+
+#if 1
+ cmp r1, #128
+ blt .Lmemset_mainloop
+ ands r2, ip, #63 /* check for 64-byte alignment */
+ beq .Lmemset_mainloop
+ /*
+ * Let's align to a 64-byte boundary so that stores don't cross
+ * cacheline boundaries. We also know we have at least 128-bytes to
+ * copy so we don't have to worry about the length at the moment.
+ */
+ rsb r2, r2, #64 /* how many bytes until 64 bytes */
+ sub r1, r1, r2 ?* subtract from remaining length */
+#if
CVS commit: src/sys/dev/pci
Module Name:src Committed By: riastradh Date: Sat Jan 12 20:33:03 UTC 2013 Modified Files: src/sys/dev/pci: ichsmb.c Log Message: Match the C600's other smbus controller. To generate a diff of this commit: cvs rdiff -u -r1.29 -r1.30 src/sys/dev/pci/ichsmb.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/pci/ichsmb.c diff -u src/sys/dev/pci/ichsmb.c:1.29 src/sys/dev/pci/ichsmb.c:1.30 --- src/sys/dev/pci/ichsmb.c:1.29 Thu Nov 29 18:48:26 2012 +++ src/sys/dev/pci/ichsmb.c Sat Jan 12 20:33:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ichsmb.c,v 1.29 2012/11/29 18:48:26 msaitoh Exp $ */ +/* $NetBSD: ichsmb.c,v 1.30 2013/01/12 20:33:02 riastradh Exp $ */ /* $OpenBSD: ichiic.c,v 1.18 2007/05/03 09:36:26 dlg Exp $ */ /* @@ -22,7 +22,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.29 2012/11/29 18:48:26 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: ichsmb.c,v 1.30 2013/01/12 20:33:02 riastradh Exp $); #include sys/param.h #include sys/device.h @@ -109,6 +109,7 @@ ichsmb_match(device_t parent, cfdata_t m case PCI_PRODUCT_INTEL_3400_SMB: case PCI_PRODUCT_INTEL_6SERIES_SMB: case PCI_PRODUCT_INTEL_7SERIES_SMB: + case PCI_PRODUCT_INTEL_C600_SMBUS: case PCI_PRODUCT_INTEL_C600_SMB_0: case PCI_PRODUCT_INTEL_C600_SMB_1: case PCI_PRODUCT_INTEL_C600_SMB_2:
CVS commit: src/sys/arch/x86/pci
Module Name:src
Committed By: riastradh
Date: Sat Jan 12 20:34:00 UTC 2013
Modified Files:
src/sys/arch/x86/pci: ichlpcib.c
Log Message:
Match the C600's ichlpcib.
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/sys/arch/x86/pci/ichlpcib.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/pci/ichlpcib.c
diff -u src/sys/arch/x86/pci/ichlpcib.c:1.37 src/sys/arch/x86/pci/ichlpcib.c:1.38
--- src/sys/arch/x86/pci/ichlpcib.c:1.37 Wed Dec 19 05:52:00 2012
+++ src/sys/arch/x86/pci/ichlpcib.c Sat Jan 12 20:33:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ichlpcib.c,v 1.37 2012/12/19 05:52:00 msaitoh Exp $ */
+/* $NetBSD: ichlpcib.c,v 1.38 2013/01/12 20:33:59 riastradh Exp $ */
/*-
* Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -39,7 +39,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.37 2012/12/19 05:52:00 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: ichlpcib.c,v 1.38 2013/01/12 20:33:59 riastradh Exp $);
#include sys/types.h
#include sys/param.h
@@ -247,6 +247,7 @@ static struct lpcib_device {
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Q77_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z75_LPC, 1, 0 },
{ PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_Z77_LPC, 1, 0 },
+ { PCI_VENDOR_INTEL, PCI_PRODUCT_INTEL_C600_LPC, 1, 0 },
{ 0, 0, 0, 0 },
};
CVS commit: src/sys/arch/xen
Module Name:src
Committed By: bouyer
Date: Sat Jan 12 21:09:10 UTC 2013
Modified Files:
src/sys/arch/xen/include: hypervisor.h
src/sys/arch/xen/x86: hypervisor_machdep.c
src/sys/arch/xen/xen: evtchn.c
Log Message:
Revert these commits from november 2012:
http://mail-index.netbsd.org/source-changes/2012/11/25/msg039125.html
http://mail-index.netbsd.org/source-changes/2012/11/25/msg039126.html
http://mail-index.netbsd.org/source-changes/2012/11/25/msg039142.html
they cause a i386PAE domU to hang while running ATF tests, as shown in
http://www-soc.lip6.fr/~bouyer/NetBSD-tests/xen/HEAD/
(we should pay more attention to test results, myself first).
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/sys/arch/xen/include/hypervisor.h
cvs rdiff -u -r1.25 -r1.26 src/sys/arch/xen/x86/hypervisor_machdep.c
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/xen/xen/evtchn.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/xen/include/hypervisor.h
diff -u src/sys/arch/xen/include/hypervisor.h:1.41 src/sys/arch/xen/include/hypervisor.h:1.42
--- src/sys/arch/xen/include/hypervisor.h:1.41 Sat Jan 12 17:39:46 2013
+++ src/sys/arch/xen/include/hypervisor.h Sat Jan 12 21:09:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor.h,v 1.41 2013/01/12 17:39:46 bouyer Exp $ */
+/* $NetBSD: hypervisor.h,v 1.42 2013/01/12 21:09:10 bouyer Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -142,7 +142,8 @@ void hypervisor_unmask_event(unsigned in
void hypervisor_mask_event(unsigned int);
void hypervisor_clear_event(unsigned int);
void hypervisor_enable_ipl(unsigned int);
-void hypervisor_set_ipending(uint32_t, int, int);
+void hypervisor_set_ipending(struct cpu_info *,
+ uint32_t, int, int);
void hypervisor_machdep_attach(void);
void hypervisor_machdep_resume(void);
Index: src/sys/arch/xen/x86/hypervisor_machdep.c
diff -u src/sys/arch/xen/x86/hypervisor_machdep.c:1.25 src/sys/arch/xen/x86/hypervisor_machdep.c:1.26
--- src/sys/arch/xen/x86/hypervisor_machdep.c:1.25 Sat Jan 12 17:39:46 2013
+++ src/sys/arch/xen/x86/hypervisor_machdep.c Sat Jan 12 21:09:10 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: hypervisor_machdep.c,v 1.25 2013/01/12 17:39:46 bouyer Exp $ */
+/* $NetBSD: hypervisor_machdep.c,v 1.26 2013/01/12 21:09:10 bouyer Exp $ */
/*
*
@@ -54,7 +54,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.25 2013/01/12 17:39:46 bouyer Exp $);
+__KERNEL_RCSID(0, $NetBSD: hypervisor_machdep.c,v 1.26 2013/01/12 21:09:10 bouyer Exp $);
#include sys/param.h
#include sys/systm.h
@@ -87,11 +87,11 @@ static void update_p2m_frame_list_list(v
// #define EARLY_DEBUG_EVENT
/* callback function type */
-typedef void (*iterate_func_t)(unsigned int, unsigned int,
- unsigned int, void *);
+typedef void (*iterate_func_t)(struct cpu_info *, unsigned int,
+ unsigned int, unsigned int, void *);
static inline void
-evt_iterate_bits(volatile unsigned long *pendingl1,
+evt_iterate_bits(struct cpu_info *ci, volatile unsigned long *pendingl1,
volatile unsigned long *pendingl2,
volatile unsigned long *mask,
iterate_func_t iterate_pending, void *iterate_args)
@@ -109,7 +109,7 @@ evt_iterate_bits(volatile unsigned long
l1 = ~(1UL l1i);
l2 = pendingl2[l1i] (mask != NULL ? ~mask[l1i] : -1UL);
- l2 = curcpu()-ci_evtmask[l1i];
+ l2 = ci-ci_evtmask[l1i];
if (mask != NULL) xen_atomic_setbits_l(mask[l1i], l2);
xen_atomic_clearbits_l(pendingl2[l1i], l2);
@@ -120,7 +120,7 @@ evt_iterate_bits(volatile unsigned long
port = (l1i LONG_SHIFT) + l2i;
- iterate_pending(port, l1i, l2i, iterate_args);
+ iterate_pending(ci, port, l1i, l2i, iterate_args);
}
}
}
@@ -131,18 +131,20 @@ evt_iterate_bits(volatile unsigned long
*/
static inline void
-evt_set_pending(unsigned int port, unsigned int l1i,
+evt_set_pending(struct cpu_info *ci, unsigned int port, unsigned int l1i,
unsigned int l2i, void *args)
{
KASSERT(args != NULL);
+ KASSERT(ci != NULL);
int *ret = args;
if (evtsource[port]) {
- hypervisor_set_ipending(evtsource[port]-ev_imask, l1i, l2i);
+ hypervisor_set_ipending(evtsource[port]-ev_cpu,
+ evtsource[port]-ev_imask, l1i, l2i);
evtsource[port]-ev_evcnt.ev_count++;
- if (*ret == 0 curcpu()-ci_ilevel
+ if (*ret == 0 ci-ci_ilevel
evtsource[port]-ev_maxlevel)
*ret = 1;
}
@@ -191,7 +193,7 @@ stipending(void)
vci-evtchn_upcall_pending = 0;
- evt_iterate_bits(vci-evtchn_pending_sel,
+ evt_iterate_bits(ci, vci-evtchn_pending_sel,
s-evtchn_pending, s-evtchn_mask,
evt_set_pending, ret);
@@ -212,12 +214,12 @@ stipending(void)
/* Iterate through pending events and call the event handler */
static inline void
-evt_do_hypervisor_callback(unsigned int port, unsigned int l1i,
- unsigned int l2i, void *args)
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jakllsch Date: Sat Jan 12 21:25:59 UTC 2013 Modified Files: src/sys/dev/mii: miidevs Log Message: Add SMSC OUI and LAN8700 and LAN8710/LAN8720 PHY IDs, at this point just for MIIVERBOSE. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/sys/dev/mii/miidevs 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 diff -u src/sys/dev/mii/miidevs:1.109 src/sys/dev/mii/miidevs:1.110 --- src/sys/dev/mii/miidevs:1.109 Mon Sep 17 11:42:38 2012 +++ src/sys/dev/mii/miidevs Sat Jan 12 21:25:58 2013 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp $ +$NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -74,6 +74,7 @@ oui REALTEK 0x00e04c RealTek oui QUALSEMI 0x006051 Quality Semiconductor oui SEEQ 0x00a07d Seeq oui SIS0x00e006 Silicon Integrated Systems +oui SMSC 0x00800f SMSC oui TI0x080028 Texas Instruments oui TSC0x00c039 TDK Semiconductor oui XAQTI 0x00e0ae XaQti Corp. @@ -285,6 +286,10 @@ model SEEQ 80225 0x0008 Seeq 80225 10/1 /* Silicon Integrated Systems PHYs */ model SIS 900 0x SiS 900 10/100 media interface +/* SMSC PHYs */ +model SMSC LAN8700 0x000c LAN8700 10/100 Ethernet Transceiver +model SMSC LAN8710_LAN8720 0x000f LAN8710/LAN8720 10/100 Ethernet Transceiver + /* Texas Instruments PHYs */ model TI TLAN10T 0x0001 ThunderLAN 10BASE-T media interface model TI 100VGPMI 0x0002 ThunderLAN 100VG-AnyLan media interface
CVS commit: src/sys/dev/mii
Module Name:src
Committed By: jakllsch
Date: Sat Jan 12 21:26:24 UTC 2013
Modified Files:
src/sys/dev/mii: miidevs.h miidevs_data.h
Log Message:
regen.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/sys/dev/mii/miidevs.h
cvs rdiff -u -r1.100 -r1.101 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.112 src/sys/dev/mii/miidevs.h:1.113
--- src/sys/dev/mii/miidevs.h:1.112 Mon Sep 17 11:43:50 2012
+++ src/sys/dev/mii/miidevs.h Sat Jan 12 21:26:24 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs.h,v 1.112 2012/09/17 11:43:50 tsutsui Exp $ */
+/* $NetBSD: miidevs.h,v 1.113 2013/01/12 21:26:24 jakllsch Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp
+ * NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp
*/
/*-
@@ -81,6 +81,7 @@
#define MII_OUI_QUALSEMI 0x006051 /* Quality Semiconductor */
#define MII_OUI_SEEQ 0x00a07d /* Seeq */
#define MII_OUI_SIS 0x00e006 /* Silicon Integrated Systems */
+#define MII_OUI_SMSC 0x00800f /* SMSC */
#define MII_OUI_TI 0x080028 /* Texas Instruments */
#define MII_OUI_TSC 0x00c039 /* TDK Semiconductor */
#define MII_OUI_XAQTI 0x00e0ae /* XaQti Corp. */
@@ -417,6 +418,12 @@
#define MII_MODEL_SIS_900 0x
#define MII_STR_SIS_900 SiS 900 10/100 media interface
+/* SMSC PHYs */
+#define MII_MODEL_SMSC_LAN8700 0x000c
+#define MII_STR_SMSC_LAN8700 LAN8700 10/100 Ethernet Transceiver
+#define MII_MODEL_SMSC_LAN8710_LAN8720 0x000f
+#define MII_STR_SMSC_LAN8710_LAN8720 LAN8710/LAN8720 10/100 Ethernet Transceiver
+
/* Texas Instruments PHYs */
#define MII_MODEL_TI_TLAN10T 0x0001
#define MII_STR_TI_TLAN10T ThunderLAN 10BASE-T media interface
Index: src/sys/dev/mii/miidevs_data.h
diff -u src/sys/dev/mii/miidevs_data.h:1.100 src/sys/dev/mii/miidevs_data.h:1.101
--- src/sys/dev/mii/miidevs_data.h:1.100 Mon Sep 17 11:43:50 2012
+++ src/sys/dev/mii/miidevs_data.h Sat Jan 12 21:26:24 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: miidevs_data.h,v 1.100 2012/09/17 11:43:50 tsutsui Exp $ */
+/* $NetBSD: miidevs_data.h,v 1.101 2013/01/12 21:26:24 jakllsch Exp $ */
/*
* THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: miidevs,v 1.109 2012/09/17 11:42:38 tsutsui Exp
+ * NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp
*/
/*-
@@ -162,6 +162,8 @@ struct mii_knowndev mii_knowndevs[] = {
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_84220, MII_STR_SEEQ_84220 },
{ MII_OUI_SEEQ, MII_MODEL_SEEQ_80225, MII_STR_SEEQ_80225 },
{ MII_OUI_SIS, MII_MODEL_SIS_900, MII_STR_SIS_900 },
+ { MII_OUI_SMSC, MII_MODEL_SMSC_LAN8700, MII_STR_SMSC_LAN8700 },
+ { MII_OUI_SMSC, MII_MODEL_SMSC_LAN8710_LAN8720, MII_STR_SMSC_LAN8710_LAN8720 },
{ MII_OUI_TI, MII_MODEL_TI_TLAN10T, MII_STR_TI_TLAN10T },
{ MII_OUI_TI, MII_MODEL_TI_100VGPMI, MII_STR_TI_100VGPMI },
{ MII_OUI_TI, MII_MODEL_TI_TNETE2101, MII_STR_TI_TNETE2101 },
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jakllsch Date: Sat Jan 12 21:34:48 UTC 2013 Modified Files: src/sys/dev/usb: usbdevs Log Message: Add SMSC9512 hub Id, and reorder SMSC products by Id number. To generate a diff of this commit: cvs rdiff -u -r1.633 -r1.634 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/usbdevs diff -u src/sys/dev/usb/usbdevs:1.633 src/sys/dev/usb/usbdevs:1.634 --- src/sys/dev/usb/usbdevs:1.633 Sat Jan 12 20:04:02 2013 +++ src/sys/dev/usb/usbdevs Sat Jan 12 21:34:48 2013 @@ -1,4 +1,4 @@ -$NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp $ +$NetBSD: usbdevs,v 1.634 2013/01/12 21:34:48 jakllsch Exp $ /* * Copyright (c) 1998-2004 The NetBSD Foundation, Inc. @@ -2896,9 +2896,9 @@ product SMK MCE_IR 0x031d eHome Infrare product SMSC 2020HUB 0x2020 USB Hub product SMSC SMSC9500 0x9500 SMSC9500 Ethernet device product SMSC SMSC9505 0x9505 SMSC9505 Ethernet device -product SMSC SMSC9500A 0x9e00 SMSC9500A Ethernet device -product SMSC SMSC9505A 0x9e01 SMSC9505A Ethernet device -product SMSC SMSC9512_14 0xec00 SMSC9512/9514 USB Hub Ethernet device +product SMSC SMSC9512 0x9512 SMSC9512 USB Hub +product SMSC LAN9530 0x9530 LAN9530 Ethernet Device +product SMSC LAN9730 0x9730 LAN9730 Ethernet Device product SMSC SMSC9500_SAL10 0x9900 SMSC9500 Ethernet device (SAL10) product SMSC SMSC9505_SAL10 0x9901 SMSC9505 Ethernet device (SAL10) product SMSC SMSC9500A_SAL10 0x9902 SMSC9500A Ethernet device (SAL10) @@ -2909,9 +2909,10 @@ product SMSC SMSC9505A_HAL 0x9906 SMSC95 product SMSC SMSC9500_ALT 0x9907 SMSC9500 Ethernet Device product SMSC SMSC9500A_ALT 0x9908 SMSC9500A Ethernet Device product SMSC SMSC9512_14_ALT 0x9909 SMSC9512 Hub Ethernet Device -product SMSC LAN9530 0x9530 LAN9530 Ethernet Device -product SMSC LAN9730 0x9730 LAN9730 Ethernet Device +product SMSC SMSC9500A 0x9e00 SMSC9500A Ethernet device +product SMSC SMSC9505A 0x9e01 SMSC9505A Ethernet device product SMSC LAN89530 0x9e08 LAN89530 +product SMSC SMSC9512_14 0xec00 SMSC9512/9514 USB Hub Ethernet device /* SOHOware products */ product SOHOWARE NUB100 0x9100 10/100 USB Ethernet
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jakllsch
Date: Sat Jan 12 21:35:34 UTC 2013
Modified Files:
src/sys/dev/usb: usbdevs.h usbdevs_data.h
Log Message:
regen
To generate a diff of this commit:
cvs rdiff -u -r1.626 -r1.627 src/sys/dev/usb/usbdevs.h
cvs rdiff -u -r1.627 -r1.628 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.626 src/sys/dev/usb/usbdevs.h:1.627
--- src/sys/dev/usb/usbdevs.h:1.626 Sat Jan 12 20:06:47 2013
+++ src/sys/dev/usb/usbdevs.h Sat Jan 12 21:35:34 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs.h,v 1.626 2013/01/12 20:06:47 jakllsch Exp $ */
+/* $NetBSD: usbdevs.h,v 1.627 2013/01/12 21:35:34 jakllsch Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp
+ * NetBSD: usbdevs,v 1.634 2013/01/12 21:34:48 jakllsch Exp
*/
/*
@@ -2903,9 +2903,9 @@
#define USB_PRODUCT_SMSC_2020HUB 0x2020 /* USB Hub */
#define USB_PRODUCT_SMSC_SMSC9500 0x9500 /* SMSC9500 Ethernet device */
#define USB_PRODUCT_SMSC_SMSC9505 0x9505 /* SMSC9505 Ethernet device */
-#define USB_PRODUCT_SMSC_SMSC9500A 0x9e00 /* SMSC9500A Ethernet device */
-#define USB_PRODUCT_SMSC_SMSC9505A 0x9e01 /* SMSC9505A Ethernet device */
-#define USB_PRODUCT_SMSC_SMSC9512_14 0xec00 /* SMSC9512/9514 USB Hub Ethernet device */
+#define USB_PRODUCT_SMSC_SMSC9512 0x9512 /* SMSC9512 USB Hub */
+#define USB_PRODUCT_SMSC_LAN9530 0x9530 /* LAN9530 Ethernet Device */
+#define USB_PRODUCT_SMSC_LAN9730 0x9730 /* LAN9730 Ethernet Device */
#define USB_PRODUCT_SMSC_SMSC9500_SAL10 0x9900 /* SMSC9500 Ethernet device (SAL10) */
#define USB_PRODUCT_SMSC_SMSC9505_SAL10 0x9901 /* SMSC9505 Ethernet device (SAL10) */
#define USB_PRODUCT_SMSC_SMSC9500A_SAL10 0x9902 /* SMSC9500A Ethernet device (SAL10) */
@@ -2916,9 +2916,10 @@
#define USB_PRODUCT_SMSC_SMSC9500_ALT 0x9907 /* SMSC9500 Ethernet Device */
#define USB_PRODUCT_SMSC_SMSC9500A_ALT 0x9908 /* SMSC9500A Ethernet Device */
#define USB_PRODUCT_SMSC_SMSC9512_14_ALT 0x9909 /* SMSC9512 Hub Ethernet Device */
-#define USB_PRODUCT_SMSC_LAN9530 0x9530 /* LAN9530 Ethernet Device */
-#define USB_PRODUCT_SMSC_LAN9730 0x9730 /* LAN9730 Ethernet Device */
+#define USB_PRODUCT_SMSC_SMSC9500A 0x9e00 /* SMSC9500A Ethernet device */
+#define USB_PRODUCT_SMSC_SMSC9505A 0x9e01 /* SMSC9505A Ethernet device */
#define USB_PRODUCT_SMSC_LAN89530 0x9e08 /* LAN89530 */
+#define USB_PRODUCT_SMSC_SMSC9512_14 0xec00 /* SMSC9512/9514 USB Hub Ethernet device */
/* SOHOware products */
#define USB_PRODUCT_SOHOWARE_NUB100 0x9100 /* 10/100 USB Ethernet */
Index: src/sys/dev/usb/usbdevs_data.h
diff -u src/sys/dev/usb/usbdevs_data.h:1.627 src/sys/dev/usb/usbdevs_data.h:1.628
--- src/sys/dev/usb/usbdevs_data.h:1.627 Sat Jan 12 20:06:47 2013
+++ src/sys/dev/usb/usbdevs_data.h Sat Jan 12 21:35:34 2013
@@ -1,10 +1,10 @@
-/* $NetBSD: usbdevs_data.h,v 1.627 2013/01/12 20:06:47 jakllsch Exp $ */
+/* $NetBSD: usbdevs_data.h,v 1.628 2013/01/12 21:35:34 jakllsch Exp $ */
/*
* THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.
*
* generated from:
- * NetBSD: usbdevs,v 1.633 2013/01/12 20:04:02 jakllsch Exp
+ * NetBSD: usbdevs,v 1.634 2013/01/12 21:34:48 jakllsch Exp
*/
/*
@@ -8863,16 +8863,16 @@ const struct usb_product usb_products[]
SMSC9505 Ethernet device,
},
{
- USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A,
- SMSC9500A Ethernet device,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512,
+ SMSC9512 USB Hub,
},
{
- USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A,
- SMSC9505A Ethernet device,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530,
+ LAN9530 Ethernet Device,
},
{
- USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14,
- SMSC9512/9514 USB Hub Ethernet device,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730,
+ LAN9730 Ethernet Device,
},
{
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500_SAL10,
@@ -8915,18 +8915,22 @@ const struct usb_product usb_products[]
SMSC9512 Hub Ethernet Device,
},
{
- USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9530,
- LAN9530 Ethernet Device,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9500A,
+ SMSC9500A Ethernet device,
},
{
- USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN9730,
- LAN9730 Ethernet Device,
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9505A,
+ SMSC9505A Ethernet device,
},
{
USB_VENDOR_SMSC, USB_PRODUCT_SMSC_LAN89530,
LAN89530,
},
{
+ USB_VENDOR_SMSC, USB_PRODUCT_SMSC_SMSC9512_14,
+ SMSC9512/9514 USB Hub Ethernet device,
+ },
+ {
USB_VENDOR_SOHOWARE, USB_PRODUCT_SOHOWARE_NUB100,
10/100 USB Ethernet,
},
@@ -9855,4 +9859,4 @@ const struct usb_product usb_products[]
Prestige,
},
};
-const int usb_nproducts = 1934;
+const int
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jakllsch Date: Sat Jan 12 21:43:14 UTC 2013 Modified Files: src/sys/dev/mii: miidevs Log Message: Unlike usbdevs, miidevs needs the vendor name in the product id string. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/sys/dev/mii/miidevs 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 diff -u src/sys/dev/mii/miidevs:1.110 src/sys/dev/mii/miidevs:1.111 --- src/sys/dev/mii/miidevs:1.110 Sat Jan 12 21:25:58 2013 +++ src/sys/dev/mii/miidevs Sat Jan 12 21:43:13 2013 @@ -1,4 +1,4 @@ -$NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp $ +$NetBSD: miidevs,v 1.111 2013/01/12 21:43:13 jakllsch Exp $ /*- * Copyright (c) 1998, 1999 The NetBSD Foundation, Inc. @@ -287,8 +287,8 @@ model SEEQ 80225 0x0008 Seeq 80225 10/1 model SIS 900 0x SiS 900 10/100 media interface /* SMSC PHYs */ -model SMSC LAN8700 0x000c LAN8700 10/100 Ethernet Transceiver -model SMSC LAN8710_LAN8720 0x000f LAN8710/LAN8720 10/100 Ethernet Transceiver +model SMSC LAN8700 0x000c SMSC LAN8700 10/100 Ethernet Transceiver +model SMSC LAN8710_LAN8720 0x000f SMSC LAN8710/LAN8720 10/100 Ethernet Transceiver /* Texas Instruments PHYs */ model TI TLAN10T 0x0001 ThunderLAN 10BASE-T media interface
CVS commit: src/sys/dev/mii
Module Name:src Committed By: jakllsch Date: Sat Jan 12 21:43:26 UTC 2013 Modified Files: src/sys/dev/mii: miidevs.h miidevs_data.h Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.113 -r1.114 src/sys/dev/mii/miidevs.h cvs rdiff -u -r1.101 -r1.102 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.113 src/sys/dev/mii/miidevs.h:1.114 --- src/sys/dev/mii/miidevs.h:1.113 Sat Jan 12 21:26:24 2013 +++ src/sys/dev/mii/miidevs.h Sat Jan 12 21:43:26 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs.h,v 1.113 2013/01/12 21:26:24 jakllsch Exp $ */ +/* $NetBSD: miidevs.h,v 1.114 2013/01/12 21:43:26 jakllsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp + * NetBSD: miidevs,v 1.111 2013/01/12 21:43:13 jakllsch Exp */ /*- @@ -420,9 +420,9 @@ /* SMSC PHYs */ #define MII_MODEL_SMSC_LAN8700 0x000c -#define MII_STR_SMSC_LAN8700 LAN8700 10/100 Ethernet Transceiver +#define MII_STR_SMSC_LAN8700 SMSC LAN8700 10/100 Ethernet Transceiver #define MII_MODEL_SMSC_LAN8710_LAN8720 0x000f -#define MII_STR_SMSC_LAN8710_LAN8720 LAN8710/LAN8720 10/100 Ethernet Transceiver +#define MII_STR_SMSC_LAN8710_LAN8720 SMSC LAN8710/LAN8720 10/100 Ethernet Transceiver /* Texas Instruments PHYs */ #define MII_MODEL_TI_TLAN10T 0x0001 Index: src/sys/dev/mii/miidevs_data.h diff -u src/sys/dev/mii/miidevs_data.h:1.101 src/sys/dev/mii/miidevs_data.h:1.102 --- src/sys/dev/mii/miidevs_data.h:1.101 Sat Jan 12 21:26:24 2013 +++ src/sys/dev/mii/miidevs_data.h Sat Jan 12 21:43:26 2013 @@ -1,10 +1,10 @@ -/* $NetBSD: miidevs_data.h,v 1.101 2013/01/12 21:26:24 jakllsch Exp $ */ +/* $NetBSD: miidevs_data.h,v 1.102 2013/01/12 21:43:26 jakllsch Exp $ */ /* * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT. * * generated from: - * NetBSD: miidevs,v 1.110 2013/01/12 21:25:58 jakllsch Exp + * NetBSD: miidevs,v 1.111 2013/01/12 21:43:13 jakllsch Exp */ /*-
CVS commit: src/doc
Module Name:src Committed By: skrll Date: Sat Jan 12 22:28:40 UTC 2013 Modified Files: src/doc: CHANGES Log Message: Fix thinko in one of my entries To generate a diff of this commit: cvs rdiff -u -r1.1779 -r1.1780 src/doc/CHANGES 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 diff -u src/doc/CHANGES:1.1779 src/doc/CHANGES:1.1780 --- src/doc/CHANGES:1.1779 Fri Jan 11 14:25:26 2013 +++ src/doc/CHANGES Sat Jan 12 22:28:40 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1779 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1780 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -168,7 +168,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: luna68k: Add native bootloader. Based on 4.4BSD-Lite2/luna68k Stinger loader. [tsutsui 20130105] kernel: Add dotg(4), a driver for Synopsys DesignWare USB OTG, - ported from NetBSD. [skrll 20130109] + ported from FreeBSD. [skrll 20130109] kernel: Add usmsc(4), a driver for SMSC LAN95xx USB LAN devices, ported from OpenBSD. [skrll 20130109] arm: kill userland FPA support, replace with VFP. [matt 20130111]
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Jan 12 22:42:49 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
If we're going to have GINTSTS_ and GINTMSK_ might as well be consistent
about their use.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.17 src/sys/dev/usb/dwc_otg.c:1.18
--- src/sys/dev/usb/dwc_otg.c:1.17 Sat Jan 12 18:53:21 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 22:42:49 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.17 2013/01/12 18:53:21 jmcneill Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.18 2013/01/12 22:42:49 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.17 2013/01/12 18:53:21 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.18 2013/01/12 22:42:49 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -109,15 +109,15 @@ int dwc_otgdebug = 0;
#endif
#define DWC_OTG_MSK_GINT_ENABLED \
- (GINTSTS_ENUMDONE | \
- GINTSTS_USBRST | \
- GINTSTS_USBSUSP | \
- GINTSTS_IEPINT | \
- GINTSTS_RXFLVL | \
- GINTSTS_SESSREQINT | \
+ (GINTMSK_ENUMDONEMSK | \
+ GINTMSK_USBRSTMSK | \
+ GINTMSK_USBSUSPMSK | \
+ GINTMSK_IEPINTMSK | \
+ GINTMSK_RXFLVLMSK | \
+ GINTMSK_SESSREQINTMSK | \
GINTMSK_OTGINTMSK | \
GINTMSK_HCHINTMSK | \
- GINTSTS_PRTINT)
+ GINTMSK_PRTINTMSK)
#define DWC_OTG_BUS2SC(bus) ((bus)-hci_private)
@@ -2050,9 +2050,9 @@ dwc_otg_pull_down(struct dwc_otg_softc *
Static void
dwc_otg_enable_sof_irq(struct dwc_otg_softc *sc)
{
- if (sc-sc_irq_mask GINTSTS_SOF)
+ if (sc-sc_irq_mask GINTMSK_SOFMSK)
return;
- sc-sc_irq_mask |= GINTSTS_SOF;
+ sc-sc_irq_mask |= GINTMSK_SOFMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
}
@@ -2069,8 +2069,8 @@ dwc_otg_resume_irq(struct dwc_otg_softc
* Disable resume interrupt and enable suspend
* interrupt:
*/
- sc-sc_irq_mask = ~GINTSTS_WKUPINT;
- sc-sc_irq_mask |= GINTSTS_USBSUSP;
+ sc-sc_irq_mask = ~GINTMSK_WKUPINTMSK;
+ sc-sc_irq_mask |= GINTMSK_USBSUSPMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
}
@@ -2092,8 +2092,8 @@ dwc_otg_suspend_irq(struct dwc_otg_softc
* Disable suspend interrupt and enable resume
* interrupt:
*/
- sc-sc_irq_mask = ~GINTSTS_USBSUSP;
- sc-sc_irq_mask |= GINTSTS_WKUPINT;
+ sc-sc_irq_mask = ~GINTMSK_USBSUSPMSK;
+ sc-sc_irq_mask |= GINTMSK_WKUPINTMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
}
@@ -2168,7 +2168,7 @@ dwc_otg_common_rx_ack(struct dwc_otg_sof
DPRINTFN(5, RX status clear\n);
/* enable RX FIFO level interrupt */
- sc-sc_irq_mask |= GINTSTS_RXFLVL;
+ sc-sc_irq_mask |= GINTMSK_RXFLVLMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
/* clear cached status */
@@ -3354,7 +3354,7 @@ repeat:
goto repeat;
/* disable RX FIFO level interrupt */
- sc-sc_irq_mask = ~GINTSTS_RXFLVL;
+ sc-sc_irq_mask = ~GINTMSK_RXFLVLMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
}
}
@@ -3444,8 +3444,8 @@ dwc_otg_interrupt(struct dwc_otg_softc *
/* disable resume interrupt and enable suspend interrupt */
- sc-sc_irq_mask = ~GINTSTS_WKUPINT;
- sc-sc_irq_mask |= GINTSTS_USBSUSP;
+ sc-sc_irq_mask = ~GINTMSK_WKUPINTMSK;
+ sc-sc_irq_mask |= GINTMSK_USBSUSPMSK;
DWC_OTG_WRITE_4(sc, DOTG_GINTMSK, sc-sc_irq_mask);
/* complete root HUB interrupt endpoint */
@@ -3540,9 +3540,7 @@ dwc_otg_interrupt(struct dwc_otg_softc *
}
/* check VBUS */
- if (status (GINTSTS_USBSUSP |
- GINTSTS_USBRST |
- GINTMSK_OTGINTMSK |
+ if (status (GINTSTS_USBSUSP | GINTSTS_USBRST | GINTSTS_OTGINT |
GINTSTS_SESSREQINT)) {
DPRINTFN(5, vbus interrupt\n);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Jan 12 22:57:26 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Unwrap short lines
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.18 src/sys/dev/usb/dwc_otg.c:1.19
--- src/sys/dev/usb/dwc_otg.c:1.18 Sat Jan 12 22:42:49 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 22:57:26 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.18 2013/01/12 22:42:49 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.19 2013/01/12 22:57:26 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.18 2013/01/12 22:42:49 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.19 2013/01/12 22:57:26 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -2373,8 +2373,7 @@ dwc_otg_host_setup_tx(struct dwc_otg_td
DWC_OTG_READ_4(sc, DOTG_HCCHAR(td-channel)),
DWC_OTG_READ_4(sc, DOTG_HCTSIZ(td-channel)));
- if (hcint (HCINT_RETRY |
- HCINT_ACK | HCINT_NYET)) {
+ if (hcint (HCINT_RETRY | HCINT_ACK | HCINT_NYET)) {
/* give success bits priority over failure bits */
} else if (hcint HCINT_STALL) {
DPRINTF(CH=%d STALL\n, td-channel);
@@ -2602,8 +2601,7 @@ dwc_otg_host_data_rx(struct dwc_otg_td *
/* check interrupt bits */
- if (hcint (HCINT_RETRY |
- HCINT_ACK | HCINT_NYET)) {
+ if (hcint (HCINT_RETRY | HCINT_ACK | HCINT_NYET)) {
/* give success bits priority over failure bits */
} else if (hcint HCINT_STALL) {
DPRINTF(CH=%d STALL\n, td-channel);
@@ -2621,8 +2619,7 @@ dwc_otg_host_data_rx(struct dwc_otg_td *
/* channel must be disabled before we can complete the transfer */
- if (hcint (HCINT_ERRORS | HCINT_RETRY |
- HCINT_ACK | HCINT_NYET)) {
+ if (hcint (HCINT_ERRORS | HCINT_RETRY | HCINT_ACK | HCINT_NYET)) {
dwc_otg_host_channel_disable(sc, td-channel);
@@ -2908,8 +2905,7 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
DWC_OTG_READ_4(sc, DOTG_HCCHAR(td-channel)),
DWC_OTG_READ_4(sc, DOTG_HCTSIZ(td-channel)));
- if (hcint (HCINT_RETRY |
- HCINT_ACK | HCINT_NYET)) {
+ if (hcint (HCINT_RETRY | HCINT_ACK | HCINT_NYET)) {
/* give success bits priority over failure bits */
} else if (hcint HCINT_STALL) {
DPRINTF(CH=%d STALL\n, td-channel);
@@ -2927,8 +2923,7 @@ dwc_otg_host_data_tx(struct dwc_otg_td *
/* channel must be disabled before we can complete the transfer */
- if (hcint (HCINT_ERRORS | HCINT_RETRY |
- HCINT_ACK | HCINT_NYET)) {
+ if (hcint (HCINT_ERRORS | HCINT_RETRY | HCINT_ACK | HCINT_NYET)) {
dwc_otg_host_channel_disable(sc, td-channel);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Sat Jan 12 23:26:06 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c dwc_otgvar.h
Log Message:
use a pool to allocate xfer handles
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/dwc_otg.c
cvs rdiff -u -r1.3 -r1.4 src/sys/dev/usb/dwc_otgvar.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.19 src/sys/dev/usb/dwc_otg.c:1.20
--- src/sys/dev/usb/dwc_otg.c:1.19 Sat Jan 12 22:57:26 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Jan 12 23:26:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.19 2013/01/12 22:57:26 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.20 2013/01/12 23:26:06 jmcneill Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.19 2013/01/12 22:57:26 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.20 2013/01/12 23:26:06 jmcneill Exp $);
#include sys/param.h
#include sys/systm.h
@@ -376,24 +376,14 @@ dwc_otg_allocx(struct usbd_bus *bus)
DPRINTF(\n);
- xfer = SIMPLEQ_FIRST(sc-sc_free_xfers);
+ DOTG_EVCNT_INCR(sc-sc_ev_xferpoolget);
+ xfer = pool_cache_get(sc-sc_xferpool, PR_WAITOK);
if (xfer != NULL) {
- SIMPLEQ_REMOVE_HEAD(sc-sc_free_xfers, next);
-#ifdef DIAGNOSTIC
- if (xfer-busy_free != XFER_FREE) {
- DPRINTF(xfer=%p not free, 0x%08x\n, xfer,
- xfer-busy_free);
- }
-#endif
memset(xfer, 0, sizeof(struct dwc_otg_xfer));
- } else {
- xfer = kmem_zalloc(sizeof(struct dwc_otg_xfer), KM_SLEEP);
- }
#ifdef DIAGNOSTIC
- if (xfer != NULL) {
xfer-busy_free = XFER_BUSY;
- }
#endif
+ }
return xfer;
}
@@ -410,7 +400,8 @@ dwc_otg_freex(struct usbd_bus *bus, usbd
}
xfer-busy_free = XFER_FREE;
#endif
- SIMPLEQ_INSERT_HEAD(sc-sc_free_xfers, xfer, next);
+ DOTG_EVCNT_INCR(sc-sc_ev_xferpoolput);
+ pool_cache_put(sc-sc_xferpool, xfer);
}
@@ -4141,6 +4132,8 @@ dwc_otg_init(struct dwc_otg_softc *sc)
sc-sc_tdpool = pool_cache_init(sizeof(struct dwc_otg_td), 0, 0, 0,
dotgtd, NULL, IPL_USB, NULL, NULL, NULL);
+ sc-sc_xferpool = pool_cache_init(sizeof(struct dwc_otg_xfer), 0, 0, 0,
+ dotgxfer, NULL, IPL_USB, NULL, NULL, NULL);
sc-sc_rhc_si = softint_establish(SOFTINT_NET | SOFTINT_MPSAFE,
dwc_otg_rhc, sc);
Index: src/sys/dev/usb/dwc_otgvar.h
diff -u src/sys/dev/usb/dwc_otgvar.h:1.3 src/sys/dev/usb/dwc_otgvar.h:1.4
--- src/sys/dev/usb/dwc_otgvar.h:1.3 Fri Jan 11 20:35:51 2013
+++ src/sys/dev/usb/dwc_otgvar.h Sat Jan 12 23:26:06 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otgvar.h,v 1.3 2013/01/11 20:35:51 jmcneill Exp $ */
+/* $NetBSD: dwc_otgvar.h,v 1.4 2013/01/12 23:26:06 jmcneill Exp $ */
/* $FreeBSD: src/sys/dev/usb/controller/dwc_otg.h,v 1.12 2012/09/27 15:23:38 hselasky Exp $ */
/*-
@@ -199,9 +199,8 @@ typedef struct dwc_otg_softc {
TAILQ_HEAD(, dwc_otg_xfer) sc_active; /* active transfers */
TAILQ_HEAD(, dwc_otg_xfer) sc_complete; /* complete transfers */
- SIMPLEQ_HEAD(, usbd_xfer) sc_free_xfers; /* free xfers */
-
pool_cache_t sc_tdpool;
+ pool_cache_t sc_xferpool;
#ifdef DOTG_COUNTERS
@@ -211,6 +210,8 @@ typedef struct dwc_otg_softc {
struct evcnt sc_ev_tdpoolget;
struct evcnt sc_ev_tdpoolput;
+ struct evcnt sc_ev_xferpoolget;
+ struct evcnt sc_ev_xferpoolput;
#endif
CVS commit: src/distrib/notes/common
Module Name:src Committed By: htodd Date: Sun Jan 13 00:19:42 UTC 2013 Modified Files: src/distrib/notes/common: main Log Message: Adding myself. To generate a diff of this commit: cvs rdiff -u -r1.493 -r1.494 src/distrib/notes/common/main Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/notes/common/main diff -u src/distrib/notes/common/main:1.493 src/distrib/notes/common/main:1.494 --- src/distrib/notes/common/main:1.493 Sat Nov 3 07:59:45 2012 +++ src/distrib/notes/common/main Sun Jan 13 00:19:41 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: main,v 1.493 2012/11/03 07:59:45 mbalmer Exp $ +.\ $NetBSD: main,v 1.494 2013/01/13 00:19:41 htodd Exp $ .\ .\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -1181,6 +1181,7 @@ If you're one of them, and would like to .It Ta Matt Fredette Ta Mt frede...@netbsd.org .It Ta Thorsten Frueauf Ta Mt frue...@netbsd.org .It Ta Castor Fu Ta Mt cas...@netbsd.org +.It Ta Hisashi Todd Fujinaka Ta Mt ht...@netbsd.org .It Ta Makoto Fujiwara Ta Mt m...@netbsd.org .It Ta Ichiro Fukuhara Ta Mt ich...@netbsd.org .It Ta Quentin Garnier Ta Mt c...@netbsd.org
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sun Jan 13 01:04:47 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: attach xfer pool event counters To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/dwc_otg.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/dwc_otg.c diff -u src/sys/dev/usb/dwc_otg.c:1.20 src/sys/dev/usb/dwc_otg.c:1.21 --- src/sys/dev/usb/dwc_otg.c:1.20 Sat Jan 12 23:26:06 2013 +++ src/sys/dev/usb/dwc_otg.c Sun Jan 13 01:04:46 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.20 2013/01/12 23:26:06 jmcneill Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.21 2013/01/13 01:04:46 jmcneill Exp $ */ /*- * Copyright (c) 2012 Hans Petter Selasky. All rights reserved. @@ -60,7 +60,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.20 2013/01/12 23:26:06 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.21 2013/01/13 01:04:46 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -4154,9 +4154,14 @@ dwc_otg_init(struct dwc_otg_softc *sc) NULL, xname, work items); evcnt_attach_dynamic(sc-sc_ev_tdpoolget, EVCNT_TYPE_MISC, - NULL, xname, pool get); + NULL, xname, td pool get); evcnt_attach_dynamic(sc-sc_ev_tdpoolput, EVCNT_TYPE_MISC, - NULL, xname, pool put); + NULL, xname, td pool put); + + evcnt_attach_dynamic(sc-sc_ev_xferpoolget, EVCNT_TYPE_MISC, + NULL, xname, xfer pool get); + evcnt_attach_dynamic(sc-sc_ev_xferpoolput, EVCNT_TYPE_MISC, + NULL, xname, xfer pool put); #endif temp = DWC_OTG_READ_4(sc, DOTG_GUSBCFG);
CVS commit: src/sys/dev/usb
Module Name:src Committed By: jmcneill Date: Sun Jan 13 01:11:00 UTC 2013 Modified Files: src/sys/dev/usb: ohci.c Log Message: fix missing mutex_exit in error path of ohci_waitintr To generate a diff of this commit: cvs rdiff -u -r1.229 -r1.230 src/sys/dev/usb/ohci.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/ohci.c diff -u src/sys/dev/usb/ohci.c:1.229 src/sys/dev/usb/ohci.c:1.230 --- src/sys/dev/usb/ohci.c:1.229 Sat Jan 5 23:34:18 2013 +++ src/sys/dev/usb/ohci.c Sun Jan 13 01:10:59 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ohci.c,v 1.229 2013/01/05 23:34:18 christos Exp $ */ +/* $NetBSD: ohci.c,v 1.230 2013/01/13 01:10:59 jmcneill Exp $ */ /* * Copyright (c) 1998, 2004, 2005, 2012 The NetBSD Foundation, Inc. @@ -41,7 +41,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.229 2013/01/05 23:34:18 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: ohci.c,v 1.230 2013/01/13 01:10:59 jmcneill Exp $); #include sys/param.h #include sys/systm.h @@ -1667,7 +1667,7 @@ ohci_waitintr(ohci_softc_t *sc, usbd_xfe ohci_intr1(sc); mutex_spin_exit(sc-sc_intr_lock); if (xfer-status != USBD_IN_PROGRESS) -return; +goto done; } } @@ -1678,6 +1678,7 @@ ohci_waitintr(ohci_softc_t *sc, usbd_xfe /* XXX should free TD */ +done: mutex_exit(sc-sc_lock); }
CVS commit: src/sys/dev
Module Name:src Committed By: jakllsch Date: Sun Jan 13 01:15:03 UTC 2013 Modified Files: src/sys/dev/usb: files.usb usbdevices.config Added Files: src/sys/dev/ic: si470x_reg.h src/sys/dev/usb: slurm.c Log Message: Add slurm(4), a radio(4) driver for USB FM radio modules based on the Silicon Labs reference design. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/sys/dev/ic/si470x_reg.h cvs rdiff -u -r1.126 -r1.127 src/sys/dev/usb/files.usb cvs rdiff -u -r0 -r1.1 src/sys/dev/usb/slurm.c cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/usbdevices.config 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/files.usb diff -u src/sys/dev/usb/files.usb:1.126 src/sys/dev/usb/files.usb:1.127 --- src/sys/dev/usb/files.usb:1.126 Wed Jan 9 23:02:59 2013 +++ src/sys/dev/usb/files.usb Sun Jan 13 01:15:02 2013 @@ -1,4 +1,4 @@ -# $NetBSD: files.usb,v 1.126 2013/01/09 23:02:59 skrll Exp $ +# $NetBSD: files.usb,v 1.127 2013/01/13 01:15:02 jakllsch Exp $ # # Config file and device description for machine-independent USB code. # Included by ports that need it. Ports that use it must provide @@ -236,6 +236,11 @@ device udsbr: radiodev attach udsbr at usbdevif file dev/usb/udsbr.c udsbr +# Silicon Labs USB radio module (FM) +device slurm: radiodev +attach slurm at usbifif +file dev/usb/slurm.c slurm + # TEMPerHUM HID device uthum: hid, sysmon_envsys attach uthum at uhidbus Index: src/sys/dev/usb/usbdevices.config diff -u src/sys/dev/usb/usbdevices.config:1.19 src/sys/dev/usb/usbdevices.config:1.20 --- src/sys/dev/usb/usbdevices.config:1.19 Wed Jan 9 23:02:59 2013 +++ src/sys/dev/usb/usbdevices.config Sun Jan 13 01:15:02 2013 @@ -1,4 +1,4 @@ -# $NetBSD: usbdevices.config,v 1.19 2013/01/09 23:02:59 skrll Exp $ +# $NetBSD: usbdevices.config,v 1.20 2013/01/13 01:15:02 jakllsch Exp $ # # This file contains all USB related configuration. # It is suitable for inclusion in a kernel config(5) file. @@ -195,6 +195,10 @@ uyap* at uhub? port ? udsbr* at uhub? port ? radio* at udsbr? +# Silicon Labs-based USB radio modules +slurm* at uhub? port ? +radio* at slurm? + # USB Generic driver ugen* at uhub? port ? Added files: Index: src/sys/dev/ic/si470x_reg.h diff -u /dev/null src/sys/dev/ic/si470x_reg.h:1.1 --- /dev/null Sun Jan 13 01:15:03 2013 +++ src/sys/dev/ic/si470x_reg.h Sun Jan 13 01:15:02 2013 @@ -0,0 +1,112 @@ +/* $NetBSD: si470x_reg.h,v 1.1 2013/01/13 01:15:02 jakllsch Exp $ */ + +/* + * Copyright (c) 2012 Jonathan A. Kollasch + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + *notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + *notice, this list of conditions and the following disclaimer in the + *documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * AS IS AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +#ifndef _DEV_IC_SI470X_REG_H_ +#define _DEV_IC_SI470X_REG_H_ + +#define __BIT16(x) ((uint16_t)__BIT(x)) +#define __BITS16(x, y) ((uint16_t)__BITS((x), (y))) + +#define SI470X_DEVICEID 0x00 +#define SI470X_PN __BITS16(15, 12) +#define SI470X_MFGID __BITS16(11, 0) + +#define SI470X_CHIPID 0x01 +#define SI470X_REV __BITS16(15, 10) +#define SI470X_DEV __BITS16(9, 6) +#define SI470X_FIRMWARE __BITS16(5, 0) + +#define SI470X_POWERCFG 0x02 +#define SI470X_DSMUTE __BIT16(15) +#define SI470X_DMUTE __BIT16(14) +#define SI470X_MONO __BIT16(13) +#define SI470X_RDSM __BIT16(11) +#define SI470X_SKMODE __BIT16(10) +#define SI470X_SEEKUP __BIT16(9) +#define SI470X_SEEK __BIT16(8) +#define SI470X_DISABLE __BIT16(6) +#define SI470X_ENABLE __BIT16(0) + +#define SI470X_CHANNEL 0x03 +#define SI470X_TUNE __BIT16(15) +#define SI470X_CHAN __BITS16(9, 0) + +#define SI470X_SYSCONFIG1 0x04 +#define SI470X_RDSIEN __BIT16(15) +#define SI470X_STCIEN __BIT16(14) +#define SI470X_RDS __BIT16(12) +#define
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Sun Jan 13 04:39:28 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: device.h sc.c sd.c
Log Message:
Remove unused function members from struct driver.
This makes adding other drivers easier.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/device.h \
src/sys/arch/luna68k/stand/boot/sc.c src/sys/arch/luna68k/stand/boot/sd.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/luna68k/stand/boot/device.h
diff -u src/sys/arch/luna68k/stand/boot/device.h:1.1 src/sys/arch/luna68k/stand/boot/device.h:1.2
--- src/sys/arch/luna68k/stand/boot/device.h:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/device.h Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: device.h,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: device.h,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -73,10 +73,7 @@
struct driver {
int (*d_init)(void *);
char *d_name;
- int (*d_start)(void);
- int (*d_go)(void);
int (*d_intr)(void);
- int (*d_done)(void);
};
struct hp_ctlr {
Index: src/sys/arch/luna68k/stand/boot/sc.c
diff -u src/sys/arch/luna68k/stand/boot/sc.c:1.1 src/sys/arch/luna68k/stand/boot/sc.c:1.2
--- src/sys/arch/luna68k/stand/boot/sc.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/sc.c Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sc.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: sc.c,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -96,12 +96,9 @@ static void ixfer_in(struct scsidevice *
static int scrun(int, int, u_char *, int, u_char *, int, volatile int *);
static int scfinish(int);
static void scabort(struct scsi_softc *, struct scsidevice *);
-static int scstart(void);
-static int scgo(void);
-static int scdone(void);
struct driver scdriver = {
- scinit, sc, scstart, scgo, scintr, scdone
+ scinit, sc, scintr,
};
struct scsi_softc scsi_softc[NSC];
@@ -523,32 +520,6 @@ scsi_format_unit(int ctlr, int slave, in
/*
- *
- */
-
-int
-scstart(void)
-{
-
- return 0;
-}
-
-int
-scgo(void)
-{
-
- return 0;
-}
-
-int
-scdone(void)
-{
-
- return 0;
-}
-
-
-/*
* Interrupt Routine
*/
Index: src/sys/arch/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.1 src/sys/arch/luna68k/stand/boot/sd.c:1.2
--- src/sys/arch/luna68k/stand/boot/sd.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/sd.c Sun Jan 13 04:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.1 2013/01/05 17:44:24 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.2 2013/01/13 04:39:28 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -106,13 +106,10 @@ struct sd_devdata {
};
static int sdinit(void *);
-static int sdstart(void);
-static int sdgo(void);
-static int sdintr(void);
static int sdident(struct sd_softc *, struct hp_device *);
struct driver sddriver = {
- sdinit, sd, sdstart, sdgo, sdintr,
+ sdinit, sd, NULL,
};
struct sd_softc sd_softc[NSD];
@@ -364,27 +361,6 @@ sdstrategy(void *devdata, int func, dadd
return 0;
}
-int
-sdstart(void)
-{
-
- return 0;
-}
-
-int
-sdgo(void)
-{
-
- return 0;
-}
-
-int
-sdintr(void)
-{
-
- return 0;
-}
-
#if 0
int
sdread(dev_t dev, u_int blk, u_int nblk, u_char *buff, u_int len)
CVS commit: src/sys/arch/arm/broadcom
Module Name:src
Committed By: skrll
Date: Sun Jan 13 06:10:25 UTC 2013
Modified Files:
src/sys/arch/arm/broadcom: bcm2835_space.c
Log Message:
Support BUS_SPACE_MAP_CACHEABLE.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/broadcom/bcm2835_space.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/broadcom/bcm2835_space.c
diff -u src/sys/arch/arm/broadcom/bcm2835_space.c:1.2 src/sys/arch/arm/broadcom/bcm2835_space.c:1.3
--- src/sys/arch/arm/broadcom/bcm2835_space.c:1.2 Thu Jan 10 21:57:38 2013
+++ src/sys/arch/arm/broadcom/bcm2835_space.c Sun Jan 13 06:10:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bcm2835_space.c,v 1.2 2013/01/10 21:57:38 jmcneill Exp $ */
+/* $NetBSD: bcm2835_space.c,v 1.3 2013/01/13 06:10:25 skrll Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: bcm2835_space.c,v 1.2 2013/01/10 21:57:38 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: bcm2835_space.c,v 1.3 2013/01/13 06:10:25 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -285,8 +285,8 @@ bcm2835_bs_map(void *t, bus_addr_t bpa,
{
u_long startpa, endpa, pa;
vaddr_t va;
- pt_entry_t *pte;
const struct pmap_devmap *pd;
+ int pmap_flags;
if ((pd = pmap_devmap_find_pa(bpa, size)) != NULL) {
/* Device was statically mapped. */
@@ -306,16 +306,10 @@ bcm2835_bs_map(void *t, bus_addr_t bpa,
*bshp = (bus_space_handle_t)(va + (bpa - startpa));
+ pmap_flags = (flag BUS_SPACE_MAP_CACHEABLE) ? 0 : PMAP_NOCACHE;
for (pa = startpa; pa endpa; pa += PAGE_SIZE, va += PAGE_SIZE) {
- pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE, 0);
- if ((flag BUS_SPACE_MAP_CACHEABLE) == 0) {
- pte = vtopte(va);
- *pte = ~L2_S_CACHE_MASK;
- PTE_SYNC(pte);
- /* XXX: pmap_kenter_pa() also does PTE_SYNC(). a bit of
- * waste.
- */
- }
+ pmap_kenter_pa(va, pa, VM_PROT_READ | VM_PROT_WRITE,
+ pmap_flags);
}
pmap_update(pmap_kernel());
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Sun Jan 13 06:56:31 UTC 2013 Modified Files: src/sys/dev/usb: usb.h Log Message: Add DWC_OTG_DEBUG To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/sys/dev/usb/usb.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usb.h diff -u src/sys/dev/usb/usb.h:1.99 src/sys/dev/usb/usb.h:1.100 --- src/sys/dev/usb/usb.h:1.99 Wed Jan 9 01:44:46 2013 +++ src/sys/dev/usb/usb.h Sun Jan 13 06:56:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usb.h,v 1.99 2013/01/09 01:44:46 jmcneill Exp $ */ +/* $NetBSD: usb.h,v 1.100 2013/01/13 06:56:30 skrll Exp $ */ /* $FreeBSD: src/sys/dev/usb/usb.h,v 1.14 1999/11/17 22:33:46 n_hibma Exp $ */ /* @@ -61,6 +61,7 @@ MALLOC_DECLARE(M_USBHC); #define AUVITEK_I2C_DEBUG 1 #define AXE_DEBUG 1 #define CUE_DEBUG 1 +#define DWC_OTG_DEBUG 1 #define EHCI_DEBUG 1 #define EZLOAD_DEBUG 1 #define KUE_DEBUG 1
