From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-14.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2369C43461 for ; Mon, 14 Sep 2020 09:57:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 70BE32192A for ; Mon, 14 Sep 2020 09:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600077466; bh=mU9/9x1O6YKMA2zUjk1QSnbr763vPH9pqbMnLzcEujo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=rYBp+4njWKuOSIOQs6RTOHh1creKQ5PFZa6IkTUd/t0j5bw5qQuudLtxYMZg1vzIa W0ajdw9wYsyM7e2XEXRcDQdu5RNt6PqQSkubpDHBbZgEvUTYi8D/fY3weaHfL1lcFT WTC32lMX/fg0NBZ93bw4SsP4gAHsfAu/r6nad1lg= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726267AbgINJ5q (ORCPT ); Mon, 14 Sep 2020 05:57:46 -0400 Received: from mail.kernel.org ([198.145.29.99]:48944 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726239AbgINJ5o (ORCPT ); Mon, 14 Sep 2020 05:57:44 -0400 Received: from e123331-lin.nice.arm.com (unknown [37.6.197.50]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A5F7A20735; Mon, 14 Sep 2020 09:57:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600077464; bh=mU9/9x1O6YKMA2zUjk1QSnbr763vPH9pqbMnLzcEujo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kIowCm0B0ooiGfLVD9EW6E2VubGM00hkW4OKyTzCn2TC78NIJNm/+WZFRijr0Q6hX 5QEHjEr/vu7ZoA+MIkalnoyl3xsfSaKLWG0HBhzpb9cfj6P1eoQ6id+rhUIaHeKOQn 0ljxPT3uDHU73yyas78LY2h8FLKET3Yz6ITJsFpw= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Russell King , Linus Walleij , Nicolas Pitre , Nick Desaulniers , Stefan Agner , Peter Smith , Marc Zyngier , Will Deacon Subject: [PATCH 05/12] ARM: head-common.S: use PC-relative insn sequence for idmap creation Date: Mon, 14 Sep 2020 12:56:59 +0300 Message-Id: <20200914095706.3985-6-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200914095706.3985-1-ardb@kernel.org> References: <20200914095706.3985-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org Replace the open coded PC relative offset calculations involving __turn_mmu_on and __turn_mmu_on_end with a pair of adr_l invocations. This removes some open coded arithmetic involving virtual addresses, avoids literal pools on v7+, and slightly reduces the footprint of the code. Signed-off-by: Ard Biesheuvel --- arch/arm/kernel/head.S | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S index f8904227e7fd..7d8e2a296216 100644 --- a/arch/arm/kernel/head.S +++ b/arch/arm/kernel/head.S @@ -224,11 +224,8 @@ __create_page_tables: * Create identity mapping to cater for __enable_mmu. * This identity mapping will be removed by paging_init(). */ - adr r0, __turn_mmu_on_loc - ldmia r0, {r3, r5, r6} - sub r0, r0, r3 @ virt->phys offset - add r5, r5, r0 @ phys __turn_mmu_on - add r6, r6, r0 @ phys __turn_mmu_on_end + adr_l r5, __turn_mmu_on @ _pa(__turn_mmu_on) + adr_l r6, __turn_mmu_on_end @ _pa(__turn_mmu_on_end) mov r5, r5, lsr #SECTION_SHIFT mov r6, r6, lsr #SECTION_SHIFT @@ -351,11 +348,6 @@ __create_page_tables: ret lr ENDPROC(__create_page_tables) .ltorg - .align -__turn_mmu_on_loc: - .long . - .long __turn_mmu_on - .long __turn_mmu_on_end #if defined(CONFIG_SMP) .text -- 2.17.1