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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 49EA8C433EF for ; Tue, 1 Mar 2022 12:06:14 +0000 (UTC) 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:MIME-Version: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=pqYXS6QSVcRkcH0nWdguixZT68Pp26dae3lRPyXYhmE=; b=V5kvvtYQdZfubu rx/nXvkFgjB+fs6omap6J8St7AcCvW9Ls8RA4laMp9ZkWbo2M7wknCsrjgKKTsB2Gm/mWZPwgWKEP HJd6Rf2cmkzy1RZm+3D1hyfdQsGfCp7FTIJEHqm05WRjgHjym8xBkxCvsO7x52dGR++pWS00Iy1rr vgN8/ssu7lnNTAk5MyRgTLlmFKF/t6eZpr/U+75Wq+avkXji6r3C42FW4QpOSEsTLuQZl2BjGTvJb tF7ljsdA03wBfOKsHSRbrCLMSh65BGOvU06VXxieTHUSf5JTEWLMmM6eNap9tPHxLHMIpFmegW8yp OBsHwCmkntjJBsSHEFrg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nP1FO-00GV74-RW; Tue, 01 Mar 2022 12:04:54 +0000 Received: from dfw.source.kernel.org ([139.178.84.217]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nP1FL-00GV6Q-9E for linux-arm-kernel@lists.infradead.org; Tue, 01 Mar 2022 12:04:52 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A4FB561219; Tue, 1 Mar 2022 12:04:50 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D7E21C340F2; Tue, 1 Mar 2022 12:04:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1646136290; bh=pM7NCrYu2b3235oMscpRqQypRnjySjh+lmO7Xv6Yjdw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QI8I5YGyfMvIuXQp0jF2bojB9YqaoT8LQNN4sX5xd7BuoAy0gjoHvQCJmW/b+IZYm c5kGlvJqC1xZZa3daNYsc5iD33aGU+BSSvRdNqZAaeauXw0x1NLH6MIswH52PYKB7R YwDjIOiWjXsYI7i7tlpu2tyS4ySOa/cwCbdwBSg8BXcGmEsGwABWAoz/6EgTbWAwr7 YFIxHClJiHS5T1VV+IreVNoUJorZYkkP9POtHlVcPFQ1/60Cw8kX0Gd8AwnTP1B/41 lAAIv/Oj4vpbmQOd2+WxzweEmKJrW43Qv5iOIjGiqasxOi2FAIYrlXH7g6z91s/NG+ w8+DmYfSs+vYA== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Cc: Ard Biesheuvel , Russell King , Arnd Bergmann , Linus Walleij Subject: [PATCH 1/2] ARM: assembler: simplify ldr_this_cpu for !SMP builds Date: Tue, 1 Mar 2022 13:04:39 +0100 Message-Id: <20220301120440.994447-2-ardb@kernel.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220301120440.994447-1-ardb@kernel.org> References: <20220301120440.994447-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=1456; h=from:subject; bh=pM7NCrYu2b3235oMscpRqQypRnjySjh+lmO7Xv6Yjdw=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBiHgvVrBbMlgS4cTKbjA+rGXmSn+jZz8ecB2b5ACNh GEQsRu+JAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCYh4L1QAKCRDDTyI5ktmPJKbaC/ 9q7ytBs3TpYh+IeTo6BA7Aw+mvpgAgJ0zsMjL2kkPAo04LPhcrYWtcp6rQVs1Bp30F7czogcARXB1w xjM4ZsKIPxQ6NjslEYA+PO1DA/M6cJBBBtxFpMx6nmwqP02wO4S1pI0I64OizU0x9BQ256pMTn2xvM aZDzAosZtb+0rr02EthYfxX2k4Yrm3+UyJB+CcZoY1W6xZNGF6N8njhwNWPt37KT3dAliNi0XsT+45 TTDQ/U7sDqEGNuq9S/3A6sTELTql0mfBnTrBAUQ6KpTiRaQknCnTKMAHy90ZwWha6V01Gr4BJ4idDA +RT8WhsVJvjMJEERtKGv3n0sSmFq+uS8GFq+XbJk6mNTkkm88uLpLBL2lYbqg0Khn9Ek7vce+caWwA sHW1RuUO1HTgy7+/rWBd+X1RPc5wopcrL0ZgY63qMMdbZZP0ueqrWx+9EBTdX3sBd9au9zdAVEx8PP s60ZBGvnQ4I995qkk6mn5GlBG5qahIxvNXKx+PCjOIWYA= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220301_040451_408325_C3397BB1 X-CRM114-Status: GOOD ( 13.00 ) 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 When CONFIG_SMP is not defined, the CPU offset is always zero, and so we can simplify the sequence to load a per-CPU variable. Signed-off-by: Ard Biesheuvel --- arch/arm/include/asm/assembler.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h index 30c1f8c8b178..96f4028f7423 100644 --- a/arch/arm/include/asm/assembler.h +++ b/arch/arm/include/asm/assembler.h @@ -682,8 +682,12 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) /* * ldr_va - load a 32-bit word from the virtual address of \sym */ - .macro ldr_va, rd:req, sym:req, cond + .macro ldr_va, rd:req, sym:req, cond, tmp + .ifnb \tmp + __ldst_va ldr, \rd, \tmp, \sym, \cond + .else __ldst_va ldr, \rd, \rd, \sym, \cond + .endif .endm /* @@ -717,9 +721,11 @@ THUMB( orr \reg , \reg , #PSR_T_BIT ) * are permitted to overlap with 'rd' if != sp */ .macro ldr_this_cpu, rd:req, sym:req, t1:req, t2:req -#if __LINUX_ARM_ARCH__ >= 7 || \ - !defined(CONFIG_ARM_HAS_GROUP_RELOCS) || \ - (defined(MODULE) && defined(CONFIG_ARM_MODULE_PLTS)) +#ifndef CONFIG_SMP + ldr_va \rd, \sym, tmp=\t1 +#elif __LINUX_ARM_ARCH__ >= 7 || \ + !defined(CONFIG_ARM_HAS_GROUP_RELOCS) || \ + (defined(MODULE) && defined(CONFIG_ARM_MODULE_PLTS)) this_cpu_offset \t1 mov_l \t2, \sym ldr \rd, [\t1, \t2] -- 2.30.2 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel