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: 109501 Delivered-To: patch@linaro.org Received: by 10.140.101.6 with SMTP id t6csp992268qge; Sat, 5 Aug 2017 13:54:19 -0700 (PDT) X-Received: by 10.84.215.215 with SMTP id g23mr7945585plj.114.1501966458994; Sat, 05 Aug 2017 13:54:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1501966458; cv=none; d=google.com; s=arc-20160816; b=nCk2MsRUBolWYLiu83tdbCc0AEPPu9q7cWVA2xG5i3AW8q+yGhOyHPWYZh/VTV74OH IrayT+PhyxjRHxcOaC7/c2NIw0GJgXY1KaKRQ2UdL5LckDnoi9aK4kBWl/o0JZQr51dI ry48qGJSYahnhcvDtI4vMyQGAynrtWy8iaWDpeveS+rTEqQiWOJq9IksBAi29qRtRP74 MOUnXnP86iVXiBETXt6NjCjz1j9P+s39WSk0hNMO8fGq1lxvqlp4V4ZvDrNpxgiwjXrl yAw4D9/01CDED3oO89r/t5cFrSYT/IQUqPFwGqNzUmOrwroXKVMPqMbi2YPwL3MM1XMP rYAA== 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=T/PsXQqM5A3LGSBbxuXLXcsqQYo6hGK3Qehd5wDJ7N4=; b=CmZRvyB0quv3Y/jExFe0Cm9BNI679lED6sW/pDwwjqZEpJt9vr98aDU0q3npN2rZXn uRxox/9BXLSAme3Ka1dbO6T1obIsII06PfRV73gbswXxaVVrU/+Y1cU69s7F2QIrJFBY o5XEYHqfoVQKMC4fbqc0c6Q6rDMSWky5qvnVCVX7p3tp+Yc/Nc/rx52oKHOSHS4rRHvr dnU7HHf5WT5ICeFO0CtGu7zi2ZiVyAWANb6rQUKG9Q6+B/BFOQKzeDnpXc82y1y+/k6G SEdQXjQv5F+960+MAVJA1DKP0cnLxT9d0m6zQZ3Sm6IXzmDF9uZp0ZYxU/uvzrU2/xTf g7eA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.b=NWdfPLQM; 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 t17si2667268pfg.662.2017.08.05.13.54.18; Sat, 05 Aug 2017 13:54:18 -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=NWdfPLQM; 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 S1752863AbdHEUyQ (ORCPT + 3 others); Sat, 5 Aug 2017 16:54:16 -0400 Received: from mail-wm0-f45.google.com ([74.125.82.45]:35894 "EHLO mail-wm0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752917AbdHEUyA (ORCPT ); Sat, 5 Aug 2017 16:54:00 -0400 Received: by mail-wm0-f45.google.com with SMTP id t201so42452514wmt.1 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=n25A2vtRD7pgk7R7O8VBxHvsXfWoCRFHKkpMBrYDDmFORXW0K3uMCt8XQUdx141gtB ZIEi297ChEhoHzqDXW07vcc7KhaXbyPnlPRT/F8swWv8iXcUFYfp4XKC3ZXjdAa31+ZR 9nzHW8e027Kyi0+/URX3RPmfvxCp3QF30dkNJlOhoDcXzhQma/+KMMp7s9YgBeRiPkuZ ldkh5DJpDQEsDjwtK0wT2dgDvcx2Hq9VEV7BwjSXLJsS/SQKhKxHoUnOWyCfy7HFKomK fIp7mO/JEH+U4bwxzTUE4SdmIuscJsmH/HbLeVd+0YHxZwfzpZbvDSrNrBOFLXcV2m3s awHQ== X-Gm-Message-State: AHYfb5jmop8lNsFSQURBhiFhoN/xbCM3san3NQD8oZ3+jaIKreYzpL/q NKjsNqd0JgUqZhLj 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: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 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(-) -- 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/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 - .