From patchwork Sat Aug 5 20:52:18 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 109496 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp992027qge; Sat, 5 Aug 2017 13:53:57 -0700 (PDT) X-Received: by 10.98.63.204 with SMTP id z73mr6792658pfj.278.1501966437371; Sat, 05 Aug 2017 13:53:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501966437; cv=none; d=google.com; s=arc-20160816; b=QmOFRBeubc3zZIuO+Cr+lQDHvcoKAdHUWfPMepgjhJiR56cAMWRQva0t40FOF2aBrR rJwo2F5lDNrl+LUYib++Bge+3/gdTNETMIYRVV92zbPjLjp9uwZEim9reyHh0TzYH837 4C9c1m3B+9VKl3E7g/BVr+jvue8PHTV2gQjKkNp2CYoVqz0j+JX9DT8VfOLLcm+gjutE JhFTRSB2BczarA8mkfLdWIZqYXK1RAaaqUnE6MtucDRsla2AQKXFcHQPzCrDvk5Hfvkn gSvcB6LoWWnMs42hU25lMa4/w4ikQuBHZY0JcAFRVC2afdJS+MpcKKxMhlbXF07LWMvx QwXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=K5nOi/ZedXwgmUONoN+vYNi7cVA430eoLqgBLKCcyCE=; b=yPMRRRCgHfKjam0qUSv69W895IF4/RR/nxE+TsosA1/Xi8JjT2OPUwTIBhP0oqLpsy ZfziUiAJSCxhO44r9Zrf4nCETOsYsnhqr15x9A+LpSpt6GUB2N8bnAJcwYz/JrWyqChD XUC/vEV6DRfNALT9/o1ditmmkA0FBLn081iRUnzRS4nmdyNvOppZkercLzK1VTpTPrQH 0+e3/PLRZpbt7PNfstsPi/beguxJIE+jCsI3H0xVyDUwfpWFRN9bx0CgUsP31iqO+JOb vnqKd/MJGAOSnfazjEh+JrEbS514y+f6h/YCWkrgAhjUdNz3ipVDDylT6YmFU7k0keLo xKjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=jaLaInHw; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e6si3018685plk.487.2017.08.05.13.53.57; Sat, 05 Aug 2017 13:53:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=jaLaInHw; spf=pass (google.com: best guess record for domain of linux-omap-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-omap-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752873AbdHEUxx (ORCPT + 3 others); Sat, 5 Aug 2017 16:53:53 -0400 Received: from mail-wm0-f41.google.com ([74.125.82.41]:35857 "EHLO mail-wm0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752820AbdHEUxq (ORCPT ); Sat, 5 Aug 2017 16:53:46 -0400 Received: by mail-wm0-f41.google.com with SMTP id t201so42450330wmt.1 for ; Sat, 05 Aug 2017 13:53:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=u3I3Jk6wrJK6+7ea8yX3xVYVsbsP1/6JexLXk9d8LqI=; b=jaLaInHw9XlWbJPQ8iFgCklojqH1ATfBLlcdc1NXYXDhY54j4LpDU/+Tig73ENLrQV yZV0zBw/x8NNsuNJHuNryhPZdafNba2rmNH2XSjXjEW8UXDgReDrVvT1LlZyNX/n6/c8 lv+LGqLgrMHiMkBT0BeJ0Hn6XM9gszxGqAKek= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=u3I3Jk6wrJK6+7ea8yX3xVYVsbsP1/6JexLXk9d8LqI=; b=PymYZ4cXqi8izwg9/Bo0Vc81xVQo8F3czNCxfxPVgQ6ijdzIT3HL6roVFFGIsVbTSk IIBeTSVvZEIWeiaH1kgUzgsc4gs1vjyI/hgnDD0NNU5mIKvkNyJjg/avZ1F1qEQKo+hN OFmqEDjF0E+N3Y4JgTmSvpxqqr9qG4qLkymXJeK7PqzzHmAw5L185ROOVj2Yv07xb5v2 xL6WIE6uEqzQa5NRPcuPa9idcoK/3FaFQj5mdDpaU/FxBc2w68K61j0h81vQj49NsxbZ vHINwnRQL+FDDa+mb12tq+/ObUMlQBZ04JLNtqkLZfKAOymOLNyZLsV0h8kYQHsLSxO9 Ev5A== X-Gm-Message-State: AHYfb5iINDsCQxWjqXuuhA8uyuir6YxsQYZC46onVx93rjxF1+MEV3WJ t9T0OBQTiYNunEFJ X-Received: by 10.28.57.193 with SMTP id g184mr4398864wma.32.1501966424868; Sat, 05 Aug 2017 13:53:44 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:44 -0700 (PDT) From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org, linux-renesas-soc@vger.kernel.org, linux@armlinux.org.uk, linux-omap@vger.kernel.org, kvm@vger.kernel.org, kvmarm@lists.cs.columbia.edu, krzk@kernel.org, jason@lakedaemon.net, arm@kernel.org, andrew@lunn.ch, gregory.clement@free-electrons.com, sebastian.hesselbarth@gmail.com, tony@atomide.com, baohua@kernel.org, horms@verge.net.au, magnus.damm@gmail.com, vireshk@kernel.org, shiraz.linux.kernel@gmail.com, patrice.chotard@st.com, nico@linaro.org, dave.martin@arm.com, marc.zyngier@arm.com Cc: Ard Biesheuvel Subject: [PATCH 11/15] arm-soc: mvebu: replace open coded VA->PA conversion Date: Sat, 5 Aug 2017 21:52:18 +0100 Message-Id: <20170805205222.19868-12-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170805205222.19868-1-ard.biesheuvel@linaro.org> References: <20170805205222.19868-1-ard.biesheuvel@linaro.org> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org This replaces an open coded calculation to obtain the physical address of a far symbol with a call to the new ldr_l etc macro. Signed-off-by: Ard Biesheuvel --- arch/arm/mach-mvebu/coherency_ll.S | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) -- 2.11.0 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/mach-mvebu/coherency_ll.S b/arch/arm/mach-mvebu/coherency_ll.S index 8b2fbc8b6bc6..df0ccb5cef1d 100644 --- a/arch/arm/mach-mvebu/coherency_ll.S +++ b/arch/arm/mach-mvebu/coherency_ll.S @@ -42,9 +42,7 @@ ENTRY(ll_get_coherency_base) ldr r1, =coherency_base cmp r1, #0 beq 2f - adr r1, 3f - ldr r3, [r1] - ldr r1, [r1, r3] + ldr_l r1, coherency_phys_base b 2f 1: /* @@ -160,7 +158,3 @@ ENTRY(ll_disable_coherency) dsb ret lr ENDPROC(ll_disable_coherency) - - .align 2 -3: - .long coherency_phys_base - .