xen-devel.lists.xenproject.org archive mirror
 help / color / mirror / Atom feed
From: Keir Fraser <keir@xen.org>
To: Jan Beulich <JBeulich@suse.com>, xen-devel <xen-devel@lists.xen.org>
Subject: Re: [PATCH] x86: handle both NMI kinds if they occur simultaneously
Date: Thu, 17 Jan 2013 11:48:05 +0000	[thread overview]
Message-ID: <CD1D9575.59060%keir@xen.org> (raw)
In-Reply-To: <50F7E07102000078000B6B8D@nat28.tlf.novell.com>

On 17/01/2013 10:28, "Jan Beulich" <JBeulich@suse.com> wrote:

> We shouldn't assume PCI SERR excludes IOCHK.
> 
> Once at it, also remove the doubly redundant range restriction on
> "reason" - the variable already is "unsigned char".
> 
> Signed-off-by: Jan Beulich <jbeulich@suse.com>

Acked-by: Keir Fraser <keir@xen.org>

> --- a/xen/arch/x86/traps.c
> +++ b/xen/arch/x86/traps.c
> @@ -3201,10 +3201,10 @@ void do_nmi(struct cpu_user_regs *regs)
>          reason = inb(0x61);
>          if ( reason & 0x80 )
>              pci_serr_error(regs);
> -        else if ( reason & 0x40 )
> +        if ( reason & 0x40 )
>              io_check_error(regs);
> -        else if ( !nmi_watchdog )
> -            unknown_nmi_error(regs, (unsigned char)(reason&0xff));
> +        if ( !(reason & 0xc0) && !nmi_watchdog )
> +            unknown_nmi_error(regs, reason);
>      }
>  }
>  
> 
> 
> 
> _______________________________________________
> Xen-devel mailing list
> Xen-devel@lists.xen.org
> http://lists.xen.org/xen-devel

      parent reply	other threads:[~2013-01-17 11:48 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-01-17 10:28 [PATCH] x86: handle both NMI kinds if they occur simultaneously Jan Beulich
2013-01-17 11:26 ` Andrew Cooper
2013-01-17 11:48 ` Keir Fraser [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=CD1D9575.59060%keir@xen.org \
    --to=keir@xen.org \
    --cc=JBeulich@suse.com \
    --cc=xen-devel@lists.xen.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).