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_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS 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 20801C433B4 for ; Thu, 20 May 2021 16:18:42 +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 9A1BE60FE8 for ; Thu, 20 May 2021 16:18:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9A1BE60FE8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.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=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=fjHnMYPsT3PzPsIh3aUpv2nAeXa0sQlyHjX01tmXHVw=; b=RttEqwBUjBzgWcIZTZ70NiaBUN 1fhY+D40VAKE8bl13xhK3MErhhKlkxlkYjH4S0a+KDAAs0WjOdl0IewlWXuH1zZEsXP/lSoQa2P02 aEsK8BXhR6d2AjPX+wR+v3nKJCT2VQaLKjUVs3A+SS9ON00WGOVpD9NsR4Y00NU0XLsPPiZ5De/Pb /PpQG3X2Q80qn9klzFh6Wed0l67iwmf9V5ebsEB3b6r+22l0LQ72Mps8WgXPl7bnbQ4fvmGJR/BNA Sxc7m5DcPVaOV/r4KRnZgSgVKpO6vAbEmpTU33oGJJh5DoIXH6pdMxCeklrnz69aLX542D+r4J4dj wJARzRcQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljlLq-001uHS-II; Thu, 20 May 2021 16:16:46 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ljlLl-001uGd-7J for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 16:16:41 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=In-Reply-To:Content-Type:MIME-Version :References:Message-ID:Subject:Cc:To:From:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=ZlAhshD2iLADP88bjJ6QhZztCbv085G3pBCUUnijsFA=; b=X1o5+34ojl2JXytOyMYQo8hcYp gnAebMFF0nuJTj0pFUgoguzpRcAcEWmyaUp2bIVqcqpBPWLtxi1iH2Siih5adAf+e2mT4lEi6m7ZC frNEm4xUJXEWWd30GDL6wVLFRXkMfpzQY6GVcYWFA/WkSCxMYy9acKCQcrOW2vQfkIyXJAS2qcW13 fRm9BLR2EzeBFU+egT+Vv2JEYVNIfOl2W22ptuC3tobB2CCfpb1jmBZZqtUtQ/0lYFs4xsUw8oiag XmaVs2BZanvZBD9kDsgfpIwR24RAi4UJO8J+z+uTuPQ2bG2Tui03GNGvlF5SH+sOlN1h4SgvZo5oO e3F4X4ew==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1ljlLh-00GVDG-RA for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 16:16:39 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4AF77ED1; Thu, 20 May 2021 09:16:35 -0700 (PDT) Received: from C02TD0UTHF1T.local (unknown [10.57.7.235]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 827B43F73B; Thu, 20 May 2021 09:16:33 -0700 (PDT) Date: Thu, 20 May 2021 17:16:31 +0100 From: Mark Rutland To: Fuad Tabba Cc: linux-arm-kernel@lists.infradead.org, will@kernel.org, catalin.marinas@arm.com, maz@kernel.org, ardb@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, robin.murphy@arm.com Subject: Re: [PATCH v3 13/18] arm64: __clean_dcache_area_poc to take end parameter instead of size Message-ID: <20210520161631.GR17233@C02TD0UTHF1T.local> References: <20210520124406.2731873-1-tabba@google.com> <20210520124406.2731873-14-tabba@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210520124406.2731873-14-tabba@google.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_091637_995715_11582896 X-CRM114-Status: GOOD ( 23.79 ) 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 On Thu, May 20, 2021 at 01:44:01PM +0100, Fuad Tabba wrote: > To be consistent with other functions with similar names and > functionality in cacheflush.h, cache.S, and cachetlb.rst, change > to specify the range in terms of start and end, as opposed to > start and size. > > Because the code is shared with __dma_clean_area, it changes the > parameters for that as well. However, __dma_clean_area is local to > cache.S, so no other users are affected. > > No functional change intended. > > Reported-by: Will Deacon > Signed-off-by: Fuad Tabba One minor comment below, with that addressed: Acked-by: Mark Rutland Mark. > --- > arch/arm64/include/asm/cacheflush.h | 2 +- > arch/arm64/kernel/efi-entry.S | 5 +++-- > arch/arm64/mm/cache.S | 16 +++++++--------- > 3 files changed, 11 insertions(+), 12 deletions(-) > > diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h > index 695f88864784..3255878d6f30 100644 > --- a/arch/arm64/include/asm/cacheflush.h > +++ b/arch/arm64/include/asm/cacheflush.h > @@ -60,7 +60,7 @@ extern void __flush_icache_range(unsigned long start, unsigned long end); > extern void invalidate_icache_range(unsigned long start, unsigned long end); > extern void __flush_dcache_area(unsigned long start, unsigned long end); > extern void __inval_dcache_area(unsigned long start, unsigned long end); > -extern void __clean_dcache_area_poc(void *addr, size_t len); > +extern void __clean_dcache_area_poc(unsigned long start, unsigned long end); > extern void __clean_dcache_area_pop(void *addr, size_t len); > extern void __clean_dcache_area_pou(void *addr, size_t len); > extern long __flush_cache_user_range(unsigned long start, unsigned long end); > diff --git a/arch/arm64/kernel/efi-entry.S b/arch/arm64/kernel/efi-entry.S > index 0073b24b5d25..72e6a580290a 100644 > --- a/arch/arm64/kernel/efi-entry.S > +++ b/arch/arm64/kernel/efi-entry.S > @@ -28,6 +28,7 @@ SYM_CODE_START(efi_enter_kernel) > * stale icache entries from before relocation. > */ > ldr w1, =kernel_size > + add x1, x0, x1 > bl __clean_dcache_area_poc > ic ialluis > > @@ -36,7 +37,7 @@ SYM_CODE_START(efi_enter_kernel) > * so that we can safely disable the MMU and caches. > */ > adr x0, 0f > - ldr w1, 3f > + adr x1, 3f > bl __clean_dcache_area_poc > 0: > /* Turn off Dcache and MMU */ > @@ -65,4 +66,4 @@ SYM_CODE_START(efi_enter_kernel) > mov x3, xzr > br x19 > SYM_CODE_END(efi_enter_kernel) > -3: .long . - 0b > +3: Now that we're using this label for code rather than data, could we please move this before the SYM_CODE_END()? It looks a bit out-of-place sitting after the function now that it has no associated data, and it shouldn't have a functional impact either way. Mark. > diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S > index 35abc8d77c4e..9a9c44bb26d2 100644 > --- a/arch/arm64/mm/cache.S > +++ b/arch/arm64/mm/cache.S > @@ -178,24 +178,23 @@ SYM_FUNC_END_PI(__inval_dcache_area) > SYM_FUNC_END(__dma_inv_area) > > /* > - * __clean_dcache_area_poc(kaddr, size) > + * __clean_dcache_area_poc(start, end) > * > - * Ensure that any D-cache lines for the interval [kaddr, kaddr+size) > + * Ensure that any D-cache lines for the interval [start, end) > * are cleaned to the PoC. > * > - * - kaddr - kernel address > - * - size - size in question > + * - start - virtual start address of region > + * - end - virtual end address of region > */ > SYM_FUNC_START_LOCAL(__dma_clean_area) > SYM_FUNC_START_PI(__clean_dcache_area_poc) > /* FALLTHROUGH */ > > /* > - * __dma_clean_area(start, size) > + * __dma_clean_area(start, end) > * - start - virtual start address of region > - * - size - size in question > + * - end - virtual end address of region > */ > - add x1, x0, x1 > dcache_by_line_op cvac, sy, x0, x1, x2, x3 > ret > SYM_FUNC_END_PI(__clean_dcache_area_poc) > @@ -211,10 +210,10 @@ SYM_FUNC_END(__dma_clean_area) > * - size - size in question > */ > SYM_FUNC_START_PI(__clean_dcache_area_pop) > + add x1, x0, x1 > alternative_if_not ARM64_HAS_DCPOP > b __clean_dcache_area_poc > alternative_else_nop_endif > - add x1, x0, x1 > dcache_by_line_op cvap, sy, x0, x1, x2, x3 > ret > SYM_FUNC_END_PI(__clean_dcache_area_pop) > @@ -243,7 +242,6 @@ SYM_FUNC_START_PI(__dma_map_area) > add x1, x0, x1 > cmp w2, #DMA_FROM_DEVICE > b.eq __dma_inv_area > - sub x1, x1, x0 > b __dma_clean_area > SYM_FUNC_END_PI(__dma_map_area) > > -- > 2.31.1.751.gd2f1c929bd-goog > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel