CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Thu Sep 26 07:25:31 UTC 2013
Modified Files:
src/sys/dev/usb: uhidev.c uhidev.h ukbd.c usb_subr.c usbdi.c usbdi.h
usbdi_util.c usbdi_util.h
Log Message:
Remove usbd_do_request_async. It's callback was calling usbd_free_xfer
from softint context.
Adjust callers appropriately
- usbd_clear_endpoint_stall_async is already triggered via a
usb_task, so simply call usbd_do_request.
- uhidev_set_report_async had one caller in ukbd_set_leds.
Convert this usage to use usb_task as well.
Discussed with mrg@
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/dev/usb/uhidev.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/usb/uhidev.h
cvs rdiff -u -r1.128 -r1.129 src/sys/dev/usb/ukbd.c
cvs rdiff -u -r1.193 -r1.194 src/sys/dev/usb/usb_subr.c
cvs rdiff -u -r1.155 -r1.156 src/sys/dev/usb/usbdi.c
cvs rdiff -u -r1.88 -r1.89 src/sys/dev/usb/usbdi.h
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/usbdi_util.c
cvs rdiff -u -r1.44 -r1.45 src/sys/dev/usb/usbdi_util.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/uhidev.c
diff -u src/sys/dev/usb/uhidev.c:1.56 src/sys/dev/usb/uhidev.c:1.57
--- src/sys/dev/usb/uhidev.c:1.56 Sun Jun 10 06:15:54 2012
+++ src/sys/dev/usb/uhidev.c Thu Sep 26 07:25:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.c,v 1.56 2012/06/10 06:15:54 mrg Exp $ */
+/* $NetBSD: uhidev.c,v 1.57 2013/09/26 07:25:31 skrll Exp $ */
/*
* Copyright (c) 2001, 2012 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uhidev.c,v 1.56 2012/06/10 06:15:54 mrg Exp $);
+__KERNEL_RCSID(0, $NetBSD: uhidev.c,v 1.57 2013/09/26 07:25:31 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -670,22 +670,6 @@ uhidev_set_report(struct uhidev *scd, in
return retstat;
}
-void
-uhidev_set_report_async(struct uhidev *scd, int type, void *data, int len)
-{
- /* XXX */
- char buf[100];
- if (scd-sc_report_id) {
- buf[0] = scd-sc_report_id;
- memcpy(buf+1, data, len);
- len++;
- data = buf;
- }
-
- usbd_set_report_async(scd-sc_parent-sc_iface, type,
- scd-sc_report_id, data, len);
-}
-
usbd_status
uhidev_get_report(struct uhidev *scd, int type, void *data, int len)
{
Index: src/sys/dev/usb/uhidev.h
diff -u src/sys/dev/usb/uhidev.h:1.13 src/sys/dev/usb/uhidev.h:1.14
--- src/sys/dev/usb/uhidev.h:1.13 Sun Jun 10 06:15:54 2012
+++ src/sys/dev/usb/uhidev.h Thu Sep 26 07:25:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uhidev.h,v 1.13 2012/06/10 06:15:54 mrg Exp $ */
+/* $NetBSD: uhidev.h,v 1.14 2013/09/26 07:25:31 skrll Exp $ */
/*
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -79,7 +79,6 @@ struct uhidev_attach_arg {
void uhidev_get_report_desc(struct uhidev_softc *, void **, int *);
int uhidev_open(struct uhidev *);
void uhidev_close(struct uhidev *);
-usbd_status uhidev_set_report(struct uhidev *scd, int type, void *data,int len);
-void uhidev_set_report_async(struct uhidev *scd, int type, void *data, int len);
-usbd_status uhidev_get_report(struct uhidev *scd, int type, void *data,int len);
+usbd_status uhidev_set_report(struct uhidev *, int, void *, int);
+usbd_status uhidev_get_report(struct uhidev *, int, void *, int);
usbd_status uhidev_write(struct uhidev_softc *, void *, int);
Index: src/sys/dev/usb/ukbd.c
diff -u src/sys/dev/usb/ukbd.c:1.128 src/sys/dev/usb/ukbd.c:1.129
--- src/sys/dev/usb/ukbd.c:1.128 Sun Sep 15 15:44:53 2013
+++ src/sys/dev/usb/ukbd.c Thu Sep 26 07:25:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ukbd.c,v 1.128 2013/09/15 15:44:53 martin Exp $*/
+/* $NetBSD: ukbd.c,v 1.129 2013/09/26 07:25:31 skrll Exp $*/
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -35,7 +35,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.128 2013/09/15 15:44:53 martin Exp $);
+__KERNEL_RCSID(0, $NetBSD: ukbd.c,v 1.129 2013/09/26 07:25:31 skrll Exp $);
#ifdef _KERNEL_OPT
#include opt_ukbd.h
@@ -271,6 +271,7 @@ struct ukbd_softc {
struct hid_location sc_scroloc;
struct hid_location sc_compose;
int sc_leds;
+ struct usb_task sc_ledtask;
device_t sc_wskbddev;
#if defined(WSDISPLAY_COMPAT_RAWKBD)
@@ -341,6 +342,7 @@ Static void ukbd_delayed_decode(void *ad
Static int ukbd_enable(void *, int);
Static void ukbd_set_leds(void *, int);
+Static void ukbd_set_leds_task(void *);
Static int ukbd_ioctl(void *, u_long, void *, int, struct lwp *);
#if defined(WSDISPLAY_COMPAT_RAWKBD) defined(UKBD_REPEAT)
@@ -476,6 +478,9 @@ ukbd_attach(device_t parent, device_t se
callout_init(sc-sc_delay, 0);
+ usb_init_task(sc-sc_ledtask, ukbd_set_leds_task, sc,
+ USB_TASKQ_MPSAFE);
+
/* Flash the leds; no real purpose, just shows we're alive. */
ukbd_set_leds(sc, WSKBD_LED_SCROLL | WSKBD_LED_NUM | WSKBD_LED_CAPS
| WSKBD_LED_COMPOSE);
@@ -884,7 +889,7 @@ void
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Thu Sep 26 10:31:02 UTC 2013 Modified Files: src/sys/dev/usb: usbdi.c Log Message: Remove the usbd_do_request_async_cb prototype. This was missed from the previous commit. To generate a diff of this commit: cvs rdiff -u -r1.156 -r1.157 src/sys/dev/usb/usbdi.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/usbdi.c diff -u src/sys/dev/usb/usbdi.c:1.156 src/sys/dev/usb/usbdi.c:1.157 --- src/sys/dev/usb/usbdi.c:1.156 Thu Sep 26 07:25:31 2013 +++ src/sys/dev/usb/usbdi.c Thu Sep 26 10:31:02 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: usbdi.c,v 1.156 2013/09/26 07:25:31 skrll Exp $ */ +/* $NetBSD: usbdi.c,v 1.157 2013/09/26 10:31:02 skrll Exp $ */ /* * Copyright (c) 1998, 2012 The NetBSD Foundation, Inc. @@ -31,7 +31,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.156 2013/09/26 07:25:31 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: usbdi.c,v 1.157 2013/09/26 10:31:02 skrll Exp $); #ifdef _KERNEL_OPT #include opt_compat_netbsd.h @@ -66,8 +66,6 @@ extern int usbdebug; #endif Static usbd_status usbd_ar_pipe(usbd_pipe_handle pipe); -Static void usbd_do_request_async_cb - (usbd_xfer_handle, usbd_private_handle, usbd_status); Static void usbd_start_next(usbd_pipe_handle pipe); Static usbd_status usbd_open_pipe_ival (usbd_interface_handle, u_int8_t, u_int8_t, usbd_pipe_handle *, int);
CVS commit: [netbsd-6] src/doc
Module Name:src Committed By: riz Date: Thu Sep 26 14:20:16 UTC 2013 Modified Files: src/doc [netbsd-6]: CHANGES-6.2 Log Message: Ticket 960 To generate a diff of this commit: cvs rdiff -u -r1.1.2.52 -r1.1.2.53 src/doc/CHANGES-6.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.2 diff -u src/doc/CHANGES-6.2:1.1.2.52 src/doc/CHANGES-6.2:1.1.2.53 --- src/doc/CHANGES-6.2:1.1.2.52 Thu Sep 26 02:03:32 2013 +++ src/doc/CHANGES-6.2 Thu Sep 26 14:20:16 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.2,v 1.1.2.52 2013/09/26 02:03:32 riz Exp $ +# $NetBSD: CHANGES-6.2,v 1.1.2.53 2013/09/26 14:20:16 riz Exp $ A complete list of changes from the 6.1 release until the 6.2 release: @@ -802,3 +802,10 @@ lib/libpthread/pthread.c 1.137 Return errno, not just -1, from pthread_create(). [riastradh, ticket #959] +lib/libcurses/setterm.c1.51 + + Fix a crash in curses for terminals defining exit_attribute_mode but + not exit_alt_charset_mode. (Examples include vt131 and xterm-5, + among others) + [dsainty, ticket #960] +
CVS commit: [netbsd-6] src/lib/libcurses
Module Name:src Committed By: riz Date: Thu Sep 26 14:20:03 UTC 2013 Modified Files: src/lib/libcurses [netbsd-6]: setterm.c Log Message: Pull up following revision(s) (requested by dsainty in ticket #960): lib/libcurses/setterm.c: revision 1.51 Fix a NULL dereference if the exit_alt_charset_mode capability is not defined. The previous version of this file changed a terminal initialisation test on the exit_attribute_mode capability, checking for the exit_alt_charset_mode capability as a substring, rather than performing a search for the hard-coded ^O character. That works better on terminals where ^O is not the correct value for exit_alt_charset_mode. But it works worse on terminals that don't have a definition specified for exit_alt_charset_mode. For example: % TERMCAP='xterm:me=\E[m:' TERM=xterm vi segmentation fault (core dumped) TERMCAP='xterm:me=\E[m:' TERM=xterm vi The crash can be avoided (without fixing the bug) by defining exit_alt_charset_mode: % TERMCAP='xterm|:me=\E[m:ae=:' TERM=xterm vi ex/vi: Error: xterm: No such process We now test exit_alt_charset_mode for NULL before continuing with the fatal test, restoring the original no-crash behaviour. XXX does_ctrl_o() is now just a naive reimplementation of strstr(), so should probably just use strstr() instead. To generate a diff of this commit: cvs rdiff -u -r1.48.4.1 -r1.48.4.2 src/lib/libcurses/setterm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/setterm.c diff -u src/lib/libcurses/setterm.c:1.48.4.1 src/lib/libcurses/setterm.c:1.48.4.2 --- src/lib/libcurses/setterm.c:1.48.4.1 Sat May 11 21:48:23 2013 +++ src/lib/libcurses/setterm.c Thu Sep 26 14:20:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $ */ +/* $NetBSD: setterm.c,v 1.48.4.2 2013/09/26 14:20:03 riz Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)setterm.c 8.8 (Berkeley) 10/25/94; #else -__RCSID($NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $); +__RCSID($NetBSD: setterm.c,v 1.48.4.2 2013/09/26 14:20:03 riz Exp $); #endif #endif /* not lint */ @@ -172,6 +172,7 @@ _cursesi_setterm(char *type, SCREEN *scr * It might turn off ACS, so check for that. */ if (t_exit_attribute_mode(screen-term) != NULL + t_exit_alt_charset_mode(screen-term) != NULL does_ctrl_o(t_exit_attribute_mode(screen-term), t_exit_alt_charset_mode(screen-term))) screen-mask_me = 0;
CVS commit: [netbsd-6-1] src/doc
Module Name:src Committed By: riz Date: Thu Sep 26 14:21:15 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 Log Message: Ticket 960. To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-6.1.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.19 src/doc/CHANGES-6.1.2:1.1.2.20 --- src/doc/CHANGES-6.1.2:1.1.2.19 Thu Sep 26 02:01:46 2013 +++ src/doc/CHANGES-6.1.2 Thu Sep 26 14:21:15 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.19 2013/09/26 02:01:46 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.20 2013/09/26 14:21:15 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -148,3 +148,10 @@ lib/libpthread/pthread.c 1.137 Return errno, not just -1, from pthread_create(). [riastradh, ticket #959] +lib/libcurses/setterm.c1.51 + + Fix a crash in curses for terminals defining exit_attribute_mode but + not exit_alt_charset_mode. (Examples include vt131 and xterm-5, + among others) + [dsainty, ticket #960] +
CVS commit: [netbsd-6-1] src/lib/libcurses
Module Name:src Committed By: riz Date: Thu Sep 26 14:21:00 UTC 2013 Modified Files: src/lib/libcurses [netbsd-6-1]: setterm.c Log Message: Pull up following revision(s) (requested by dsainty in ticket #960): lib/libcurses/setterm.c: revision 1.51 Fix a NULL dereference if the exit_alt_charset_mode capability is not defined. The previous version of this file changed a terminal initialisation test on the exit_attribute_mode capability, checking for the exit_alt_charset_mode capability as a substring, rather than performing a search for the hard-coded ^O character. That works better on terminals where ^O is not the correct value for exit_alt_charset_mode. But it works worse on terminals that don't have a definition specified for exit_alt_charset_mode. For example: % TERMCAP='xterm:me=\E[m:' TERM=xterm vi segmentation fault (core dumped) TERMCAP='xterm:me=\E[m:' TERM=xterm vi The crash can be avoided (without fixing the bug) by defining exit_alt_charset_mode: % TERMCAP='xterm|:me=\E[m:ae=:' TERM=xterm vi ex/vi: Error: xterm: No such process We now test exit_alt_charset_mode for NULL before continuing with the fatal test, restoring the original no-crash behaviour. XXX does_ctrl_o() is now just a naive reimplementation of strstr(), so should probably just use strstr() instead. To generate a diff of this commit: cvs rdiff -u -r1.48.4.1 -r1.48.4.1.2.1 src/lib/libcurses/setterm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libcurses/setterm.c diff -u src/lib/libcurses/setterm.c:1.48.4.1 src/lib/libcurses/setterm.c:1.48.4.1.2.1 --- src/lib/libcurses/setterm.c:1.48.4.1 Sat May 11 21:48:23 2013 +++ src/lib/libcurses/setterm.c Thu Sep 26 14:21:00 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $ */ +/* $NetBSD: setterm.c,v 1.48.4.1.2.1 2013/09/26 14:21:00 riz Exp $ */ /* * Copyright (c) 1981, 1993, 1994 @@ -34,7 +34,7 @@ #if 0 static char sccsid[] = @(#)setterm.c 8.8 (Berkeley) 10/25/94; #else -__RCSID($NetBSD: setterm.c,v 1.48.4.1 2013/05/11 21:48:23 riz Exp $); +__RCSID($NetBSD: setterm.c,v 1.48.4.1.2.1 2013/09/26 14:21:00 riz Exp $); #endif #endif /* not lint */ @@ -172,6 +172,7 @@ _cursesi_setterm(char *type, SCREEN *scr * It might turn off ACS, so check for that. */ if (t_exit_attribute_mode(screen-term) != NULL + t_exit_alt_charset_mode(screen-term) != NULL does_ctrl_o(t_exit_attribute_mode(screen-term), t_exit_alt_charset_mode(screen-term))) screen-mask_me = 0;
CVS commit: [netbsd-6-1] src
Module Name:src Committed By: riz Date: Thu Sep 26 15:36:34 UTC 2013 Modified Files: src/doc [netbsd-6-1]: CHANGES-6.1.2 LAST_MINUTE src/sys/sys [netbsd-6-1]: param.h Log Message: Welcome to 6.1.2! To generate a diff of this commit: cvs rdiff -u -r1.1.2.20 -r1.1.2.21 src/doc/CHANGES-6.1.2 cvs rdiff -u -r1.2.40.2.2.1 -r1.2.40.2.2.2 src/doc/LAST_MINUTE cvs rdiff -u -r1.408.2.12.2.3 -r1.408.2.12.2.4 src/sys/sys/param.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-6.1.2 diff -u src/doc/CHANGES-6.1.2:1.1.2.20 src/doc/CHANGES-6.1.2:1.1.2.21 --- src/doc/CHANGES-6.1.2:1.1.2.20 Thu Sep 26 14:21:15 2013 +++ src/doc/CHANGES-6.1.2 Thu Sep 26 15:36:34 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-6.1.2,v 1.1.2.20 2013/09/26 14:21:15 riz Exp $ +# $NetBSD: CHANGES-6.1.2,v 1.1.2.21 2013/09/26 15:36:34 riz Exp $ A complete list of changes from the NetBSD 6.1.1 release to the NetBSD 6.1.2 release: @@ -155,3 +155,10 @@ lib/libcurses/setterm.c1.51 among others) [dsainty, ticket #960] +distrib/notes/common/main patch +doc/LAST_MINUTE patch +doc/README.filespatch +sys/sys/param.h patch + +Welcome to 6.1.2! + [riz] Index: src/doc/LAST_MINUTE diff -u src/doc/LAST_MINUTE:1.2.40.2.2.1 src/doc/LAST_MINUTE:1.2.40.2.2.2 --- src/doc/LAST_MINUTE:1.2.40.2.2.1 Thu Aug 15 03:27:37 2013 +++ src/doc/LAST_MINUTE Thu Sep 26 15:36:34 2013 @@ -1,6 +1,6 @@ -# $NetBSD: LAST_MINUTE,v 1.2.40.2.2.1 2013/08/15 03:27:37 snj Exp $ +# $NetBSD: LAST_MINUTE,v 1.2.40.2.2.2 2013/09/26 15:36:34 riz Exp $ -This file contains important information on the NetBSD 6.1.1 release that +This file contains important information on the NetBSD 6.1.2 release that did not make it into the main documentation. [all] Index: src/sys/sys/param.h diff -u src/sys/sys/param.h:1.408.2.12.2.3 src/sys/sys/param.h:1.408.2.12.2.4 --- src/sys/sys/param.h:1.408.2.12.2.3 Sat Sep 7 16:55:04 2013 +++ src/sys/sys/param.h Thu Sep 26 15:36:33 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: param.h,v 1.408.2.12.2.3 2013/09/07 16:55:04 bouyer Exp $ */ +/* $NetBSD: param.h,v 1.408.2.12.2.4 2013/09/26 15:36:33 riz Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -63,7 +63,7 @@ * 2.99.9 (299000900) */ -#define __NetBSD_Version__ 601000101 /* NetBSD 6.1.1_PATCH */ +#define __NetBSD_Version__ 601000200 /* NetBSD 6.1.2 */ #define __NetBSD_Prereq__(M,m,p) (M) * 1) + \ (m) * 100) + (p) * 100) = __NetBSD_Version__)
CVS commit: [netbsd-6-0] src
Module Name:src
Committed By: riz
Date: Thu Sep 26 15:41:52 UTC 2013
Modified Files:
src/distrib/notes/common [netbsd-6-0]: main
src/doc [netbsd-6-0]: CHANGES-6.0.3 LAST_MINUTE
src/sys/sys [netbsd-6-0]: param.h
Log Message:
Welcome to 6.0.3!
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.4.2.2 -r1.484.2.4.2.3 src/distrib/notes/common/main
cvs rdiff -u -r1.1.2.32 -r1.1.2.33 src/doc/CHANGES-6.0.3
cvs rdiff -u -r1.2.40.1.4.2 -r1.2.40.1.4.3 src/doc/LAST_MINUTE
cvs rdiff -u -r1.408.2.6.2.5 -r1.408.2.6.2.6 src/sys/sys/param.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/notes/common/main
diff -u src/distrib/notes/common/main:1.484.2.4.2.2 src/distrib/notes/common/main:1.484.2.4.2.3
--- src/distrib/notes/common/main:1.484.2.4.2.2 Sun May 12 16:56:05 2013
+++ src/distrib/notes/common/main Thu Sep 26 15:41:52 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.484.2.4.2.2 2013/05/12 16:56:05 riz Exp $
+.\ $NetBSD: main,v 1.484.2.4.2.3 2013/09/26 15:41:52 riz Exp $
.\
.\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -458,96 +458,120 @@ possible, it's likely that
wouldn't exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 6.0.1 and 6.0.2 Releases
+.Ss Changes Between The NetBSD 6.0.2 and 6.0.3 Releases
.Pp
The complete list of changes can be found in the
-CHANGES-6.0.2:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0.2/CHANGES-6.0.2
-file in the top level directory of the NetBSD 6.0.2 release tree. An abbreviated list is as follows:
+CHANGES-6.0.3:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.0.3/CHANGES-6.0.3
+file in the top level directory of the NetBSD 6.0.3 release tree. An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
-NetBSD-SA2013-001:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-001.txt.asc ,
-Kernel panic triggered from userland
-.It
-NetBSD-SA2013-003:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-003.txt.asc ,
-RNG Bug May Result in Weak Cryptographic Keys
-.It
-NetBSD-SA2013-004:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-004.txt.asc ,
-Vulnerabilities in grep
+NetBSD-SA2013-005:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-005.txt.asc
+bind Denial of Service (CVE-2013-4854)
+.It
+NetBSD-SA2013-006:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-006.txt.asc
+Arbitrary Kernel Read with netstat -P
+.It
+NetBSD-SA2013-007:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-007.txt.asc
+Protocol handling issues in X Window System client libraries
+.It
+NetBSD-SA2013-008:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-008.txt.asc
+Error in authorization check re tcpdrop sysctl
+.It
+NetBSD-SA2013-009:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-009.txt.asc
+user settable small BPF buffer can cause a panic
.bullet)
.
-.Ss2 Security Fixes
-.(bullet
-Fixed a crash which could happen with sysctl security.curtain=1 set.
-(PR#47598):
-.Lk http://gnats.NetBSD.org/47598
-.It
-Address CVE-2012-5667: Multiple integer overflows in GNU grep.
-.It
-Fixes to entropy handling in the kernel.
-.It
-Prevent ktrace from being able to crash the kernel.
-.bullet)
-.
-.Ss2 General kernel
+.Pp
+Advisories prior to NetBSD-SA2013-005 do not affect
+NetBSD 6.0.3:
+.Lk http://www.NetBSD.org/support/security/patches-6.0.3.html .
+.Ss2 Kernel
.(bullet
-Resolve races between vget() and vrele() resulting in vget() returning dead vnodes.
+.Xr virtio 4 :
+Fixed a panic during shutdown on KVM.
+(PR#48105):
+.Lk http://gnats.netbsd.org/48105
+.It
+.Xr uhci 4 :
+Fixed USB device enumeration in some cases, fixed some ops on big-endian machines.
+(PR#47522, :
+.Lk http://gnats.netbsd.org/47522
+PR#48237):
+.Lk http://gnats.netbsd.org/48237
.bullet)
.
.Ss2 Networking
.(bullet
-Fixed sendto(2) issue with IPv6 UDP datagrams.
-(PR#47408):
-.Lk http://gnats.NetBSD.org/47408
+Include BRDADDR and NETMASK in the IPv4 ioctls we ban for IPv6.
.It
-.Xr vioif 4 :
-Fixed an issue which caused recent QEMU to crash.
-.bullet)
-.
-.Ss2 Drivers
-.(bullet
-.Xr fss 4 :
-Don't crash when running multiple dump -X.
-(PR#47514):
-.Lk http://gnats.NetBSD.org/47514
-.It
-.Xr fss 4 :
-Fixed panic.
-(PR#47020):
-.Lk http://gnats.NetBSD.org/47020
+Added 4 new sysctls to help avoid IPv6 DoS attacks.
+.It
+Prevent a panic in
+.Xr mpls 4
+due to kmem abuse.
+.It
+Fixed a crash destroying
+.Xr tap 4
+interfaces after deleting the link-local address.
+(PR#47576):
+.Lk http://gnats.netbsd.org/47576
.bullet)
.
-.Ss2 Platforms
-.(bullet
-alpha:
+.Ss2 File Systems
.(bullet
-Fixed longjmp/setjmp on alpha for statically linked programs such as those in /rescue.
-.bullet)
-.
+nilfs: Fixed a serious file-read problem.
+(PR#45605):
+.Lk
CVS commit: [netbsd-6-1] src/distrib/notes/common
Module Name:src
Committed By: riz
Date: Thu Sep 26 15:42:10 UTC 2013
Modified Files:
src/distrib/notes/common [netbsd-6-1]: main
Log Message:
Welcomed to 6.1.2!
To generate a diff of this commit:
cvs rdiff -u -r1.484.2.6.2.1 -r1.484.2.6.2.2 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.484.2.6.2.1 src/distrib/notes/common/main:1.484.2.6.2.2
--- src/distrib/notes/common/main:1.484.2.6.2.1 Thu Aug 15 03:27:37 2013
+++ src/distrib/notes/common/main Thu Sep 26 15:42:10 2013
@@ -1,4 +1,4 @@
-.\ $NetBSD: main,v 1.484.2.6.2.1 2013/08/15 03:27:37 snj Exp $
+.\ $NetBSD: main,v 1.484.2.6.2.2 2013/09/26 15:42:10 riz Exp $
.\
.\ Copyright (c) 1999-2012 The NetBSD Foundation, Inc.
.\ All rights reserved.
@@ -458,72 +458,82 @@ possible, it's likely that
wouldn't exist.
.
.if \n[FOR_RELEASE] \{\
-.Ss Changes Between The NetBSD 6.1 and 6.1.1 Releases
+.Ss Changes Between The NetBSD 6.1.1 and 6.1.2 Releases
.Pp
.Nx
\*V
-is the first critical/security update of the NetBSD 6.1 release branch.
+is the second critical/security update of the NetBSD 6.1 release branch.
It represents a selected subset of fixes deemed critical for security
or stability reasons.
.Pp
The complete list of changes can be found in the
-CHANGES-6.1.1:
-.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.1/CHANGES-6.1.1
-file in the top level directory of the NetBSD 6.1.1 release tree.
-An abbreviated list is as follows:
+CHANGES-6.1.2:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/NetBSD-6.1.2/CHANGES-6.1.2
+file in the top level directory of the NetBSD 6.1.2 release tree. An abbreviated list is as follows:
.Ss2 Security Advisory Fixes
.(bullet
-NetBSD-SA2013-005:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-005.txt.asc ,
-bind Denial of Service (CVE-2013-4854)
-.It
-NetBSD-SA2013-006:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-006.txt.asc ,
-Arbitrary Kernel Read with netstat -P
-.It
-NetBSD-SA2013-007:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-007.txt.asc ,
-Protocol handling issues in X Window System client libraries
-.It
-NetBSD-SA2013-008:
-.Lk http://ftp.netbsd.org/pub/NetBSD/security/advisories/NetBSD-SA2013-008.txt.asc ,
-Error in authorization check re tcpdrop sysctl
+NetBSD-SA2013-009:
+.Lk http://ftp.NetBSD.org/pub/NetBSD/security/advisories/NetBSD-SA2013-009.txt.asc
+user settable small BPF buffer can cause a panic
.bullet)
.
-.Ss2 Security
+.Pp
+Advisories prior to NetBSD-SA2013-009 do not affect
+NetBSD 6.1.2:
+.Lk http://www.NetBSD.org/support/security/patches-6.1.2.html .
+.Ss2 Kernel
.(bullet
-Add four new sysctls to avoid IPv6 DoS attacks.
+.Xr virtio 4 :
+Fixed a panic during shutdown on KVM.
+(PR#48105):
+.Lk http://gnats.netbsd.org/48105
+.It
+.Xr uhci 4 :
+Fixed USB device enumeration in some cases, fixed some ops on big-endian machines.
+(PR#47522, :
+.Lk http://gnats.netbsd.org/47522
+PR#48237):
+.Lk http://gnats.netbsd.org/48237
.bullet)
.
.Ss2 Networking
.(bullet
-.Xr mpls 4 :
-Stop abusing kmem during softint context to prevent panic.
+Include BRDADDR and NETMASK in the IPv4 ioctls we ban for IPv6.
.It
-Avoid crash destroying tap0 after deleting its link-local address.
-PR 47576.
-.bullet)
-.
-.Ss2 File systems
-.(bullet
-NILFS: Fix serious file read problem due to not-so-clear VOP_BMAP description.
-PR 45605.
+.Xr npf 3 :
+Fixed panic with IPv6 when nbufs are reallocated.
.It
-procfs: Add a missing vm_map_unlock_read() and uvmspace_free() to the ENOMEM error case in procfs_domap()d.
-PR 48048.
+.Xr npf 3 :
+Fixed filtering with dynamic rules.
.bullet)
.
-.Ss2 Platforms
+.Ss2 File Systems
.(bullet
-amiga: Fix kernel panic on Amigas with Deneb cards.
-.It
-vax: Add a makedisk_p12high, used by VAX now after unbumping MAXPARTITIONS from 16 down to 12.
-This fixes install issues on new setups.
+udf: Fixed a problem which could result in garbage after the 4GB limit.
.bullet)
.
-.Ss2 Miscellaneous Userland
+.Ss2 Miscellaneous
.(bullet
-Updated tzdata to 2013d.
+.Xr pthread 3 :
+Fixed error return from pthread_create() in some cases.
+.It
+Update tzdata to 2013e.
+.It
+Update some TNF ssh keys in /etc/ssh/ssh_known_hosts.
+.It
+Fixed an environment issue which could cause crashes in Emacs 24 and certain other applications.
+.It
+pkg_install: Fixed installation of signed packages.
+(PR#48194):
+.Lk http://gnats.netbsd.org/48194
+.It
+Fixed regression introduced in NetBSD 6.1.1 affecting certain applications running under X.
+(PR#48170):
+.Lk http://gnats.netbsd.org/48170
+.It
+mvme68k: Fixed boot panic.
+(PR#45915):
+.Lk http://gnats.netbsd.org/45915
.bullet)
.
.Ss The NetBSD Foundation
@@ -570,6 +580,8 @@ Changes between the initial 6.0 branch a
Changes between the final release of 6.0 and final release of 6.1.
CVS commit: [netbsd-6-0] src/sys/arch/mvme68k
Module Name:src
Committed By: riz
Date: Thu Sep 26 15:58:31 UTC 2013
Modified Files:
src/sys/arch/mvme68k/include [netbsd-6-0]: prom.h
src/sys/arch/mvme68k/stand [netbsd-6-0]: Makefile.booters
src/sys/arch/mvme68k/stand/libbug [netbsd-6-0]: outln.c outstr.c
src/sys/arch/mvme68k/stand/libsa [netbsd-6-0]: Makefile Makefile.inc
Log Message:
Pull up following revision(s) (requested by tsutsui in ticket #954):
sys/arch/mvme68k/stand/libbug/outln.c: revision 1.4
sys/arch/mvme68k/stand/libsa/Makefile.inc: revision 1.6
sys/arch/mvme68k/stand/Makefile.booters: revision 1.24
sys/arch/mvme68k/include/prom.h: revision 1.18
sys/arch/mvme68k/stand/libsa/Makefile: revision 1.34
sys/arch/mvme68k/stand/libbug/outstr.c: revision 1.4
Explicitly link SRT0.o (Standalone RunTime startup code) first.
This is my fault on changes to make mvme68k bootloaders use MI libsa:
http://mail-index.netbsd.org/source-changes/2011/01/02/msg016539.html
MVME PROM requires raw binaries (by objcopy -O binary) so we have to
make sure the entry point is located at the first address of the binaries.
The problem (6.1 netboot fails with an illegal instruction message)
is reported by Andrew Gillham on port-mvme68k@:
http://mail-index.netbsd.org/port-mvme68k/2013/09/17/msg82.html
Note mvme68k bootloadres in netbsd-6 still have another bug triggered
by gcc-4.5.
Should be pulled up to netbsd-6 branches.
Make MVMEPROM_ARG2() macro take two args in a single asm statement.
Fixes a problem that a wrong address is passed to the MVMEPROM outstr
function (then caused garbages on screen) after we switched to gcc-4.5.
Reported and confirmed by Andrew Gillham on port-mvme68k@:
http://mail-index.NetBSD.org/port-mvme68k/2013/09/17/msg84.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/19/msg85.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/22/msg95.html
http://mail-index.NetBSD.org/port-mvme68k/2013/09/22/msg97.html
No error on build.sh -m mvme68k build builds.
Should be pulled up to netbsd-6 branches.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.17.124.1 src/sys/arch/mvme68k/include/prom.h
cvs rdiff -u -r1.22 -r1.22.16.1 src/sys/arch/mvme68k/stand/Makefile.booters
cvs rdiff -u -r1.3 -r1.3.56.1 src/sys/arch/mvme68k/stand/libbug/outln.c \
src/sys/arch/mvme68k/stand/libbug/outstr.c
cvs rdiff -u -r1.33 -r1.33.20.1 src/sys/arch/mvme68k/stand/libsa/Makefile
cvs rdiff -u -r1.5 -r1.5.20.1 src/sys/arch/mvme68k/stand/libsa/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mvme68k/include/prom.h
diff -u src/sys/arch/mvme68k/include/prom.h:1.17 src/sys/arch/mvme68k/include/prom.h:1.17.124.1
--- src/sys/arch/mvme68k/include/prom.h:1.17 Sat Dec 24 23:24:01 2005
+++ src/sys/arch/mvme68k/include/prom.h Thu Sep 26 15:58:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: prom.h,v 1.17 2005/12/24 23:24:01 perry Exp $ */
+/* $NetBSD: prom.h,v 1.17.124.1 2013/09/26 15:58:31 riz Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -155,8 +155,10 @@ struct mvmeprom_args {
__asm volatile (clrl %sp@-)
#define MVMEPROM_ARG1(arg) \
__asm volatile (movel %0, %%sp@-::d (arg))
-#define MVMEPROM_ARG2(arg) \
- __asm volatile (movel %0, %%sp@-::d (arg))
+#define MVMEPROM_ARG2(arg0, arg1)\
+ __asm volatile (movel %0, %%sp@-; \
+ movel %1, %%sp@-; \
+ :: d (arg0), d (arg1):)
#define MVMEPROM_GETRES(ret) \
__asm volatile (movel %%sp@+,%0: =d (ret):)
#define MVMEPROM_GETSR(ret) \
Index: src/sys/arch/mvme68k/stand/Makefile.booters
diff -u src/sys/arch/mvme68k/stand/Makefile.booters:1.22 src/sys/arch/mvme68k/stand/Makefile.booters:1.22.16.1
--- src/sys/arch/mvme68k/stand/Makefile.booters:1.22 Sat Jan 22 19:19:20 2011
+++ src/sys/arch/mvme68k/stand/Makefile.booters Thu Sep 26 15:58:31 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.booters,v 1.22 2011/01/22 19:19:20 joerg Exp $
+# $NetBSD: Makefile.booters,v 1.22.16.1 2013/09/26 15:58:31 riz Exp $
S?= ${.CURDIR}/../../../..
MDEC_DIR?= /usr/mdec
@@ -59,6 +59,8 @@ LIBSA_DIR!= cd ${LIB_SA_DIR} ${PRINTO
LIBSA= ${LIBSA_DIR}/lib/sa/libsa.a
LIBKERN= ${LIBSA_DIR}/lib/kern/libkern.a
+SRTOBJ?= ${LIBSA_DIR}/SRT0.o
+
LIB_BUG_DIR= ${.CURDIR}/../libbug
LIBBUG_DIR!= cd ${LIB_BUG_DIR} ${PRINTOBJDIR}
LIBBUG=${LIBBUG_DIR}/libbug.a
Index: src/sys/arch/mvme68k/stand/libbug/outln.c
diff -u src/sys/arch/mvme68k/stand/libbug/outln.c:1.3 src/sys/arch/mvme68k/stand/libbug/outln.c:1.3.56.1
--- src/sys/arch/mvme68k/stand/libbug/outln.c:1.3 Sat Jan 12 09:54:31 2008
+++ src/sys/arch/mvme68k/stand/libbug/outln.c Thu Sep 26 15:58:31 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: outln.c,v 1.3 2008/01/12 09:54:31 tsutsui Exp $ */
+/* $NetBSD: outln.c,v 1.3.56.1 2013/09/26 15:58:31 riz Exp $ */
/*
* bug routines -- assumes that the necessary sections of memory
@@ -13,7 +13,6 @@ void
mvmeprom_outln(char *start,
CVS commit: src/sys/dev/scsipi
Module Name:src
Committed By: kiyohara
Date: Thu Sep 26 16:00:54 UTC 2013
Modified Files:
src/sys/dev/scsipi: sd.c
Log Message:
Reset variable error to 0 before handle each ioctl cmd. Or returns EPASSTHROUGH
when some cmds. (e.g. ODIOCGDINFO)
To generate a diff of this commit:
cvs rdiff -u -r1.301 -r1.302 src/sys/dev/scsipi/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/dev/scsipi/sd.c
diff -u src/sys/dev/scsipi/sd.c:1.301 src/sys/dev/scsipi/sd.c:1.302
--- src/sys/dev/scsipi/sd.c:1.301 Thu Jun 13 00:55:01 2013
+++ src/sys/dev/scsipi/sd.c Thu Sep 26 16:00:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.301 2013/06/13 00:55:01 tls Exp $ */
+/* $NetBSD: sd.c,v 1.302 2013/09/26 16:00:54 kiyohara Exp $ */
/*-
* Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc.
@@ -47,7 +47,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.301 2013/06/13 00:55:01 tls Exp $);
+__KERNEL_RCSID(0, $NetBSD: sd.c,v 1.302 2013/09/26 16:00:54 kiyohara Exp $);
#include opt_scsi.h
@@ -1040,6 +1040,7 @@ sdioctl(dev_t dev, u_long cmd, void *add
if (error != EPASSTHROUGH)
return (error);
+ error = 0;
switch (cmd) {
case DIOCGDINFO:
*(struct disklabel *)addr = *(sd-sc_dk.dk_label);
@@ -1202,8 +1203,7 @@ sdioctl(dev_t dev, u_long cmd, void *add
sd-flags = ~SDF_FLUSHING;
else
sd-flags = ~(SDF_FLUSHING|SDF_DIRTY);
- } else
- error = 0;
+ }
return (error);
case DIOCAWEDGE:
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: kiyohara
Date: Thu Sep 26 16:14:34 UTC 2013
Modified Files:
src/sys/arch/evbarm/conf: OVERO
src/sys/arch/evbarm/gumstix: gumstix_machdep.c
Log Message:
Get and calculate some clocks from register.
And change some dpll5 settings for DM37xx. But I don't have it.
Tested EarthSTORM(Sliverlode) only. EHCI works. However clock is bad?
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/evbarm/conf/OVERO
cvs rdiff -u -r1.47 -r1.48 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/OVERO
diff -u src/sys/arch/evbarm/conf/OVERO:1.31 src/sys/arch/evbarm/conf/OVERO:1.32
--- src/sys/arch/evbarm/conf/OVERO:1.31 Sun Jun 30 21:38:56 2013
+++ src/sys/arch/evbarm/conf/OVERO Thu Sep 26 16:14:34 2013
@@ -1,5 +1,5 @@
#
-# $NetBSD: OVERO,v 1.31 2013/06/30 21:38:56 rmind Exp $
+# $NetBSD: OVERO,v 1.32 2013/09/26 16:14:34 kiyohara Exp $
#
# OVERO -- Gumstix. Inc. Overo COMS platforms kernel
#
@@ -205,7 +205,6 @@ omapmputmr0 at obio2 addr 0x49032000 int
omapmputmr1 at obio2 addr 0x49034000 intr 39 # GP Timer 3
# Microtime Reference Timer
omapmputmr2 at obio2 addr 0x49036000 intr 40 # GP Timer 4
-options OMAP_MPU_TIMER_CLOCK_FREQ=1200
# Watchdog timers
omapwdt32k* at obio1 addr 0x48314000 size 0x1000 # WDT2
Index: src/sys/arch/evbarm/gumstix/gumstix_machdep.c
diff -u src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.47 src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.48
--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c:1.47 Sun Aug 18 15:58:20 2013
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c Thu Sep 26 16:14:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: gumstix_machdep.c,v 1.47 2013/08/18 15:58:20 matt Exp $ */
+/* $NetBSD: gumstix_machdep.c,v 1.48 2013/09/26 16:14:34 kiyohara Exp $ */
/*
* Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
* All rights reserved.
@@ -248,6 +248,8 @@ pv_addr_t kernel_pt_table[NUM_KERNEL_PTS
/* Prototypes */
#if defined(GUMSTIX)
static void read_system_serial(void);
+#elif defined(OVERO)
+static void find_cpu_clock(void);
#endif
static void process_kernel_args(int, char *[]);
static void process_kernel_args_liner(char *);
@@ -498,7 +500,8 @@ initarm(void *arg)
psize_t memsize;
/*
- * U-Boot doesn't use the virtual memory.
+ * We mapped PA == VA in gumstix_start.S.
+ * Also mapped SDRAM to KERNEL_BASE first 64Mbyte only with cachable.
*
* Gumstix (basix, connex, verdex, verdex-pro):
* Physical Address Range Description
@@ -506,12 +509,19 @@ initarm(void *arg)
* 0x - 0x00ffflash Memory (16MB or 4MB)
* 0x4000 - 0x480fProcessor Registers
* 0xa000 - 0xa3ffSDRAM Bank 0 (64MB or 128MB)
+ * 0xc000 - 0xc3ffKERNEL_BASE
*
* Overo:
* Physical Address Range Description
* -----
+ * 0x8000 - 0x8fffSDRAM Bank 0 (256MB, 512MB or 1024MB)
+ * 0x8000 - 0x83ffKERNEL_BASE
*/
+#if defined(OVERO)
+ find_cpu_clock(); // find our CPU speed.
+#endif
+
/*
* Heads up ... Setup the CPU / MMU / TLB functions
*/
@@ -1024,6 +1034,34 @@ read_system_serial(void)
printf(%02x, system_serial[i]);
printf(\n);
}
+#elif defined(OVERO)
+static void
+find_cpu_clock(void)
+{
+ const vaddr_t prm_base = OMAP2_PRM_BASE;
+ const vaddr_t cm_base = OMAP2_CM_BASE;
+ const uint32_t prm_clksel =
+ *(volatile uint32_t *)(prm_base + PLL_MOD + OMAP3_PRM_CLKSEL);
+ static const uint32_t prm_clksel_freqs[] = OMAP3_PRM_CLKSEL_FREQS;
+ const uint32_t sys_clk =
+ prm_clksel_freqs[__SHIFTOUT(prm_clksel, OMAP3_PRM_CLKSEL_CLKIN)];
+ const uint32_t dpll1 =
+ *(volatile uint32_t *)(cm_base + OMAP3_CM_CLKSEL1_PLL_MPU);
+ const uint32_t dpll2 =
+ *(volatile uint32_t *)(cm_base + OMAP3_CM_CLKSEL2_PLL_MPU);
+ const uint32_t m =
+ __SHIFTOUT(dpll1, OMAP3_CM_CLKSEL1_PLL_MPU_DPLL_MULT);
+ const uint32_t n = __SHIFTOUT(dpll1, OMAP3_CM_CLKSEL1_PLL_MPU_DPLL_DIV);
+ const uint32_t m2 =
+ __SHIFTOUT(dpll2, OMAP3_CM_CLKSEL2_PLL_MPU_DPLL_CLKOUT_DIV);
+
+ /*
+ * MPU_CLK supplies ARM_FCLK which is twice the CPU frequency.
+ */
+ curcpu()-ci_data.cpu_cc_freq =
+ ((sys_clk * m) / ((n + 1) * m2 * 2)) * OMAP3_PRM_CLKSEL_MULT;
+ omap_sys_clk = sys_clk * OMAP3_PRM_CLKSEL_MULT;
+}
#endif
#ifdef GUMSTIX_NETBSD_ARGS_BUSHEADER
@@ -1339,9 +1377,9 @@ gumstix_device_register(device_t dev, vo
prop_dictionary_set_int16(dict, port0-gpio, -1);
prop_dictionary_set_int16(dict, port1-gpio, 183);
prop_dictionary_set_int16(dict, port2-gpio, -1);
- prop_dictionary_set_uint16(dict, dpll5-m, 120);
- prop_dictionary_set_uint16(dict, dpll5-n, 12);
- prop_dictionary_set_uint16(dict, dpll5-m2, 1);
+ prop_dictionary_set_uint16(dict, dpll5-m, 443);
+
CVS commit: src/share/man/man9
Module Name:src Committed By: skrll Date: Thu Sep 26 16:18:52 UTC 2013 Modified Files: src/share/man/man9: usbdi.9 Log Message: s/the the/the/ Bump date. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/share/man/man9/usbdi.9 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man9/usbdi.9 diff -u src/share/man/man9/usbdi.9:1.28 src/share/man/man9/usbdi.9:1.29 --- src/share/man/man9/usbdi.9:1.28 Mon Jun 10 06:41:58 2013 +++ src/share/man/man9/usbdi.9 Thu Sep 26 16:18:52 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: usbdi.9,v 1.28 2013/06/10 06:41:58 wiz Exp $ +.\ $NetBSD: usbdi.9,v 1.29 2013/09/26 16:18:52 skrll Exp $ .\ .\ Copyright (c) 2012 Matthew R. Green .\ All rights reserved. @@ -54,7 +54,7 @@ .\ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\ POSSIBILITY OF SUCH DAMAGE. .\ -.Dd June 10, 2013 +.Dd September 26, 2013 .Dt USBDI 9 .Os .Sh NAME @@ -548,7 +548,7 @@ for control, bulk and interrupt transfer .Fa buffer the data to transfer and its .Fa length -and for isochronous transfers the the frame length +and for isochronous transfers the frame length .Fa frlengths and number of frames .Fa nframes ,
