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.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, 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 CDE1FC433ED for ; Tue, 11 May 2021 14:45:41 +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 3ABC561288 for ; Tue, 11 May 2021 14:45:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3ABC561288 Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.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:Cc:To:From:Subject:References:Mime-Version: Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=tZOXcYbrIlNCGQht/Og5PWDXymg31T3N/ZcCPuvAKoc=; b=OjRuZ8w1tMbEaU VWqVuhuKxyEW1SQOwyYh4neNOeOudpSuD0K49fDJmRbVqcwwR/24INfeTdHktwKNrCrA1P1AnTUqF Zge7RvnWdtGxvK/amZ8S7po4biGMKB+ulFp8Q3xaCNucmIEKLm+qDo8s71Fy0YyjmOgDx98L2sYwG CuQdVEVxxv7MeHL2DtbchyAn7I0kf3ReEyRuRmWORVU1qood71hcj1vw13WMft4smikEU66uvN9PI eDo/kmsGDxNsfix8SdiPMgN0bG1BLlOHA9ply/u7kSY8s8vULybug8Q9dFwIc/3FGCRsLLrq9XltQ +qIBlmykYy5HkU+A3Eww==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lgTcD-000TSI-Hx; Tue, 11 May 2021 14:44:05 +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 1lgTbK-000TFU-Fh for linux-arm-kernel@desiato.infradead.org; Tue, 11 May 2021 14:43:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Type:Cc:To:From:Subject: References:Mime-Version:Message-Id:In-Reply-To:Date:Sender:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=U5sDBAAq2htgUdldX/vcAGUnxgHxgz2qSCkNBv1Jrjw=; b=KKVPtR7IFL6QRb70aod6hHtN/I 0M04tplm5MB5p2Ha0g6zxUR3W8KAKU1WdOqspp54IWCNWo0ZrsklUkx11Zv5AQQc5p/yt/rn09E6P MdUvLJc6KPA/67rzT5vfxCsn1cIW1dUE5OMDtkD3HLTwHQJBHhc28ALtqmXq7PSkhvwNrnHCwc3cp 6OhAzRmnlXxFx69YtW3NSvH8Zgd4Hk5XPwtnDbfUphUh5kvcPsnGJpDchcnsrGIZL26lmwiFDqhJF jpm14lg1bJt5vtmdf3Zh3lCLvS1GJbbQijvG5SrtV6JV4icn7+9o4JbHzl6VLLQ1UtxftwwhgkYna PaEvwEpw==; Received: from mail-wr1-x44a.google.com ([2a00:1450:4864:20::44a]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lgTbH-009gVX-QN for linux-arm-kernel@lists.infradead.org; Tue, 11 May 2021 14:43:09 +0000 Received: by mail-wr1-x44a.google.com with SMTP id d20-20020adfc3d40000b029010e1a640bbfso8866013wrg.21 for ; Tue, 11 May 2021 07:43:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=U5sDBAAq2htgUdldX/vcAGUnxgHxgz2qSCkNBv1Jrjw=; b=I2adHtPlOeK1f51JqVfS2af2hzYEhTcSlir7qV4R2qEaqZB6dZA8+0qYBBp3a5QV2p IfJiNSkj0IRKz50jLeaM9G0dxw7oWyFrKhgdMcc/6p7GQOCnEjojuhbD6+I26q6b8MRG CK1w1QnuT11X7AcWBrjieqOQ8vcc8OEV4Nq3++dnydKSbbMFXekN/b8wIjVlwpitEadb ViGwUaTSrciNKeD/eliO08D5VZ/FN5sRqz0I7eLvAz0gGL8lbeD7LcGX+qcTOrZUY9GR 3TQqladDIvWheFuO+KNnwmNyE1LNiZhPYnsNPgM/Mvi1S7129kaZp8isQ3s3m9oxXZxb 3cYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=U5sDBAAq2htgUdldX/vcAGUnxgHxgz2qSCkNBv1Jrjw=; b=DnZgBhFvNVMuOdkICXOQu544ACiwvdOhzxy1EZOfKbBIEkbumywolDBpFMPaj9W7KB 6hKPCeNKPGQXrDD9mHynZTESgEaxvv4z433qEVEyFg/fdm8XnJ5EJMJRafzXJNcVh7tK 3mA0VZyj+L8lPHiLYAFAxHuR/8zXuJzk5EidQkTIw4yVIIiS/K0VeWjGrhCvERL55a5g Af8u0aRrPjC8b6hHzVqXvd90pne7ShES94GcgA4rL0QEaJc7P6i7IwR800E8H5gpBn76 aDFsWlLzsMl7T7t+PhHQgOekOLEsTDUuJ1w5iZ2T7HoI6gkkHKz5thYRsNAQF9jbnqCC 0oGQ== X-Gm-Message-State: AOAM531Ectm8jIooOxVF9gfqQWa7nnWGRTCFijXua8ia39OQvUZJDFum 7isBcEVafUERT4EMfLbuYUQ+7y//vLzNhLgwaoLZNkbU8jDn2bEc5OZTtaOBvrMUdZ2/qDhbGBR lMBYPLTZZDQNMvmxZ7BYjiRS/Tq3JsTDtekgN99mS3ZNy6ZtgEP1aPp54dsXV9bot2T67v+Ou1S nc1A== X-Google-Smtp-Source: ABdhPJxKSjUsLU7aqmEg4fMD16LL/JagIPC6upQMTu/WxFW0UmSpD3nTuc9SmNcMfc9csJ7plDHZGYUN4A== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a05:600c:35cc:: with SMTP id r12mr567048wmq.1.1620744185161; Tue, 11 May 2021 07:43:05 -0700 (PDT) Date: Tue, 11 May 2021 15:42:44 +0100 In-Reply-To: <20210511144252.3779113-1-tabba@google.com> Message-Id: <20210511144252.3779113-6-tabba@google.com> Mime-Version: 1.0 References: <20210511144252.3779113-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.607.g51e8a6a459-goog Subject: [PATCH v1 05/13] arm64: __inval_dcache_area to take end parameter instead of size From: Fuad Tabba To: linux-arm-kernel@lists.infradead.org Cc: will@kernel.org, catalin.marinas@arm.com, mark.rutland@arm.com, maz@kernel.org, ardb@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210511_074307_876841_C5DC5882 X-CRM114-Status: GOOD ( 14.67 ) 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 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_inv_area, it changes the parameters for that as well. However, __dma_inv_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 --- arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/kernel/head.S | 5 +---- arch/arm64/mm/cache.S | 16 +++++++++------- arch/arm64/mm/flush.c | 2 +- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index a586afa84172..157234706817 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -59,7 +59,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(void *addr, size_t len); -extern void __inval_dcache_area(void *addr, size_t len); +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_pop(void *addr, size_t len); extern void __clean_dcache_area_pou(void *addr, size_t len); diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 96873dfa67fd..8df0ac8d9123 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -117,7 +117,7 @@ SYM_CODE_START_LOCAL(preserve_boot_args) dmb sy // needed before dc ivac with // MMU off - mov x1, #0x20 // 4 x 8 bytes + add x1, x0, #0x20 // 4 x 8 bytes b __inval_dcache_area // tail call SYM_CODE_END(preserve_boot_args) @@ -268,7 +268,6 @@ SYM_FUNC_START_LOCAL(__create_page_tables) */ adrp x0, init_pg_dir adrp x1, init_pg_end - sub x1, x1, x0 bl __inval_dcache_area /* @@ -382,12 +381,10 @@ SYM_FUNC_START_LOCAL(__create_page_tables) adrp x0, idmap_pg_dir adrp x1, idmap_pg_end - sub x1, x1, x0 bl __inval_dcache_area adrp x0, init_pg_dir adrp x1, init_pg_end - sub x1, x1, x0 bl __inval_dcache_area ret x28 diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 6babaaf34f17..64507944b461 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -146,25 +146,24 @@ alternative_else_nop_endif SYM_FUNC_END(__clean_dcache_area_pou) /* - * __inval_dcache_area(kaddr, size) + * __inval_dcache_area(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 invalidated. Any partial lines at the ends of the interval are * also cleaned to PoC to prevent data loss. * - * - kaddr - kernel address - * - size - size in question + * - start - kernel start address of region + * - end - kernel end address of region */ SYM_FUNC_START_LOCAL(__dma_inv_area) SYM_FUNC_START_PI(__inval_dcache_area) /* FALLTHROUGH */ /* - * __dma_inv_area(start, size) + * __dma_inv_area(start, end) * - start - virtual start address of region - * - size - size in question + * - end - virtual end address of region */ - add x1, x1, x0 dcache_line_size x2, x3 sub x3, x2, #1 tst x1, x3 // end cache line aligned? @@ -245,8 +244,10 @@ SYM_FUNC_END_PI(__dma_flush_area) * - dir - DMA direction */ 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) @@ -257,6 +258,7 @@ SYM_FUNC_END_PI(__dma_map_area) * - dir - DMA direction */ SYM_FUNC_START_PI(__dma_unmap_area) + add x1, x0, x1 cmp w2, #DMA_TO_DEVICE b.ne __dma_inv_area ret diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index ac485163a4a7..4e3505c2bea6 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -88,7 +88,7 @@ EXPORT_SYMBOL_GPL(arch_wb_cache_pmem); void arch_invalidate_pmem(void *addr, size_t size) { - __inval_dcache_area(addr, size); + __inval_dcache_area((unsigned long)addr, (unsigned long)addr + size); } EXPORT_SYMBOL_GPL(arch_invalidate_pmem); #endif -- 2.31.1.607.g51e8a6a459-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel