[50/99] x86, UV: Set DELIVERY_MODE=4 for vector=NMI_VECTOR in uv_hub_send_ipi()

From: Greg KH
Date: Fri Nov 06 2009 - 17:33:10 EST

2.6.31-stable review patch. If anyone has any objections, please let us know.

From: Robin Holt <holt@xxxxxxx>

commit 02dd0a0613e0d84c7dd8315e3fe6204d005b7c79 upstream.

When sending a NMI_VECTOR IPI using the UV_HUB_IPI_INT register,
we need to ensure the delivery mode field of that register has
NMI delivery selected.

This makes those IPIs true NMIs, instead of flat IPIs. It
matters to reboot sequences and KGDB, both of which use NMI

Signed-off-by: Robin Holt <holt@xxxxxxx>
Acked-by: Jack Steiner <steiner@xxxxxxx>
Cc: Martin Hicks <mort@xxxxxxx>
LKML-Reference: <20091020193620.877322000@xxxxxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

arch/x86/include/asm/uv/uv_hub.h | 7 +++++++
1 file changed, 7 insertions(+)

--- a/arch/x86/include/asm/uv/uv_hub.h
+++ b/arch/x86/include/asm/uv/uv_hub.h
@@ -18,6 +18,8 @@
#include <asm/types.h>
#include <asm/percpu.h>
#include <asm/uv/uv_mmrs.h>
+#include <asm/irq_vectors.h>
+#include <asm/io_apic.h>

@@ -420,9 +422,14 @@ static inline void uv_set_cpu_scir_bits(
static inline void uv_hub_send_ipi(int pnode, int apicid, int vector)
unsigned long val;
+ unsigned long dmode = dest_Fixed;
+ if (vector == NMI_VECTOR)
+ dmode = dest_NMI;

val = (1UL << UVH_IPI_INT_SEND_SHFT) |
((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
uv_write_global_mmr64(pnode, UVH_IPI_INT, val);

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/