m68k: merge the mmu and non-mmu versions of mmu_context.h
Simple merge of the mmu and non-mmu versions of mmu_context.h Signed-off-by: Greg Ungerer <gerg@uclinux.org>
This commit is contained in:
parent
2844b66035
commit
66d73f00a6
|
@ -1,5 +1,175 @@
|
|||
#ifdef __uClinux__
|
||||
#include "mmu_context_no.h"
|
||||
#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)
|
||||
{
|
||||
}
|
||||
|
||||
#ifdef CONFIG_MMU
|
||||
#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
|
||||
#include "mmu_context_mm.h"
|
||||
"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
|
||||
#else /* !CONFIG_MMU */
|
||||
|
||||
static inline int init_new_context(struct task_struct *tsk, struct mm_struct *mm)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
|
||||
{
|
||||
}
|
||||
|
||||
#define destroy_context(mm) do { } while (0)
|
||||
#define deactivate_mm(tsk,mm) do { } while (0)
|
||||
|
||||
static inline void activate_mm(struct mm_struct *prev_mm, struct mm_struct *next_mm)
|
||||
{
|
||||
}
|
||||
|
||||
#endif /* CONFIG_MMU */
|
||||
#endif /* __M68K_MMU_CONTEXT_H */
|
||||
|
|
|
@ -1,154 +0,0 @@
|
|||
#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
|
|
@ -1,33 +0,0 @@
|
|||
#ifndef __M68KNOMMU_MMU_CONTEXT_H
|
||||
#define __M68KNOMMU_MMU_CONTEXT_H
|
||||
|
||||
#include <asm/setup.h>
|
||||
#include <asm/page.h>
|
||||
#include <asm/pgalloc.h>
|
||||
#include <asm-generic/mm_hooks.h>
|
||||
|
||||
static inline void enter_lazy_tlb(struct mm_struct *mm, struct task_struct *tsk)
|
||||
{
|
||||
}
|
||||
|
||||
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(struct mm_struct *prev, struct mm_struct *next, struct task_struct *tsk)
|
||||
{
|
||||
}
|
||||
|
||||
#define deactivate_mm(tsk,mm) do { } while (0)
|
||||
|
||||
static inline void activate_mm(struct mm_struct *prev_mm,
|
||||
struct mm_struct *next_mm)
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
Loading…
Reference in New Issue