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

Commit b671ad2b authored by Kumar Gala's avatar Kumar Gala Committed by Paul Mackerras
Browse files

[PATCH] powerpc: merged hw_irq.h 



Merged hw_irq.h between ppc32 & ppc64.  Added support to use the Book-E
wrtee[i] instructions that allow modifying MSR[EE] atomically.
Additionally, added get_irq_desc() macros to ppc32 to allow mask_irq(),
unmask_irq(), and ack_irq() to be common between ppc32 & ppc64.

Note: because 64-bit Book-E implementations only have a 32-bit MSR the
macro's for Book-E need to come before the PPC64 macro's to ensure the
right thing happends for 64-bit Book-E processors.

Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent fa2ac7a2

include/asm-ppc64/hw_irq.h→include/asm-powerpc/hw_irq.h

+37 −26
Original line number Diff line number Diff line 
/*

 * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>

 *

 * Use inline IRQs where possible - Anton Blanchard <anton@au.ibm.com>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * as published by the Free Software Foundation; either version

 * 2 of the License, or (at your option) any later version.

 */

#ifndef _ASM_POWERPC_HW_IRQ_H

#define _ASM_POWERPC_HW_IRQ_H



#ifdef __KERNEL__

#ifndef _PPC64_HW_IRQ_H

#define _PPC64_HW_IRQ_H



#include <linux/config.h>

#include <linux/errno.h>

#include <asm/ptrace.h>

#include <asm/processor.h>

#include <asm/irq.h>



extern void timer_interrupt(struct pt_regs *);
@@ -33,45 +29,60 @@ extern void local_irq_restore(unsigned long); 


#else



#define local_save_flags(flags)	((flags) = mfmsr())

#if defined(CONFIG_BOOKE)

#define SET_MSR_EE(x)	mtmsr(x)

#define local_irq_restore(flags)	__asm__ __volatile__("wrtee %0" : : "r" (flags) : "memory")

#elif defined(__powerpc64__)

#define SET_MSR_EE(x)	__mtmsrd(x, 1)

#define local_irq_restore(flags) do { \

	__asm__ __volatile__("": : :"memory"); \

	__mtmsrd((flags), 1); \

} while(0)

#else

#define SET_MSR_EE(x)	mtmsr(x)

#define local_irq_restore(flags)	mtmsr(flags)

#endif



static inline void local_irq_disable(void)

{

#ifdef CONFIG_BOOKE

	__asm__ __volatile__("wrteei 0": : :"memory");

#else

	unsigned long msr;

	msr = mfmsr();

	__mtmsrd(msr & ~MSR_EE, 1);

	__asm__ __volatile__("": : :"memory");

	msr = mfmsr();

	SET_MSR_EE(msr & ~MSR_EE);

#endif

}



static inline void local_irq_enable(void)

{

#ifdef CONFIG_BOOKE

	__asm__ __volatile__("wrteei 1": : :"memory");

#else

	unsigned long msr;

	__asm__ __volatile__("": : :"memory");

	msr = mfmsr();

	__mtmsrd(msr | MSR_EE, 1);

	SET_MSR_EE(msr | MSR_EE);

#endif

}



static inline void __do_save_and_cli(unsigned long *flags)

static inline void local_irq_save_ptr(unsigned long *flags)

{

	unsigned long msr;

	msr = mfmsr();

	*flags = msr;

	__mtmsrd(msr & ~MSR_EE, 1);

#ifdef CONFIG_BOOKE

	__asm__ __volatile__("wrteei 0": : :"memory");

#else

	SET_MSR_EE(msr & ~MSR_EE);

#endif

	__asm__ __volatile__("": : :"memory");

}



#define local_irq_save(flags)          __do_save_and_cli(&flags)



#define irqs_disabled()				\

({						\

	unsigned long flags;			\

	local_save_flags(flags);		\

	!(flags & MSR_EE);			\

})

#define local_save_flags(flags)	((flags) = mfmsr())

#define local_irq_save(flags)	local_irq_save_ptr(&flags)

#define irqs_disabled()		((mfmsr() & MSR_EE) == 0)



#endif /* CONFIG_PPC_ISERIES */
@@ -100,5 +111,5 @@ static inline void __do_save_and_cli(unsigned long *flags) 
struct hw_interrupt_type;

static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}



#endif /* _PPC64_HW_IRQ_H */

#endif	/* __KERNEL__ */

#endif	/* _ASM_POWERPC_HW_IRQ_H */

include/asm-ppc/hw_irq.h

deleted100644 → 0
+0 −59
Original line number Diff line number Diff line 
/*

 * Copyright (C) 1999 Cort Dougan <cort@cs.nmt.edu>

 */

#ifdef __KERNEL__

#ifndef _PPC_HW_IRQ_H

#define _PPC_HW_IRQ_H



#include <asm/ptrace.h>

#include <asm/reg.h>

#include <asm/irq.h>



extern void timer_interrupt(struct pt_regs *);



#define irqs_disabled()	((mfmsr() & MSR_EE) == 0)



static inline void local_irq_disable(void)

{

	unsigned long msr;

	msr = mfmsr();

	mtmsr(msr & ~MSR_EE);

	__asm__ __volatile__("": : :"memory");

}



static inline void local_irq_enable(void)

{

	unsigned long msr;

	__asm__ __volatile__("": : :"memory");

	msr = mfmsr();

	mtmsr(msr | MSR_EE);

}



static inline void local_irq_save_ptr(unsigned long *flags)

{

	unsigned long msr;

	msr = mfmsr();

	*flags = msr;

	mtmsr(msr & ~MSR_EE);

	__asm__ __volatile__("": : :"memory");

}



#define local_save_flags(flags)		((flags) = mfmsr())

#define local_irq_save(flags)		local_irq_save_ptr(&flags)

#define local_irq_restore(flags)	mtmsr(flags)



extern void do_lost_interrupts(unsigned long);



#define mask_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->disable) irq_desc[irq].handler->disable(irq);})

#define unmask_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->enable) irq_desc[irq].handler->enable(irq);})

#define ack_irq(irq) ({if (irq_desc[irq].handler && irq_desc[irq].handler->ack) irq_desc[irq].handler->ack(irq);})



/* Should we handle this via lost interrupts and IPIs or should we don't care like

 * we do now ? --BenH.

 */

struct hw_interrupt_type;

static inline void hw_resend_irq(struct hw_interrupt_type *h, unsigned int i) {}





#endif /* _PPC_HW_IRQ_H */

#endif /* __KERNEL__ */

include/asm-ppc/irq.h

+6 −0
Original line number Diff line number Diff line
@@ -24,6 +24,12 @@ 
 */

#define ARCH_HAS_IRQ_PER_CPU



#define get_irq_desc(irq) (&irq_desc[(irq)])



/* Define a way to iterate across irqs. */

#define for_each_irq(i) \

	for ((i) = 0; (i) < NR_IRQS; ++(i))



#if defined(CONFIG_40x)

#include <asm/ibm4xx.h>