aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/sgi-xp
diff options
context:
space:
mode:
authorRobin Holt <holt@sgi.com>2009-12-15 19:47:58 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-16 10:20:14 -0500
commitdbd2918ec65c35f36bb102c88eafe87be0552f6f (patch)
tree97763c2f9c6b2938e209911a89690794c290f22b /drivers/misc/sgi-xp
parent15b87d67ff3dc042bee42f991858d6b121b3b3ca (diff)
X86: uv: xpc_make_first_contact hang due to not accepting ACTIVE state
Many times while the initial connection is being made, the contacted partition will send back both the ACTIVATING and the ACTIVE remote_act_state changes in very close succescion. The 1/4 second delay in the make first contact loop is large enough to nearly always miss the ACTIVATING state change. Since either state indicates the remote partition has acknowledged our state change, accept either. Signed-off-by: Robin Holt <holt@sgi.com> Cc: Jack Steiner <steiner@sgi.com> Cc: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/misc/sgi-xp')
-rw-r--r--drivers/misc/sgi-xp/xpc_uv.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/misc/sgi-xp/xpc_uv.c b/drivers/misc/sgi-xp/xpc_uv.c
index 19bd7b0ede91..241ea5f01aaa 100644
--- a/drivers/misc/sgi-xp/xpc_uv.c
+++ b/drivers/misc/sgi-xp/xpc_uv.c
@@ -1024,7 +1024,8 @@ xpc_make_first_contact_uv(struct xpc_partition *part)
1024 xpc_send_activate_IRQ_part_uv(part, &msg, sizeof(msg), 1024 xpc_send_activate_IRQ_part_uv(part, &msg, sizeof(msg),
1025 XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV); 1025 XPC_ACTIVATE_MQ_MSG_SYNC_ACT_STATE_UV);
1026 1026
1027 while (part->sn.uv.remote_act_state != XPC_P_AS_ACTIVATING) { 1027 while (!((part->sn.uv.remote_act_state == XPC_P_AS_ACTIVATING) ||
1028 (part->sn.uv.remote_act_state == XPC_P_AS_ACTIVE))) {
1028 1029
1029 dev_dbg(xpc_part, "waiting to make first contact with " 1030 dev_dbg(xpc_part, "waiting to make first contact with "
1030 "partition %d\n", XPC_PARTID(part)); 1031 "partition %d\n", XPC_PARTID(part));