diff options
| author | Jack Steiner <steiner@sgi.com> | 2009-06-18 01:28:27 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-18 22:04:02 +0200 |
| commit | 270952a907220c0331fdaecbb55df892921c5e2d (patch) | |
| tree | 374bc1a642108f2c878a86903a70d8af8cd7a04a /drivers/misc/sgi-gru/grukservices.c | |
| parent | gru: update gru kernel self tests (diff) | |
| download | linux-270952a907220c0331fdaecbb55df892921c5e2d.tar.xz linux-270952a907220c0331fdaecbb55df892921c5e2d.zip | |
gru: update to rev 0.9 of gru spec
Update GRU driver to the latest version of the GRU spec. This consists
of minor updates:
- changes & additions to error status bits
- new restriction on handling of TLB misses while in FMM mode
- new field (not used by software) in TFH
Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-gru/grukservices.c')
| -rw-r--r-- | drivers/misc/sgi-gru/grukservices.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/sgi-gru/grukservices.c b/drivers/misc/sgi-gru/grukservices.c index 7d7952b27e03..ba6fcd963f30 100644 --- a/drivers/misc/sgi-gru/grukservices.c +++ b/drivers/misc/sgi-gru/grukservices.c @@ -406,7 +406,8 @@ static int gru_retry_exception(void *cb) return CBS_IDLE; gru_get_cb_exception_detail(cb, &excdet); - if (excdet.ecause & ~EXCEPTION_RETRY_BITS) + if ((excdet.ecause & ~EXCEPTION_RETRY_BITS) || + (excdet.cbrexecstatus & CBR_EXS_ABORT_OCC)) break; if (retry-- == 0) break; |