mirror of
https://github.com/torvalds/linux.git
synced 2024-12-28 22:02:28 +00:00
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>
172 lines
4.9 KiB
C
172 lines
4.9 KiB
C
/*
|
|
* Definitions for Sun3 custom MMU.
|
|
*/
|
|
#ifndef __SUN3_MMU_H__
|
|
#define __SUN3_MMU_H__
|
|
|
|
#include <linux/types.h>
|
|
#include <asm/movs.h>
|
|
#include <asm/sun3-head.h>
|
|
|
|
/* MMU characteristics. */
|
|
#define SUN3_SEGMAPS_PER_CONTEXT 2048
|
|
#define SUN3_PMEGS_NUM 256
|
|
#define SUN3_CONTEXTS_NUM 8
|
|
|
|
#define SUN3_PMEG_SIZE_BITS 17
|
|
#define SUN3_PMEG_SIZE (1 << SUN3_PMEG_SIZE_BITS)
|
|
#define SUN3_PMEG_MASK (SUN3_PMEG_SIZE - 1)
|
|
|
|
#define SUN3_PTE_SIZE_BITS 13
|
|
#define SUN3_PTE_SIZE (1 << SUN3_PTE_SIZE_BITS)
|
|
#define SUN3_PTE_MASK (SUN3_PTE_SIZE - 1)
|
|
|
|
#define SUN3_CONTROL_MASK (0x0FFFFFFC)
|
|
#define SUN3_INVALID_PMEG 255
|
|
#define SUN3_INVALID_CONTEXT 255
|
|
|
|
#define AC_IDPROM 0x00000000 /* 34 ID PROM, R/O, byte, 32 bytes */
|
|
#define AC_PAGEMAP 0x10000000 /* 3 Pagemap R/W, long */
|
|
#define AC_SEGMAP 0x20000000 /* 3 Segment map, byte */
|
|
#define AC_CONTEXT 0x30000000 /* 34c current mmu-context */
|
|
#define AC_SENABLE 0x40000000 /* 34c system dvma/cache/reset enable reg*/
|
|
#define AC_UDVMA_ENB 0x50000000 /* 34 Not used on Sun boards, byte */
|
|
#define AC_BUS_ERROR 0x60000000 /* 34 Cleared on read, byte. */
|
|
#define AC_SYNC_ERR 0x60000000 /* c fault type */
|
|
#define AC_SYNC_VA 0x60000004 /* c fault virtual address */
|
|
#define AC_ASYNC_ERR 0x60000008 /* c asynchronous fault type */
|
|
#define AC_ASYNC_VA 0x6000000c /* c async fault virtual address */
|
|
#define AC_LEDS 0x70000000 /* 34 Zero turns on LEDs, byte */
|
|
#define AC_CACHETAGS 0x80000000 /* 34c direct access to the VAC tags */
|
|
#define AC_CACHEDDATA 0x90000000 /* 3 c direct access to the VAC data */
|
|
#define AC_UDVMA_MAP 0xD0000000 /* 4 Not used on Sun boards, byte */
|
|
#define AC_VME_VECTOR 0xE0000000 /* 4 For non-Autovector VME, byte */
|
|
#define AC_BOOT_SCC 0xF0000000 /* 34 bypass to access Zilog 8530. byte.*/
|
|
|
|
#define SUN3_PAGE_CHG_MASK (SUN3_PAGE_PGNUM_MASK \
|
|
| SUN3_PAGE_ACCESSED | SUN3_PAGE_MODIFIED)
|
|
|
|
/* Bus access type within PTE. */
|
|
#define SUN3_PAGE_TYPE_MASK (0x0c000000)
|
|
#define SUN3_PAGE_TYPE_MEMORY (0x00000000)
|
|
#define SUN3_PAGE_TYPE_IO (0x04000000)
|
|
#define SUN3_PAGE_TYPE_VME16 (0x08000000)
|
|
#define SUN3_PAGE_TYPE_VME32 (0x0c000000)
|
|
|
|
/* Mask for page number within PTE. */
|
|
#define SUN3_PAGE_PGNUM_MASK (0x0007FFFF)
|
|
|
|
/* Bits within bus-error register. */
|
|
#define SUN3_BUSERR_WATCHDOG (0x01)
|
|
#define SUN3_BUSERR_unused (0x02)
|
|
#define SUN3_BUSERR_FPAENERR (0x04)
|
|
#define SUN3_BUSERR_FPABERR (0x08)
|
|
#define SUN3_BUSERR_VMEBERR (0x10)
|
|
#define SUN3_BUSERR_TIMEOUT (0x20)
|
|
#define SUN3_BUSERR_PROTERR (0x40)
|
|
#define SUN3_BUSERR_INVALID (0x80)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
/* Read bus error status register (implicitly clearing it). */
|
|
static inline unsigned char sun3_get_buserr(void)
|
|
{
|
|
unsigned char sfc, c;
|
|
|
|
GET_SFC (sfc);
|
|
SET_SFC (FC_CONTROL);
|
|
GET_CONTROL_BYTE (AC_BUS_ERROR, c);
|
|
SET_SFC (sfc);
|
|
|
|
return c;
|
|
}
|
|
|
|
/* Read segmap from hardware MMU. */
|
|
static inline unsigned long sun3_get_segmap(unsigned long addr)
|
|
{
|
|
register unsigned long entry;
|
|
unsigned char c, sfc;
|
|
|
|
GET_SFC (sfc);
|
|
SET_SFC (FC_CONTROL);
|
|
GET_CONTROL_BYTE (AC_SEGMAP | (addr & SUN3_CONTROL_MASK), c);
|
|
SET_SFC (sfc);
|
|
entry = c;
|
|
|
|
return entry;
|
|
}
|
|
|
|
/* Write segmap to hardware MMU. */
|
|
static inline void sun3_put_segmap(unsigned long addr, unsigned long entry)
|
|
{
|
|
unsigned char sfc;
|
|
|
|
GET_DFC (sfc);
|
|
SET_DFC (FC_CONTROL);
|
|
SET_CONTROL_BYTE (AC_SEGMAP | (addr & SUN3_CONTROL_MASK), entry);
|
|
SET_DFC (sfc);
|
|
|
|
return;
|
|
}
|
|
|
|
/* Read PTE from hardware MMU. */
|
|
static inline unsigned long sun3_get_pte(unsigned long addr)
|
|
{
|
|
register unsigned long entry;
|
|
unsigned char sfc;
|
|
|
|
GET_SFC (sfc);
|
|
SET_SFC (FC_CONTROL);
|
|
GET_CONTROL_WORD (AC_PAGEMAP | (addr & SUN3_CONTROL_MASK), entry);
|
|
SET_SFC (sfc);
|
|
|
|
return entry;
|
|
}
|
|
|
|
/* Write PTE to hardware MMU. */
|
|
static inline void sun3_put_pte(unsigned long addr, unsigned long entry)
|
|
{
|
|
unsigned char sfc;
|
|
|
|
GET_DFC (sfc);
|
|
SET_DFC (FC_CONTROL);
|
|
SET_CONTROL_WORD (AC_PAGEMAP | (addr & SUN3_CONTROL_MASK), entry);
|
|
SET_DFC (sfc);
|
|
|
|
return;
|
|
}
|
|
|
|
/* get current context */
|
|
static inline unsigned char sun3_get_context(void)
|
|
{
|
|
unsigned char sfc, c;
|
|
|
|
GET_SFC(sfc);
|
|
SET_SFC(FC_CONTROL);
|
|
GET_CONTROL_BYTE(AC_CONTEXT, c);
|
|
SET_SFC(sfc);
|
|
|
|
return c;
|
|
}
|
|
|
|
/* set alternate context */
|
|
static inline void sun3_put_context(unsigned char c)
|
|
{
|
|
unsigned char dfc;
|
|
GET_DFC(dfc);
|
|
SET_DFC(FC_CONTROL);
|
|
SET_CONTROL_BYTE(AC_CONTEXT, c);
|
|
SET_DFC(dfc);
|
|
|
|
return;
|
|
}
|
|
|
|
extern void __iomem *sun3_ioremap(unsigned long phys, unsigned long size,
|
|
unsigned long type);
|
|
|
|
extern int sun3_map_test(unsigned long addr, char *val);
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#endif /* !__SUN3_MMU_H__ */
|