From patchwork Wed Jan 28 05:18:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Behan Webster X-Patchwork-Id: 43873 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f72.google.com (mail-wg0-f72.google.com [74.125.82.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A73C923FFF for ; Wed, 28 Jan 2015 05:18:41 +0000 (UTC) Received: by mail-wg0-f72.google.com with SMTP id k14sf9713947wgh.3 for ; Tue, 27 Jan 2015 21:18:40 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=Q5PYukkSpuDRmNvXyZdh5r8LtTdvsoGeXnNcsyEG3+k=; b=OkA7WDKyoqXg1rlaMsc2LXKHTUCGL/oateorm9UQJzdGmIxAKd4Z+HgEKQmb2YD9+l NXSYCOp1UDZqNivBwETHrQ+aTkT6xqQEcJS4CvmDmeKarxxyFnNZs/l4E/2fcdGg9A7B DyEoGsB99moihv4oqnLU3Eesf0hWaVn7Y1thnfouYAEwjm9wzL5kc8PWDfb1ANmayp+i bV7aBBSSKpUWtipiVnncOI9jxr+dcK+TP8ysJBIgLj9w+QI6GVxsFgEfai0DVrBLUb/m tNgkNbMz6DrVyrxRabSDVKWVpshkbI3lSzQ/TAfhoOHOkWhQSmw42oC4KfDCCzT47vtH Nq+g== X-Gm-Message-State: ALoCoQlxNQ52PrF5rIVUQN6grjAP4o08v8RBNV53Qr/z4qyFhFoK93rD+TZjGGvEYmJb2wQOG1DF X-Received: by 10.152.37.130 with SMTP id y2mr719967laj.8.1422422320922; Tue, 27 Jan 2015 21:18:40 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.130 with SMTP id m2ls102464laf.87.gmail; Tue, 27 Jan 2015 21:18:40 -0800 (PST) X-Received: by 10.152.87.210 with SMTP id ba18mr5717779lab.3.1422422320741; Tue, 27 Jan 2015 21:18:40 -0800 (PST) Received: from mail-la0-x236.google.com (mail-la0-x236.google.com. [2a00:1450:4010:c03::236]) by mx.google.com with ESMTPS id yi9si3212092lbb.13.2015.01.27.21.18.40 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 27 Jan 2015 21:18:40 -0800 (PST) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::236 as permitted sender) client-ip=2a00:1450:4010:c03::236; Received: by mail-la0-f54.google.com with SMTP id hv19so16961455lab.13 for ; Tue, 27 Jan 2015 21:18:40 -0800 (PST) X-Received: by 10.152.182.235 with SMTP id eh11mr5104623lac.9.1422422320480; Tue, 27 Jan 2015 21:18:40 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp1321681lbj; Tue, 27 Jan 2015 21:18:39 -0800 (PST) X-Received: by 10.70.98.174 with SMTP id ej14mr2579332pdb.37.1422422317919; Tue, 27 Jan 2015 21:18:37 -0800 (PST) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y2si4434189pbw.6.2015.01.27.21.18.36; Tue, 27 Jan 2015 21:18:37 -0800 (PST) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1762489AbbA1FSf (ORCPT + 28 others); Wed, 28 Jan 2015 00:18:35 -0500 Received: from mail-qg0-f49.google.com ([209.85.192.49]:60558 "EHLO mail-qg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1762470AbbA1FSe (ORCPT ); Wed, 28 Jan 2015 00:18:34 -0500 Received: by mail-qg0-f49.google.com with SMTP id i50so15318639qgf.8 for ; Tue, 27 Jan 2015 21:18:33 -0800 (PST) X-Received: by 10.224.43.10 with SMTP id u10mr9958233qae.20.1422422313222; Tue, 27 Jan 2015 21:18:33 -0800 (PST) Received: from galdor.websterwood.com (d75-157-25-177.bchsia.telus.net. [75.157.25.177]) by mx.google.com with ESMTPSA id c16sm3137388qge.24.2015.01.27.21.18.30 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 27 Jan 2015 21:18:32 -0800 (PST) From: Behan Webster To: bcm@fixthebug.org, f.fainelli@gmail.com, linux@arm.linux.org.uk, mporter@linaro.org Cc: behanw@converseincode.com, bcm-kernel-feedback-list@broadcom.com, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Alex Elder Subject: [PATCH] bcm: address clang inline asm incompatibility Date: Tue, 27 Jan 2015 21:18:26 -0800 Message-Id: <1422422306-27473-1-git-send-email-behanw@converseincode.com> X-Mailer: git-send-email 1.9.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Original-Sender: behanw@converseincode.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 2a00:1450:4010:c03::236 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=neutral (body hash did not verify) header.i=@ Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Alex Elder My GCC-based build environment likes to call register r12 by the name "ip" in inline asm. Behan Webster informed me that his Clang- based build environment likes "r12" instead. Try to make them both happy. Signed-off-by: Alex Elder Signed-off-by: Behan Webster --- arch/arm/mach-bcm/bcm_kona_smc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c index a55a7ec..3937bd5 100644 --- a/arch/arm/mach-bcm/bcm_kona_smc.c +++ b/arch/arm/mach-bcm/bcm_kona_smc.c @@ -106,9 +106,14 @@ int __init bcm_kona_smc_init(void) * request result appropriately. This result value is found in r0 * when the "smc" request completes. */ +#ifdef __clang__ +#define R12 "r12" +#else /* !__clang__ */ +#define R12 "ip" /* gcc calls r12 "ip" */ +#endif /* !__clang__ */ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys) { - register u32 ip asm("ip"); /* Also called r12 */ + register u32 ip asm(R12); /* Also called r12 */ register u32 r0 asm("r0"); register u32 r4 asm("r4"); register u32 r5 asm("r5"); @@ -120,7 +125,7 @@ static int bcm_kona_do_smc(u32 service_id, u32 buffer_phys) asm volatile ( /* Make sure we got the registers we want */ - __asmeq("%0", "ip") + __asmeq("%0", R12) __asmeq("%1", "r0") __asmeq("%2", "r4") __asmeq("%3", "r5")