From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753611Ab1CBPcf (ORCPT ); Wed, 2 Mar 2011 10:32:35 -0500 Received: from mail-fx0-f46.google.com ([209.85.161.46]:56637 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752157Ab1CBPce (ORCPT ); Wed, 2 Mar 2011 10:32:34 -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 :content-type:content-transfer-encoding; b=ilyNDXqH9kJN4onzPWpAsALRH/5ylDvrwHFrVYA1E4wh4v2vm9Z4IinoiSvDtVe0Tq hPme092gMYFuyObeVJ9UfrC3y6m2c/WjCMsmYXH+saL73Ae+BKeg48PCo3+iiK+H2CA1 Ige7JfO1eGsDvW63N9gb6IZTsJdTLDxo6GFJE= Message-ID: <4D6E630E.1070107@openvz.org> Date: Wed, 02 Mar 2011 18:32:30 +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: Don Zickus , "Huang, Ying" , lkml Subject: [PATCH -tip 1/2 resend] x86, nmi: Define a name for NMI control port Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Also add a comment anout why we need in-out operations. Signed-off-by: Cyrill Gorcunov --- Ingo I hope this time I've resolved MUA space injection. 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(); } -- Cyrill