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.6 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,URIBL_BLOCKED,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 CD55AC433DB for ; Mon, 8 Feb 2021 22:51:28 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 6E83D64DA1 for ; Mon, 8 Feb 2021 22:51:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6E83D64DA1 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=8x0S4Hg8uq2t6vTsrHLmqfABEB8SnMt2cSRtl2nMAJ8=; b=eYcQRz2osQ7Pf+VnbBi2kumm3 uB8i3jDej/hZPrBdoKyLiThq8tKmNKXv/Z6HSZD6Hdk1s+X8Di1EjT9t6k2cEnq2+BmctwYMfa1Uq RskdDBr0ZP22V6xwulikgU6XLt+3AUU3qwzZpFxrATQgsWF2F8pO7P2B/Wd+5hRP2Urxlh1vCoH6z RwGzvgOUVW1ppHe29s3tOLdf1t97GfqHSNjZVQKfEL5HjtGBSgt2FRpK+Cgt88SLpbZLVLbHOCQ63 eECMKBgIq2yvEOcHbnmMRDVxoohwAEhlFHfNKT+vj7ps7cKl/u4uU3UEsTTWjOGUXdqXQl8YD9Esp AT1Vi2kyQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9FMJ-0007BR-CW; Mon, 08 Feb 2021 22:50:19 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l9FME-0007AI-I2 for linux-arm-kernel@lists.infradead.org; Mon, 08 Feb 2021 22:50:15 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 7928764EAC; Mon, 8 Feb 2021 22:50:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1612824614; bh=BGQX99Re1TVoYqC7BE4/QK01QPkt15cx6Jf+kKhJlX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Fn68ZO08r9K6b2kdnYUTI7e6vSqN8lr4uDyF7WfMHFHoJHhCYmL1VXIsOVwrQEDbU djm8dQKMCjBt5KPvl1AIhOO0WeSZbUWab8hXOkQL80LK5aoByU2eQ5sG+MxLL0gNv3 aPpHVStT68nS1wNtelkAiveWipbmIAuxWVjTHrMfiPKCAkARyNLli6qC4gWXniSryo jONpx+kFRWWVc5QkVZZoLpLYTKHPEuRvU/dDTqUbQzw/O6BWBByEvucYPn3ojTJvH9 /xa5+LFj35VuwaV+Pp/NNpKRo+8/6ChIFwxwDTLLARBLkImQbsE1IvbXPvaCvXsWqN dWVajEbpGcbUQ== From: Ard Biesheuvel To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/3] ARM: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 Date: Mon, 8 Feb 2021 23:49:58 +0100 Message-Id: <20210208224959.13683-3-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210208224959.13683-1-ardb@kernel.org> References: <20210208224959.13683-1-ardb@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210208_175014_758094_FEE33E35 X-CRM114-Status: GOOD ( 14.49 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nicolas Pitre , Marc Zyngier , Linus Walleij , Russell King , kernel-team@android.com, Ard Biesheuvel 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 The cache invalidation code in v7_invalidate_l1 can be tweaked to re-read the associativity from CCSIDR, and keep the set/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. Signed-off-by: Ard Biesheuvel --- 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 307f381eee71..4544af4855f6 100644 --- a/arch/arm/mm/cache-v7.S +++ b/arch/arm/mm/cache-v7.S @@ -33,9 +33,8 @@ 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 @@ -43,32 +42,32 @@ ENTRY(v7_invalidate_l1) isb mrc p15, 1, r0, c0, c0, 0 @ read cache geometry from CCSIDR - 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<