From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752809AbZJTTgV (ORCPT ); Tue, 20 Oct 2009 15:36:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752068AbZJTTgU (ORCPT ); Tue, 20 Oct 2009 15:36:20 -0400 Received: from relay3.sgi.com ([192.48.152.1]:35676 "EHLO relay.sgi.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751704AbZJTTgT (ORCPT ); Tue, 20 Oct 2009 15:36:19 -0400 From: Robin Holt Message-Id: <20091020193620.877322000@alcatraz.americas.sgi.com> User-Agent: quilt/0.47-1 Date: Tue, 20 Oct 2009 14:36:15 -0500 To: Ingo Molnar , tglx@linutronix.de Cc: Jack Steiner , linux-kernel@vger.kernel.org, stable@kernel.org, Martin Hicks Subject: [patch 1/1] x86, UV: uv_hub_send_ipi Needs to set DELIVERY_MODE=4 for vector=NMI_VECTOR - V2. References: <20091020193614.821299000@alcatraz.americas.sgi.com> Content-Disposition: inline; filename=uv_fix_nmi_delivery.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 To: tglx@linutronix.de Signed-off-by: Robin Holt Acked-by: Jack Steiner Cc: linux-kernel@vger.kernel.org Cc: stable@kernel.org Cc: Martin Hicks --- V2 - use dest_* instead of hard coded values for delivery modes. arch/x86/include/asm/uv/uv_hub.h | 7 +++++++ 1 file changed, 7 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-20 13:44:17.000000000 -0500 +++ linux-x86/arch/x86/include/asm/uv/uv_hub.h 2009-10-20 13:59:30.000000000 -0500 @@ -19,6 +19,8 @@ #include #include #include +#include +#include /* @@ -435,9 +437,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) | + (dmode << UVH_IPI_INT_DELIVERY_MODE_SHFT) | (vector << UVH_IPI_INT_VECTOR_SHFT); uv_write_global_mmr64(pnode, UVH_IPI_INT, val); }