49148020bc
Merge header files for m68k and m68knommu to the single location:
arch/m68k/include/asm
The majority of this patch was the result of the
script that is included in the changelog below.
The script was originally written by Arnd Bergman and
exten by me to cover a few more files.
When the header files differed the script uses the following:
The original m68k file is named <file>_mm.h [mm for memory manager]
The m68knommu file is named <file>_no.h [no for no memory manager]
The files uses the following include guard:
This include gaurd works as the m68knommu toolchain set
the __uClinux__ symbol - so this should work in userspace too.
Merging the header files for m68k and m68knommu exposes the
(unexpected?) ABI differences thus it is easier to actually
identify these and thus to fix them.
The commit has been build tested with both a m68k and
a m68knommu toolchain - with success.
The commit has also been tested with "make headers_check"
and this patch fixes make headers_check for m68knommu.
The script used:
TARGET=arch/m68k/include/asm
SOURCE=arch/m68knommu/include/asm
INCLUDE="cachectl.h errno.h fcntl.h hwtest.h ioctls.h ipcbuf.h \
linkage.h math-emu.h md.h mman.h movs.h msgbuf.h openprom.h \
oplib.h poll.h posix_types.h resource.h rtc.h sembuf.h shmbuf.h \
shm.h shmparam.h socket.h sockios.h spinlock.h statfs.h stat.h \
termbits.h termios.h tlb.h types.h user.h"
EQUAL="auxvec.h cputime.h device.h emergency-restart.h futex.h \
ioctl.h irq_regs.h kdebug.h local.h mutex.h percpu.h \
sections.h topology.h"
NOMUUFILES="anchor.h bootstd.h coldfire.h commproc.h dbg.h \
elia.h flat.h m5206sim.h m520xsim.h m523xsim.h m5249sim.h \
m5272sim.h m527xsim.h m528xsim.h m5307sim.h m532xsim.h \
m5407sim.h m68360_enet.h m68360.h m68360_pram.h m68360_quicc.h \
m68360_regs.h MC68328.h MC68332.h MC68EZ328.h MC68VZ328.h \
mcfcache.h mcfdma.h mcfmbus.h mcfne.h mcfpci.h mcfpit.h \
mcfsim.h mcfsmc.h mcftimer.h mcfuart.h mcfwdebug.h \
nettel.h quicc_simple.h smp.h"
FILES="atomic.h bitops.h bootinfo.h bug.h bugs.h byteorder.h cache.h \
cacheflush.h checksum.h current.h delay.h div64.h \
dma-mapping.h dma.h elf.h entry.h fb.h fpu.h hardirq.h hw_irq.h io.h \
irq.h kmap_types.h machdep.h mc146818rtc.h mmu.h mmu_context.h \
module.h page.h page_offset.h param.h pci.h pgalloc.h \
pgtable.h processor.h ptrace.h scatterlist.h segment.h \
setup.h sigcontext.h siginfo.h signal.h string.h system.h swab.h \
thread_info.h timex.h tlbflush.h traps.h uaccess.h ucontext.h \
unaligned.h unistd.h"
mergefile() {
BASE=${1%.h}
git mv ${SOURCE}/$1 ${TARGET}/${BASE}_no.h
git mv ${TARGET}/$1 ${TARGET}/${BASE}_mm.h
cat << EOF > ${TARGET}/$1
EOF
git add ${TARGET}/$1
}
set -e
mkdir -p ${TARGET}
git mv include/asm-m68k/* ${TARGET}
rmdir include/asm-m68k
git rm ${SOURCE}/Kbuild
for F in $INCLUDE $EQUAL; do
git rm ${SOURCE}/$F
done
for F in $NOMUUFILES; do
git mv ${SOURCE}/$F ${TARGET}/$F
done
for F in $FILES ; do
mergefile $F
done
rmdir arch/m68knommu/include/asm
rmdir arch/m68knommu/include
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
155 lines
3.3 KiB
C
155 lines
3.3 KiB
C
#ifndef __M68K_MMU_CONTEXT_H
|
|
#define __M68K_MMU_CONTEXT_H
|
|
|
|
#include <asm-generic/mm_hooks.h>
|
|
|
|
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
|
|
{
|
|
}
|
|
|
|
#ifndef CONFIG_SUN3
|
|
|
|
#include <asm/setup.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgalloc.h>
|
|
|
|
static inline int init_new_context(struct task_struct *tsk,
|
|
struct mm_struct *mm)
|
|
{
|
|
mm->context = virt_to_phys(mm->pgd);
|
|
return 0;
|
|
}
|
|
|
|
#define destroy_context(mm) do { } while(0)
|
|
|
|
static inline void switch_mm_0230(struct mm_struct *mm)
|
|
{
|
|
unsigned long crp[2] = {
|
|
0x80000000 | _PAGE_TABLE, mm->context
|
|
};
|
|
unsigned long tmp;
|
|
|
|
asm volatile (".chip 68030");
|
|
|
|
/* flush MC68030/MC68020 caches (they are virtually addressed) */
|
|
asm volatile (
|
|
"movec %%cacr,%0;"
|
|
"orw %1,%0; "
|
|
"movec %0,%%cacr"
|
|
: "=d" (tmp) : "di" (FLUSH_I_AND_D));
|
|
|
|
/* Switch the root pointer. For a 030-only kernel,
|
|
* avoid flushing the whole ATC, we only need to
|
|
* flush the user entries. The 68851 does this by
|
|
* itself. Avoid a runtime check here.
|
|
*/
|
|
asm volatile (
|
|
#ifdef CPU_M68030_ONLY
|
|
"pmovefd %0,%%crp; "
|
|
"pflush #0,#4"
|
|
#else
|
|
"pmove %0,%%crp"
|
|
#endif
|
|
: : "m" (crp[0]));
|
|
|
|
asm volatile (".chip 68k");
|
|
}
|
|
|
|
static inline void switch_mm_0460(struct mm_struct *mm)
|
|
{
|
|
asm volatile (".chip 68040");
|
|
|
|
/* flush address translation cache (user entries) */
|
|
asm volatile ("pflushan");
|
|
|
|
/* switch the root pointer */
|
|
asm volatile ("movec %0,%%urp" : : "r" (mm->context));
|
|
|
|
if (CPU_IS_060) {
|
|
unsigned long tmp;
|
|
|
|
/* clear user entries in the branch cache */
|
|
asm volatile (
|
|
"movec %%cacr,%0; "
|
|
"orl %1,%0; "
|
|
"movec %0,%%cacr"
|
|
: "=d" (tmp): "di" (0x00200000));
|
|
}
|
|
|
|
asm volatile (".chip 68k");
|
|
}
|
|
|
|
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
|
|
{
|
|
if (prev != next) {
|
|
if (CPU_IS_020_OR_030)
|
|
switch_mm_0230(next);
|
|
else
|
|
switch_mm_0460(next);
|
|
}
|
|
}
|
|
|
|
#define deactivate_mm(tsk,mm) do { } while (0)
|
|
|
|
static inline void activate_mm(struct mm_struct *prev_mm,
|
|
struct mm_struct *next_mm)
|
|
{
|
|
next_mm->context = virt_to_phys(next_mm->pgd);
|
|
|
|
if (CPU_IS_020_OR_030)
|
|
switch_mm_0230(next_mm);
|
|
else
|
|
switch_mm_0460(next_mm);
|
|
}
|
|
|
|
#else /* CONFIG_SUN3 */
|
|
#include <asm/sun3mmu.h>
|
|
#include <linux/sched.h>
|
|
|
|
extern unsigned long get_free_context(struct mm_struct *mm);
|
|
extern void clear_context(unsigned long context);
|
|
|
|
/* set the context for a new task to unmapped */
|
|
static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
|
|
{
|
|
mm->context = SUN3_INVALID_CONTEXT;
|
|
return 0;
|
|
}
|
|
|
|
/* find the context given to this process, and if it hasn't already
|
|
got one, go get one for it. */
|
|
static inline void get_mmu_context(struct mm_struct *mm)
|
|
{
|
|
if(mm->context == SUN3_INVALID_CONTEXT)
|
|
mm->context = get_free_context(mm);
|
|
}
|
|
|
|
/* flush context if allocated... */
|
|
static inline void destroy_context(struct mm_struct *mm)
|
|
{
|
|
if(mm->context != SUN3_INVALID_CONTEXT)
|
|
clear_context(mm->context);
|
|
}
|
|
|
|
static inline void activate_context(struct mm_struct *mm)
|
|
{
|
|
get_mmu_context(mm);
|
|
sun3_put_context(mm->context);
|
|
}
|
|
|
|
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
|
|
{
|
|
activate_context(tsk->mm);
|
|
}
|
|
|
|
#define deactivate_mm(tsk,mm) do { } while (0)
|
|
|
|
static inline void activate_mm(struct mm_struct *prev_mm,
|
|
struct mm_struct *next_mm)
|
|
{
|
|
activate_context(next_mm);
|
|
}
|
|
|
|
#endif
|
|
#endif
|