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>
219 lines
5.6 KiB
C
219 lines
5.6 KiB
C
#ifndef _M68K_SYSTEM_H
|
|
#define _M68K_SYSTEM_H
|
|
|
|
#include <linux/linkage.h>
|
|
#include <linux/kernel.h>
|
|
#include <asm/segment.h>
|
|
#include <asm/entry.h>
|
|
|
|
#ifdef __KERNEL__
|
|
|
|
/*
|
|
* switch_to(n) should switch tasks to task ptr, first checking that
|
|
* ptr isn't the current task, in which case it does nothing. This
|
|
* also clears the TS-flag if the task we switched to has used the
|
|
* math co-processor latest.
|
|
*/
|
|
/*
|
|
* switch_to() saves the extra registers, that are not saved
|
|
* automatically by SAVE_SWITCH_STACK in resume(), ie. d0-d5 and
|
|
* a0-a1. Some of these are used by schedule() and its predecessors
|
|
* and so we might get see unexpected behaviors when a task returns
|
|
* with unexpected register values.
|
|
*
|
|
* syscall stores these registers itself and none of them are used
|
|
* by syscall after the function in the syscall has been called.
|
|
*
|
|
* Beware that resume now expects *next to be in d1 and the offset of
|
|
* tss to be in a1. This saves a few instructions as we no longer have
|
|
* to push them onto the stack and read them back right after.
|
|
*
|
|
* 02/17/96 - Jes Sorensen (jds@kom.auc.dk)
|
|
*
|
|
* Changed 96/09/19 by Andreas Schwab
|
|
* pass prev in a0, next in a1
|
|
*/
|
|
asmlinkage void resume(void);
|
|
#define switch_to(prev,next,last) do { \
|
|
register void *_prev __asm__ ("a0") = (prev); \
|
|
register void *_next __asm__ ("a1") = (next); \
|
|
register void *_last __asm__ ("d1"); \
|
|
__asm__ __volatile__("jbsr resume" \
|
|
: "=a" (_prev), "=a" (_next), "=d" (_last) \
|
|
: "0" (_prev), "1" (_next) \
|
|
: "d0", "d2", "d3", "d4", "d5"); \
|
|
(last) = _last; \
|
|
} while (0)
|
|
|
|
|
|
/*
|
|
* Force strict CPU ordering.
|
|
* Not really required on m68k...
|
|
*/
|
|
#define nop() do { asm volatile ("nop"); barrier(); } while (0)
|
|
#define mb() barrier()
|
|
#define rmb() barrier()
|
|
#define wmb() barrier()
|
|
#define read_barrier_depends() ((void)0)
|
|
#define set_mb(var, value) ({ (var) = (value); wmb(); })
|
|
|
|
#define smp_mb() barrier()
|
|
#define smp_rmb() barrier()
|
|
#define smp_wmb() barrier()
|
|
#define smp_read_barrier_depends() ((void)0)
|
|
|
|
/* interrupt control.. */
|
|
#if 0
|
|
#define local_irq_enable() asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory")
|
|
#else
|
|
#include <linux/hardirq.h>
|
|
#define local_irq_enable() ({ \
|
|
if (MACH_IS_Q40 || !hardirq_count()) \
|
|
asm volatile ("andiw %0,%%sr": : "i" (ALLOWINT) : "memory"); \
|
|
})
|
|
#endif
|
|
#define local_irq_disable() asm volatile ("oriw #0x0700,%%sr": : : "memory")
|
|
#define local_save_flags(x) asm volatile ("movew %%sr,%0":"=d" (x) : : "memory")
|
|
#define local_irq_restore(x) asm volatile ("movew %0,%%sr": :"d" (x) : "memory")
|
|
|
|
static inline int irqs_disabled(void)
|
|
{
|
|
unsigned long flags;
|
|
local_save_flags(flags);
|
|
return flags & ~ALLOWINT;
|
|
}
|
|
|
|
/* For spinlocks etc */
|
|
#define local_irq_save(x) ({ local_save_flags(x); local_irq_disable(); })
|
|
|
|
#define xchg(ptr,x) ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
|
|
|
|
struct __xchg_dummy { unsigned long a[100]; };
|
|
#define __xg(x) ((volatile struct __xchg_dummy *)(x))
|
|
|
|
#ifndef CONFIG_RMW_INSNS
|
|
static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
|
|
{
|
|
unsigned long flags, tmp;
|
|
|
|
local_irq_save(flags);
|
|
|
|
switch (size) {
|
|
case 1:
|
|
tmp = *(u8 *)ptr;
|
|
*(u8 *)ptr = x;
|
|
x = tmp;
|
|
break;
|
|
case 2:
|
|
tmp = *(u16 *)ptr;
|
|
*(u16 *)ptr = x;
|
|
x = tmp;
|
|
break;
|
|
case 4:
|
|
tmp = *(u32 *)ptr;
|
|
*(u32 *)ptr = x;
|
|
x = tmp;
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
local_irq_restore(flags);
|
|
return x;
|
|
}
|
|
#else
|
|
static inline unsigned long __xchg(unsigned long x, volatile void * ptr, int size)
|
|
{
|
|
switch (size) {
|
|
case 1:
|
|
__asm__ __volatile__
|
|
("moveb %2,%0\n\t"
|
|
"1:\n\t"
|
|
"casb %0,%1,%2\n\t"
|
|
"jne 1b"
|
|
: "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory");
|
|
break;
|
|
case 2:
|
|
__asm__ __volatile__
|
|
("movew %2,%0\n\t"
|
|
"1:\n\t"
|
|
"casw %0,%1,%2\n\t"
|
|
"jne 1b"
|
|
: "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory");
|
|
break;
|
|
case 4:
|
|
__asm__ __volatile__
|
|
("movel %2,%0\n\t"
|
|
"1:\n\t"
|
|
"casl %0,%1,%2\n\t"
|
|
"jne 1b"
|
|
: "=&d" (x) : "d" (x), "m" (*__xg(ptr)) : "memory");
|
|
break;
|
|
}
|
|
return x;
|
|
}
|
|
#endif
|
|
|
|
#include <asm-generic/cmpxchg-local.h>
|
|
|
|
#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))
|
|
|
|
/*
|
|
* Atomic compare and exchange. Compare OLD with MEM, if identical,
|
|
* store NEW in MEM. Return the initial value in MEM. Success is
|
|
* indicated by comparing RETURN with OLD.
|
|
*/
|
|
#ifdef CONFIG_RMW_INSNS
|
|
#define __HAVE_ARCH_CMPXCHG 1
|
|
|
|
static inline unsigned long __cmpxchg(volatile void *p, unsigned long old,
|
|
unsigned long new, int size)
|
|
{
|
|
switch (size) {
|
|
case 1:
|
|
__asm__ __volatile__ ("casb %0,%2,%1"
|
|
: "=d" (old), "=m" (*(char *)p)
|
|
: "d" (new), "0" (old), "m" (*(char *)p));
|
|
break;
|
|
case 2:
|
|
__asm__ __volatile__ ("casw %0,%2,%1"
|
|
: "=d" (old), "=m" (*(short *)p)
|
|
: "d" (new), "0" (old), "m" (*(short *)p));
|
|
break;
|
|
case 4:
|
|
__asm__ __volatile__ ("casl %0,%2,%1"
|
|
: "=d" (old), "=m" (*(int *)p)
|
|
: "d" (new), "0" (old), "m" (*(int *)p));
|
|
break;
|
|
}
|
|
return old;
|
|
}
|
|
|
|
#define cmpxchg(ptr, o, n) \
|
|
((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \
|
|
(unsigned long)(n), sizeof(*(ptr))))
|
|
#define cmpxchg_local(ptr, o, n) \
|
|
((__typeof__(*(ptr)))__cmpxchg((ptr), (unsigned long)(o), \
|
|
(unsigned long)(n), sizeof(*(ptr))))
|
|
#else
|
|
|
|
/*
|
|
* cmpxchg_local and cmpxchg64_local are atomic wrt current CPU. Always make
|
|
* them available.
|
|
*/
|
|
#define cmpxchg_local(ptr, o, n) \
|
|
((__typeof__(*(ptr)))__cmpxchg_local_generic((ptr), (unsigned long)(o),\
|
|
(unsigned long)(n), sizeof(*(ptr))))
|
|
|
|
#ifndef CONFIG_SMP
|
|
#include <asm-generic/cmpxchg.h>
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#define arch_align_stack(x) (x)
|
|
|
|
#endif /* __KERNEL__ */
|
|
|
|
#endif /* _M68K_SYSTEM_H */
|