Commit 2c419bde authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[POWERPC] Port fixmap from x86 and use for kmap_atomic 



The fixmap code from x86 allows us to have compile time virtual addresses
that we change the physical addresses of at run time.

This is useful for applications like kmap_atomic, PCI config that is done
via direct memory map, kexec/kdump.

We got ride of CONFIG_HIGHMEM_START as we can now determine a more optimal
location for PKMAP_BASE based on where the fixmap addresses start and
working back from there.

Additionally, the kmap code in asm-powerpc/highmem.h always had debug
enabled.  Moved to using CONFIG_DEBUG_HIGHMEM to determine if we should
have the extra debug checking.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 2fd53e02

arch/powerpc/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -626,20 +626,6 @@ config ADVANCED_OPTIONS 
comment "Default settings for advanced configuration options are used"

	depends on !ADVANCED_OPTIONS



config HIGHMEM_START_BOOL

	bool "Set high memory pool address"

	depends on ADVANCED_OPTIONS && HIGHMEM

	help

	  This option allows you to set the base address of the kernel virtual

	  area used to map high memory pages.  This can be useful in

	  optimizing the layout of kernel virtual memory.



	  Say N here unless you know what you are doing.



config HIGHMEM_START

	hex "Virtual start address of high memory pool" if HIGHMEM_START_BOOL

	default "0xfe000000"



config LOWMEM_SIZE_BOOL

	bool "Set maximum low memory"

	depends on ADVANCED_OPTIONS

arch/powerpc/mm/init_32.c

+0 −8
Original line number Diff line number Diff line
@@ -71,14 +71,6 @@ unsigned long agp_special_page; 
EXPORT_SYMBOL(agp_special_page);

#endif



#ifdef CONFIG_HIGHMEM

pte_t *kmap_pte;

pgprot_t kmap_prot;



EXPORT_SYMBOL(kmap_prot);

EXPORT_SYMBOL(kmap_pte);

#endif



void MMU_init(void);



/* XXX should be in current.h  -- paulus */

arch/powerpc/mm/mem.c

+26 −6
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <asm/tlb.h>

#include <asm/sections.h>

#include <asm/vdso.h>

#include <asm/fixmap.h>



#include "mmu_decl.h"
@@ -57,6 +58,20 @@ int init_bootmem_done; 
int mem_init_done;

unsigned long memory_limit;



#ifdef CONFIG_HIGHMEM

pte_t *kmap_pte;

pgprot_t kmap_prot;



EXPORT_SYMBOL(kmap_prot);

EXPORT_SYMBOL(kmap_pte);



static inline pte_t *virt_to_kpte(unsigned long vaddr)

{

	return pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k(vaddr),

			vaddr), vaddr), vaddr);

}

#endif



int page_is_ram(unsigned long pfn)

{

	unsigned long paddr = (pfn << PAGE_SHIFT);
@@ -311,14 +326,19 @@ void __init paging_init(void) 
	unsigned long top_of_ram = lmb_end_of_DRAM();

	unsigned long max_zone_pfns[MAX_NR_ZONES];



#ifdef CONFIG_PPC32

	unsigned long v = __fix_to_virt(__end_of_fixed_addresses - 1);

	unsigned long end = __fix_to_virt(FIX_HOLE);



	for (; v < end; v += PAGE_SIZE)

		map_page(v, 0, 0); /* XXX gross */

#endif



#ifdef CONFIG_HIGHMEM

	map_page(PKMAP_BASE, 0, 0);	/* XXX gross */

	pkmap_page_table = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k

			(PKMAP_BASE), PKMAP_BASE), PKMAP_BASE), PKMAP_BASE);

	map_page(KMAP_FIX_BEGIN, 0, 0);	/* XXX gross */

	kmap_pte = pte_offset_kernel(pmd_offset(pud_offset(pgd_offset_k

			(KMAP_FIX_BEGIN), KMAP_FIX_BEGIN), KMAP_FIX_BEGIN),

			 KMAP_FIX_BEGIN);

	pkmap_page_table = virt_to_kpte(PKMAP_BASE);



	kmap_pte = virt_to_kpte(__fix_to_virt(FIX_KMAP_BEGIN));

	kmap_prot = PAGE_KERNEL;

#endif /* CONFIG_HIGHMEM */

arch/powerpc/mm/pgtable_32.c

+23 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 


#include <asm/pgtable.h>

#include <asm/pgalloc.h>

#include <asm/fixmap.h>

