| Message ID | 1426001982-20047-6-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDYNJBOFRECBBVNC7STQKGQEDTVNRSY@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f71.google.com (mail-la0-f71.google.com [209.85.215.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 2EDF8214BF for <linaro@patches.linaro.org>; Tue, 10 Mar 2015 15:44:22 +0000 (UTC) Received: by labgm9 with SMTP id gm9sf2137512lab.1 for <linaro@patches.linaro.org>; Tue, 10 Mar 2015 08:44:21 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:subject:date:message-id :in-reply-to:references:cc:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list; bh=lHmKxTlJ6JV4NHxXAPAlfBWb7hP/BhxpVcJJ5vx/c9Y=; b=Gh4ZNyFlfPM7veeVQYsM54gl10lF87tutTg/B6NpkUJIrmbMPvuvpXKeXnr854iRsY BvtQr7z9PLovxhtn+1OLvjkAuVWCbMc0Q8VtnGhQBktKT5/SJBqM/GHVzfmx3OAp2w1I 7rdxrvPNSXY8IQiH+rBmMqboe4cYnkZfuPSBSynELeo9CeURuYrGoMhgjuBOBz3HmkUC +ao9k6fn1jZEVz38ZYXW1LcY5V9Fcpyu9ybdKet9gobtKS4mR0iXXFasU0XpyqNcIuPB Ran49XZU1JcLzsF0vUIqkU5oJMLt4sVoahXiTYpQ8WyDsp16QZcVQW7RQjK4ezoeI0gQ f4/w== X-Gm-Message-State: ALoCoQnjs3jRLvqSQtvVF44YH/6JeNt3XvaD5l55R2XdAu7ERa4w8EnSBE7y0qx8bV3uiBQjxnZd X-Received: by 10.112.120.136 with SMTP id lc8mr1858029lbb.24.1426002261178; Tue, 10 Mar 2015 08:44:21 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.25.193 with SMTP id e1ls42116lag.80.gmail; Tue, 10 Mar 2015 08:44:21 -0700 (PDT) X-Received: by 10.152.22.229 with SMTP id h5mr31046105laf.21.1426002261030; Tue, 10 Mar 2015 08:44:21 -0700 (PDT) Received: from mail-lb0-f172.google.com (mail-lb0-f172.google.com. [209.85.217.172]) by mx.google.com with ESMTPS id c5si567416lbi.91.2015.03.10.08.44.20 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 08:44:20 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) client-ip=209.85.217.172; Received: by lbiz11 with SMTP id z11so2586811lbi.13 for <patchwork-forward@linaro.org>; Tue, 10 Mar 2015 08:44:20 -0700 (PDT) X-Received: by 10.112.130.195 with SMTP id og3mr30497448lbb.112.1426002260581; Tue, 10 Mar 2015 08:44:20 -0700 (PDT) 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 h5csp2214344lbj; Tue, 10 Mar 2015 08:44:19 -0700 (PDT) X-Received: by 10.66.233.74 with SMTP id tu10mr67140539pac.135.1426002258793; Tue, 10 Mar 2015 08:44:18 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id a4si1401424pdm.207.2015.03.10.08.44.17 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 08:44:18 -0700 (PDT) Received-SPF: none (google.com: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org does not designate permitted sender hosts) client-ip=2001:1868:205::9; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVMIi-0005ae-PK; Tue, 10 Mar 2015 15:42:32 +0000 Received: from mail-wg0-f53.google.com ([74.125.82.53]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YVMGf-00039w-IN for linux-arm-kernel@lists.infradead.org; Tue, 10 Mar 2015 15:40:26 +0000 Received: by wghl2 with SMTP id l2so2704132wgh.8 for <linux-arm-kernel@lists.infradead.org>; Tue, 10 Mar 2015 08:40:01 -0700 (PDT) X-Received: by 10.180.39.33 with SMTP id m1mr71483683wik.26.1426002001720; Tue, 10 Mar 2015 08:40:01 -0700 (PDT) Received: from ards-macbook-pro.local ([213.143.60.209]) by mx.google.com with ESMTPSA id ei3sm7381208wib.4.2015.03.10.08.39.59 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 10 Mar 2015 08:40:00 -0700 (PDT) From: Ard Biesheuvel <ard.biesheuvel@linaro.org> To: will.deacon@arm.com, mark.rutland@arm.com, catalin.marinas@arm.com, linux-arm-kernel@lists.infradead.org Subject: [PATCH v4 5/5] arm64: use PC-relative reference for secondary_holding_pen_release Date: Tue, 10 Mar 2015 16:39:42 +0100 Message-Id: <1426001982-20047-6-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1426001982-20047-1-git-send-email-ard.biesheuvel@linaro.org> References: <1426001982-20047-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150310_084025_819957_E4189DC7 X-CRM114-Status: UNSURE ( 8.35 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.53 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [74.125.82.53 listed in wl.mailspike.net] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: <patchwork-forward.linaro.org> List-Unsubscribe: <mailto:googlegroups-manage+836684582541+unsubscribe@googlegroups.com>, <http://groups.google.com/a/linaro.org/group/patchwork-forward/subscribe> List-Archive: <http://groups.google.com/a/linaro.org/group/patchwork-forward/> List-Post: <http://groups.google.com/a/linaro.org/group/patchwork-forward/post>, <mailto:patchwork-forward@linaro.org> List-Help: <http://support.google.com/a/linaro.org/bin/topic.py?topic=25838>, <mailto:patchwork-forward+help@linaro.org> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patch=linaro.org@lists.infradead.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ard.biesheuvel@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 |
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index cd3b94cb597f..69f2029a883c 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -576,10 +576,6 @@ ENTRY(__boot_cpu_mode) .popsection #ifdef CONFIG_SMP - .align 3 -1: .quad . - .quad secondary_holding_pen_release - /* * This provides a "holding pen" for platforms to hold all secondary * cores are held until we're ready for them to initialise. @@ -591,10 +587,7 @@ ENTRY(secondary_holding_pen) mrs x0, mpidr_el1 ldr x1, =MPIDR_HWID_BITMASK and x0, x0, x1 - adr x1, 1b - ldp x2, x3, [x1] - sub x1, x1, x2 - add x3, x3, x1 + adr_l x3, secondary_holding_pen_release pen: ldr x4, [x3] cmp x4, x0 b.eq secondary_startup
Replace the confusing virtual/physical address arithmetic with a simple PC-relative reference. Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org> --- arch/arm64/kernel/head.S | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)