From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757006Ab1CARdj (ORCPT ); Tue, 1 Mar 2011 12:33:39 -0500 Received: from mail-bw0-f46.google.com ([209.85.214.46]:42275 "EHLO mail-bw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756713Ab1CARdi (ORCPT ); Tue, 1 Mar 2011 12:33:38 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:user-agent:mime-version:to:cc:subject :references:in-reply-to:content-type:content-transfer-encoding; b=swPZNPFNOLJZLCwNbI4ZxX7dm0gp6QVhH8ksXfcDZvB0D5Npda5X66EN44zCrtLHdp dBhvafIXg6R9H/fz892ti62k8kJCtuooOluJaBFQqGaSbwcmlIwY9+/X6+PSevwzt5pa l0gV+74wa5lVZpF0zQr04GHra9kUvN3VyeIuI= Message-ID: <4D6D2DD1.1020707@openvz.org> Date: Tue, 01 Mar 2011 20:33:05 +0300 From: Cyrill Gorcunov User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.2.13) Gecko/20101208 Thunderbird/3.1.7 MIME-Version: 1.0 To: Ingo Molnar CC: Thomas Gleixner , "H. Peter Anvin" , Don Zickus , "Huang, Ying" , lkml , "Maciej W. Rozycki" Subject: Re: [PATHC -tip 1/2] x86, nmi: Define a name for NMI control port References: <4D6C163A.4010904@openvz.org> <20110301075712.GA13857@elte.hu> In-Reply-To: <20110301075712.GA13857@elte.hu> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 03/01/2011 10:57 AM, Ingo Molnar wrote: ... > > FYI, the patch is whitespace damaged. > > Ingo Ingo, this one should be fine --- From: Cyrill Gorcunov Subject: [PATCH -tip 1/2] x86, nmi: Define a name for NMI control port Also add a comment anout why we need in-out operations. Signed-off-by: Cyrill Gorcunov --- arch/x86/include/asm/mach_traps.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) Index: linux-2.6.git/arch/x86/include/asm/mach_traps.h ===================================================================== --- linux-2.6.git.orig/arch/x86/include/asm/mach_traps.h +++ linux-2.6.git/arch/x86/include/asm/mach_traps.h @@ -8,6 +8,7 @@ #include #define NMI_REASON_PORT 0x61 +#define NMI_ENABLE_PORT 0x70 /* Real-Time Clock Address Register as well */ #define NMI_REASON_SERR 0x80 #define NMI_REASON_IOCHK 0x40 @@ -30,12 +31,19 @@ static inline void reassert_nmi(void) old_reg = current_lock_cmos_reg(); else lock_cmos(0); /* register doesn't matter here */ - outb(0x8f, 0x70); - inb(0x71); /* dummy */ - outb(0x0f, 0x70); - inb(0x71); /* dummy */ + + /* + * This will cause the NMI output to transition low + * then high if there are any pending NMI sources. The + * CPU's NMI input logic will then register a new NMI. + */ + outb(0x8f, NMI_ENABLE_PORT); + inb(0x71); /* dummy */ + outb(0x0f, NMI_ENABLE_PORT); + inb(0x71); /* dummy */ + if (old_reg >= 0) - outb(old_reg, 0x70); + outb(old_reg, NMI_ENABLE_PORT); else unlock_cmos(); }