lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

m68k: use ColdFire MMU read/write bit flags when ioremapping

Browse Source 
The ColdFire MMU has separate read and write bits, unlike the Motorola
m68k MMU which has a single read-only bit.

Define a _PAGE_READWRITE value for the Motorola MMU, which is 0, so we
can unconditionaly include that in the page table entry bits when setting
up ioremapped pages.

Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Acked-by: Matt Waddel <mwaddel@yahoo.com>
Acked-by: Kurt Mahan <kmahan@xmission.com>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
This commit is contained in:
Greg Ungerer
2011-10-18 16:16:43 +10:00
parent 6061019255
commit d49316e84b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/m68k/include/asm/motorola_pgtable.h
View File

@@ -8,6 +8,7 @@
#define _PAGE_PRESENT 0x001 #define _PAGE_PRESENT 0x001
#define _PAGE_SHORT 0x002 #define _PAGE_SHORT 0x002
#define _PAGE_RONLY 0x004 #define _PAGE_RONLY 0x004
#define _PAGE_READWRITE 0x000
#define _PAGE_ACCESSED 0x008 #define _PAGE_ACCESSED 0x008
#define _PAGE_DIRTY 0x010 #define _PAGE_DIRTY 0x010
#define _PAGE_SUPER 0x080 /* 68040 supervisor only */ #define _PAGE_SUPER 0x080 /* 68040 supervisor only */

3
arch/m68k/mm/kmap.c
View File

@@ -171,7 +171,8 @@ void __iomem *__ioremap(unsigned long physaddr, unsigned long size, int cachefla
break; break;
} }
} else { } else {
physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED | _PAGE_DIRTY); physaddr |= (_PAGE_PRESENT | _PAGE_ACCESSED |
_PAGE_DIRTY | _PAGE_READWRITE);
switch (cacheflag) { switch (cacheflag) {
case IOMAP_NOCACHE_SER: case IOMAP_NOCACHE_SER:
case IOMAP_NOCACHE_NONSER: case IOMAP_NOCACHE_NONSER: