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

Commit 39847e7f authored by Cliff Wickman's avatar Cliff Wickman Committed by Ingo Molnar
Browse files

x86, UV: Correct BAU software acknowledge 



Correct the acknowledgment and the reset of a BAU
software-acknowledged message.

A retry message should be testing only for timed-out resources
(mask << 8). (And we delete a log message that might cause
unnecessary concern) The acknowledge MMR is
|--timed-out--|---pending--|,  each is 8 bits.

The IPI-driven reset of software acknowledge resources frees
both timed out and pending resources.

Signed-off-by: default avatarCliff Wickman <cpw@sgi.com>
Cc: gregkh@suse.de
LKML-Reference: <E1OJvNy-0004aP-7O@eag09.americas.sgi.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4faca155

arch/x86/kernel/tlb_uv.c

+8 −9
Original line number Diff line number Diff line
@@ -161,15 +161,14 @@ static inline void uv_bau_process_retry_msg(struct msg_desc *mdp, 
			slot2 = msg2 - mdp->va_queue_first;

			mmr = uv_read_local_mmr

				(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);

			msg_res = ((msg2->sw_ack_vector << 8) |

				   msg2->sw_ack_vector);

			msg_res = msg2->sw_ack_vector;

			/*

			 * This is a message retry; clear the resources held

			 * by the previous message only if they timed out.

			 * If it has not timed out we have an unexpected

			 * situation to report.

			 */

			if (mmr & (msg_res << 8)) {

			if (mmr & (msg_res << UV_SW_ACK_NPENDING)) {

				/*

				 * is the resource timed out?

				 * make everyone ignore the cancelled message.
@@ -179,9 +178,9 @@ static inline void uv_bau_process_retry_msg(struct msg_desc *mdp, 
				cancel_count++;

				uv_write_local_mmr(

				    UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS,

					(msg_res << 8) | msg_res);

			} else

				printk(KERN_INFO "note bau retry: no effect\n");

					(msg_res << UV_SW_ACK_NPENDING) |

					 msg_res);

			}

		}

	}

	if (!cancel_count)
@@ -317,12 +316,12 @@ uv_do_reset(void *ptr) 
			 */

			mmr = uv_read_local_mmr

					(UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE);

			msg_res = ((msg->sw_ack_vector << 8) |

						   msg->sw_ack_vector);

			msg_res = msg->sw_ack_vector;

			if (mmr & msg_res) {

				stat->d_rcanceled++;

				uv_write_local_mmr(

				    UVH_LB_BAU_INTD_SOFTWARE_ACKNOWLEDGE_ALIAS,

					(msg_res << UV_SW_ACK_NPENDING) |

					 msg_res);

			}

		}