From patchwork Mon Feb 14 13:17:51 2011
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: tip-bot for Dave Martin <dave.martin@linaro.org>
X-Patchwork-Id: 555431
X-Patchwork-Delegate: khilman@deeprootsystems.com
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p1EDI2p2029230
	for <patchwork-omap@patchwork.kernel.org>;
	Mon, 14 Feb 2011 13:18:02 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754939Ab1BNNSB (ORCPT
	<rfc822;patchwork-omap@patchwork.kernel.org>);
	Mon, 14 Feb 2011 08:18:01 -0500
Received: from mail-ww0-f44.google.com ([74.125.82.44]:46759 "EHLO
	mail-ww0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753707Ab1BNNSA (ORCPT
	<rfc822; linux-omap@vger.kernel.org>); Mon, 14 Feb 2011 08:18:00 -0500
Received: by wwa36 with SMTP id 36so4856390wwa.1
	for <linux-omap@vger.kernel.org>;
	Mon, 14 Feb 2011 05:17:59 -0800 (PST)
Received: by 10.227.156.5 with SMTP id u5mr2525354wbw.28.1297689479393;
	Mon, 14 Feb 2011 05:17:59 -0800 (PST)
Received: from arm.com (host86-166-238-5.range86-166.btcentralplus.com
	[86.166.238.5])
	by mx.google.com with ESMTPS id f27sm1907971wbf.1.2011.02.14.05.17.57
	(version=SSLv3 cipher=OTHER); Mon, 14 Feb 2011 05:17:58 -0800 (PST)
Date: Mon, 14 Feb 2011 13:17:51 +0000
From: Dave Martin <dave.martin@linaro.org>
To: Kevin Hilman <khilman@ti.com>
Cc: linux-arm-kernel@lists.infradead.org, Tony Lindgren <tony@atomide.com>,
	Santosh Shilimkar <santosh.shilimkar@ti.com>,
	Jean Pihet <j-pihet@ti.com>, linux-omap@vger.kernel.org,
	Nicolas Pitre <nicolas.pitre@linaro.org>
Subject: Re: [PATCH v4 0/5] ARM: omap[34]: Thumb-2 compatibility fixes
Message-ID: <20110214131750.GA2869@arm.com>
References: <1297263683-10621-1-git-send-email-dave.martin@linaro.org>
	<87pqqy6tdj.fsf@ti.com>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <87pqqy6tdj.fsf@ti.com>
User-Agent: Mutt/1.5.20 (2009-06-14)
Sender: linux-omap-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-omap.vger.kernel.org>
X-Mailing-List: linux-omap@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]);
	Mon, 14 Feb 2011 13:18:03 +0000 (UTC)


diff --git a/arch/arm/mach-omap2/sleep34xx.S b/arch/arm/mach-omap2/sleep34xx.S
index a204c78..ee1edb1 100644
--- a/arch/arm/mach-omap2/sleep34xx.S
+++ b/arch/arm/mach-omap2/sleep34xx.S
@@ -32,6 +32,14 @@
 #include "sdrc.h"
 #include "control.h"
 
+#undef ARM
+#undef THUMB
+#undef BSYM
+#define ARM(x...) x
+#define THUMB(x...)
+#define BSYM(x) (x)
+	.arm
+
 /*
  * Registers access definitions
  */
@@ -289,8 +297,20 @@ clean_l2:
 	 *  - should be faster and will change with kernel
 	 *  - 'might' have to copy address, load and jump to it
 	 */
+#ifdef CONFIG_THUMB2_KERNEL
+	/* kernel is non-interworking : must do this from Thumb */
+	adr	r1, . + 1
+	bx	r1
+	.thumb
+#endif
 	ldr	r1, kernel_flush
 	blx	r1
+#ifdef CONFIG_THUMB2_KERNEL
+	.align
+	bx	pc
+	nop
+	.arm
+#endif
 
 omap3_do_wfi:
 	ldr	r4, sdrc_power		@ read the SDRC_POWER register
diff --git a/arch/arm/mach-omap2/sram34xx.S b/arch/arm/mach-omap2/sram34xx.S
index 829d235..64faab8 100644
--- a/arch/arm/mach-omap2/sram34xx.S
+++ b/arch/arm/mach-omap2/sram34xx.S
@@ -34,6 +34,14 @@
 #include "sdrc.h"
 #include "cm2xxx_3xxx.h"
 
+#undef ARM
+#undef THUMB
+#undef BSYM
+#define ARM(x...) x
+#define THUMB(x...)
+#define BSYM(x) (x)
+	.arm
+
 	.text
 
 /* r1 parameters */