lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

powerpc/book3e-64: Reraise doorbell when masked by soft-irq-disable

Browse Source 
Signed-off-by: Scott Wood <scottwood@freescale.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Scott Wood
2011-06-22 11:19:49 +00:00
committed by Benjamin Herrenschmidt
parent 3c350a1a55
commit 3d97a619ac
4 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/powerpc/include/asm/smp.h
View File

@@ -119,7 +119,6 @@ extern const char *smp_ipi_name[];
/* for irq controllers with only a single ipi */ /* for irq controllers with only a single ipi */
extern void smp_muxed_ipi_set_data(int cpu, unsigned long data); extern void smp_muxed_ipi_set_data(int cpu, unsigned long data);
extern void smp_muxed_ipi_message_pass(int cpu, int msg); extern void smp_muxed_ipi_message_pass(int cpu, int msg);
extern void smp_muxed_ipi_resend(void);
extern irqreturn_t smp_ipi_demux(void); extern irqreturn_t smp_ipi_demux(void);
void smp_init_iSeries(void); void smp_init_iSeries(void);

22
arch/powerpc/kernel/exceptions-64e.S
View File

@@ -120,6 +120,12 @@
std r14,PACA_EXMC+EX_R14(r13); \ std r14,PACA_EXMC+EX_R14(r13); \
std r15,PACA_EXMC+EX_R15(r13) std r15,PACA_EXMC+EX_R15(r13)
#define PROLOG_ADDITION_DOORBELL_GEN \
lbz r11,PACASOFTIRQEN(r13); /* are irqs soft-disabled ? */ \
cmpwi cr0,r11,0; /* yes -> go out of line */ \
beq masked_doorbell_book3e
/* Core exception code for all exceptions except TLB misses. /* Core exception code for all exceptions except TLB misses.
* XXX: Needs to make SPRN_SPRG_GEN depend on exception type * XXX: Needs to make SPRN_SPRG_GEN depend on exception type
*/ */
@@ -522,7 +528,13 @@ kernel_dbg_exc:
MASKABLE_EXCEPTION(0x260, perfmon, .performance_monitor_exception, ACK_NONE) MASKABLE_EXCEPTION(0x260, perfmon, .performance_monitor_exception, ACK_NONE)
/* Doorbell interrupt */ /* Doorbell interrupt */
MASKABLE_EXCEPTION(0x2070, doorbell, .doorbell_exception, ACK_NONE) START_EXCEPTION(doorbell)
NORMAL_EXCEPTION_PROLOG(0x2070, PROLOG_ADDITION_DOORBELL)
EXCEPTION_COMMON(0x2070, PACA_EXGEN, INTS_DISABLE_ALL)
CHECK_NAPPING()
addi r3,r1,STACK_FRAME_OVERHEAD
bl .doorbell_exception
b .ret_from_except_lite
/* Doorbell critical Interrupt */ /* Doorbell critical Interrupt */
START_EXCEPTION(doorbell_crit); START_EXCEPTION(doorbell_crit);
@@ -545,8 +557,16 @@ kernel_dbg_exc:
* An interrupt came in while soft-disabled; clear EE in SRR1, * An interrupt came in while soft-disabled; clear EE in SRR1,
* clear paca->hard_enabled and return. * clear paca->hard_enabled and return.
*/ */
masked_doorbell_book3e:
mtcr r10
/* Resend the doorbell to fire again when ints enabled */
mfspr r10,SPRN_PIR
PPC_MSGSND(r10)
b masked_interrupt_book3e_common
masked_interrupt_book3e: masked_interrupt_book3e:
mtcr r10 mtcr r10
masked_interrupt_book3e_common:
stb r11,PACAHARDIRQEN(r13) stb r11,PACAHARDIRQEN(r13)
mfspr r10,SPRN_SRR1 mfspr r10,SPRN_SRR1
rldicl r11,r10,48,1 /* clear MSR_EE */ rldicl r11,r10,48,1 /* clear MSR_EE */

6
arch/powerpc/kernel/irq.c
View File

@@ -157,12 +157,6 @@ notrace void arch_local_irq_restore(unsigned long en)
if (get_hard_enabled()) if (get_hard_enabled())
return; return;
#if defined(CONFIG_BOOKE) && defined(CONFIG_SMP)
/* Check for pending doorbell interrupts and resend to ourself */
if (cpu_has_feature(CPU_FTR_DBELL))
smp_muxed_ipi_resend();
#endif
/* /*
* Need to hard-enable interrupts here. Since currently disabled, * Need to hard-enable interrupts here. Since currently disabled,
* no need to take further asm precautions against preemption; but * no need to take further asm precautions against preemption; but

8
arch/powerpc/kernel/smp.c
View File

@@ -202,14 +202,6 @@ void smp_muxed_ipi_message_pass(int cpu, int msg)
smp_ops->cause_ipi(cpu, info->data); smp_ops->cause_ipi(cpu, info->data);
} }
void smp_muxed_ipi_resend(void)
{
struct cpu_messages *info = &__get_cpu_var(ipi_message);
if (info->messages)
smp_ops->cause_ipi(smp_processor_id(), info->data);
}
irqreturn_t smp_ipi_demux(void) irqreturn_t smp_ipi_demux(void)
{ {
struct cpu_messages *info = &__get_cpu_var(ipi_message); struct cpu_messages *info = &__get_cpu_var(ipi_message);