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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 592DFC35671 for ; Mon, 24 Feb 2020 12:17:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 265D620838 for ; Mon, 24 Feb 2020 12:17:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582546669; bh=mztqZtSqiSBQKD7LlQORhwESyj6VWRq2ScqN29qp6k0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=OmJSaUrEeRhcENa1CeEy9rYb8kII3onGoCMC0pafpJepEXNFI1NHfERyEdMWRwlwt rVdIm4FSfVg+a8IHQvtxJOst1b9KMYn4YFI4KngW7eL6fuYimVNXQFV1BdBd+s6aNO ZndBdkb5m+l9qEpU2XvHv991SKJR25e1QGQTGCzc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727185AbgBXMRt (ORCPT ); Mon, 24 Feb 2020 07:17:49 -0500 Received: from mail.kernel.org ([198.145.29.99]:44332 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727183AbgBXMRs (ORCPT ); Mon, 24 Feb 2020 07:17:48 -0500 Received: from e123331-lin.home (amontpellier-657-1-18-247.w109-210.abo.wanadoo.fr [109.210.65.247]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8C61820732; Mon, 24 Feb 2020 12:17:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582546668; bh=mztqZtSqiSBQKD7LlQORhwESyj6VWRq2ScqN29qp6k0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1TYTzMfjGaCDZKZcz0C6j6rLcKWqm4oEZMkn+agbSrnV3AEghJGBM3+UZaHMIiNgI s2Uyk7b7tGsB6uIsSM0EPIe8vWB80itfUvZHfbUGXO25498IlWSgEYJ+wGNRS4Mayf WsIhLyS08ppNfDcJNPh8uyG9P+Rw+nc2SjvGu72M= From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, Ard Biesheuvel , Russell King , Marc Zyngier , Nicolas Pitre , Catalin Marinas , Tony Lindgren , Linus Walleij Subject: [PATCH v3 4/5] ARM: decompressor: prepare cache_clean_flush for doing by-VA maintenance Date: Mon, 24 Feb 2020 13:17:32 +0100 Message-Id: <20200224121733.2202-5-ardb@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200224121733.2202-1-ardb@kernel.org> References: <20200224121733.2202-1-ardb@kernel.org> Sender: linux-efi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-efi@vger.kernel.org In preparation for turning the decompressor's cache clean/flush operations into proper by-VA maintenance for v7 cores, pass the start and end addresses of the regions that need cache maintenance into cache_clean_flush in registers r0 and r1. Currently, all implementations of cache_clean_flush ignore these values, so no functional change is expected as a result of this patch. Signed-off-by: Ard Biesheuvel --- arch/arm/boot/compressed/head.S | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 674e55400cfd..12d631503bfa 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S @@ -533,12 +533,19 @@ dtb_check_done: add sp, sp, r6 #endif + adr r0, restart + ldr r1, .Lclean_size + add r0, r0, r6 + add r1, r1, r0 bl cache_clean_flush badr r0, restart add r0, r0, r6 mov pc, r0 + .align 2 +.Lclean_size: .long _edata - restart + wont_overwrite: /* * If delta is zero, we are running at the address we were linked at. @@ -629,6 +636,11 @@ not_relocated: mov r0, #0 add r2, sp, #0x10000 @ 64k max mov r3, r7 bl decompress_kernel + + get_inflated_image_size r1, r2, r3 + + mov r0, r4 @ start of inflated image + add r1, r1, r0 @ end of inflated image bl cache_clean_flush bl cache_off @@ -1182,6 +1194,9 @@ __armv7_mmu_cache_off: /* * Clean and flush the cache to maintain consistency. * + * On entry, + * r0 = start address + * r1 = end address (exclusive) * On exit, * r1, r2, r3, r9, r10, r11, r12 corrupted * This routine must preserve: -- 2.17.1