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=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,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 76930C433ED for ; Mon, 10 May 2021 16:00:57 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 2C1756161C for ; Mon, 10 May 2021 16:00:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 2C1756161C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:MIME-Version:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:Cc:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=YIYQNEOg7Y3b9feTL4mf77mvO8I6mKy+pgqVTCgOoNY=; b=WIZBPS47RekhaHWxzNJvGF/9su MUUu1sE2nB3nCpLTafyElEAzBxykGOXE3abtbZqtjn8DzP4TQGlY5DdVJJvUeXB1xlDLM09O7CaRS Khdrd4IZyM5cyki/86cIaLYyuZhQMkEwtUYD570p1ZPOq35D1zxLBVEJPNw+qRmQDRGSrIo4KMBYp V8o+ARWcwZFoQE9gpt6ybMBe+SniMBaU+gk+/65d9MFf5dGSXI+a3v673NcoG9azwH60nwnpM3a5H 1/Dybrz8Z1e9aTVI7sKFZBmQQhLbGMsNBKdMzat/uFVkBBM/w/wyzu/cbLbpJPsYBxB1WLEXXLs52 iLeh2JYg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg8JS-00ErI9-Ga; Mon, 10 May 2021 15:59:18 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lg8Hg-00EqXT-6A for linux-arm-kernel@desiato.infradead.org; Mon, 10 May 2021 15:57:28 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description; bh=2mTtX6iY2hzmdquNPod1WlCD6UWozzacPvy7Ql/qZxA=; b=XCd4WcjGBfZUcPKkZMtFDTOi0m ceXAzMpmzcWgIkEuNyi/mRwPPfNNZpsBnlFFoxuMOHgRK9F0ncJ734Vb/2DRqPwn8eUsTtq0NlXE9 oKmQ9tZYedsXdd8K6Mv3yo85txhj6Ti8c7XQctZKF9e4PxCS7ewD4OM/MH0GtfMm7aVMsSSLw1SFJ VNcfwjHi9CZVuU0S4Grrj3JIDDGnduqfZKXVhnZx/y2k/KwlkXSfqnxuK/tDp1hNEoLyYPB3ASHlY zTeymsrKd6Ijewl/UV1mawzhSQ3nwGuWZRMK+mFfD+QjPjM3X2stdpzWUHKR3aur6XLPHWjJvZoj9 +Iqp+2cg==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lg8Hd-008tOX-JQ for linux-arm-kernel@lists.infradead.org; Mon, 10 May 2021 15:57:26 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 37217168F; Mon, 10 May 2021 08:57:23 -0700 (PDT) Received: from lakrids.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 407993F73B; Mon, 10 May 2021 08:57:22 -0700 (PDT) From: Mark Rutland To: linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com Cc: james.morse@arm.com, mark.rutland@arm.com, maz@kernel.org Subject: [PATCH 10/14] arm64: entry: consolidate EL1 exception returns Date: Mon, 10 May 2021 16:56:17 +0100 Message-Id: <20210510155621.52811-11-mark.rutland@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20210510155621.52811-1-mark.rutland@arm.com> References: <20210510155621.52811-1-mark.rutland@arm.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210510_085725_702468_127ACD89 X-CRM114-Status: UNSURE ( 8.63 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Following the example of ret_to_user, let's consolidate all the EL1 return paths with a ret_to_kernel helper, rather than each entry point having its own copy of the return code. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland Cc: Catalin Marinas Cc: James Morse Cc: Marc Zyngier Cc: Will Deacon --- arch/arm64/kernel/entry.S | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index be8e596af75a..9b662d4c09d8 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -618,7 +618,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_sync) kernel_entry 1 mov x0, sp bl el1_sync_handler - kernel_exit 1 + b ret_to_kernel SYM_CODE_END(el1_sync) .align 6 @@ -626,7 +626,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_irq) kernel_entry 1 mov x0, sp bl el1_irq_handler - kernel_exit 1 + b ret_to_kernel SYM_CODE_END(el1_irq) .align 6 @@ -634,7 +634,7 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_fiq) kernel_entry 1 mov x0, sp bl el1_fiq_handler - kernel_exit 1 + b ret_to_kernel SYM_CODE_END(el1_fiq) .align 6 @@ -642,9 +642,13 @@ SYM_CODE_START_LOCAL_NOALIGN(el1_error) kernel_entry 1 mov x0, sp bl el1_error_handler - kernel_exit 1 + b ret_to_kernel SYM_CODE_END(el1_error) +SYM_CODE_START_LOCAL(ret_to_kernel) + kernel_exit 1 +SYM_CODE_END(ret_to_kernel) + /* * EL0 mode handlers. */ -- 2.11.0 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel