From owner-p4-projects@FreeBSD.ORG  Sun Mar  1 08:21:52 2009
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C63071065670; Sun,  1 Mar 2009 08:21:51 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 85F91106566B
	for <perforce@FreeBSD.org>; Sun,  1 Mar 2009 08:21:51 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 5A2AB8FC13
	for <perforce@FreeBSD.org>; Sun,  1 Mar 2009 08:21:51 +0000 (UTC)
	(envelope-from lulf@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n218LpEZ046569
	for <perforce@FreeBSD.org>; Sun, 1 Mar 2009 08:21:51 GMT
	(envelope-from lulf@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n218LpGw046567
	for perforce@freebsd.org; Sun, 1 Mar 2009 08:21:51 GMT
	(envelope-from lulf@FreeBSD.org)
Date: Sun, 1 Mar 2009 08:21:51 GMT
Message-Id: <200903010821.n218LpGw046567@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	lulf@FreeBSD.org using -f
From: Ulf Lilleengen <lulf@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 158517 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 01 Mar 2009 08:21:52 -0000

http://perforce.freebsd.org/chv.cgi?CH=158517

Change 158517 by lulf@lulf_carrot on 2009/03/01 08:21:27

	- Move sleep mode definitions into the general headers for ap700x, since
	  the implementations doesn't differ that much.
	- Fix broken sleep mode conditions. There are several ways to do this,
	  but for now, disallow sleep mode if global, exception, i1 or i2 masks
	  are set.
	
	
	Discussed with:		antab

Affected files ...

.. //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#9 edit
.. //depot/projects/avr32/src/sys/avr32/include/at32ap7000.h#2 delete
.. //depot/projects/avr32/src/sys/avr32/include/at32ap700x.h#3 edit

Differences ...

==== //depot/projects/avr32/src/sys/avr32/avr32/cpu.c#9 (text+ko) ====

@@ -63,7 +63,6 @@
 #include <machine/reg_intc.h>
 #include <machine/reg_usart.h>
 #include <machine/at32ap700x.h>
-#include <machine/at32ap7000.h>
 
 extern vm_offset_t _evba;
 
@@ -90,17 +89,12 @@
 void
 cpu_idle(int busy)
 {
-	uint32_t gm;
-
-	gm = bit_offset(SYS, SR, GM);
-	/* Make sure interrupts are enabled before we do this. */
-	if (gm == 1 || (sysreg_read(SR) & INTR_MASK) == gm)
-		panic("sleeping with interrupts disabled");
-#if defined(CPU_AT32AP7000)
-	__asm__ __volatile ("sleep %0" : : "i"(AT32AP7000_SLEEP_IDLE));
-#else
-	avr32_impl();
-#endif
+	/* Make sure important interrupts are enabled before we do this. */
+	if (sysreg_read(SR) & (bit_offset(SYS, SR, GM) |
+	    bit_offset(SYS, SR, EM) | bit_offset(SYS, SR, I0M) |
+	    bit_offset(SYS, SR, I1M)))
+		panic("sleeping with critical interrupts masked");
+	__asm__ __volatile ("sleep %0" : : "i"(AT32AP700X_SLEEP_IDLE));
 }
 
 void

==== //depot/projects/avr32/src/sys/avr32/include/at32ap700x.h#3 (text+ko) ====

@@ -119,4 +119,11 @@
 #define AT32AP700X_EEC0_OFFSET		0xF03C00
 #define AT32AP700X_EEC0_SIZE		0x100
 
+/* Sleep modes. */
+#define AT32AP700X_SLEEP_IDLE		0
+#define AT32AP700X_SLEEP_FROZEN		1
+#define AT32AP700X_SLEEP_STANDBY	2
+#define AT32AP700X_SLEEP_STOP		3
+#define AT32AP700X_SLEEP_STATIC		5 /* Not a typo. */
+
 #endif /* !_MACHINE_AT32AP700X_H_ */