Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6e2fbce authored by Jack Steiner's avatar Jack Steiner Committed by Linus Torvalds
Browse files

gru: fix automatic retry of gru instruction failures 



Fix bug in automatic retry of GRU instruction failures.  CBR substatus
(message queue failure) was being checked incorrectly.

Signed-off-by: default avatarJack Steiner <steiner@sgi.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d5826dd6

drivers/misc/sgi-gru/grukservices.c

+2 −3
Original line number Diff line number Diff line
@@ -436,11 +436,10 @@ static int gru_retry_exception(void *cb) 
	int retry = EXCEPTION_RETRY_LIMIT;



	while (1)  {

		if (gru_get_cb_message_queue_substatus(cb))

			break;

		if (gru_wait_idle_or_exception(gen) == CBS_IDLE)

			return CBS_IDLE;



		if (gru_get_cb_message_queue_substatus(cb))

			return CBS_EXCEPTION;

		gru_get_cb_exception_detail(cb, &excdet);

		if ((excdet.ecause & ~EXCEPTION_RETRY_BITS) ||

				(excdet.cbrexecstatus & CBR_EXS_ABORT_OCC))