#include <asm/io.h>



#include "mmu_decl.h"
@@ -387,3 +388,25 @@ void kernel_map_pages(struct page *page, int numpages, int enable) 
	change_page_attr(page, numpages, enable ? PAGE_KERNEL : __pgprot(0));

}

#endif /* CONFIG_DEBUG_PAGEALLOC */



static int fixmaps;

unsigned long FIXADDR_TOP = 0xfffff000;

EXPORT_SYMBOL(FIXADDR_TOP);



void __set_fixmap (enum fixed_addresses idx, phys_addr_t phys, pgprot_t flags)

{

	unsigned long address = __fix_to_virt(idx);



	if (idx >= __end_of_fixed_addresses) {

		BUG();

		return;

	}



	map_page(address, phys, flags);

	fixmaps++;

}



void __this_fixmap_does_not_exist(void)

{

	WARN_ON(1);

}

include/asm-powerpc/fixmap.h

0 → 100644
+106 −0
Original line number Diff line number Diff line 
/*

 * fixmap.h: compile-time virtual memory allocation

 *

 * This file is subject to the terms and conditions of the GNU General Public

 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 *

 * Copyright (C) 1998 Ingo Molnar

 *

 * Copyright 2008 Freescale Semiconductor Inc.

 *   Port to powerpc added by Kumar Gala

 */



#ifndef _ASM_FIXMAP_H

#define _ASM_FIXMAP_H



extern unsigned long FIXADDR_TOP;



#ifndef __ASSEMBLY__

#include <linux/kernel.h>

#include <asm/page.h>

#ifdef CONFIG_HIGHMEM

#include <linux/threads.h>

#include <asm/kmap_types.h>

#endif



/*

 * Here we define all the compile-time 'special' virtual

 * addresses. The point is to have a constant address at

 * compile time, but to set the physical address only

 * in the boot process. We allocate these special addresses

 * from the end of virtual memory (0xfffff000) backwards.

 * Also this lets us do fail-safe vmalloc(), we

 * can guarantee that these special addresses and

 * vmalloc()-ed addresses never overlap.

 *

 * these 'compile-time allocated' memory buffers are

 * fixed-size 4k pages. (or larger if used with an increment

 * highger than 1) use fixmap_set(idx,phys) to associate

 * physical memory with fixmap indices.

 *

 * TLB entries of such buffers will not be flushed across

 * task switches.

 */

enum fixed_addresses {

	FIX_HOLE,

#ifdef CONFIG_HIGHMEM

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

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

#endif

	/* FIX_PCIE_MCFG, */

	__end_of_fixed_addresses

};



extern void __set_fixmap (enum fixed_addresses idx,

					phys_addr_t phys, pgprot_t flags);



#define set_fixmap(idx, phys) \

		__set_fixmap(idx, phys, PAGE_KERNEL)

/*

 * Some hardware wants to get fixmapped without caching.

 */

#define set_fixmap_nocache(idx, phys) \

		__set_fixmap(idx, phys, PAGE_KERNEL_NOCACHE)



#define clear_fixmap(idx) \

		__set_fixmap(idx, 0, __pgprot(0))



#define __FIXADDR_SIZE	(__end_of_fixed_addresses << PAGE_SHIFT)

#define FIXADDR_START		(FIXADDR_TOP - __FIXADDR_SIZE)



#define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))

#define __virt_to_fix(x)	((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)



extern void __this_fixmap_does_not_exist(void);



/*

 * 'index to address' translation. If anyone tries to use the idx

 * directly without tranlation, we catch the bug with a NULL-deference

 * kernel oops. Illegal ranges of incoming indices are caught too.

 */

static __always_inline unsigned long fix_to_virt(const unsigned int idx)

{

	/*

	 * this branch gets completely eliminated after inlining,

	 * except when someone tries to use fixaddr indices in an

	 * illegal way. (such as mixing up address types or using

	 * out-of-range indices).

	 *

	 * If it doesn't get removed, the linker will complain

	 * loudly with a reasonably clear error message..

	 */

	if (idx >= __end_of_fixed_addresses)

		__this_fixmap_does_not_exist();



        return __fix_to_virt(idx);

}



static inline unsigned long virt_to_fix(const unsigned long vaddr)

{

	BUG_ON(vaddr >= FIXADDR_TOP || vaddr < FIXADDR_START);

	return __virt_to_fix(vaddr);

}



#endif /* !__ASSEMBLY__ */

#endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE