![Sam Ravnborg](/assets/img/avatar_default.png)
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>
229 lines
5.3 KiB
C
229 lines
5.3 KiB
C
#ifndef _M68K_PAGE_H
|
|
#define _M68K_PAGE_H
|
|
|
|
#include <linux/const.h>
|
|
|
|
/* PAGE_SHIFT determines the page size */
|
|
#ifndef CONFIG_SUN3
|
|
#define PAGE_SHIFT (12)
|
|
#else
|
|
#define PAGE_SHIFT (13)
|
|
#endif
|
|
#define PAGE_SIZE (_AC(1, UL) << PAGE_SHIFT)
|
|
#define PAGE_MASK (~(PAGE_SIZE-1))
|
|
|
|
#include <asm/setup.h>
|
|
|
|
#if PAGE_SHIFT < 13
|
|
#define THREAD_SIZE (8192)
|
|
#else
|
|
#define THREAD_SIZE PAGE_SIZE
|
|
#endif
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#include <linux/compiler.h>
|
|
|
|
#include <asm/module.h>
|
|
|
|
#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
|
|
#define free_user_page(page, addr) free_page(addr)
|
|
|
|
/*
|
|
* We don't need to check for alignment etc.
|
|
*/
|
|
#ifdef CPU_M68040_OR_M68060_ONLY
|
|
static inline void copy_page(void *to, void *from)
|
|
{
|
|
unsigned long tmp;
|
|
|
|
__asm__ __volatile__("1:\t"
|
|
".chip 68040\n\t"
|
|
"move16 %1@+,%0@+\n\t"
|
|
"move16 %1@+,%0@+\n\t"
|
|
".chip 68k\n\t"
|
|
"dbra %2,1b\n\t"
|
|
: "=a" (to), "=a" (from), "=d" (tmp)
|
|
: "0" (to), "1" (from) , "2" (PAGE_SIZE / 32 - 1)
|
|
);
|
|
}
|
|
|
|
static inline void clear_page(void *page)
|
|
{
|
|
unsigned long tmp;
|
|
unsigned long *sp = page;
|
|
|
|
*sp++ = 0;
|
|
*sp++ = 0;
|
|
*sp++ = 0;
|
|
*sp++ = 0;
|
|
|
|
__asm__ __volatile__("1:\t"
|
|
".chip 68040\n\t"
|
|
"move16 %2@+,%0@+\n\t"
|
|
".chip 68k\n\t"
|
|
"subqw #8,%2\n\t"
|
|
"subqw #8,%2\n\t"
|
|
"dbra %1,1b\n\t"
|
|
: "=a" (sp), "=d" (tmp)
|
|
: "a" (page), "0" (sp),
|
|
"1" ((PAGE_SIZE - 16) / 16 - 1));
|
|
}
|
|
|
|
#else
|
|
#define clear_page(page) memset((page), 0, PAGE_SIZE)
|
|
#define copy_page(to,from) memcpy((to), (from), PAGE_SIZE)
|
|
#endif
|
|
|
|
#define clear_user_page(addr, vaddr, page) \
|
|
do { clear_page(addr); \
|
|
flush_dcache_page(page); \
|
|
} while (0)
|
|
#define copy_user_page(to, from, vaddr, page) \
|
|
do { copy_page(to, from); \
|
|
flush_dcache_page(page); \
|
|
} while (0)
|
|
|
|
/*
|
|
* These are used to make use of C type-checking..
|
|
*/
|
|
typedef struct { unsigned long pte; } pte_t;
|
|
typedef struct { unsigned long pmd[16]; } pmd_t;
|
|
typedef struct { unsigned long pgd; } pgd_t;
|
|
typedef struct { unsigned long pgprot; } pgprot_t;
|
|
typedef struct page *pgtable_t;
|
|
|
|
#define pte_val(x) ((x).pte)
|
|
#define pmd_val(x) ((&x)->pmd[0])
|
|
#define pgd_val(x) ((x).pgd)
|
|
#define pgprot_val(x) ((x).pgprot)
|
|
|
|
#define __pte(x) ((pte_t) { (x) } )
|
|
#define __pmd(x) ((pmd_t) { (x) } )
|
|
#define __pgd(x) ((pgd_t) { (x) } )
|
|
#define __pgprot(x) ((pgprot_t) { (x) } )
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
|
|
#include <asm/page_offset.h>
|
|
|
|
#define PAGE_OFFSET (PAGE_OFFSET_RAW)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
extern unsigned long m68k_memoffset;
|
|
|
|
#ifndef CONFIG_SUN3
|
|
|
|
#define WANT_PAGE_VIRTUAL
|
|
|
|
static inline unsigned long ___pa(void *vaddr)
|
|
{
|
|
unsigned long paddr;
|
|
asm (
|
|
"1: addl #0,%0\n"
|
|
m68k_fixup(%c2, 1b+2)
|
|
: "=r" (paddr)
|
|
: "0" (vaddr), "i" (m68k_fixup_memoffset));
|
|
return paddr;
|
|
}
|
|
#define __pa(vaddr) ___pa((void *)(vaddr))
|
|
static inline void *__va(unsigned long paddr)
|
|
{
|
|
void *vaddr;
|
|
asm (
|
|
"1: subl #0,%0\n"
|
|
m68k_fixup(%c2, 1b+2)
|
|
: "=r" (vaddr)
|
|
: "0" (paddr), "i" (m68k_fixup_memoffset));
|
|
return vaddr;
|
|
}
|
|
|
|
#else /* !CONFIG_SUN3 */
|
|
/* This #define is a horrible hack to suppress lots of warnings. --m */
|
|
#define __pa(x) ___pa((unsigned long)(x))
|
|
static inline unsigned long ___pa(unsigned long x)
|
|
{
|
|
if(x == 0)
|
|
return 0;
|
|
if(x >= PAGE_OFFSET)
|
|
return (x-PAGE_OFFSET);
|
|
else
|
|
return (x+0x2000000);
|
|
}
|
|
|
|
static inline void *__va(unsigned long x)
|
|
{
|
|
if(x == 0)
|
|
return (void *)0;
|
|
|
|
if(x < 0x2000000)
|
|
return (void *)(x+PAGE_OFFSET);
|
|
else
|
|
return (void *)(x-0x2000000);
|
|
}
|
|
#endif /* CONFIG_SUN3 */
|
|
|
|
/*
|
|
* NOTE: virtual isn't really correct, actually it should be the offset into the
|
|
* memory node, but we have no highmem, so that works for now.
|
|
* TODO: implement (fast) pfn<->pgdat_idx conversion functions, this makes lots
|
|
* of the shifts unnecessary.
|
|
*/
|
|
#define virt_to_pfn(kaddr) (__pa(kaddr) >> PAGE_SHIFT)
|
|
#define pfn_to_virt(pfn) __va((pfn) << PAGE_SHIFT)
|
|
|
|
extern int m68k_virt_to_node_shift;
|
|
|
|
#ifdef CONFIG_SINGLE_MEMORY_CHUNK
|
|
#define __virt_to_node(addr) (&pg_data_map[0])
|
|
#else
|
|
extern struct pglist_data *pg_data_table[];
|
|
|
|
static inline __attribute_const__ int __virt_to_node_shift(void)
|
|
{
|
|
int shift;
|
|
|
|
asm (
|
|
"1: moveq #0,%0\n"
|
|
m68k_fixup(%c1, 1b)
|
|
: "=d" (shift)
|
|
: "i" (m68k_fixup_vnode_shift));
|
|
return shift;
|
|
}
|
|
|
|
#define __virt_to_node(addr) (pg_data_table[(unsigned long)(addr) >> __virt_to_node_shift()])
|
|
#endif
|
|
|
|
#define virt_to_page(addr) ({ \
|
|
pfn_to_page(virt_to_pfn(addr)); \
|
|
})
|
|
#define page_to_virt(page) ({ \
|
|
pfn_to_virt(page_to_pfn(page)); \
|
|
})
|
|
|
|
#define pfn_to_page(pfn) ({ \
|
|
unsigned long __pfn = (pfn); \
|
|
struct pglist_data *pgdat; \
|
|
pgdat = __virt_to_node((unsigned long)pfn_to_virt(__pfn)); \
|
|
pgdat->node_mem_map + (__pfn - pgdat->node_start_pfn); \
|
|
})
|
|
#define page_to_pfn(_page) ({ \
|
|
struct page *__p = (_page); \
|
|
struct pglist_data *pgdat; \
|
|
pgdat = &pg_data_map[page_to_nid(__p)]; \
|
|
((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn; \
|
|
})
|
|
|
|
#define virt_addr_valid(kaddr) ((void *)(kaddr) >= (void *)PAGE_OFFSET && (void *)(kaddr) < high_memory)
|
|
#define pfn_valid(pfn) virt_addr_valid(pfn_to_virt(pfn))
|
|
|
|
#endif /* __ASSEMBLY__ */
|
|
|
|
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
|
|
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
|
|
|
|
#include <asm-generic/page.h>
|
|
|
|
#endif /* _M68K_PAGE_H */
|