diff options
| author | Philippe Gerum <rpm@xenomai.org> | 2011-03-17 02:15:24 -0400 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-03-18 04:01:11 -0400 |
| commit | 9169b51f8ce6cd11cd19913b54466ec11e6a12f9 (patch) | |
| tree | 79d6537878aefeb5c6b766971b717358a2ee1513 /arch/blackfin/mach-common/entry.S | |
| parent | 5b5da4c4b843e0d84244472b72fe1e7500f5681f (diff) | |
| download | blackbird-op-linux-9169b51f8ce6cd11cd19913b54466ec11e6a12f9.tar.gz blackbird-op-linux-9169b51f8ce6cd11cd19913b54466ec11e6a12f9.zip | |
Blackfin/ipipe: fix deferred pipeline sync for the root stage
This patch makes sure to sync the pipeline for the root stage only
from the outer interrupt level, when resuming kernel code after an
interrupt.
This fixes a bug causing EVT15 to be spuriously popped off upon nested
interrupts, which in turn would cause the preempted kernel code to
resume without supervisor privileges.
Signed-off-by: Philippe Gerum <rpm@xenomai.org>
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Diffstat (limited to 'arch/blackfin/mach-common/entry.S')
| -rw-r--r-- | arch/blackfin/mach-common/entry.S | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/blackfin/mach-common/entry.S b/arch/blackfin/mach-common/entry.S index bc08c98d008d..4845d51e88a6 100644 --- a/arch/blackfin/mach-common/entry.S +++ b/arch/blackfin/mach-common/entry.S @@ -952,8 +952,17 @@ ENDPROC(_evt_up_evt14) #ifdef CONFIG_IPIPE _resume_kernel_from_int: + r1 = LO(~0x8000) (Z); + r1 = r0 & r1; + r0 = 1; + r0 = r1 - r0; + r2 = r1 & r0; + cc = r2 == 0; + /* Sync the root stage only from the outer interrupt level. */ + if !cc jump .Lnosync; r0.l = ___ipipe_sync_root; r0.h = ___ipipe_sync_root; + [--sp] = reti; [--sp] = rets; [--sp] = ( r7:4, p5:3 ); SP += -12; @@ -961,6 +970,8 @@ _resume_kernel_from_int: SP += 12; ( r7:4, p5:3 ) = [sp++]; rets = [sp++]; + reti = [sp++]; +.Lnosync: rts #elif defined(CONFIG_PREEMPT) |
