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: 2825499 Return-Path: X-Original-To: patchwork-linux-sh@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 BAD679F9CF for ; Wed, 10 Jul 2013 02:06:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E3D712011B for ; Wed, 10 Jul 2013 02:06:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E969220119 for ; Wed, 10 Jul 2013 02:06:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754094Ab3GJCGj (ORCPT ); Tue, 9 Jul 2013 22:06:39 -0400 Received: from fbvrgw.firstserver.ne.jp ([164.46.1.51]:51367 "EHLO fbvrgw.firstserver.ne.jp" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754024Ab3GJCGj (ORCPT ); Tue, 9 Jul 2013 22:06:39 -0400 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 r6A20AGJ011415 for ; Wed, 10 Jul 2013 11:00:10 +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 Cc: linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tetsuyuki Kobayashi 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> Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-3.6 required=5.0 tests=BAYES_00, FSL_HELO_BARE_IP_2, RCVD_IN_DNSWL_HI, RCVD_NUMERIC_HELO, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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