All of lore.kernel.org
 help / color / mirror / Atom feed
From: "Joachim Deguara" <joachim.deguara@amd.com>
To: discuss@x86-64.org, "Langsdorf, Mark" <mark.langsdorf@amd.com>,
	linux-kernel@vger.kernel.org, "Nagendra,
	Bhavana" <bhavana.nagendra@amd.com>
Subject: [PATCH] i386 mce check capability
Date: Tue, 03 Apr 2007 14:49:42 +0200	[thread overview]
Message-ID: <46124D66.7030309@amd.com> (raw)

[-- Attachment #1: Type: text/plain, Size: 181 bytes --]

Currently the i386 architecture checks the family for mce capability and this removes that and uses the CPUID information.  Tested on a K8 revE and a family10h processor.

-Joachim

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: i386_mce_check_capability.patch --]
[-- Type: text/x-patch; name=i386_mce_check_capability.patch, Size: 1188 bytes --]

This eliminates checking of a set AMD procesor family if mce is 
allowed and relies on the information being in CPUID.

Signed-off-by: Joachim Deguara <joachim.deguara@amd.com>

Index: 2.6-linus-git/arch/i386/kernel/cpu/mcheck/mce.c
===================================================================
--- 2.6-linus-git.orig/arch/i386/kernel/cpu/mcheck/mce.c
+++ 2.6-linus-git/arch/i386/kernel/cpu/mcheck/mce.c
@@ -38,8 +38,7 @@ void mcheck_init(struct cpuinfo_x86 *c)
 
 	switch (c->x86_vendor) {
 		case X86_VENDOR_AMD:
-			if (c->x86==6 || c->x86==15)
-				amd_mcheck_init(c);
+			amd_mcheck_init(c);
 			break;
 
 		case X86_VENDOR_INTEL:
Index: 2.6-linus-git/arch/i386/kernel/cpu/mcheck/k7.c
===================================================================
--- 2.6-linus-git.orig/arch/i386/kernel/cpu/mcheck/k7.c
+++ 2.6-linus-git/arch/i386/kernel/cpu/mcheck/k7.c
@@ -75,6 +75,9 @@ void amd_mcheck_init(struct cpuinfo_x86 
 	machine_check_vector = k7_machine_check;
 	wmb();
 
+	if (!cpu_has(c, X86_FEATURE_MCE))
+		return;
+
 	printk (KERN_INFO "Intel machine check architecture supported.\n");
 	rdmsr (MSR_IA32_MCG_CAP, l, h);
 	if (l & (1<<8))	/* Control register present ? */

                 reply	other threads:[~2007-04-03 12:50 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=46124D66.7030309@amd.com \
    --to=joachim.deguara@amd.com \
    --cc=bhavana.nagendra@amd.com \
    --cc=discuss@x86-64.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.langsdorf@amd.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.