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

Commit 850f22d5 authored Jul 09, 2010 by Michael Ellerman Committed by Benjamin Herrenschmidt Jul 09, 2010

powerpc/book3e: Resend doorbell exceptions to ourself

If we are soft disabled and receive a doorbell exception we don't process
it immediately. This means we need to check on the way out of irq restore
if there are any doorbell exceptions to process.

The problem is at that point we don't know what our regs are, and that
in turn makes xmon unhappy. To workaround the problem, instead of checking
for and processing doorbells, we check for any doorbells and if there were
any we send ourselves another.

Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

parent 0e37d259

arch/powerpc/include/asm/dbell.h

+1 −0

Original line number	Original line	Diff line number	Diff line
	@@ -29,6 +29,7 @@ enum ppc_dbell {

	extern void doorbell_message_pass(int target, int msg);		extern void doorbell_message_pass(int target, int msg);
	extern void doorbell_exception(struct pt_regs *regs);		extern void doorbell_exception(struct pt_regs *regs);
			extern void doorbell_check_self(void);
	extern void doorbell_setup_this_cpu(void);		extern void doorbell_setup_this_cpu(void);

	static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)		static inline void ppc_msgsnd(enum ppc_dbell type, u32 flags, u32 tag)

arch/powerpc/kernel/dbell.c

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -81,6 +81,16 @@ void doorbell_exception(struct pt_regs *regs)
	set_irq_regs(old_regs);		set_irq_regs(old_regs);
	}		}

			void doorbell_check_self(void)
			{
			struct doorbell_cpu_info *info = &__get_cpu_var(doorbell_cpu_info);

			if (!info->messages)
			return;

			ppc_msgsnd(PPC_DBELL, 0, info->tag);
			}

	#else /* CONFIG_SMP */		#else /* CONFIG_SMP */
	void doorbell_exception(struct pt_regs *regs)		void doorbell_exception(struct pt_regs *regs)
	{		{

arch/powerpc/kernel/irq.c

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -156,8 +156,8 @@ notrace void raw_local_irq_restore(unsigned long en)
	return;		return;

	#if defined(CONFIG_BOOKE) && defined(CONFIG_SMP)		#if defined(CONFIG_BOOKE) && defined(CONFIG_SMP)
	/* Check for pending doorbell interrupts on SMP */		/* Check for pending doorbell interrupts and resend to ourself */
	doorbell_exception(NULL);		doorbell_check_self();
	#endif		#endif

	/*		/*