[src/trunk]: src/sys/arch/x86/x86 Only fix up IPMI on ProLiant Microserver wh...

[mlelstv <mlelstv%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/822b466cd1a6
branches:  trunk
changeset: 344529:822b466cd1a6
user:      mlelstv <mlelstv%NetBSD.org@localhost>
date:      Sun Apr 03 10:32:00 2016 +0000

description:
Only fix up IPMI on ProLiant Microserver when address if set.
Don't assume a specific preconfigured address, just clear the lower bits.

diffstat:

 sys/arch/x86/x86/ipmi.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 2fab3e590bb0 -r 822b466cd1a6 sys/arch/x86/x86/ipmi.c
--- a/sys/arch/x86/x86/ipmi.c   Sun Apr 03 10:03:34 2016 +0000
+++ b/sys/arch/x86/x86/ipmi.c   Sun Apr 03 10:32:00 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipmi.c,v 1.62 2015/08/28 14:06:01 joerg Exp $ */
+/*     $NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.62 2015/08/28 14:06:01 joerg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.63 2016/04/03 10:32:00 mlelstv Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -939,9 +939,10 @@
 
        platform = pmf_get_platform("system-product");
        if (platform != NULL &&
-           strcmp(platform, "ProLiant MicroServer") == 0) {
+           strcmp(platform, "ProLiant MicroServer") == 0 &&
+           pipmi->smipmi_base_address != 0) {
                 ia->iaa_if_iospacing = 1;
-                ia->iaa_if_iobase = pipmi->smipmi_base_address - 7;
+                ia->iaa_if_iobase = pipmi->smipmi_base_address & ~0x7;
                 ia->iaa_if_iotype = 'i';
                 return;
         }