renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-17 01:34:00 +08:00
Code

sh: Move over the SH-5 head.S and tlb.h.

Browse Source 
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
This commit is contained in:
Paul Mundt 2007-11-10 20:35:53 +09:00
parent 256b22ca66
commit 959f7d587e
6 changed files with 24 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/sh/kernel/Makefile_32
View File

@ -2,7 +2,7 @@
# Makefile for the Linux/SuperH kernel.
#
extra-y := head.o init_task.o vmlinux.lds
extra-y := head_32.o init_task.o vmlinux.lds
obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_32.o \
ptrace_32.o semaphore.o setup.o signal_32.o sys_sh.o syscalls.o \

2
arch/sh/kernel/Makefile_64
View File

@ -1,4 +1,4 @@
extra-y := head.o init_task.o vmlinux.lds
extra-y := head_64.o init_task.o vmlinux.lds
obj-y := debugtraps.o io.o io_generic.o irq.o machvec.o process_64.o \
ptrace_64.o semaphore.o setup.o signal_64.o sys_sh64.o syscalls.o \

0
arch/sh/kernel/head.S → arch/sh/kernel/head_32.S
View File

9
arch/sh64/kernel/head.S → arch/sh/kernel/head_64.S
View File

@ -19,14 +19,11 @@
* lethal@linux-sh.org: 8th May 2004
* Add early SCIF console DTLB mapping.
*/
#include <asm/page.h>
#include <asm/mmu_context.h>
#include <asm/cache.h>
#include <asm/tlb.h>
#include <asm/processor.h>
#include <asm/registers.h>
#include <asm/cpu/registers.h>
#include <asm/cpu/mmu_context.h>
#include <asm/thread_info.h>
/*
@ -368,5 +365,3 @@ hopeless:
* (r32) _start_kernel address
*/
blink tr7, ZERO

10
include/asm-sh/tlb.h
View File

@ -1,6 +1,12 @@
#ifndef __ASM_SH_TLB_H
#define __ASM_SH_TLB_H
#ifdef CONFIG_SUPERH64
# include "tlb_64.h"
#endif
#ifndef __ASSEMBLY__
#define tlb_start_vma(tlb, vma) \
flush_cache_range(vma, vma->vm_start, vma->vm_end)
@ -15,4 +21,6 @@
#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
#include <asm-generic/tlb.h>
#endif
#endif /* __ASSEMBLY__ */
#endif /* __ASM_SH_TLB_H */

45
include/asm-sh64/tlb.h → include/asm-sh/tlb_64.h
View File

@ -1,20 +1,14 @@
/*
* include/asm-sh64/tlb.h
* include/asm-sh/tlb_64.h
*
* Copyright (C) 2003 Paul Mundt
*
* 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_SH64_TLB_H
#define __ASM_SH64_TLB_H
/*
* Note! These are mostly unused, we just need the xTLB_LAST_VAR_UNRESTRICTED
* for head.S! Once this limitation is gone, we can clean the rest of this up.
*/
#ifndef __ASM_SH_TLB_64_H
#define __ASM_SH_TLB_64_H
/* ITLB defines */
#define ITLB_FIXED 0x00000000 /* First fixed ITLB, see head.S */
@ -63,30 +57,13 @@ static inline void __flush_tlb_slot(unsigned long long slot)
}
/* arch/sh64/mm/tlb.c */
extern int sh64_tlb_init(void);
extern unsigned long long sh64_next_free_dtlb_entry(void);
extern unsigned long long sh64_get_wired_dtlb_entry(void);
extern int sh64_put_wired_dtlb_entry(unsigned long long entry);
extern void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr, unsigned long asid, unsigned long paddr);
extern void sh64_teardown_tlb_slot(unsigned long long config_addr);
#define tlb_start_vma(tlb, vma) \
flush_cache_range(vma, vma->vm_start, vma->vm_end)
#define tlb_end_vma(tlb, vma) \
flush_tlb_range(vma, vma->vm_start, vma->vm_end)
#define __tlb_remove_tlb_entry(tlb, pte, address) do { } while (0)
/*
* Flush whole TLBs for MM
*/
#define tlb_flush(tlb) flush_tlb_mm((tlb)->mm)
#include <asm-generic/tlb.h>
int sh64_tlb_init(void);
unsigned long long sh64_next_free_dtlb_entry(void);
unsigned long long sh64_get_wired_dtlb_entry(void);
int sh64_put_wired_dtlb_entry(unsigned long long entry);
void sh64_setup_tlb_slot(unsigned long long config_addr, unsigned long eaddr,
unsigned long asid, unsigned long paddr);
void sh64_teardown_tlb_slot(unsigned long long config_addr);
#endif /* __ASSEMBLY__ */
#endif /* __ASM_SH64_TLB_H */
#endif /* __ASM_SH_TLB_64_H */