Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03fdb708 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: Convert to asm-generic/irqflags.h. 



This simplifies the irqflags support by switching over to the asm-generic
version. The necessary support functions are brought out-of-line for both
SHcompact and SHmedia instruction sets.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent cae19b59

arch/sh/include/asm/irqflags.h

+3 −28
Original line number Diff line number Diff line 
#ifndef __ASM_SH_IRQFLAGS_H

#define __ASM_SH_IRQFLAGS_H



#ifdef CONFIG_SUPERH32

#include "irqflags_32.h"

#else

#include "irqflags_64.h"

#endif

#define RAW_IRQ_DISABLED	0xf0

#define RAW_IRQ_ENABLED		0x00



#define raw_local_save_flags(flags) \

		do { (flags) = __raw_local_save_flags(); } while (0)



static inline int raw_irqs_disabled_flags(unsigned long flags)

{

	return (flags != 0);

}



static inline int raw_irqs_disabled(void)

{

	unsigned long flags = __raw_local_save_flags();



	return raw_irqs_disabled_flags(flags);

}



#define raw_local_irq_save(flags) \

		do { (flags) = __raw_local_irq_save(); } while (0)



static inline void raw_local_irq_restore(unsigned long flags)

{

	if ((flags & 0xf0) != 0xf0)

		raw_local_irq_enable();

}

#include <asm-generic/irqflags.h>



#endif /* __ASM_SH_IRQFLAGS_H */

arch/sh/include/asm/irqflags_32.h

deleted100644 → 0
+0 −99
Original line number Diff line number Diff line 
#ifndef __ASM_SH_IRQFLAGS_32_H

#define __ASM_SH_IRQFLAGS_32_H



static inline void raw_local_irq_enable(void)

{

	unsigned long __dummy0, __dummy1;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"and	%1, %0\n\t"

#ifdef CONFIG_CPU_HAS_SR_RB

		"stc	r6_bank, %1\n\t"

		"or	%1, %0\n\t"

#endif

		"ldc	%0, sr\n\t"

		: "=&r" (__dummy0), "=r" (__dummy1)

		: "1" (~0x000000f0)

		: "memory"

	);

}



static inline void raw_local_irq_disable(void)

{

	unsigned long flags;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"or	#0xf0, %0\n\t"

		"ldc	%0, sr\n\t"

		: "=&z" (flags)

		: /* no inputs */

		: "memory"

	);

}



static inline void set_bl_bit(void)

{

	unsigned long __dummy0, __dummy1;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"or	%2, %0\n\t"

		"and	%3, %0\n\t"

		"ldc	%0, sr\n\t"

		: "=&r" (__dummy0), "=r" (__dummy1)

		: "r" (0x10000000), "r" (0xffffff0f)

		: "memory"

	);

}



static inline void clear_bl_bit(void)

{

	unsigned long __dummy0, __dummy1;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"and	%2, %0\n\t"

		"ldc	%0, sr\n\t"

		: "=&r" (__dummy0), "=r" (__dummy1)

		: "1" (~0x10000000)

		: "memory"

	);

}



static inline unsigned long __raw_local_save_flags(void)

{

	unsigned long flags;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"and	#0xf0, %0\n\t"

		: "=&z" (flags)

		: /* no inputs */

		: "memory"

	);



	return flags;

}



static inline unsigned long __raw_local_irq_save(void)

{

	unsigned long flags, __dummy;



	__asm__ __volatile__ (

		"stc	sr, %1\n\t"

		"mov	%1, %0\n\t"

		"or	#0xf0, %0\n\t"

		"ldc	%0, sr\n\t"

		"mov	%1, %0\n\t"

		"and	#0xf0, %0\n\t"

		: "=&z" (flags), "=&r" (__dummy)

		: /* no inputs */

		: "memory"

	);



	return flags;

}



#endif /* __ASM_SH_IRQFLAGS_32_H */

arch/sh/include/asm/irqflags_64.h

deleted100644 → 0
+0 −85
Original line number Diff line number Diff line 
#ifndef __ASM_SH_IRQFLAGS_64_H

#define __ASM_SH_IRQFLAGS_64_H



#include <cpu/registers.h>



#define SR_MASK_LL	0x00000000000000f0LL

#define SR_BL_LL	0x0000000010000000LL



static inline void raw_local_irq_enable(void)

{

	unsigned long long __dummy0, __dummy1 = ~SR_MASK_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "and	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));

}



static inline void raw_local_irq_disable(void)

{

	unsigned long long __dummy0, __dummy1 = SR_MASK_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "or	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));

}



static inline void set_bl_bit(void)

{

	unsigned long long __dummy0, __dummy1 = SR_BL_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "or	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));



}



static inline void clear_bl_bit(void)

{

	unsigned long long __dummy0, __dummy1 = ~SR_BL_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "and	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));

}



static inline unsigned long __raw_local_save_flags(void)

{

	unsigned long long __dummy = SR_MASK_LL;

	unsigned long flags;



	__asm__ __volatile__ (

		"getcon	" __SR ", %0\n\t"

		"and	%0, %1, %0"

		: "=&r" (flags)

		: "r" (__dummy));



	return flags;

}



static inline unsigned long __raw_local_irq_save(void)

{

	unsigned long long __dummy0, __dummy1 = SR_MASK_LL;

	unsigned long flags;



	__asm__ __volatile__ (

		"getcon	" __SR ", %1\n\t"

		"or	%1, r63, %0\n\t"

		"or	%1, %2, %1\n\t"

		"putcon	%1, " __SR "\n\t"

		"and	%0, %2, %0"

		: "=&r" (flags), "=&r" (__dummy0)

		: "r" (__dummy1));



	return flags;

}



#endif /* __ASM_SH_IRQFLAGS_64_H */

arch/sh/include/asm/system_32.h

+29 −0
Original line number Diff line number Diff line
@@ -232,4 +232,33 @@ asmlinkage void do_exception_error(unsigned long r4, unsigned long r5, 
				   unsigned long r6, unsigned long r7,

				   struct pt_regs __regs);



static inline void set_bl_bit(void)

{

	unsigned long __dummy0, __dummy1;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"or	%2, %0\n\t"

		"and	%3, %0\n\t"

		"ldc	%0, sr\n\t"

		: "=&r" (__dummy0), "=r" (__dummy1)

		: "r" (0x10000000), "r" (0xffffff0f)

		: "memory"

	);

}



static inline void clear_bl_bit(void)

{

	unsigned long __dummy0, __dummy1;



	__asm__ __volatile__ (

		"stc	sr, %0\n\t"

		"and	%2, %0\n\t"

		"ldc	%0, sr\n\t"

		: "=&r" (__dummy0), "=r" (__dummy1)

		: "1" (~0x10000000)

		: "memory"

	);

}



#endif /* __ASM_SH_SYSTEM_32_H */

arch/sh/include/asm/system_64.h

+26 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
 * License.  See the file "COPYING" in the main directory of this archive

 * for more details.

 */

#include <cpu/registers.h>

#include <asm/processor.h>



/*
@@ -47,4 +48,29 @@ static inline reg_size_t register_align(void *val) 
	return (unsigned long long)(signed long long)(signed long)val;

}



#define SR_BL_LL	0x0000000010000000LL



static inline void set_bl_bit(void)

{

	unsigned long long __dummy0, __dummy1 = SR_BL_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "or	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));



}



static inline void clear_bl_bit(void)

{

	unsigned long long __dummy0, __dummy1 = ~SR_BL_LL;



	__asm__ __volatile__("getcon	" __SR ", %0\n\t"

			     "and	%0, %1, %0\n\t"

			     "putcon	%0, " __SR "\n\t"

			     : "=&r" (__dummy0)

			     : "r" (__dummy1));

}



#endif /* __ASM_SH_SYSTEM_64_H */