| Message ID | 1426690527-14258-6-git-send-email-ard.biesheuvel@linaro.org |
|---|---|
| State | New |
| Headers | show
Return-Path: <patchwork-forward+bncBDYNJBOFRECBB7NZU2UAKGQEBJKGQZQ@linaro.org> X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f70.google.com (mail-wg0-f70.google.com [74.125.82.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id EBF762153B for <linaro@patches.linaro.org>; Wed, 18 Mar 2015 15:42:53 +0000 (UTC) Received: by wggx13 with SMTP id x13sf7940180wgg.0 for <linaro@patches.linaro.org>; Wed, 18 Mar 2015 08:42:53 -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=9RAJTyyPCOcLxZEB9YCmN1S0s6wRLiP8NsyYF8ObK7I=; b=cQWxD3KuJhMAtgc61LEpJV7sZtSMqq+pyrUvoNv8CaZVr1xybK/jVAZP0AOhJmOz7C hDFMIJiXPnZd14MlL0p+sIHjt5QWqVMdqHJAttAvH15tJK++pnAYUrtkz+ltGkRDf5bv c9pGdneNP2KuULIP6FTkOvXyN2xRjazDqxFV7Csi/deRLPq3KPATYwXFYcLezX1P/stN Tbi33Rz21bE0/3imOTw/HNjMXnvEt0H1k1wZZIkJOp54I2qTQFRVQOQqzJp5xm4JhftC f3n8zisIpNOnMsHgKkBCtzeJtsbph3KdB93OQIr4UjCRTmkAZF57acuAiuw9O68Sx2CT UZqQ== X-Gm-Message-State: ALoCoQnk9A6ienv5rjwfVkrBcad4Gzweju/0F5VJZQmS7qgsFj9t+H9UvYN4jC0/tXaeYcoMcK/Z X-Received: by 10.180.150.115 with SMTP id uh19mr881535wib.7.1426693373268; Wed, 18 Mar 2015 08:42:53 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.170.164 with SMTP id an4ls180650lac.19.gmail; Wed, 18 Mar 2015 08:42:53 -0700 (PDT) X-Received: by 10.153.8.135 with SMTP id dk7mr63903249lad.93.1426693373109; Wed, 18 Mar 2015 08:42:53 -0700 (PDT) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com. [209.85.215.44]) by mx.google.com with ESMTPS id j9si13175731lbc.32.2015.03.18.08.42.53 for <patchwork-forward@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 08:42:53 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.44 as permitted sender) client-ip=209.85.215.44; Received: by lagg8 with SMTP id g8so39449127lag.1 for <patchwork-forward@linaro.org>; Wed, 18 Mar 2015 08:42:53 -0700 (PDT) X-Received: by 10.112.162.167 with SMTP id yb7mr63343566lbb.76.1426693372943; Wed, 18 Mar 2015 08:42:52 -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 h5csp1237079lbj; Wed, 18 Mar 2015 08:42:52 -0700 (PDT) X-Received: by 10.70.102.236 with SMTP id fr12mr92408082pdb.79.1426693371224; Wed, 18 Mar 2015 08:42:51 -0700 (PDT) Received: from bombadil.infradead.org (bombadil.infradead.org. [2001:1868:205::9]) by mx.google.com with ESMTPS id b8si36791642pdm.21.2015.03.18.08.42.50 for <patch@linaro.org> (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Mar 2015 08:42:51 -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 1YYG5K-0007QF-Hs; Wed, 18 Mar 2015 15:40:42 +0000 Received: from mail-wi0-f180.google.com ([209.85.212.180]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYFOD-0003SJ-EQ for linux-arm-kernel@lists.infradead.org; Wed, 18 Mar 2015 14:56:10 +0000 Received: by wibg7 with SMTP id g7so92538384wib.1 for <linux-arm-kernel@lists.infradead.org>; Wed, 18 Mar 2015 07:55:46 -0700 (PDT) X-Received: by 10.194.121.10 with SMTP id lg10mr146080087wjb.71.1426690546498; Wed, 18 Mar 2015 07:55:46 -0700 (PDT) Received: from ards-macbook-pro.local ([84.78.25.113]) by mx.google.com with ESMTPSA id y14sm24826582wjr.39.2015.03.18.07.55.44 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 18 Mar 2015 07:55:45 -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 v5 5/8] arm64: use PC-relative reference for secondary_holding_pen_release Date: Wed, 18 Mar 2015 15:55:24 +0100 Message-Id: <1426690527-14258-6-git-send-email-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1426690527-14258-1-git-send-email-ard.biesheuvel@linaro.org> References: <1426690527-14258-1-git-send-email-ard.biesheuvel@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150318_075609_716121_3A61D0B0 X-CRM114-Status: UNSURE ( 8.03 ) 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.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [209.85.212.180 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.180 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders Cc: marc.zyngier@arm.com, 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.215.44 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 7e8e746931af..65c7de889c8c 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -564,10 +564,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. @@ -579,10 +575,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(-)