Disintegrate asm/system.h for Xtensa (f9aa7e18) · Commits · e / devices / android_kernel_xiaomi_markw

arch/xtensa/include/asm/atomic.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -18,7 +18,7 @@

		#ifdef __KERNEL__
		#include <asm/processor.h>
		#include <asm/system.h>
		#include <asm/cmpxchg.h>

		#define ATOMIC_INIT(i) { (i) }

arch/xtensa/include/asm/barrier.h

0 → 100644

+29 −0

Original line number	Diff line number	Diff line
		/*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 2001 - 2005 Tensilica Inc.
		*/

		#ifndef _XTENSA_SYSTEM_H
		#define _XTENSA_SYSTEM_H

		#define smp_read_barrier_depends() do { } while(0)
		#define read_barrier_depends() do { } while(0)

		#define mb() barrier()
		#define rmb() mb()
		#define wmb() mb()

		#ifdef CONFIG_SMP
		#error smp_* not defined
		#else
		#define smp_mb() barrier()
		#define smp_rmb() barrier()
		#define smp_wmb() barrier()
		#endif

		#define set_mb(var, value) do { var = value; mb(); } while (0)

		#endif /* _XTENSA_SYSTEM_H */

arch/xtensa/include/asm/bitops.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,6 @@

		#include <asm/processor.h>
		#include <asm/byteorder.h>
		#include <asm/system.h>

		#ifdef CONFIG_SMP
		# error SMP not supported on this architecture

arch/xtensa/include/asm/cmpxchg.h

0 → 100644

+131 −0

Original line number	Diff line number	Diff line
		/*
		* Atomic xchg and cmpxchg operations.
		*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 2001 - 2005 Tensilica Inc.
		*/

		#ifndef _XTENSA_CMPXCHG_H
		#define _XTENSA_CMPXCHG_H

		#ifndef __ASSEMBLY__

		#include <linux/stringify.h>

		/*
		* cmpxchg
		*/

		static inline unsigned long
		__cmpxchg_u32(volatile int *p, int old, int new)
		{
		__asm__ __volatile__("rsil a15, "__stringify(LOCKLEVEL)"\n\t"
		"l32i %0, %1, 0 \n\t"
		"bne %0, %2, 1f \n\t"
		"s32i %3, %1, 0 \n\t"
		"1: \n\t"
		"wsr a15, "__stringify(PS)" \n\t"
		"rsync \n\t"
		: "=&a" (old)
		: "a" (p), "a" (old), "r" (new)
		: "a15", "memory");
		return old;
		}
		/* This function doesn't exist, so you'll get a linker error
		* if something tries to do an invalid cmpxchg(). */

		extern void __cmpxchg_called_with_bad_pointer(void);

		static __inline__ unsigned long
		__cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, int size)
		{
		switch (size) {
		case 4: return __cmpxchg_u32(ptr, old, new);
		default: __cmpxchg_called_with_bad_pointer();
		return old;
		}
		}

		#define cmpxchg(ptr,o,n) \
		({ __typeof__(*(ptr)) _o_ = (o); \
		__typeof__(*(ptr)) _n_ = (n); \
		(__typeof__(*(ptr))) __cmpxchg((ptr), (unsigned long)_o_, \
		(unsigned long)_n_, sizeof (*(ptr))); \
		})

		#include <asm-generic/cmpxchg-local.h>

		static inline unsigned long __cmpxchg_local(volatile void *ptr,
		unsigned long old,
		unsigned long new, int size)
		{
		switch (size) {
		case 4:
		return __cmpxchg_u32(ptr, old, new);
		default:
		return __cmpxchg_local_generic(ptr, old, new, size);
		}

		return old;
		}

		/*
		* 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))))
		#define cmpxchg64_local(ptr, o, n) __cmpxchg64_local_generic((ptr), (o), (n))

		/*
		* xchg_u32
		*
		* Note that a15 is used here because the register allocation
		* done by the compiler is not guaranteed and a window overflow
		* may not occur between the rsil and wsr instructions. By using
		* a15 in the rsil, the machine is guaranteed to be in a state
		* where no register reference will cause an overflow.
		*/

		static inline unsigned long xchg_u32(volatile int * m, unsigned long val)
		{
		unsigned long tmp;
		__asm__ __volatile__("rsil a15, "__stringify(LOCKLEVEL)"\n\t"
		"l32i %0, %1, 0 \n\t"
		"s32i %2, %1, 0 \n\t"
		"wsr a15, "__stringify(PS)" \n\t"
		"rsync \n\t"
		: "=&a" (tmp)
		: "a" (m), "a" (val)
		: "a15", "memory");
		return tmp;
		}

		#define xchg(ptr,x) ((__typeof__((ptr)))__xchg((unsigned long)(x),(ptr),sizeof((ptr))))

		/*
		* This only works if the compiler isn't horribly bad at optimizing.
		* gcc-2.5.8 reportedly can't handle this, but I define that one to
		* be dead anyway.
		*/

		extern void __xchg_called_with_bad_pointer(void);

		static __inline__ unsigned long
		__xchg(unsigned long x, volatile void * ptr, int size)
		{
		switch (size) {
		case 4:
		return xchg_u32(ptr, x);
		}
		__xchg_called_with_bad_pointer();
		return x;
		}

		#endif /* __ASSEMBLY__ */

		#endif /* _XTENSA_CMPXCHG_H */

arch/xtensa/include/asm/exec.h

0 → 100644

+14 −0

Original line number	Diff line number	Diff line
		/*
		* This file is subject to the terms and conditions of the GNU General Public
		* License. See the file "COPYING" in the main directory of this archive
		* for more details.
		*
		* Copyright (C) 2001 - 2005 Tensilica Inc.
		*/

		#ifndef _XTENSA_EXEC_H
		#define _XTENSA_EXEC_H

		#define arch_align_stack(x) (x)

		#endif /* _XTENSA_EXEC_H */