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: 9883355 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 8A1DA603F4 for ; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A5EB28801 for ; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6DB3A287B9; Sat, 5 Aug 2017 20:54:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CE6D9287B9 for ; Sat, 5 Aug 2017 20:54:50 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752820AbdHEUxx (ORCPT ); Sat, 5 Aug 2017 16:53:53 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:35856 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752814AbdHEUxq (ORCPT ); Sat, 5 Aug 2017 16:53:46 -0400 Received: by mail-wm0-f53.google.com with SMTP id t201so42450327wmt.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=JXIgDw3XUmwNsBFLQIWPRwSiL1K1NrRB4emf2rkJt6DF6W1sNJoqPUTsJdkbErRl+c AgXnplVcBG2TBV3bGKe6uaCd5rPeHLvYPSPA4Wc1ZZzXza/3iPjyvkgpE+aRHnKcOPAh e5xIFGxCFHujFKAUyM90Q1XoT2M5ZQSoPAwPrImztYHbTTyYMRbwcPFwq8UTV9GexWKI Ihwvwbk0V76AivyMl6wR7OhAwG4duJBhd5eSxMfdV5b/TRJJTX4Ik+om0N9aV6HoXb/4 PIG/902CXHXOfSf0tXxxMw+nqZmJMLV/dUKNsXz9SrEA94r2EkeX3QwWFTBP5rYIcqZN SBoQ== X-Gm-Message-State: AHYfb5h7jYcMzJHldJSiHKk3QgjL03l1s3d3/oMrscNm0OEPIUYsIg2s UTIIXb1hSzL5g8K/ 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: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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(-) 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 - .