From patchwork Thu May 20 12:44:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 12270205 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.1 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, 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 0ADBFC433B4 for ; Thu, 20 May 2021 12:51:40 +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 8F692600D1 for ; Thu, 20 May 2021 12:51:39 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8F692600D1 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=I69JHA8CIy+9d0ecA+FiJiyh6Ag7q8UNQsUm/FQVSfY=; b=A4wno0rjYsRCUs 4k+Bh+jafWLIqgEl9rTcz2sKTpY3ZPX8JaaxMTvrPOyYeOXzE2eRaG+7/NDwz5CI1z6/sero1X5ps hYQT10YthNjTr8Oj0PYFIpGcsgDHK5q3iOQzKW9Dttl0ZZu5U97Gg5MbXyackF8U5QqxB3PB7mi1B cbzAjVFsnyBHMiY5SRUAkxBkj51CoIv0GynUFTJnptoccJkk2rC4be5Xvfqrrg4Qh4jL2632MhWAM cqSmnGnVUSzdwZpuxmDcDRYKLdsmq8TrZ+0b5miUaJphT0UNyGkwsZDo+hxXt7bcC5y9ov8YnNlxz 4+TBW2q6+h3yvg+d5G/Q==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lji7h-000xqV-IJ; Thu, 20 May 2021 12:49:58 +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 1lji2c-000u38-H3 for linux-arm-kernel@desiato.infradead.org; Thu, 20 May 2021 12:44:42 +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=kTsEENXDmPZEUuN+noYdKA7b/Q6OpBcy7Qni/3TfSaE=; b=xL7w9o5PjMl8jZZACOr6IRSpx3 f7NSivruvL88TNgYTJQ7q0nHRG6avt/OsTQiYv14Kg/RqP1PF5DsEHfNkkIGHpVccil+ImmAEaMab h2blUZN4PtuqElfbD6hCCFflSRtPx3GEnN0FwW8o9Cnpf5RdqVKHi5d+sjgK/tQ5JbShtuxkHTUyr l0KXo/y9YUp3/SMCC02Najrgaofrxunm3ujEEwMG+/E5oA0pPQehz2SsZ1muSkKSfzg52AktDH71d IkxHMrfPKmna6NglSRqKDrnCe3VdYOi1QPFhBxF7n9OxblKRvzJRX8E8D0ILK5usSpXLGSRQN7xxh pP+pO/MA==; Received: from mail-wr1-x449.google.com ([2a00:1450:4864:20::449]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lji2Z-00GKgi-V9 for linux-arm-kernel@lists.infradead.org; Thu, 20 May 2021 12:44:41 +0000 Received: by mail-wr1-x449.google.com with SMTP id j33-20020adf91240000b029010e4009d2ffso8613495wrj.0 for ; Thu, 20 May 2021 05:44:39 -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=kTsEENXDmPZEUuN+noYdKA7b/Q6OpBcy7Qni/3TfSaE=; b=f/8uTZIVRRkyOOBfvNRHVuffPY+EeZ/ZibLU3yJHqqxUj5GX3oVt2661UM3IzvPw24 h/Gk2Vk2Ny7XEX7UQ0n84xnt6mJ7E1Woy9zWjNrxkb0U/1V6IGlW28GCLjSNJSd5prfo dB+pURw8v9mM0DZjmW3bbSk/JPlhZkbZTKpZWRuwOl9aEvTy1b+2xvAzdcCbmwGSI/8i uu/83hFbMlvcGC+74MCpnrEgIHuYzPh8YkeNYBj8Z8jvcPJxOcsDGBUP59YgBq8voBwK /YMmormWZPgkdWIcwLIu4PdPcd/qEf6jy5ypRTe4etcunPeHDdQNN2CKFUTp2bcdaO9n 0mKQ== 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=kTsEENXDmPZEUuN+noYdKA7b/Q6OpBcy7Qni/3TfSaE=; b=t69IIaw328lPNb+yqaGRkKZnp5OjM4LwvL/0ElTnfAkTulmB6C12gd1HgUP7TH6hxE KJeDg3Tv7COJ/A3s8mTrMvDouQgaVb7zF6ggTieZmUS2L/u6dyq+YOWXcqbsdOfojsiE i5ldqY6zvr/qyUN92jmVkEyWFYXgm0JYQlcTMfYoYvod39oynBjo/UN1oU95E4VPfQXD u9MsBZ4LFN7B1ehhe2BGzkgPw/COvhm2ULykyoj3RcnTW8cwz0rhhpxhLU4cwtlqnypQ VwD96pQcPGTvHeQ35O5yzaXEPMO3aDb4yBcAlBJhy4WX64lcREC5k8VjKl9rpVqdALkx dJpw== X-Gm-Message-State: AOAM5309OPVsVSOcjms3vQ5LBYuyuXFERNWA/EU/ZGqQvisFoNGuxBXr DmnMfHQy6un36Z3ni0OcpIW1taxP7TU+ICMhA6K3b+7CfMosyMa1eKR8INuHvQGwuHNPg4dKkRu hR37tAn32GQkXjaIPQnPXlY2/La4Ma+U7jQ1HapCLCaAHMlc7ZD1OLkpcQvUIShxZLXuK51AHrk UE9A== X-Google-Smtp-Source: ABdhPJyuB5dIpvfZABUyHh4xUXycaJwowaYU+7tPLrX23BRooeuvKYYmldI7zCR4/UcMsYjU6OIWhd7MLQ== X-Received: from tabba.c.googlers.com ([fda3:e722:ac3:10:28:9cb1:c0a8:482]) (user=tabba job=sendgmr) by 2002:a5d:4b50:: with SMTP id w16mr3988948wrs.276.1621514678023; Thu, 20 May 2021 05:44:38 -0700 (PDT) Date: Thu, 20 May 2021 13:44:02 +0100 In-Reply-To: <20210520124406.2731873-1-tabba@google.com> Message-Id: <20210520124406.2731873-15-tabba@google.com> Mime-Version: 1.0 References: <20210520124406.2731873-1-tabba@google.com> X-Mailer: git-send-email 2.31.1.751.gd2f1c929bd-goog Subject: [PATCH v3 14/18] arm64: __clean_dcache_area_pop 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, robin.murphy@arm.com, tabba@google.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210520_054440_022458_AF292BDC X-CRM114-Status: GOOD ( 14.43 ) 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: , 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. No functional change intended. Reported-by: Will Deacon Signed-off-by: Fuad Tabba Acked-by: Mark Rutland --- arch/arm64/include/asm/cacheflush.h | 2 +- arch/arm64/lib/uaccess_flushcache.c | 4 ++-- arch/arm64/mm/cache.S | 9 ++++----- arch/arm64/mm/flush.c | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/arch/arm64/include/asm/cacheflush.h b/arch/arm64/include/asm/cacheflush.h index 3255878d6f30..fa5641868d65 100644 --- a/arch/arm64/include/asm/cacheflush.h +++ b/arch/arm64/include/asm/cacheflush.h @@ -61,7 +61,7 @@ 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(unsigned long start, unsigned long end); -extern void __clean_dcache_area_pop(void *addr, size_t len); +extern void __clean_dcache_area_pop(unsigned long start, unsigned long end); extern void __clean_dcache_area_pou(void *addr, size_t len); extern long __flush_cache_user_range(unsigned long start, unsigned long end); extern void sync_icache_aliases(void *kaddr, unsigned long len); diff --git a/arch/arm64/lib/uaccess_flushcache.c b/arch/arm64/lib/uaccess_flushcache.c index c83bb5a4aad2..62ea989effe8 100644 --- a/arch/arm64/lib/uaccess_flushcache.c +++ b/arch/arm64/lib/uaccess_flushcache.c @@ -15,7 +15,7 @@ void memcpy_flushcache(void *dst, const void *src, size_t cnt) * barrier to order the cache maintenance against the memcpy. */ memcpy(dst, src, cnt); - __clean_dcache_area_pop(dst, cnt); + __clean_dcache_area_pop((unsigned long)dst, (unsigned long)dst + cnt); } EXPORT_SYMBOL_GPL(memcpy_flushcache); @@ -33,6 +33,6 @@ unsigned long __copy_user_flushcache(void *to, const void __user *from, rc = raw_copy_from_user(to, from, n); /* See above */ - __clean_dcache_area_pop(to, n - rc); + __clean_dcache_area_pop((unsigned long)to, (unsigned long)to + n - rc); return rc; } diff --git a/arch/arm64/mm/cache.S b/arch/arm64/mm/cache.S index 9a9c44bb26d2..b72fbae4b8e9 100644 --- a/arch/arm64/mm/cache.S +++ b/arch/arm64/mm/cache.S @@ -201,16 +201,15 @@ SYM_FUNC_END_PI(__clean_dcache_area_poc) SYM_FUNC_END(__dma_clean_area) /* - * __clean_dcache_area_pop(kaddr, size) + * __clean_dcache_area_pop(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 PoP. * - * - kaddr - kernel address - * - size - size in question + * - start - virtual start address of region + * - end - virtual end address of region */ 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 diff --git a/arch/arm64/mm/flush.c b/arch/arm64/mm/flush.c index 4e3505c2bea6..5aba7fe42d4b 100644 --- a/arch/arm64/mm/flush.c +++ b/arch/arm64/mm/flush.c @@ -82,7 +82,7 @@ void arch_wb_cache_pmem(void *addr, size_t size) { /* Ensure order against any prior non-cacheable writes */ dmb(osh); - __clean_dcache_area_pop(addr, size); + __clean_dcache_area_pop((unsigned long)addr, (unsigned long)addr + size); } EXPORT_SYMBOL_GPL(arch_wb_cache_pmem);