mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-29 23:53:32 +00:00
0195c00244
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAT3NKzROxKuMESys7AQKElw/+JyDxJSlj+g+nymkx8IVVuU8CsEwNLgRk
8KEnRfLhGtkXFLSJYWO6jzGo16F8Uqli1PdMFte/wagSv0285/HZaKlkkBVHdJ/m
u40oSjgT013bBh6MQ0Oaf8pFezFUiQB5zPOA9QGaLVGDLXCmgqUgd7exaD5wRIwB
ZmyItjZeAVnDfk1R+ZiNYytHAi8A5wSB+eFDCIQYgyulA1Igd1UnRtx+dRKbvc/m
rWQ6KWbZHIdvP1ksd8wHHkrlUD2pEeJ8glJLsZUhMm/5oMf/8RmOCvmo8rvE/qwl
eDQ1h4cGYlfjobxXZMHqAN9m7Jg2bI946HZjdb7/7oCeO6VW3FwPZ/Ic75p+wp45
HXJTItufERYk6QxShiOKvA+QexnYwY0IT5oRP4DrhdVB/X9cl2MoaZHC+RbYLQy+
/5VNZKi38iK4F9AbFamS7kd0i5QszA/ZzEzKZ6VMuOp3W/fagpn4ZJT1LIA3m4A9
Q0cj24mqeyCfjysu0TMbPtaN+Yjeu1o1OFRvM8XffbZsp5bNzuTDEvviJ2NXw4vK
4qUHulhYSEWcu9YgAZXvEWDEM78FXCkg2v/CrZXH5tyc95kUkMPcgG+QZBB5wElR
FaOKpiC/BuNIGEf02IZQ4nfDxE90QwnDeoYeV+FvNj9UEOopJ5z5bMPoTHxm4cCD
NypQthI85pc=
=G9mT
-----END PGP SIGNATURE-----
Merge tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system
Pull "Disintegrate and delete asm/system.h" from David Howells:
"Here are a bunch of patches to disintegrate asm/system.h into a set of
separate bits to relieve the problem of circular inclusion
dependencies.
I've built all the working defconfigs from all the arches that I can
and made sure that they don't break.
The reason for these patches is that I recently encountered a circular
dependency problem that came about when I produced some patches to
optimise get_order() by rewriting it to use ilog2().
This uses bitops - and on the SH arch asm/bitops.h drags in
asm-generic/get_order.h by a circuituous route involving asm/system.h.
The main difficulty seems to be asm/system.h. It holds a number of
low level bits with no/few dependencies that are commonly used (eg.
memory barriers) and a number of bits with more dependencies that
aren't used in many places (eg. switch_to()).
These patches break asm/system.h up into the following core pieces:
(1) asm/barrier.h
Move memory barriers here. This already done for MIPS and Alpha.
(2) asm/switch_to.h
Move switch_to() and related stuff here.
(3) asm/exec.h
Move arch_align_stack() here. Other process execution related bits
could perhaps go here from asm/processor.h.
(4) asm/cmpxchg.h
Move xchg() and cmpxchg() here as they're full word atomic ops and
frequently used by atomic_xchg() and atomic_cmpxchg().
(5) asm/bug.h
Move die() and related bits.
(6) asm/auxvec.h
Move AT_VECTOR_SIZE_ARCH here.
Other arch headers are created as needed on a per-arch basis."
Fixed up some conflicts from other header file cleanups and moving code
around that has happened in the meantime, so David's testing is somewhat
weakened by that. We'll find out anything that got broken and fix it..
* tag 'split-asm_system_h-for-linus-20120328' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-asm_system: (38 commits)
Delete all instances of asm/system.h
Remove all #inclusions of asm/system.h
Add #includes needed to permit the removal of asm/system.h
Move all declarations of free_initmem() to linux/mm.h
Disintegrate asm/system.h for OpenRISC
Split arch_align_stack() out from asm-generic/system.h
Split the switch_to() wrapper out of asm-generic/system.h
Move the asm-generic/system.h xchg() implementation to asm-generic/cmpxchg.h
Create asm-generic/barrier.h
Make asm-generic/cmpxchg.h #include asm-generic/cmpxchg-local.h
Disintegrate asm/system.h for Xtensa
Disintegrate asm/system.h for Unicore32 [based on ver #3, changed by gxt]
Disintegrate asm/system.h for Tile
Disintegrate asm/system.h for Sparc
Disintegrate asm/system.h for SH
Disintegrate asm/system.h for Score
Disintegrate asm/system.h for S390
Disintegrate asm/system.h for PowerPC
Disintegrate asm/system.h for PA-RISC
Disintegrate asm/system.h for MN10300
...
213 lines
6.2 KiB
C
213 lines
6.2 KiB
C
/*
|
|
* VM ops
|
|
*
|
|
* Copyright (C) 2008-2009 Michal Simek <monstr@monstr.eu>
|
|
* Copyright (C) 2008-2009 PetaLogix
|
|
* Copyright (C) 2006 Atmark Techno, Inc.
|
|
* Changes for MMU support:
|
|
* Copyright (C) 2007 Xilinx, Inc. All rights reserved.
|
|
*
|
|
* 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.
|
|
*/
|
|
|
|
#ifndef _ASM_MICROBLAZE_PAGE_H
|
|
#define _ASM_MICROBLAZE_PAGE_H
|
|
|
|
#include <linux/pfn.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/asm-compat.h>
|
|
#include <linux/const.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/* PAGE_SHIFT determines the page size */
|
|
#if defined(CONFIG_MICROBLAZE_32K_PAGES)
|
|
#define PAGE_SHIFT 15
|
|
#elif defined(CONFIG_MICROBLAZE_16K_PAGES)
|
|
#define PAGE_SHIFT 14
|
|
#elif defined(CONFIG_MICROBLAZE_8K_PAGES)
|
|
#define PAGE_SHIFT 13
|
|
#else
|
|
#define PAGE_SHIFT 12
|
|
#endif
|
|
#define PAGE_SIZE (ASM_CONST(1) << PAGE_SHIFT)
|
|
#define PAGE_MASK (~(PAGE_SIZE-1))
|
|
|
|
#define LOAD_OFFSET ASM_CONST((CONFIG_KERNEL_START-CONFIG_KERNEL_BASE_ADDR))
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* MS be sure that SLAB allocates aligned objects */
|
|
#define ARCH_DMA_MINALIGN L1_CACHE_BYTES
|
|
|
|
#define ARCH_SLAB_MINALIGN L1_CACHE_BYTES
|
|
|
|
#define PAGE_UP(addr) (((addr)+((PAGE_SIZE)-1))&(~((PAGE_SIZE)-1)))
|
|
#define PAGE_DOWN(addr) ((addr)&(~((PAGE_SIZE)-1)))
|
|
|
|
#ifndef CONFIG_MMU
|
|
/*
|
|
* PAGE_OFFSET -- the first address of the first page of memory. When not
|
|
* using MMU this corresponds to the first free page in physical memory (aligned
|
|
* on a page boundary).
|
|
*/
|
|
extern unsigned int __page_offset;
|
|
#define PAGE_OFFSET __page_offset
|
|
|
|
#else /* CONFIG_MMU */
|
|
|
|
/*
|
|
* PAGE_OFFSET -- the first address of the first page of memory. With MMU
|
|
* it is set to the kernel start address (aligned on a page boundary).
|
|
*
|
|
* CONFIG_KERNEL_START is defined in arch/microblaze/config.in and used
|
|
* in arch/microblaze/Makefile.
|
|
*/
|
|
#define PAGE_OFFSET CONFIG_KERNEL_START
|
|
|
|
/*
|
|
* The basic type of a PTE - 32 bit physical addressing.
|
|
*/
|
|
typedef unsigned long pte_basic_t;
|
|
#define PTE_SHIFT (PAGE_SHIFT - 2) /* 1024 ptes per page */
|
|
#define PTE_FMT "%.8lx"
|
|
|
|
#endif /* CONFIG_MMU */
|
|
|
|
# define copy_page(to, from) memcpy((to), (from), PAGE_SIZE)
|
|
# define clear_page(pgaddr) memset((pgaddr), 0, PAGE_SIZE)
|
|
|
|
# define clear_user_page(pgaddr, vaddr, page) memset((pgaddr), 0, PAGE_SIZE)
|
|
# define copy_user_page(vto, vfrom, vaddr, topg) \
|
|
memcpy((vto), (vfrom), PAGE_SIZE)
|
|
|
|
/*
|
|
* These are used to make use of C type-checking..
|
|
*/
|
|
typedef struct page *pgtable_t;
|
|
typedef struct { unsigned long pte; } pte_t;
|
|
typedef struct { unsigned long pgprot; } pgprot_t;
|
|
/* FIXME this can depend on linux kernel version */
|
|
# ifdef CONFIG_MMU
|
|
typedef struct { unsigned long pmd; } pmd_t;
|
|
typedef struct { unsigned long pgd; } pgd_t;
|
|
# else /* CONFIG_MMU */
|
|
typedef struct { unsigned long ste[64]; } pmd_t;
|
|
typedef struct { pmd_t pue[1]; } pud_t;
|
|
typedef struct { pud_t pge[1]; } pgd_t;
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# define pte_val(x) ((x).pte)
|
|
# define pgprot_val(x) ((x).pgprot)
|
|
|
|
# ifdef CONFIG_MMU
|
|
# define pmd_val(x) ((x).pmd)
|
|
# define pgd_val(x) ((x).pgd)
|
|
# else /* CONFIG_MMU */
|
|
# define pmd_val(x) ((x).ste[0])
|
|
# define pud_val(x) ((x).pue[0])
|
|
# define pgd_val(x) ((x).pge[0])
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# define __pte(x) ((pte_t) { (x) })
|
|
# define __pmd(x) ((pmd_t) { (x) })
|
|
# define __pgd(x) ((pgd_t) { (x) })
|
|
# define __pgprot(x) ((pgprot_t) { (x) })
|
|
|
|
/**
|
|
* Conversions for virtual address, physical address, pfn, and struct
|
|
* page are defined in the following files.
|
|
*
|
|
* virt -+
|
|
* | asm-microblaze/page.h
|
|
* phys -+
|
|
* | linux/pfn.h
|
|
* pfn -+
|
|
* | asm-generic/memory_model.h
|
|
* page -+
|
|
*
|
|
*/
|
|
|
|
extern unsigned long max_low_pfn;
|
|
extern unsigned long min_low_pfn;
|
|
extern unsigned long max_pfn;
|
|
|
|
extern unsigned long memory_start;
|
|
extern unsigned long memory_size;
|
|
extern unsigned long lowmem_size;
|
|
|
|
extern unsigned long kernel_tlb;
|
|
|
|
extern int page_is_ram(unsigned long pfn);
|
|
|
|
# define phys_to_pfn(phys) (PFN_DOWN(phys))
|
|
# define pfn_to_phys(pfn) (PFN_PHYS(pfn))
|
|
|
|
# define virt_to_pfn(vaddr) (phys_to_pfn((__pa(vaddr))))
|
|
# define pfn_to_virt(pfn) __va(pfn_to_phys((pfn)))
|
|
|
|
# ifdef CONFIG_MMU
|
|
|
|
# define virt_to_page(kaddr) (pfn_to_page(__pa(kaddr) >> PAGE_SHIFT))
|
|
# define page_to_virt(page) __va(page_to_pfn(page) << PAGE_SHIFT)
|
|
# define page_to_phys(page) (page_to_pfn(page) << PAGE_SHIFT)
|
|
|
|
# else /* CONFIG_MMU */
|
|
# define virt_to_page(vaddr) (pfn_to_page(virt_to_pfn(vaddr)))
|
|
# define page_to_virt(page) (pfn_to_virt(page_to_pfn(page)))
|
|
# define page_to_phys(page) (pfn_to_phys(page_to_pfn(page)))
|
|
# define page_to_bus(page) (page_to_phys(page))
|
|
# define phys_to_page(paddr) (pfn_to_page(phys_to_pfn(paddr)))
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# ifndef CONFIG_MMU
|
|
# define pfn_valid(pfn) (((pfn) >= min_low_pfn) && \
|
|
((pfn) <= (min_low_pfn + max_mapnr)))
|
|
# define ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT)
|
|
# else /* CONFIG_MMU */
|
|
# define ARCH_PFN_OFFSET (memory_start >> PAGE_SHIFT)
|
|
# define pfn_valid(pfn) ((pfn) < (max_mapnr + ARCH_PFN_OFFSET))
|
|
# define VALID_PAGE(page) ((page - mem_map) < max_mapnr)
|
|
# endif /* CONFIG_MMU */
|
|
|
|
# endif /* __ASSEMBLY__ */
|
|
|
|
#define virt_addr_valid(vaddr) (pfn_valid(virt_to_pfn(vaddr)))
|
|
|
|
# define __pa(x) __virt_to_phys((unsigned long)(x))
|
|
# define __va(x) ((void *)__phys_to_virt((unsigned long)(x)))
|
|
|
|
/* Convert between virtual and physical address for MMU. */
|
|
/* Handle MicroBlaze processor with virtual memory. */
|
|
#ifndef CONFIG_MMU
|
|
#define __virt_to_phys(addr) addr
|
|
#define __phys_to_virt(addr) addr
|
|
#define tophys(rd, rs) addik rd, rs, 0
|
|
#define tovirt(rd, rs) addik rd, rs, 0
|
|
#else
|
|
#define __virt_to_phys(addr) \
|
|
((addr) + CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START)
|
|
#define __phys_to_virt(addr) \
|
|
((addr) + CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
|
|
#define tophys(rd, rs) \
|
|
addik rd, rs, (CONFIG_KERNEL_BASE_ADDR - CONFIG_KERNEL_START)
|
|
#define tovirt(rd, rs) \
|
|
addik rd, rs, (CONFIG_KERNEL_START - CONFIG_KERNEL_BASE_ADDR)
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#define TOPHYS(addr) __virt_to_phys(addr)
|
|
|
|
#ifdef CONFIG_MMU
|
|
|
|
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
|
|
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
|
#endif /* CONFIG_MMU */
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#include <asm-generic/memory_model.h>
|
|
#include <asm-generic/getorder.h>
|
|
|
|
#endif /* _ASM_MICROBLAZE_PAGE_H */
|