diff options
author | Takao Shinohara <shin@sm.sony.co.jp> | 2007-05-01 07:01:07 +1000 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-05-02 20:04:31 +1000 |
commit | 0874dd40bf3c1f291da14b2c554c5640c0b6bf1b (patch) | |
tree | d20a34d51de21ffd04bb19e0d1f7a55176b57092 /arch/powerpc/kernel/irq.c | |
parent | dc4f60c25ae71e8278dcf909486e4aa34de7eecb (diff) | |
download | blackbird-op-linux-0874dd40bf3c1f291da14b2c554c5640c0b6bf1b.tar.gz blackbird-op-linux-0874dd40bf3c1f291da14b2c554c5640c0b6bf1b.zip |
[POWERPC] PS3: Fix system slowdown
The PS3 HV will deliver soft-disabled interrupts at the next HV call or
interrupt. Add an HV call to local_irq_restore() to force the timely
delivery of any pending interrupts.
This fixes the system slowdown bug reported here
http://bugzilla.kernel.org/show_bug.cgi?id=8260
Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/powerpc/kernel/irq.c')
-rw-r--r-- | arch/powerpc/kernel/irq.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c index 6c83fe229e60..5719a530f2d1 100644 --- a/arch/powerpc/kernel/irq.c +++ b/arch/powerpc/kernel/irq.c @@ -67,6 +67,7 @@ #ifdef CONFIG_PPC64 #include <asm/paca.h> #include <asm/firmware.h> +#include <asm/lv1call.h> #endif int __irq_offset_value; @@ -162,6 +163,16 @@ void local_irq_restore(unsigned long en) local_paca->hard_enabled = en; if ((int)mfspr(SPRN_DEC) < 0) mtspr(SPRN_DEC, 1); + + /* + * Force the delivery of pending soft-disabled interrupts on PS3. + * Any HV call will have this side effect. + */ + if (firmware_has_feature(FW_FEATURE_PS3_LV1)) { + u64 tmp; + lv1_get_version_info(&tmp); + } + hard_irq_enable(); } #endif /* CONFIG_PPC64 */ |