[src/netbsd-8]: src/sys/arch/x86/x86 Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/eafd75268ae3
branches:  netbsd-8
changeset: 937421:eafd75268ae3
user:      martin <martin%NetBSD.org@localhost>
date:      Tue Aug 18 09:41:10 2020 +0000

description:
Pull up following revision(s) (requested by nonaka in ticket #1597):

        sys/dev/ipmi.c: revision 1.5
        (applied to sys/arch/x86/x86/ipmi.c)

ipmi(4): Fixed a bug that incorrect condition is notified.

When the value obtained from the sensor is below the lower limit of
the critical threshold, it is notified that the value is below the lower
limit of the warning threshold.

diffstat:

 sys/arch/x86/x86/ipmi.c |  12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diffs (37 lines):

diff -r d4259bb582e5 -r eafd75268ae3 sys/arch/x86/x86/ipmi.c
--- a/sys/arch/x86/x86/ipmi.c   Tue Aug 11 17:08:36 2020 +0000
+++ b/sys/arch/x86/x86/ipmi.c   Tue Aug 18 09:41:10 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $ */
+/*     $NetBSD: ipmi.c,v 1.64.10.1 2020/08/18 09:41:10 martin Exp $ */
 
 /*
  * Copyright (c) 2006 Manuel Bouyer.
@@ -52,7 +52,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.64 2016/07/07 06:55:40 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipmi.c,v 1.64.10.1 2020/08/18 09:41:10 martin Exp $");
 
 #include <sys/types.h>
 #include <sys/param.h>
@@ -1667,14 +1667,14 @@
                    edata->value_cur > psensor->i_limits.sel_warnmax)
                        return ENVSYS_SWARNOVER;
 
+               if (psensor->i_props & PROP_CRITMIN &&
+                   edata->value_cur < psensor->i_limits.sel_critmin)
+                       return ENVSYS_SCRITUNDER;
+
                if (psensor->i_props & PROP_WARNMIN &&
                    edata->value_cur < psensor->i_limits.sel_warnmin)
                        return ENVSYS_SWARNUNDER;
 
-               if (psensor->i_props & PROP_CRITMIN &&
-                   edata->value_cur < psensor->i_limits.sel_critmin)
-                       return ENVSYS_SCRITUNDER;
-
                break;
 
        case IPMI_SENSOR_TYPE_INTRUSION: