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.1 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,URIBL_BLOCKED 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 86AE4C4707F for ; Thu, 27 May 2021 11:05:00 +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 356FF613C3 for ; Thu, 27 May 2021 11:05:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 356FF613C3 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=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc: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=9h/PmXR3S2EEQD8GVBclptqDvUV2BUCBJ5lA+EpZxVk=; b=SUcdw5Ux04h4Nz yJgVssdaX7WUVppNV5ENQ5k6oSoZI4ulxYdCP0mjRUkuAjj/RVnjCmbcMyTtPP1LSgCUUmf3uc9/O zbxpgjdBFBzI1gG3OZDREqJSF8ua3o6rbQGoEie3ZYxTmHLXBIF1eBNviixl5fFv2E9u31nYjm8gB 1NYMVXAQnw/zUuoSg3Pdc7hWtK9lB8vxnqwYLEfdnJI07HoIeSow0arLD148/voVo45AUHHaCDMGK Njp2SQ+sYmIwtGYWKC61AtswfZOsTw+tiXXwIQTmuPXSQgc6fCwsQPWhm1Mi9u8Is+Ej/qE4bcJxG GI/m8G9ZfuUPiUzFwmLg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmDnO-0053jc-I1; Thu, 27 May 2021 11:03:22 +0000 Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmDnK-0053iF-0J for linux-arm-kernel@lists.infradead.org; Thu, 27 May 2021 11:03:19 +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 32E2D13A1; Thu, 27 May 2021 04:03:16 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.39.84]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4F0253F73D; Thu, 27 May 2021 04:03:15 -0700 (PDT) Date: Thu, 27 May 2021 12:03:12 +0100 From: Mark Rutland To: Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kernel-team@android.com, Sami Tolvanen Subject: Re: [PATCH] arm64: scs: Drop unused 'tmp' argument to scs_{load,save} asm macros Message-ID: <20210527110312.GB34323@C02TD0UTHF1T.local> References: <20210527105529.21967-1-will@kernel.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210527105529.21967-1-will@kernel.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210527_040318_119418_BA3DC0DA X-CRM114-Status: GOOD ( 15.61 ) 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: , 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 On Thu, May 27, 2021 at 11:55:29AM +0100, Will Deacon wrote: > The scs_load and scs_save asm macros don't make use of the mandatory > 'tmp' register argument, so drop it and fix up the callers. > > Cc: Sami Tolvanen > Cc: Mark Rutland > Signed-off-by: Will Deacon I see this has been the case since commit: 51189c7a7ed1b4ed ("arm64: scs: Store absolute SCS stack pointer value in thread_info") ... so this looks good to me: Acked-by: Mark Rutland Mark. > --- > > Applies against for-next/boot > > arch/arm64/include/asm/scs.h | 8 ++++---- > arch/arm64/kernel/entry.S | 8 ++++---- > arch/arm64/kernel/head.S | 2 +- > 3 files changed, 9 insertions(+), 9 deletions(-) > > diff --git a/arch/arm64/include/asm/scs.h b/arch/arm64/include/asm/scs.h > index eaa2cd92e4c1..8297bccf0784 100644 > --- a/arch/arm64/include/asm/scs.h > +++ b/arch/arm64/include/asm/scs.h > @@ -9,18 +9,18 @@ > #ifdef CONFIG_SHADOW_CALL_STACK > scs_sp .req x18 > > - .macro scs_load tsk, tmp > + .macro scs_load tsk > ldr scs_sp, [\tsk, #TSK_TI_SCS_SP] > .endm > > - .macro scs_save tsk, tmp > + .macro scs_save tsk > str scs_sp, [\tsk, #TSK_TI_SCS_SP] > .endm > #else > - .macro scs_load tsk, tmp > + .macro scs_load tsk > .endm > > - .macro scs_save tsk, tmp > + .macro scs_save tsk > .endm > #endif /* CONFIG_SHADOW_CALL_STACK */ > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 294f24e16fee..3153f1448cdb 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -275,7 +275,7 @@ alternative_else_nop_endif > > mte_set_kernel_gcr x22, x23 > > - scs_load tsk, x20 > + scs_load tsk > .else > add x21, sp, #PT_REGS_SIZE > get_current_task tsk > @@ -375,7 +375,7 @@ alternative_if ARM64_WORKAROUND_845719 > alternative_else_nop_endif > #endif > 3: > - scs_save tsk, x0 > + scs_save tsk > > #ifdef CONFIG_ARM64_PTR_AUTH > alternative_if ARM64_HAS_ADDRESS_AUTH > @@ -979,8 +979,8 @@ SYM_FUNC_START(cpu_switch_to) > mov sp, x9 > msr sp_el0, x1 > ptrauth_keys_install_kernel x1, x8, x9, x10 > - scs_save x0, x8 > - scs_load x1, x8 > + scs_save x0 > + scs_load x1 > ret > SYM_FUNC_END(cpu_switch_to) > NOKPROBE(cpu_switch_to) > diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S > index 070ed53c049d..6a700526b117 100644 > --- a/arch/arm64/kernel/head.S > +++ b/arch/arm64/kernel/head.S > @@ -412,7 +412,7 @@ SYM_FUNC_END(__create_page_tables) > stp xzr, xzr, [sp, #S_STACKFRAME] > add x29, sp, #S_STACKFRAME > > - scs_load \tsk, \tmp1 > + scs_load \tsk > > adr_l \tmp1, __per_cpu_offset > ldr w\tmp2, [\tsk, #TSK_CPU] > -- > 2.31.1.818.g46aad6cb9e-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel