Disintegrate asm/system.h for MN10300 (1c80f22f) · Commits · e / devices / android_kernel_oneplus_sm7250

arch/mn10300/include/asm/atomic.h

+3 −106

Original line number	Diff line number	Diff line
		@@ -12,112 +12,7 @@
		#define _ASM_ATOMIC_H

		#include <asm/irqflags.h>

		#ifndef __ASSEMBLY__

		#ifdef CONFIG_SMP
		#ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
		static inline
		unsigned long __xchg(volatile unsigned long *m, unsigned long val)
		{
		unsigned long status;
		unsigned long oldval;

		asm volatile(
		"1: mov %4,(_AAR,%3) \n"
		" mov (_ADR,%3),%1 \n"
		" mov %5,(_ADR,%3) \n"
		" mov (_ADR,%3),%0 \n" /* flush */
		" mov (_ASR,%3),%0 \n"
		" or %0,%0 \n"
		" bne 1b \n"
		: "=&r"(status), "=&r"(oldval), "=m"(*m)
		: "a"(ATOMIC_OPS_BASE_ADDR), "r"(m), "r"(val)
		: "memory", "cc");

		return oldval;
		}

		static inline unsigned long __cmpxchg(volatile unsigned long *m,
		unsigned long old, unsigned long new)
		{
		unsigned long status;
		unsigned long oldval;

		asm volatile(
		"1: mov %4,(_AAR,%3) \n"
		" mov (_ADR,%3),%1 \n"
		" cmp %5,%1 \n"
		" bne 2f \n"
		" mov %6,(_ADR,%3) \n"
		"2: mov (_ADR,%3),%0 \n" /* flush */
		" mov (_ASR,%3),%0 \n"
		" or %0,%0 \n"
		" bne 1b \n"
		: "=&r"(status), "=&r"(oldval), "=m"(*m)
		: "a"(ATOMIC_OPS_BASE_ADDR), "r"(m),
		"r"(old), "r"(new)
		: "memory", "cc");

		return oldval;
		}
		#else /* CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT */
		#error "No SMP atomic operation support!"
		#endif /* CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT */

		#else /* CONFIG_SMP */

		/*
		* Emulate xchg for non-SMP MN10300
		*/
		struct __xchg_dummy { unsigned long a[100]; };
		#define __xg(x) ((struct __xchg_dummy *)(x))

		static inline
		unsigned long __xchg(volatile unsigned long *m, unsigned long val)
		{
		unsigned long oldval;
		unsigned long flags;

		flags = arch_local_cli_save();
		oldval = *m;
		*m = val;
		arch_local_irq_restore(flags);
		return oldval;
		}

		/*
		* Emulate cmpxchg for non-SMP MN10300
		*/
		static inline unsigned long __cmpxchg(volatile unsigned long *m,
		unsigned long old, unsigned long new)
		{
		unsigned long oldval;
		unsigned long flags;

		flags = arch_local_cli_save();
		oldval = *m;
		if (oldval == old)
		*m = new;
		arch_local_irq_restore(flags);
		return oldval;
		}

		#endif /* CONFIG_SMP */

		#define xchg(ptr, v) \
		((__typeof__((ptr))) __xchg((unsigned long )(ptr), \
		(unsigned long)(v)))

		#define cmpxchg(ptr, o, n) \
		((__typeof__((ptr))) __cmpxchg((unsigned long )(ptr), \
		(unsigned long)(o), \
		(unsigned long)(n)))

		#define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v)))
		#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))

		#endif /* !__ASSEMBLY__ */
		#include <asm/cmpxchg.h>

		#ifndef CONFIG_SMP
		#include <asm-generic/atomic.h>
		@@ -269,6 +164,8 @@ static inline void atomic_dec(atomic_t *v)
		c; \
		})

		#define atomic_xchg(ptr, v) (xchg(&(ptr)->counter, (v)))
		#define atomic_cmpxchg(v, old, new) (cmpxchg(&((v)->counter), (old), (new)))

		/**
		* atomic_clear_mask - Atomically clear bits in memory

arch/mn10300/include/asm/barrier.h

0 → 100644

+37 −0

Original line number	Diff line number	Diff line
		/* MN10300 memory barrier definitions
		*
		* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
		* Written by David Howells (dhowells@redhat.com)
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public Licence
		* as published by the Free Software Foundation; either version
		* 2 of the Licence, or (at your option) any later version.
		*/
		#ifndef _ASM_BARRIER_H
		#define _ASM_BARRIER_H

		#define nop() asm volatile ("nop")

		#define mb() asm volatile ("": : :"memory")
		#define rmb() mb()
		#define wmb() asm volatile ("": : :"memory")

		#ifdef CONFIG_SMP
		#define smp_mb() mb()
		#define smp_rmb() rmb()
		#define smp_wmb() wmb()
		#define set_mb(var, value) do { xchg(&var, value); } while (0)
		#else /* CONFIG_SMP */
		#define smp_mb() barrier()
		#define smp_rmb() barrier()
		#define smp_wmb() barrier()
		#define set_mb(var, value) do { var = value; mb(); } while (0)
		#endif /* CONFIG_SMP */

		#define set_wmb(var, value) do { var = value; wmb(); } while (0)

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

		#endif /* _ASM_BARRIER_H */

arch/mn10300/include/asm/cmpxchg.h

0 → 100644

+115 −0

Original line number	Diff line number	Diff line
		/* MN10300 Atomic xchg/cmpxchg operations
		*
		* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
		* Written by David Howells (dhowells@redhat.com)
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public Licence
		* as published by the Free Software Foundation; either version
		* 2 of the Licence, or (at your option) any later version.
		*/
		#ifndef _ASM_CMPXCHG_H
		#define _ASM_CMPXCHG_H

		#include <asm/irqflags.h>

		#ifdef CONFIG_SMP
		#ifdef CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT
		static inline
		unsigned long __xchg(volatile unsigned long *m, unsigned long val)
		{
		unsigned long status;
		unsigned long oldval;

		asm volatile(
		"1: mov %4,(_AAR,%3) \n"
		" mov (_ADR,%3),%1 \n"
		" mov %5,(_ADR,%3) \n"
		" mov (_ADR,%3),%0 \n" /* flush */
		" mov (_ASR,%3),%0 \n"
		" or %0,%0 \n"
		" bne 1b \n"
		: "=&r"(status), "=&r"(oldval), "=m"(*m)
		: "a"(ATOMIC_OPS_BASE_ADDR), "r"(m), "r"(val)
		: "memory", "cc");

		return oldval;
		}

		static inline unsigned long __cmpxchg(volatile unsigned long *m,
		unsigned long old, unsigned long new)
		{
		unsigned long status;
		unsigned long oldval;

		asm volatile(
		"1: mov %4,(_AAR,%3) \n"
		" mov (_ADR,%3),%1 \n"
		" cmp %5,%1 \n"
		" bne 2f \n"
		" mov %6,(_ADR,%3) \n"
		"2: mov (_ADR,%3),%0 \n" /* flush */
		" mov (_ASR,%3),%0 \n"
		" or %0,%0 \n"
		" bne 1b \n"
		: "=&r"(status), "=&r"(oldval), "=m"(*m)
		: "a"(ATOMIC_OPS_BASE_ADDR), "r"(m),
		"r"(old), "r"(new)
		: "memory", "cc");

		return oldval;
		}
		#else /* CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT */
		#error "No SMP atomic operation support!"
		#endif /* CONFIG_MN10300_HAS_ATOMIC_OPS_UNIT */

		#else /* CONFIG_SMP */

		/*
		* Emulate xchg for non-SMP MN10300
		*/
		struct __xchg_dummy { unsigned long a[100]; };
		#define __xg(x) ((struct __xchg_dummy *)(x))

		static inline
		unsigned long __xchg(volatile unsigned long *m, unsigned long val)
		{
		unsigned long oldval;
		unsigned long flags;

		flags = arch_local_cli_save();
		oldval = *m;
		*m = val;
		arch_local_irq_restore(flags);
		return oldval;
		}

		/*
		* Emulate cmpxchg for non-SMP MN10300
		*/
		static inline unsigned long __cmpxchg(volatile unsigned long *m,
		unsigned long old, unsigned long new)
		{
		unsigned long oldval;
		unsigned long flags;

		flags = arch_local_cli_save();
		oldval = *m;
		if (oldval == old)
		*m = new;
		arch_local_irq_restore(flags);
		return oldval;
		}

		#endif /* CONFIG_SMP */

		#define xchg(ptr, v) \
		((__typeof__((ptr))) __xchg((unsigned long )(ptr), \
		(unsigned long)(v)))

		#define cmpxchg(ptr, o, n) \
		((__typeof__((ptr))) __cmpxchg((unsigned long )(ptr), \
		(unsigned long)(o), \
		(unsigned long)(n)))

		#endif /* _ASM_CMPXCHG_H */

arch/mn10300/include/asm/dma.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -11,7 +11,6 @@
		#ifndef _ASM_DMA_H
		#define _ASM_DMA_H

		#include <asm/system.h>
		#include <linux/spinlock.h>
		#include <asm/io.h>
		#include <linux/delay.h>

arch/mn10300/include/asm/exec.h

0 → 100644

+16 −0

Original line number	Diff line number	Diff line
		/* MN10300 process execution definitions
		*
		* Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
		* Written by David Howells (dhowells@redhat.com)
		*
		* This program is free software; you can redistribute it and/or
		* modify it under the terms of the GNU General Public Licence
		* as published by the Free Software Foundation; either version
		* 2 of the Licence, or (at your option) any later version.
		*/
		#ifndef _ASM_EXEC_H
		#define _ASM_EXEC_H

		#define arch_align_stack(x) (x)

		#endif /* _ASM_EXEC_H */