Commit 093c16bf authored by Luke Browning's avatar Luke Browning Committed by Jeremy Kerr

[POWERPC] spufs: set SPU_CONTEXT_SWITCH_PENDING before synchronising SPU irqs

synchronize_irq() provides the serialization for
SPU_CONTEXT_SWITCH_PENDING which is read with a simple load. This
routine guarantees that the relevant interrupt handlers are not running,
so that the next time they do run they will see the update
memory value.

This must be done correctly so that exception handling code does not
restart the mfc in the middle of a context switch while we are trying
to atomically stop it and save state.
Signed-off-by: default avatarLuke Browning <lukebr@linux.vnet.ibm.com>
Signed-off-by: default avatarJeremy Kerr <jk@ozlabs.org>
parent d29694f0
...@@ -132,6 +132,13 @@ static inline void disable_interrupts(struct spu_state *csa, struct spu *spu) ...@@ -132,6 +132,13 @@ static inline void disable_interrupts(struct spu_state *csa, struct spu *spu)
spu_int_mask_set(spu, 2, 0ul); spu_int_mask_set(spu, 2, 0ul);
eieio(); eieio();
spin_unlock_irq(&spu->register_lock); spin_unlock_irq(&spu->register_lock);
/*
* This flag needs to be set before calling synchronize_irq so
* that the update will be visible to the relevant handlers
* via a simple load.
*/
set_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags);
synchronize_irq(spu->irqs[0]); synchronize_irq(spu->irqs[0]);
synchronize_irq(spu->irqs[1]); synchronize_irq(spu->irqs[1]);
synchronize_irq(spu->irqs[2]); synchronize_irq(spu->irqs[2]);
...@@ -166,9 +173,8 @@ static inline void set_switch_pending(struct spu_state *csa, struct spu *spu) ...@@ -166,9 +173,8 @@ static inline void set_switch_pending(struct spu_state *csa, struct spu *spu)
/* Save, Step 7: /* Save, Step 7:
* Restore, Step 5: * Restore, Step 5:
* Set a software context switch pending flag. * Set a software context switch pending flag.
* Done above in Step 3 - disable_interrupts().
*/ */
set_bit(SPU_CONTEXT_SWITCH_PENDING, &spu->flags);
mb();
} }
static inline void save_mfc_cntl(struct spu_state *csa, struct spu *spu) static inline void save_mfc_cntl(struct spu_state *csa, struct spu *spu)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment