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.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 0BF8BC433ED for ; Wed, 12 May 2021 18:11:18 +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 584A361166 for ; Wed, 12 May 2021 18:11:17 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 584A361166 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+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:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version: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:In-Reply-To:References:List-Owner; bh=glBC0yj8f3itLY6JNLopl70xExpuYgRRp+rGEbVf91c=; b=kqH0StyONLfhqJz3cgEAgmXFlA HD22opYyXA0edUbs/NbBLzvS8oUnqd/O3Ke61UOHJSQ6y2DR10TDZAa+vhq6zMIWLJYstLPhLbTej 8JAY01kgqa+X4PdE+2HnE+ETzbNH8lej2isuEyyJZckgkQeD+XxpLv2eZiOmFay5gotPM7iiVXdxO vT1HmRPupEzdthFpGXOrogXwshC4UxJjH/W69ixXzXVuN296OWa39m/gaQcq0HjWXrr0ZWTQWKe5z hH0SnPuMNreloEEZl/lFWKwWy9CoECLIiKIgdQ7oYiNiYuyTTriUZha4IUlgCS+bQFiOW78dFaTiK WCDpAksg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgtIk-003YPB-Lx; Wed, 12 May 2021 18:09:43 +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 1lgtDR-003WTm-NU for linux-arm-kernel@desiato.infradead.org; Wed, 12 May 2021 18:04:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=TiM8ap2aQ9CwZ0wXiQLJyE4cOOs6sAcb2b2j/d7VL+c=; b=Z8hmpir4xt48iFA60qgT2VnAZb pVPGhg26tf+jSeHIsjvVawdzS2p2Nfj6myBWxskApcO8xT1h0gqnoRo06WBGHl7GULDVAET0JkcU3 hry5BeRcSVMo7i1j6EBOB58J9JY6I29NehIHeHRINDZp/NEfJ3kYX2088s1ZNVUhGY+lRtYLdkpbp 3bLrKUCHAHrIpD84yqQ07+N1/N+bSsqxSc2oEQGzv0Q0zck1dkl+lPVb7YPF2YqCakTGAAfsmMODL hm9D7yDargaXaCh5zOVH26g43r6hlG/uNHa8k6RvY5jjUKvtWVmQt2+LZbIwnCckhQKJucqsl8AC8 c+AU/MxQ==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgtDP-00Ag7Q-1X for linux-arm-kernel@lists.infradead.org; Wed, 12 May 2021 18:04:12 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9C06B6143D; Wed, 12 May 2021 18:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1620842650; bh=ILTr4Wen9gcQkgsGSnaYH+FUJ15G07fAEGN4yCgoz4s=; h=From:To:Cc:Subject:Date:From; b=Yb0lKIhEJtvc3N1fVQIb2Tl0hq8c1X8fAjY56qVTR0MKeeK/N0keESKNQUvMZTp5P PquS7btbdu0pQxp9tdLDdKTod6WTlN55qqYatsagrc1XyXOIkNJetv5LycY4qpOhjv xwMXgLM8Qf6oLHqG6AnoPZGnyj1R67y3ItKP9dhLiP9pmvBWyo1GQ5iFPgsAHbapbA Z2vaEH/OrmXeK/GNLuC8+HV+V6Z7Y3ksErvq4DgLl5ERGul04IVKu5jSmfzd9tNKny iqTE+73QIeAPbGy+f3rqgnOfQws0BMBSiN9Hx9HbcVGcqWqR83C4To45rGowowTEjI 9ff+xzLpWLC9A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ard Biesheuvel , Nicolas Pitre , Russell King , Sasha Levin , linux-arm-kernel@lists.infradead.org Subject: [PATCH AUTOSEL 5.4 01/23] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 Date: Wed, 12 May 2021 14:03:45 -0400 Message-Id: <20210512180408.665338-1-sashal@kernel.org> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210512_110411_186916_1C934DC1 X-CRM114-Status: GOOD ( 14.80 ) 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 From: Ard Biesheuvel [ Upstream commit f9e7a99fb6b86aa6a00e53b34ee6973840e005aa ] The cache invalidation code in v7_invalidate_l1 can be tweaked to re-read the associativity from CCSIDR, and keep the way identifier component in a single register that is assigned in the outer loop. This way, we need 2 registers less. Given that the number of sets is typically much larger than the associativity, rearrange the code so that the outer loop has the fewer number of iterations, ensuring that the re-read of CCSIDR only occurs a handful of times in practice. Fix the whitespace while at it, and update the comment to indicate that this code is no longer a clone of anything else. Acked-by: Nicolas Pitre Signed-off-by: Ard Biesheuvel Signed-off-by: Russell King Signed-off-by: Sasha Levin --- arch/arm/mm/cache-v7.S | 51 +++++++++++++++++++++--------------------- 1 file changed, 25 insertions(+), 26 deletions(-) diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S index 0ee8fc4b4672..8e69bf36a3ec 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -33,41 +33,40 @@ icache_size: * processor. We fix this by performing an invalidate, rather than a * clean + invalidate, before jumping into the kernel. * - * This function is cloned from arch/arm/mach-tegra/headsmp.S, and needs - * to be called for both secondary cores startup and primary core resume - * procedures. + * This function needs to be called for both secondary cores startup and + * primary core resume procedures. */ ENTRY(v7_invalidate_l1) mov r0, #0 mcr p15, 2, r0, c0, c0, 0 mrc p15, 1, r0, c0, c0, 0 - movw r1, #0x7fff - and r2, r1, r0, lsr #13 + movw r3, #0x3ff + and r3, r3, r0, lsr #3 @ 'Associativity' in CCSIDR[12:3] + clz r1, r3 @ WayShift + mov r2, #1 + mov r3, r3, lsl r1 @ NumWays-1 shifted into bits [31:...] + movs r1, r2, lsl r1 @ #1 shifted left by same amount + moveq r1, #1 @ r1 needs value > 0 even if only 1 way - movw r1, #0x3ff + and r2, r0, #0x7 + add r2, r2, #4 @ SetShift - and r3, r1, r0, lsr #3 @ NumWays - 1 - add r2, r2, #1 @ NumSets +1: movw r4, #0x7fff + and r0, r4, r0, lsr #13 @ 'NumSets' in CCSIDR[27:13] - and r0, r0, #0x7 - add r0, r0, #4 @ SetShift - - clz r1, r3 @ WayShift - add r4, r3, #1 @ NumWays -1: sub r2, r2, #1 @ NumSets-- - mov r3, r4 @ Temp = NumWays -2: subs r3, r3, #1 @ Temp-- - mov r5, r3, lsl r1 - mov r6, r2, lsl r0 - orr r5, r5, r6 @ Reg = (Temp<