Commit a4c33e83 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

mips/mm/highmem: Switch to generic kmap atomic 



No reason having the same code in every architecture

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20201103095857.885321106@linutronix.de
parent 7ac1b26b

arch/mips/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -2719,6 +2719,7 @@ config WAR_MIPS34K_MISSED_ITLB 
config HIGHMEM

	bool "High Memory Support"

	depends on 32BIT && CPU_SUPPORTS_HIGHMEM && SYS_SUPPORTS_HIGHMEM && !CPU_MIPS32_3_5_EVA

	select KMAP_LOCAL



config CPU_SUPPORTS_HIGHMEM

	bool

arch/mips/include/asm/fixmap.h

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include <spaces.h>

#ifdef CONFIG_HIGHMEM

#include <linux/threads.h>

#include <asm/kmap_types.h>

#include <asm/kmap_size.h>

#endif



/*
@@ -52,7 +52,7 @@ enum fixed_addresses { 
#ifdef CONFIG_HIGHMEM

	/* reserved pte's for temporary kernel mappings */

	FIX_KMAP_BEGIN = FIX_CMAP_END + 1,

	FIX_KMAP_END = FIX_KMAP_BEGIN+(KM_TYPE_NR*NR_CPUS)-1,

	FIX_KMAP_END = FIX_KMAP_BEGIN + (KM_MAX_IDX * NR_CPUS) - 1,

#endif

	__end_of_fixed_addresses

};

arch/mips/include/asm/highmem.h

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
#include <linux/interrupt.h>

#include <linux/uaccess.h>

#include <asm/cpu-features.h>

#include <asm/kmap_types.h>

#include <asm/kmap_size.h>



/* declarations for highmem.c */

extern unsigned long highstart_pfn, highend_pfn;
@@ -48,11 +48,11 @@ extern pte_t *pkmap_page_table; 


#define ARCH_HAS_KMAP_FLUSH_TLB

extern void kmap_flush_tlb(unsigned long addr);

extern void *kmap_atomic_pfn(unsigned long pfn);



#define flush_cache_kmaps()	BUG_ON(cpu_has_dc_aliases)



extern void kmap_init(void);

#define arch_kmap_local_post_map(vaddr, pteval)	local_flush_tlb_one(vaddr)

#define arch_kmap_local_post_unmap(vaddr)	local_flush_tlb_one(vaddr)



#endif /* __KERNEL__ */

arch/mips/include/asm/kmap_types.h

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

#ifndef _ASM_KMAP_TYPES_H

#define _ASM_KMAP_TYPES_H



#ifdef CONFIG_DEBUG_HIGHMEM

#define	 __WITH_KM_FENCE

#endif



#include <asm-generic/kmap_types.h>



#undef __WITH_KM_FENCE



#endif

arch/mips/mm/highmem.c

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

#include <asm/tlbflush.h>



static pte_t *kmap_pte;



unsigned long highstart_pfn, highend_pfn;



void kmap_flush_tlb(unsigned long addr)
@@ -17,78 +15,3 @@ void kmap_flush_tlb(unsigned long addr) 
	flush_tlb_one(addr);

}

EXPORT_SYMBOL(kmap_flush_tlb);
 


void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)

{

	unsigned long vaddr;

	int idx, type;



	type = kmap_atomic_idx_push();

	idx = type + KM_TYPE_NR*smp_processor_id();

	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);

#ifdef CONFIG_DEBUG_HIGHMEM

	BUG_ON(!pte_none(*(kmap_pte - idx)));

#endif

	set_pte(kmap_pte-idx, mk_pte(page, prot));

	local_flush_tlb_one((unsigned long)vaddr);



	return (void*) vaddr;

}

EXPORT_SYMBOL(kmap_atomic_high_prot);



void kunmap_atomic_high(void *kvaddr)

{

	unsigned long vaddr = (unsigned long) kvaddr & PAGE_MASK;

	int type __maybe_unused;



	if (vaddr < FIXADDR_START)

		return;



	type = kmap_atomic_idx();

#ifdef CONFIG_DEBUG_HIGHMEM

	{

		int idx = type + KM_TYPE_NR * smp_processor_id();



		BUG_ON(vaddr != __fix_to_virt(FIX_KMAP_BEGIN + idx));



		/*

		 * force other mappings to Oops if they'll try to access

		 * this pte without first remap it

		 */

		pte_clear(&init_mm, vaddr, kmap_pte-idx);

		local_flush_tlb_one(vaddr);

	}

#endif

	kmap_atomic_idx_pop();

}

EXPORT_SYMBOL(kunmap_atomic_high);



/*

 * This is the same as kmap_atomic() but can map memory that doesn't

 * have a struct page associated with it.

 */

void *kmap_atomic_pfn(unsigned long pfn)

{

	unsigned long vaddr;

	int idx, type;



	preempt_disable();

	pagefault_disable();



	type = kmap_atomic_idx_push();

	idx = type + KM_TYPE_NR*smp_processor_id();

	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);

	set_pte(kmap_pte-idx, pfn_pte(pfn, PAGE_KERNEL));

	flush_tlb_one(vaddr);



	return (void*) vaddr;

}



void __init kmap_init(void)

{

	unsigned long kmap_vstart;



	/* cache the first kmap pte */

	kmap_vstart = __fix_to_virt(FIX_KMAP_BEGIN);

	kmap_pte = virt_to_kpte(kmap_vstart);

}