From patchwork Wed Jul 10 01:56:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tetsuyuki Kobayashi X-Patchwork-Id: 2825503 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3A4A79F756 for ; Wed, 10 Jul 2013 02:15:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 108A920119 for ; Wed, 10 Jul 2013 02:15:57 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9B7872011B for ; Wed, 10 Jul 2013 02:15:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwjok-0002Nj-38; Wed, 10 Jul 2013 02:07:46 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwjo8-0007ZD-7h; Wed, 10 Jul 2013 02:07:04 +0000 Received: from fbvrgw.firstserver.ne.jp ([164.46.1.51]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Uwjo5-0007YR-Dd for linux-arm-kernel@lists.infradead.org; Wed, 10 Jul 2013 02:07:02 +0000 Received: from vrgw3.firstserver.ne.jp (vrgw3.firstserver.ne.jp [164.46.1.46]) by fbvrgw.firstserver.ne.jp (8.13.8/8.13.8/FirstServer) with ESMTP id r6A1wlfK011155 for ; Wed, 10 Jul 2013 10:58:47 +0900 (envelope-from koba@kmckk.co.jp) Received: from fvrsp051.firstserver.ne.jp (fvrsp051.firstserver.ne.jp [203.183.56.3]) by vrgw3.firstserver.ne.jp (8.13.8/8.13.8/FirstServer) with ESMTP id r6A1vaMH015887; Wed, 10 Jul 2013 10:57:36 +0900 (envelope-from koba@kmckk.co.jp) Received: from 203.137.25.97 (203.137.25.97) by fvrsp051.firstserver.ne.jp (F-Secure/virusgw_smtp/407/fvrsp051.firstserver.ne.jp); Wed, 10 Jul 2013 10:57:36 +0900 (JST) X-Virus-Status: clean(F-Secure/virusgw_smtp/407/fvrsp051.firstserver.ne.jp) Received: from localhost (58-188-103-12f2.kns1.eonet.ne.jp [58.188.103.12]) (authenticated (0 bits)) by mail.kmckk.co.jp (8.14.3/8.11.3) with ESMTP id r6A1vaaq023237; Wed, 10 Jul 2013 10:57:36 +0900 From: Tetsuyuki Kobayashi To: horms@verge.net.au, magnus.damm@gmail.com Subject: [PATCH 1/3] ARM: shmobile: fix compile error when CONFIG_THUMB2_KERNEL=y Date: Wed, 10 Jul 2013 10:56:35 +0900 Message-Id: <1373421397-1786-2-git-send-email-koba@kmckk.co.jp> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1373421397-1786-1-git-send-email-koba@kmckk.co.jp> References: <1373421397-1786-1-git-send-email-koba@kmckk.co.jp> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130709_220701_824057_B3F93D77 X-CRM114-Status: GOOD ( 10.54 ) X-Spam-Score: 1.7 (+) Cc: Tetsuyuki Kobayashi , linux-arm-kernel@lists.infradead.org, linux-sh@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-0.9 required=5.0 tests=BAYES_00, FSL_HELO_BARE_IP_2, RCVD_IN_DNSWL_MED, RCVD_NUMERIC_HELO, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP On KZM-A9-GT board (SMP), when CONFIG_THUMB2_KERNEL=y it fails to compile AS arch/arm/mach-shmobile/headsmp-scu.o /proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S: Assembler messages: /proj/koba/kernel/arm-soc/arch/arm/mach-shmobile/headsmp-scu.S:41: Error: shift must be constant -- `bic r2,r2,r3,lsl r1' make[2]: *** [arch/arm/mach-shmobile/headsmp-scu.o] Error 1 make[1]: *** [arch/arm/mach-shmobile] Error 2 make: *** [sub-make] Error 2 Instruction `bic r2,r2,r3,lsl r1' is not supported in thumb mode. This patch split it into 2 instructions. Signed-off-by: Tetsuyuki Kobayashi --- arch/arm/mach-shmobile/headsmp-scu.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S index 6f98654..5ce416c 100644 --- a/arch/arm/mach-shmobile/headsmp-scu.S +++ b/arch/arm/mach-shmobile/headsmp-scu.S @@ -38,7 +38,8 @@ ENTRY(shmobile_boot_scu) lsl r1, r1, #3 @ we will shift by cpu_id * 8 bits ldr r2, [r0, #8] @ SCU Power Status Register mov r3, #3 - bic r2, r2, r3, lsl r1 @ Clear bits of our CPU (Run Mode) + lsl r3, r3, r1 + bic r2, r2, r3 @ Clear bits of our CPU (Run Mode) str r2, [r0, #8] @ write back b shmobile_invalidate_start