diff options
| author | Jack Steiner <steiner@sgi.com> | 2005-12-06 08:05:24 -0600 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-12-06 09:13:42 -0800 |
| commit | 590711b7dd731bb04e7892c0451566d788985e79 (patch) | |
| tree | aa5f23e68992eaaeec13b80e13b546ff56d1e316 | |
| parent | bd1d6e2451f2bb0132416fda4d129c4f57a827bc (diff) | |
| download | op-kernel-dev-590711b7dd731bb04e7892c0451566d788985e79.zip op-kernel-dev-590711b7dd731bb04e7892c0451566d788985e79.tar.gz | |
[IA64-SGI] Fix SN PTC deadlock recovery
The patch that added support for a new platform chipset (shub2) broke
PTC deadlock recovery on older versions of the chipset. (PTCs are the
SN platform-specific method for doing a global TLB purge). This
patch fixes deadlock recovery so that it works on both the old & new
chipsets.
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
| -rw-r--r-- | arch/ia64/sn/kernel/sn2/ptc_deadlock.S | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S index 3fa9506..bebbcc4 100644 --- a/arch/ia64/sn/kernel/sn2/ptc_deadlock.S +++ b/arch/ia64/sn/kernel/sn2/ptc_deadlock.S @@ -39,9 +39,13 @@ sn2_ptc_deadlock_recovery_core: mov r8=r0 1: + cmp.ne p8,p9=r0,ptc1 // Test for shub type (ptc1 non-null on shub1) + // p8 = 1 if shub1, p9 = 1 if shub2 + add scr2=ALIAS_OFFSET,piowc // Address of WRITE_STATUS alias register - ;; - ld8.acq scr1=[scr2];; + mov scr1=7;; // Clear DEADLOCK, WRITE_ERROR, MULTI_WRITE_ERROR +(p8) st8.rel [scr2]=scr1;; +(p9) ld8.acq scr1=[scr2];; 5: ld8.acq scr1=[piowc];; // Wait for PIOs to complete. hint @pause |
