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=-13.8 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,URIBL_BLOCKED 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 E997FC433E0 for ; Wed, 3 Mar 2021 19:56:55 +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 5C89964EAE for ; Wed, 3 Mar 2021 19:56:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5C89964EAE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linutronix.de 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:MIME-Version:References:Subject:Cc:To:From:Date: Message-Id:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:List-Owner; bh=xNMbc0VuUv74kwxxfm1uEADQY8mvzUcHXUi7iyujcYI=; b=cqZ6vChISgk1LDSIoY8gjFr/G N5NOunyv6Hez9Nk/DQSmXqW4jYLTUqwPXiq5zpOt+SuGCecon1HFywym6/KokcFI+1Ng9s2LCzkCn T9AtmWTZz07SaPYRoUkB58eYPoySWLqTv9574dTDuvgEZgbI/zCJLwAL9ASMjpXf5cBxLmags3E2F 0s1hjFtJ7q9ajxp8ANdOVXZ8ke2Nx9I9G4IsSMa9suWeZjV7hHzJo29b10ItAImOyCT4KWE5Zv4qR feJHVfskkrN91WzrXwJbBN6QlXb+ZSLwLo41CDrHuad8f6Bw3SLmoVrSEh2uJ8kwVZs6AqwJQAREe QnpNT6eCA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lHXZZ-006JE9-OS; Wed, 03 Mar 2021 19:54:18 +0000 Received: from casper.infradead.org ([2001:8b0:10b:1236::1]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHT4T-005IP1-TF for linux-arm-kernel@desiato.infradead.org; Wed, 03 Mar 2021 15:05:54 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-transfer-encoding:Content-Type: MIME-Version:References:Subject:Cc:To:From:Date:Message-Id:Sender:Reply-To: Content-ID:Content-Description:In-Reply-To; bh=eWdIiVkP8/X3j2/negs822pPzotc1RS3VDSLc2vlH3s=; b=FAOUQm9q8YGie8NW+USp6pukkV FV4xV6uIoVAHS6pVEy7dfym85NuPowLQGZ/0PiMqbHOrpbVBon7luDo9rwVtBntOqpbScL7oVycBj o3AMRgG3hPyXuKiM+dfiO0CTzkwIfFNwwcTw+212ND5FOFzP/Vrs6bam5FhgksdX1BDzU7J+XFJHL ZvVvVqxG/5bHLTGyFg4eUqkh6zBoLzjj8Hgla4ZfptNeh195fpadOqB3ZZlZYBSjxJIOtohXW0ILs sQJv+SIbclDmvSvPY8tk5R/B3Lb5m/codbzChbY5M5yJXNsJBarGW+xXFptF2gqBR8EUmUWKwQ3fS mhboeB0Q==; Received: from galois.linutronix.de ([2a0a:51c0:0:12e:550::1]) by casper.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lHQ5J-002RMD-I0 for linux-arm-kernel@lists.infradead.org; Wed, 03 Mar 2021 11:54:36 +0000 Message-Id: <20210303114727.967383885@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1614772458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=eWdIiVkP8/X3j2/negs822pPzotc1RS3VDSLc2vlH3s=; b=KJGW07a0B+9U0rAjZaZ0eOfQUeUJTgZJxgiG6TjHLaVci9q/7crMVYj1Di/6TeLi352JEe AqFbndGwi9aMI//Et7nakmQmclVxTn41icrrpk8bmKGOJzjieFpgaCrHMkrlZozYJCu9s2 nvGxuDOA+kP44ZY/cxW+wA44FMm5+7r7f4wvsCXGv4veQX23kE/28XIMZ+snZCpaMGal0M PcJ8inqdKYuYwgeSdAtWCh2Ys/sTaQNfx4YcEPZFe7V8eK02ofuf5ISz4UpZSeR979WTX4 vfiVI6TEofzRAWjql4i4SBmJQ7M2nqO9AXtsqiGPM3O3PxBx7qjkGBOyxkrpYw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1614772458; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: references:references; bh=eWdIiVkP8/X3j2/negs822pPzotc1RS3VDSLc2vlH3s=; b=wscu+3YV+RmkZqcTLn44nZQTQMhbSfgQTfXb7ByZjvUKmrlA648K0PddMzi5GOpJTu603o psRRivF4wN0+bzCQ== Date: Wed, 03 Mar 2021 12:45:12 +0100 From: Thomas Gleixner To: LKML Cc: Russell King , linux-arm-kernel@lists.infradead.org, Andrew Morton , linux-mm@kvack.org Subject: [patch 1/2] ARM: mm: Replace kmap_atomic_pfn() References: <20210303114511.927078317@linutronix.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210303_115436_224442_D1999408 X-CRM114-Status: GOOD ( 11.05 ) 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 From: Thomas Gleixner There is no requirement to disable pagefaults and preemption for these cache management mappings. Replace kmap_atomic_pfn() with kmap_local_pfn(). This allows to remove kmap_atomic_pfn() in the next step. Signed-off-by: Thomas Gleixner Cc: Russell King Cc: linux-arm-kernel@lists.infradead.org --- arch/arm/mm/cache-feroceon-l2.c | 6 +++--- arch/arm/mm/cache-xsc3l2.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) --- a/arch/arm/mm/cache-feroceon-l2.c +++ b/arch/arm/mm/cache-feroceon-l2.c @@ -49,9 +49,9 @@ static inline unsigned long l2_get_va(un * we simply install a virtual mapping for it only for the * TLB lookup to occur, hence no need to flush the untouched * memory mapping afterwards (note: a cache flush may happen - * in some circumstances depending on the path taken in kunmap_atomic). + * in some circumstances depending on the path taken in kunmap_local). */ - void *vaddr = kmap_atomic_pfn(paddr >> PAGE_SHIFT); + void *vaddr = kmap_local_pfn(paddr >> PAGE_SHIFT); return (unsigned long)vaddr + (paddr & ~PAGE_MASK); #else return __phys_to_virt(paddr); @@ -61,7 +61,7 @@ static inline unsigned long l2_get_va(un static inline void l2_put_va(unsigned long vaddr) { #ifdef CONFIG_HIGHMEM - kunmap_atomic((void *)vaddr); + kunmap_local((void *)vaddr); #endif } --- a/arch/arm/mm/cache-xsc3l2.c +++ b/arch/arm/mm/cache-xsc3l2.c @@ -59,7 +59,7 @@ static inline void l2_unmap_va(unsigned { #ifdef CONFIG_HIGHMEM if (va != -1) - kunmap_atomic((void *)va); + kunmap_local((void *)va); #endif } @@ -75,7 +75,7 @@ static inline unsigned long l2_map_va(un * in place for it. */ l2_unmap_va(prev_va); - va = (unsigned long)kmap_atomic_pfn(pa >> PAGE_SHIFT); + va = (unsigned long)kmap_local_pfn(pa >> PAGE_SHIFT); } return va + (pa_offset >> (32 - PAGE_SHIFT)); #else _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel