svn commit: r209780 - in projects/altix/sys: amd64/conf amd64/include boot/ia64/efi kern mips/atheros

[Marcel Moolenaar]

Author: marcel
Date: Wed Jul  7 20:21:24 2010
New Revision: 209780
URL: http://svn.freebsd.org/changeset/base/209780

Log:
  Merge svn+ssh://svn.freebsd.org/base/head@209779

Modified:
  projects/altix/sys/amd64/conf/GENERIC
  projects/altix/sys/amd64/include/segments.h
  projects/altix/sys/boot/ia64/efi/version
  projects/altix/sys/kern/kern_clock.c
  projects/altix/sys/mips/atheros/ar71xxreg.h
Directory Properties:
  projects/altix/lib/libstand/   (props changed)
  projects/altix/sys/   (props changed)
  projects/altix/sys/amd64/include/xen/   (props changed)
  projects/altix/sys/cddl/contrib/opensolaris/   (props changed)
  projects/altix/sys/contrib/dev/acpica/   (props changed)
  projects/altix/sys/contrib/x86emu/   (props changed)
  projects/altix/sys/dev/xen/xenpci/   (props changed)

Modified: projects/altix/sys/amd64/conf/GENERIC
==============================================================================
--- projects/altix/sys/amd64/conf/GENERIC	Wed Jul  7 20:07:33 2010	(r209779)
+++ projects/altix/sys/amd64/conf/GENERIC	Wed Jul  7 20:21:24 2010	(r209780)
@@ -294,6 +294,7 @@ device		umass		# Disks/Mass storage - Re
 device		ums		# Mouse
 device		urio		# Diamond Rio 500 MP3 player
 # USB Serial devices
+device		u3g		# USB-based 3G modems (Option, Huawei, Sierra)
 device		uark		# Technologies ARK3116 based serial adapters
 device		ubsa		# Belkin F5U103 and compatible serial adapters
 device		uftdi		# For FTDI usb serial adapters

Modified: projects/altix/sys/amd64/include/segments.h
==============================================================================
--- projects/altix/sys/amd64/include/segments.h	Wed Jul  7 20:07:33 2010	(r209779)
+++ projects/altix/sys/amd64/include/segments.h	Wed Jul  7 20:21:24 2010	(r209780)
@@ -74,12 +74,12 @@ struct	user_segment_descriptor {
 	u_int64_t sd_hibase:8;		/* segment base address  (msb) */
 } __packed;
 
-#define USD_GETBASE(_sd)	(((_sd)->sd_lobase) | (_sd)->sd_hibase << 24) 
-#define USD_SETBASE(_sd, _b)	(_sd)->sd_lobase = (_b); 	\
-				(_sd)->sd_hibase = ((_b) >> 24);
-#define USD_GETLIMIT(_sd)	(((_sd)->sd_lolimit) | (_sd)->sd_hilimit << 16)
-#define USD_SETLIMIT(_sd, _l)	(_sd)->sd_lolimit = (_l);	\
-				(_sd)->sd_hilimit = ((_l) >> 16);
+#define	USD_GETBASE(sd)		(((sd)->sd_lobase) | (sd)->sd_hibase << 24) 
+#define	USD_SETBASE(sd, b)	(sd)->sd_lobase = (b); 	\
+				(sd)->sd_hibase = ((b) >> 24);
+#define	USD_GETLIMIT(sd)	(((sd)->sd_lolimit) | (sd)->sd_hilimit << 16)
+#define	USD_SETLIMIT(sd, l)	(sd)->sd_lolimit = (l);	\
+				(sd)->sd_hilimit = ((l) >> 16);
 
 /*
  * System segment descriptors (128 bit wide)

Modified: projects/altix/sys/boot/ia64/efi/version
==============================================================================
--- projects/altix/sys/boot/ia64/efi/version	Wed Jul  7 20:07:33 2010	(r209779)
+++ projects/altix/sys/boot/ia64/efi/version	Wed Jul  7 20:21:24 2010	(r209780)
@@ -3,6 +3,8 @@ $FreeBSD$
 NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE.  The format of this
 file is important.  Make sure the current version number is on line 6.
 
+2.2:	Create direct mapping based on start address instead of mapping
+	first 256M.
 2.1:	Add support for "-dev <part>" argument parsing.
 2.0:	Provide devices based on the block I/O protocol, rather than the
 	simple file services protocol. Use the FreeBSD file system code

Modified: projects/altix/sys/kern/kern_clock.c
==============================================================================
--- projects/altix/sys/kern/kern_clock.c	Wed Jul  7 20:07:33 2010	(r209779)
+++ projects/altix/sys/kern/kern_clock.c	Wed Jul  7 20:21:24 2010	(r209780)
@@ -202,8 +202,14 @@ deadlkres(void)
 		FOREACH_PROC_IN_SYSTEM(p) {
 			PROC_LOCK(p);
 			FOREACH_THREAD_IN_PROC(p, td) {
+
+				/*
+				 * Once a thread is found in "interesting"
+				 * state a possible ticks wrap-up needs to be
+				 * checked.
+				 */
 				thread_lock(td);
-				if (TD_ON_LOCK(td)) {
+				if (TD_ON_LOCK(td) && ticks < td->td_blktick) {
 
 					/*
 					 * The thread should be blocked on a
@@ -212,11 +218,6 @@ deadlkres(void)
 					 */
 					MPASS(td->td_blocked != NULL);
 
-					/* Handle ticks wrap-up. */
-					if (ticks < td->td_blktick) {
-						thread_unlock(td);
-						continue;
-					}
 					tticks = ticks - td->td_blktick;
 					thread_unlock(td);
 					if (tticks > blkticks) {
@@ -232,13 +233,9 @@ deadlkres(void)
 	panic("%s: possible deadlock detected for %p, blocked for %d ticks\n",
 						    __func__, td, tticks);
 					}
-				} else if (TD_IS_SLEEPING(td)) {
-
-					/* Handle ticks wrap-up. */
-					if (ticks < td->td_blktick) {
-						thread_unlock(td);
-						continue;
-					}
+				} else if (TD_IS_SLEEPING(td) &&
+				    TD_ON_SLEEPQ(td) &&
+				    ticks < td->td_blktick) {
 
 					/*
 					 * Check if the thread is sleeping on a

Modified: projects/altix/sys/mips/atheros/ar71xxreg.h
==============================================================================
--- projects/altix/sys/mips/atheros/ar71xxreg.h	Wed Jul  7 20:07:33 2010	(r209779)
+++ projects/altix/sys/mips/atheros/ar71xxreg.h	Wed Jul  7 20:21:24 2010	(r209780)
@@ -151,10 +151,10 @@
 #define		AR71XX_GPIO_FUNCTION		0x28
 #define			GPIO_FUNC_STEREO_EN     (1 << 17)
 #define			GPIO_FUNC_SLIC_EN       (1 << 16)
-#define			GPIO_FUNC_SPI_CS1_EN    (1 << 15)
-				/* CS1 is shared with GPIO_1 */
-#define			GPIO_FUNC_SPI_CS0_EN    (1 << 14)
-				/* CS0 is shared with GPIO_0 */
+#define			GPIO_FUNC_SPI_CS2_EN    (1 << 15)
+				/* CS2 is shared with GPIO_1 */
+#define			GPIO_FUNC_SPI_CS1_EN    (1 << 14)
+				/* CS1 is shared with GPIO_0 */
 #define			GPIO_FUNC_SPI_EN        (1 << 13)
 #define			GPIO_FUNC_UART_EN       (1 << 8)
 #define			GPIO_FUNC_USB_OC_EN     (1 << 4)