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_ADSP_CUSTOM_MED,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 21A93C47089 for ; Thu, 27 May 2021 16:35:19 +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 DA18C61184 for ; Thu, 27 May 2021 16:35:18 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA18C61184 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.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:Cc:To:Subject:Message-ID:Date:From: In-Reply-To:References:MIME-Version:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/Z8fe5VU6DQzLnHCkGE/0uCqgxEBQ5Xg/4/ir5RjOyo=; b=hJJ8UmAsX3u3eT H78jzbsh5urDH3BhuX2bbdvkTZI9BeEf0I4gZXSBeGrzL1qp6oSGU3MqKudKxVfDc/IxSBW6ywZpk pgP5V/B/T6/oDHvpsuphOOWU+jkVdGkuhY5Gjff8O6fxc/gqWDEo0HXVtxvXETZBYbyHHgFDSbWaq IStMxT3AY0f5x/XLnPXHUkFOajS+S4WnIccEFh77kvBHwEcvhxqsyk0+ksuTBmNnCF3ObMfrpTWd6 Vujx+4AeR3V4+eMlTC8hPcB7qQTXyV88PjhvHXjNsNVoBoppAsUhAfjUIB9X0JSGSwEu3KqiGlUhD xfk+OWmro+hAAvUEyN+Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmIwO-007eYy-M7; Thu, 27 May 2021 16:33:02 +0000 Received: from mail-yb1-xb30.google.com ([2607:f8b0:4864:20::b30]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lmHcO-0072qh-Cf for linux-arm-kernel@lists.infradead.org; Thu, 27 May 2021 15:08:17 +0000 Received: by mail-yb1-xb30.google.com with SMTP id b13so1135763ybk.4 for ; Thu, 27 May 2021 08:08:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=ssC/yO2pn36HWxEbDYmR3EBLpkfnk0LfeXVoizHn4No=; b=BQloaccjzQ3BTQI3qBdL5gU7osVZZanSH9oVi3VFjvF3dcbhqMCc/zDJP9vfeuFKpc 23wv7WRvjE/lcQmD999p1nc32V2MuNDZf79CYHMUjfLOCkKTe9mrhNGPkVVJ5++dHeR3 LWhg3jve6Kks9snjZ8BGHmdsb1h4CS6FfZa1iA5TkTGQ2fYmlb6fooTfBJ5IRhnfIkDP KGVlgdQp/qJi0A8iZ4U/bKALZtB8Ltl6CacmCT6oSO7p1f5HHIlEMVBYOlgYQoAk0vMs o0ElLAyKvSl/JYKELvblxRrsm0WyHNCtQYoo33Xu+bezrAXWMxiLhypKcGrL499f/E4a i9SA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=ssC/yO2pn36HWxEbDYmR3EBLpkfnk0LfeXVoizHn4No=; b=igchGUnwtOepoUBLrw5DBcHimZjIQm0j+Mg4awEYYdVgsxjTe3egCD+JKGxr4fD8jm 47ZUBPbkn0T7IgBV49gwPLArvCJIsDyNqKwjGc1pigk2/fg7pSN6uJerAitIW+E/IqWf 5cLYKElYCDjjb3ngUl0+DKaC83YahMkqtFRSbD6kGkwjlSUW/vOoDcFeE5vQz9pLIyMm KwXht1E51Fde+qDwpIcND6pivQcuRkD40XuokRCEY1nMqOYOF9vzmPEHWXPJc+AVuE+P RONNm8xaSTGSU7A8+Vr57PA5YF3RwLUmlHZwZ6ImKMioBm1uXlMD+3QXLX8ovaCfSYBQ cxVQ== X-Gm-Message-State: AOAM533P9LstUffd+wP2MXlQvXwRQKHPnMdnGSlEfVlLz4StkUmOdXtE UTMSV4a/5Fbgf/KP0ZzzR8p0Jj00QhetqGZ0FaC+Vw== X-Google-Smtp-Source: ABdhPJyWxHYglgCVfaDR9t41HV/v2G5TEz7nHGRS6N9iIVUFs+Ifd0TX117nbeerxgupifHJDbW9lihVG67fdwdx0ZI= X-Received: by 2002:a25:7085:: with SMTP id l127mr5890058ybc.293.1622128092359; Thu, 27 May 2021 08:08:12 -0700 (PDT) MIME-Version: 1.0 References: <20210527105529.21967-1-will@kernel.org> In-Reply-To: <20210527105529.21967-1-will@kernel.org> From: Sami Tolvanen Date: Thu, 27 May 2021 08:08:01 -0700 Message-ID: Subject: Re: [PATCH] arm64: scs: Drop unused 'tmp' argument to scs_{load, save} asm macros To: Will Deacon Cc: linux-arm-kernel , Android Kernel Team , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210527_080816_507615_8E46931E X-CRM114-Status: GOOD ( 16.71 ) 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 Hi Will, On Thu, May 27, 2021 at 3:55 AM 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 > --- > > 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] Looks good to me, thanks for cleaning this up! Reviewed-by: Sami Tolvanen Sami _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel