From patchwork Sat Aug 5 20:52:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 109499 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp992150qge; Sat, 5 Aug 2017 13:54:07 -0700 (PDT) X-Received: by 10.99.117.67 with SMTP id f3mr6700395pgn.258.1501966447473; Sat, 05 Aug 2017 13:54:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501966447; cv=none; d=google.com; s=arc-20160816; b=w9yRSvuvxQ3T56GHSfttt14HAT/x2N/UQcCuyXu02pYyfKRpjs+X3zoKlsWnyVsMAT 8Qaks31s0LKwuSQdq7ZPTmwigmdfNOd5Nv7UfFkxmdstDelHa92eE61MdN0QBio7nbIE 619W154qsARQDpSimEu06sgcPv/QFIudZp4rx78AG4BkZTiIbUnPLykeKkM3S3k8N5PP m1+U5PRJnd8WECxrTwrSSBiSefijpNgE9FCfLdK3s7+MphNGLMIvdZVgB30SfTe62A1e 81cCJErdHCGJyjxsZDNam6uxEgrX4wQ+8piNaChu5WuOWtj95BgAmGqHTg8RZM94dWhI avSg== 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=3qITjTS8Anzieb3Mw1v9k/GrTNgk8e9M6TfQmdleqN4=; b=BFAGSN0pDCKgOlglcrlOWpq/NR3/wSE95nNyQUGOpKxOxYoBNzzjy1C2nN3JgxVluN FQDNrBuT6kM+fmhyYSAC6dvNDCYMsNeQhN4YW7J7oMpevY/6Vh62Y29PoesE3H/Dgwvu v1dHCl1xH4MzPU/M7P8D5/BrxrYV92GzYTY4jJGBzsTItwyi8TeHAjkNKmZAsxJ3YGQv 89N0xQ03oqeElW16JFz72WerYjcmP7ZGYMoDCtks0VSnC1WnXrEnNiQjHnxQAd+A+e7O iQ1k3NqJo8CsbJYeZnlLxJiahjgBxCnogkNRT9UIvaLIrMXwmQuf3FagtO/6PnR9jyOe Q7vQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=MiX1R5+g; 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.54.07; Sat, 05 Aug 2017 13:54:07 -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=MiX1R5+g; 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 S1752104AbdHEUyE (ORCPT + 3 others); Sat, 5 Aug 2017 16:54:04 -0400 Received: from mail-wm0-f53.google.com ([74.125.82.53]:38579 "EHLO mail-wm0-f53.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752840AbdHEUx4 (ORCPT ); Sat, 5 Aug 2017 16:53:56 -0400 Received: by mail-wm0-f53.google.com with SMTP id m85so42574146wma.1 for ; Sat, 05 Aug 2017 13:53:56 -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=HgtvlHtjxVQtYXstO0AYX5efYHzWsBFgWdEFzZ6J5m8=; b=MiX1R5+g9uw7R63eTtwF0t1sTWTfaQw7RpJHNyBCFaoUyJ+BkM52E1Au3Tz1XVza5s WyStk+mg8aJa9Na7yiljVgDo4zyVkv/tLUFVAqmSDLk8/srbSCaW1+h61hjhWI/4egci PF2BmCevVmzd+R53Uky3ium2sNqstliCzqTOs= 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=HgtvlHtjxVQtYXstO0AYX5efYHzWsBFgWdEFzZ6J5m8=; b=h8l2y8dFppa1dpZB8s/8vGoxh9IqDsX2cdbsySrlX4zpz4YCe2SGkwPaoh/0V5dPLP JI0ngGuVaaoJUguOFfMwnJUVRHkuyHPFMcgjKD5b2lN3PMNU0fZ8NxWM+TY/6MWnNu8F 3BgTSDM+fGls/hiRYS+qUIxBcvHQu2CO84vZdm+HAMCIBe5kk1Fhz3ixr64X0wrC3sC7 CJzXQ72TZWx/oWpccl2f609jMFkvoloUc8JrsdBJuZ2Y8yifjR6Ru1sGM2FF3ehu/z7C mA2rrnAC/09NOEqXvvK1rLRKaPWdKhXhsaMH8mfMDHVG+9auSJhS4iPxL0FLq3koiJzK upaA== X-Gm-Message-State: AHYfb5iFBTG6Fz7v2Uj4l9ZCl3A8l1lp3Xk/jZvmVj0eanULCCv7X94g ARxkdAp89oOg7VXP X-Received: by 10.28.181.18 with SMTP id e18mr4287563wmf.157.1501966435763; Sat, 05 Aug 2017 13:53:55 -0700 (PDT) Received: from localhost.localdomain ([160.77.147.147]) by smtp.gmail.com with ESMTPSA id v62sm2601775wmd.2.2017.08.05.13.53.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 05 Aug 2017 13:53:54 -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 14/15] arm-soc: shmobile: replace open coded VA->PA calculation Date: Sat, 5 Aug 2017 21:52:21 +0100 Message-Id: <20170805205222.19868-15-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 a couple of open coded calculations to obtain the physical address of a far symbol with calls to the new adr_l etc macros. Signed-off-by: Ard Biesheuvel --- arch/arm/mach-shmobile/headsmp.S | 14 ++++---------- 1 file changed, 4 insertions(+), 10 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-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S index 32e0bf6e3ccb..f5e0d7c93cda 100644 --- a/arch/arm/mach-shmobile/headsmp.S +++ b/arch/arm/mach-shmobile/headsmp.S @@ -46,11 +46,10 @@ ENTRY(shmobile_smp_boot) and r0, r1, #0xffffff @ MPIDR_HWID_BITMASK @ r0 = cpu_logical_map() value mov r1, #0 @ r1 = CPU index - adr r2, 1f - ldmia r2, {r5, r6, r7} - add r5, r5, r2 @ array of per-cpu mpidr values - add r6, r6, r2 @ array of per-cpu functions - add r7, r7, r2 @ array of per-cpu arguments + + adr_l r5, shmobile_smp_mpidr @ array of per-cpu mpidr values + adr_l r6, shmobile_smp_fn @ array of per-cpu functions + adr_l r7, shmobile_smp_arg @ array of per-cpu arguments shmobile_smp_boot_find_mpidr: ldr r8, [r5, r1, lsl #2] @@ -78,11 +77,6 @@ ENTRY(shmobile_smp_sleep) b shmobile_smp_boot ENDPROC(shmobile_smp_sleep) - .align 2 -1: .long shmobile_smp_mpidr - . - .long shmobile_smp_fn - 1b - .long shmobile_smp_arg - 1b - .bss .globl shmobile_smp_mpidr shmobile_smp_mpidr: