Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fae7d1c5 authored by Ira Weiny's avatar Ira Weiny Committed by Bernhard Thoben
Browse files

arch/kmap: remove redundant arch specific kmaps 



The kmap code for all the architectures is almost 100% identical.

Lift the common code to the core.  Use ARCH_HAS_KMAP_FLUSH_TLB to indicate
if an arch defines kmap_flush_tlb() and call if if needed.

This also has the benefit of changing kmap() on a number of architectures
to be an inline call rather than an actual function.

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20200507150004.1423069-4-ira.weiny@intel.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 525aaf9bad00e7454b9f9b3873e92795afb59f8e)
parent 60a26e6c

arch/arm/include/asm/highmem.h

+0 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 


extern pte_t *pkmap_page_table;



extern void *kmap_high(struct page *page);

extern void kunmap_high(struct page *page);



/*
@@ -62,7 +61,6 @@ static inline void *kmap_high_get(struct page *page) 
 * when CONFIG_HIGHMEM is not set.

 */

#ifdef CONFIG_HIGHMEM

extern void *kmap(struct page *page);

extern void kunmap(struct page *page);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

arch/arm/mm/highmem.c

+0 −8
Original line number Diff line number Diff line
@@ -19,14 +19,6 @@ 
#include <asm/tlbflush.h>

#include "mm.h"



void *kmap(struct page *page)

{

	might_sleep();

	if (!PageHighMem(page))

		return page_address(page);

	return kmap_high(page);

}

EXPORT_SYMBOL(kmap);



void kunmap(struct page *page)

{

arch/csky/include/asm/highmem.h

0 → 100644
+51 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

// Copyright (C) 2018 Hangzhou C-SKY Microsystems co.,ltd.



#ifndef __ASM_CSKY_HIGHMEM_H

#define __ASM_CSKY_HIGHMEM_H



#ifdef __KERNEL__



#include <linux/init.h>

#include <linux/interrupt.h>

#include <linux/uaccess.h>

#include <asm/kmap_types.h>

#include <asm/cache.h>



/* undef for production */

#define HIGHMEM_DEBUG 1



/* declarations for highmem.c */

extern unsigned long highstart_pfn, highend_pfn;



extern pte_t *pkmap_page_table;



/*

 * Right now we initialize only a single pte table. It can be extended

 * easily, subsequent pte tables have to be allocated in one physical

 * chunk of RAM.

 */

#define LAST_PKMAP 1024

#define LAST_PKMAP_MASK (LAST_PKMAP-1)

#define PKMAP_NR(virt)  ((virt-PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))



extern void kunmap_high(struct page *page);



#define ARCH_HAS_KMAP_FLUSH_TLB

extern void kmap_flush_tlb(unsigned long addr);

extern void kunmap(struct page *page);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);

extern void *kmap_atomic_pfn(unsigned long pfn);

extern struct page *kmap_atomic_to_page(void *ptr);



#define flush_cache_kmaps() do {} while (0)



extern void kmap_init(void);



#define kmap_prot PAGE_KERNEL



#endif /* __KERNEL__ */



#endif /* __ASM_CSKY_HIGHMEM_H */

arch/microblaze/include/asm/highmem.h

+0 −9
Original line number Diff line number Diff line
@@ -50,19 +50,10 @@ extern pte_t *pkmap_page_table; 
#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))



extern void *kmap_high(struct page *page);

extern void kunmap_high(struct page *page);

extern void *kmap_atomic_prot(struct page *page, pgprot_t prot);

extern void __kunmap_atomic(void *kvaddr);



static inline void *kmap(struct page *page)

{

	might_sleep();

	if (!PageHighMem(page))

		return page_address(page);

	return kmap_high(page);

}



static inline void kunmap(struct page *page)

{

	BUG_ON(in_interrupt());

arch/mips/include/asm/highmem.h

+2 −2
Original line number Diff line number Diff line
@@ -42,10 +42,10 @@ extern pte_t *pkmap_page_table; 
#define PKMAP_NR(virt)	((virt-PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)	(PKMAP_BASE + ((nr) << PAGE_SHIFT))



extern void * kmap_high(struct page *page);

extern void kunmap_high(struct page *page);



extern void *kmap(struct page *page);

#define ARCH_HAS_KMAP_FLUSH_TLB

extern void kmap_flush_tlb(unsigned long addr);

extern void kunmap(struct page *page);

extern void *kmap_atomic(struct page *page);

extern void __kunmap_atomic(void *kvaddr);