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=-8.5 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE, SPF_PASS,USER_AGENT_SANE_1 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 E9ED9C1975A for ; Tue, 17 Mar 2020 22:30:13 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B767120738 for ; Tue, 17 Mar 2020 22:30:13 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="iohf38VQ"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="N0uISv0M" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B767120738 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=Ifxdr+oG3eDQF3ciUjicxkPQtGvcmdZTVn8e0AqlaUU=; b=iohf38VQXQztpb naRxN56hYGRKBV/a/jwKZwRj37BdLzvD7Ppkt7kybG8P1ec3yeTNnWwmvagtpeqLvxoOfpYX93sJ+ Qiv76zf8gYABPlkFa5xo8fFMzwOMQvMOHZpiDnGb5h8ea2/cTCoLp5PdNnprTDt2NduAHxUzgNqtW 5H0SfA4uqlAgOHy+BGEKBFTzW1igf4XDhkbRdvJFsd5R7dEXpqBNiRk7rCN/s6BygggRDTfb/ka2W 57MpIekqVxIPVRZiZONXi11jMFSVf4BNckC9LtAyMgoWbA3eIw0TrwJLlv2s8WoYQKVN6SgiO+5xt yKKaFH0Dkf//nVkwftlA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEKiy-0008G1-Fh; Tue, 17 Mar 2020 22:30:12 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jEKiv-0008E1-G1 for linux-arm-kernel@lists.infradead.org; Tue, 17 Mar 2020 22:30:10 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 342BF20409; Tue, 17 Mar 2020 22:30:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1584484209; bh=o8ZNCMkXZjVnIlo9/wMZey1YXi3Jg07cUnvtiDRqlOI=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=N0uISv0MXfN6mCvtsByqJuSFHOxfBHEz2Ww6PSCrBJNmgm0VsEilxLpEjyFfgtj+K ptyPhLFLzZsBdWn6S2UTAn72S/WbdqB3YLIjGp5jij2oVW12Z/PNOM8cZjCbC6Rgkr ABD173ZaoHIBhzzUF4NDmMo4s5PF4fDIBnwku7Ys= Date: Tue, 17 Mar 2020 22:30:05 +0000 From: Will Deacon To: =?iso-8859-1?Q?R=E9mi?= Denis-Courmont Subject: Re: [PATCH 1/3] arm64: clean up trampoline vector loads Message-ID: <20200317223004.GJ20788@willie-the-truck> References: <20200316124046.103844-1-remi@remlab.net> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20200316124046.103844-1-remi@remlab.net> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200317_153009_559308_AF4320D7 X-CRM114-Status: GOOD ( 13.11 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: mark.rutland@arm.com, catalin.marinas@arm.com, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 16, 2020 at 02:40:44PM +0200, R=E9mi Denis-Courmont wrote: > From: R=E9mi Denis-Courmont > = > This switches from custom instruction patterns to the regular large > memory model sequence with ADRP and LDR. In doing so, the ADD > instruction can be eliminated in the SDEI handler, and the code no > longer assumes that the trampoline vectors and the vectors address both > start on a page boundary. > = > Signed-off-by: R=E9mi Denis-Courmont > --- > arch/arm64/kernel/entry.S | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > = > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index e5d4e30ee242..24f828739696 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -805,9 +805,9 @@ alternative_else_nop_endif > 2: > tramp_map_kernel x30 > #ifdef CONFIG_RANDOMIZE_BASE > - adr x30, tramp_vectors + PAGE_SIZE > + adrp x30, tramp_vectors + PAGE_SIZE > alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 > - ldr x30, [x30] > + ldr x30, [x30, #:lo12:__entry_tramp_data_start] > #else > ldr x30, =3Dvectors > #endif > @@ -953,9 +953,8 @@ SYM_CODE_START(__sdei_asm_entry_trampoline) > 1: str x4, [x1, #(SDEI_EVENT_INTREGS + S_ORIG_ADDR_LIMIT)] > = > #ifdef CONFIG_RANDOMIZE_BASE > - adr x4, tramp_vectors + PAGE_SIZE > - add x4, x4, #:lo12:__sdei_asm_trampoline_next_handler > - ldr x4, [x4] > + adrp x4, tramp_vectors + PAGE_SIZE > + ldr x4, [x4, #:lo12:__sdei_asm_trampoline_next_handler] > #else > ldr x4, =3D__sdei_asm_handler > #endif Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel