From patchwork Sat Aug 5 20:52:22 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 9883391 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 E497A60392 for ; Sat, 5 Aug 2017 20:54:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D6FD7286CC for ; Sat, 5 Aug 2017 20:54:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBC35287B9; Sat, 5 Aug 2017 20:54:53 +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=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_HI,RCVD_IN_SORBS_SPAM autolearn=unavailable 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 EA8B5287C1 for ; Sat, 5 Aug 2017 20:54:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752857AbdHEUyR (ORCPT ); Sat, 5 Aug 2017 16:54:17 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:35132 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752920AbdHEUyA (ORCPT ); Sat, 5 Aug 2017 16:54:00 -0400 Received: by mail-wm0-f52.google.com with SMTP id m85so42484447wma.0 for ; Sat, 05 Aug 2017 13:54:00 -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=aBJ+ZJYVVJY5UPy7n00EgotUih+BsL7WsvuLTx2gZQg=; b=NWdfPLQM2bISR0rlD0h0pabm8BPpYKjrxWHOXNSe2j0Vbb/6V+WX2wAE+wZGPsQmB2 sYLtUMfmEzq4vTo9+9w+eXxeMpwfisJBiQ601z4SReXZduJ9lTvhzKWnv1Ce13LMB6NY 2WhI9T3kESjDDgstW/J34MGZfckgsk1g0ON+g= 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=aBJ+ZJYVVJY5UPy7n00EgotUih+BsL7WsvuLTx2gZQg=; b=kqsU1tO5Y4AUZD6c6y2LnP8RDrydCB7WB0Gdx2sBEy0MPeUM/HCTfNQjDQ6DczS+w/ BfP0tmqcvFxURZ3t7GJ0aBDVMZJPNzgjDLqBTkibnl4tZFkiApMoXLsXDHVKuVEHzgIn IcbKmhc6vXXUM44Sk5pCPHIgc+7KiTKl+gfi+poWJGgCAX4+YbEqAfrwvsGOb1T+3tDe uq3/ihz1mcvI3jWhuVhovhSsefQYPtBUmrnlWRl/b51DiidxBGn8S2TvYga8HRHt0ZOP zA7dDpLDmNKcd8xs4BZFoS/GS8NIXKcnTh+QCjbiWbvbuMCxWhlOCsoeHzdznAj8rqJ/ TEVg== X-Gm-Message-State: AHYfb5jCwiCMR+CcZAooypOzpyv+jAGctfAK9xizlByVNY+ko7RF9+bO ONljKUpUCzOQme0O X-Received: by 10.28.236.221 with SMTP id h90mr1674149wmi.143.1501966439709; Sat, 05 Aug 2017 13:53:59 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.56 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:58 -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 15/15] ARM: l2c: replace open coded VA->PA calculation Date: Sat, 5 Aug 2017 21:52:22 +0100 Message-Id: <20170805205222.19868-16-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 adr_l macro. Signed-off-by: Ard Biesheuvel --- arch/arm/mm/l2c-l2x0-resume.S | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/arch/arm/mm/l2c-l2x0-resume.S b/arch/arm/mm/l2c-l2x0-resume.S index fda415e4ca8f..3e75aa8c1aff 100644 --- a/arch/arm/mm/l2c-l2x0-resume.S +++ b/arch/arm/mm/l2c-l2x0-resume.S @@ -12,9 +12,7 @@ .text ENTRY(l2c310_early_resume) - adr r0, 1f - ldr r2, [r0] - add r0, r2, r0 + adr_l r0, l2x0_saved_regs ldmia r0, {r1, r2, r3, r4, r5, r6, r7, r8} @ r1 = phys address of L2C-310 controller @@ -54,6 +52,3 @@ ENTRY(l2c310_early_resume) str r9, [r1, #L2X0_CTRL] ret lr ENDPROC(l2c310_early_resume) - - .align -1: .long l2x0_saved_regs - .