[patch 1/1] x86, UV: uv_hub_send_ipi Needs to set DELIVERY_MODE=4 for vector=NMI_VECTOR.

[patch 1/1] x86, UV: uv_hub_send_ipi Needs to set DELIVERY_MODE=4 for vector=NMI_VECTOR.

[Robin Holt]

[-- Attachment #1: uv_fix_nmi_delivery.patch --]
[-- Type: text/plain, Size: 1387 bytes --]

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.

To: Ingo Molnar <mingo@elte.hu>
To: tglx@linutronix.de
Signed-off-by: Robin Holt <holt@sgi.com>
Acked-by: Jack Steiner <steiner@sgi.com>
Cc: linux-kernel@vger.kernel.org
Cc: stable@kernel.org
Cc: Martin Hicks <mort@sgi.com>

---
 arch/x86/include/asm/uv/uv_hub.h |    6 ++++++
 1 file changed, 6 insertions(+)
Index: linux-x86/arch/x86/include/asm/uv/uv_hub.h
===================================================================
--- linux-x86.orig/arch/x86/include/asm/uv/uv_hub.h	2009-10-19 04:07:07.000000000 -0500
+++ linux-x86/arch/x86/include/asm/uv/uv_hub.h	2009-10-19 04:07:09.000000000 -0500
@@ -19,6 +19,7 @@
 #include <asm/types.h>
 #include <asm/percpu.h>
 #include <asm/uv/uv_mmrs.h>
+#include <asm/irq_vectors.h>
 
 
 /*
@@ -435,9 +436,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 = 0; /* Directed Delivery */
+
+	if (vector == NMI_VECTOR)
+		dmode = 4; /* NMI Delivery */
 
 	val = (1UL << UVH_IPI_INT_SEND_SHFT) |
 			((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
+			(dmode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
 			(vector << UVH_IPI_INT_VECTOR_SHFT);
 	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);
 }

Re: [patch 1/1] x86, UV: uv_hub_send_ipi Needs to set DELIVERY_MODE=4 for vector=NMI_VECTOR.

[Ingo Molnar]

* Robin Holt <holt@sgi.com> wrote:

> 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.
> 
> To: Ingo Molnar <mingo@elte.hu>
> To: tglx@linutronix.de
> Signed-off-by: Robin Holt <holt@sgi.com>
> Acked-by: Jack Steiner <steiner@sgi.com>
> Cc: linux-kernel@vger.kernel.org
> Cc: stable@kernel.org
> Cc: Martin Hicks <mort@sgi.com>
> 
> ---
>  arch/x86/include/asm/uv/uv_hub.h |    6 ++++++
>  1 file changed, 6 insertions(+)
> Index: linux-x86/arch/x86/include/asm/uv/uv_hub.h
> ===================================================================
> --- linux-x86.orig/arch/x86/include/asm/uv/uv_hub.h	2009-10-19 04:07:07.000000000 -0500
> +++ linux-x86/arch/x86/include/asm/uv/uv_hub.h	2009-10-19 04:07:09.000000000 -0500
> @@ -19,6 +19,7 @@
>  #include <asm/types.h>
>  #include <asm/percpu.h>
>  #include <asm/uv/uv_mmrs.h>
> +#include <asm/irq_vectors.h>
>  
>  
>  /*
> @@ -435,9 +436,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 = 0; /* Directed Delivery */
> +
> +	if (vector == NMI_VECTOR)
> +		dmode = 4; /* NMI Delivery */
>  
>  	val = (1UL << UVH_IPI_INT_SEND_SHFT) |
>  			((apicid) << UVH_IPI_INT_APIC_ID_SHFT) |
> +			(dmode << UVH_IPI_INT_DELIVERY_MODE_SHFT) |
>  			(vector << UVH_IPI_INT_VECTOR_SHFT);
>  	uv_write_global_mmr64(pnode, UVH_IPI_INT, val);

Hm, would be cleaner to create an enum for that '4' (and for 0) in 
uv_mmrs.h and use it here. (We have similar constants for delivery modes 
in io_apic.h, see dest_*.)

	Ingo

Re: [patch 1/1] x86, UV: uv_hub_send_ipi Needs to set DELIVERY_MODE=4 for vector=NMI_VECTOR.

[Robin Holt]

On Mon, Oct 19, 2009 at 03:08:21PM +0200, Ingo Molnar wrote:
> Hm, would be cleaner to create an enum for that '4' (and for 0) in 
> uv_mmrs.h and use it here. (We have similar constants for delivery modes 
> in io_apic.h, see dest_*.)

I will send another patch shortly.  This register has delivery modes
modeled after the io_apic.

Robin