[GIT PULL] One MCE decoding fixlet for 3.4

[Borislav Petkov <bp@amd64.org>]

Hi Linus,

please pull the following fixlet for -rc2.

Thanks.

The following changes since commit dd775ae2549217d3ae09363e3edb305d0fa19928:

  Linux 3.4-rc1 (2012-03-31 16:24:09 -0700)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git tags/mce-fix-for-3.4

for you to fetch changes up to ec3e82d6dc46cac7309b01ff9761f469b0263019:

  MCE, AMD: Drop too granulary family model checks (2012-04-04 15:50:11 +0200)

----------------------------------------------------------------
One fix which makes MCE decoding much more "liberal" wrt families.

----------------------------------------------------------------
Borislav Petkov (1):
      MCE, AMD: Drop too granulary family model checks

 drivers/edac/mce_amd.c |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

commit ec3e82d6dc46cac7309b01ff9761f469b0263019
Author: Borislav Petkov <borislav.petkov@amd.com>
Date:   Wed Apr 4 14:21:02 2012 +0200

    MCE, AMD: Drop too granulary family model checks
    
    MCA details seldom change inbetween the models of a family so don't
    be too conservative and enable decoding on everything starting from
    K8 onwards. Minor adjustments can come in later but most importantly,
    we have some decoding infrastructure in place for upcoming models by
    default.
    
    Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>

diff --git a/drivers/edac/mce_amd.c b/drivers/edac/mce_amd.c
index 36e1486eb9aa..d0c372e30de4 100644
--- a/drivers/edac/mce_amd.c
+++ b/drivers/edac/mce_amd.c
@@ -754,9 +754,7 @@ static int __init mce_amd_init(void)
 	if (c->x86_vendor != X86_VENDOR_AMD)
 		return 0;
 
-	if ((c->x86 < 0xf || c->x86 > 0x12) &&
-	    (c->x86 != 0x14 || c->x86_model > 0xf) &&
-	    (c->x86 != 0x15 || c->x86_model > 0xf))
+	if (c->x86 < 0xf || c->x86 > 0x15)
 		return 0;
 
 	fam_ops = kzalloc(sizeof(struct amd_decoder_ops), GFP_KERNEL);
@@ -797,7 +795,7 @@ static int __init mce_amd_init(void)
 		break;
 
 	default:
-		printk(KERN_WARNING "Huh? What family is that: %d?!\n", c->x86);
+		printk(KERN_WARNING "Huh? What family is it: 0x%x?!\n", c->x86);
 		kfree(fam_ops);
 		return -EINVAL;
 	}
-- 
Regards/Gruss,
Boris.

Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
GM: Alberto Bozzo
Reg: Dornach, Landkreis Muenchen
HRB Nr. 43632 WEEE Registernr: 129 19551