commit 6c2ac394eef7740bd8bf3850ad4acc65e70d8698
author Brandon Wyman <bjwyman@gmail.com> Tue Dec 21 22:23:06 2021 +0000
committer Brandon Wyman <bjwyman@gmail.com> Fri Jan 07 00:56:14 2022 +0000
tree a4a134066570614af088dfb3eb45f6811172a027
parent e3f7ad238a5ffaa87e19839ce15c12c3e8df9c9e

psu-ng: Refactor MFR fault detection

Move handling of MFR fault to its own analyzeMFRFault() function.

This will handle checking if the MFR fault bit is on in STATUS_WORD, and
determinine what power supply specific meaning any STATUS_MFR_SPECIFIC
bits mean by calling determineMFRFault().

The analyze() function is getting a bit long and hard to read.

Change-Id: I401ebcf11943099385044081518a27511075fa94
Signed-off-by: Brandon Wyman <bjwyman@gmail.com>

phosphor-power-supply/power_supply.cpp

diff --git a/phosphor-power-supply/power_supply.cpp b/phosphor-power-supply/power_supply.cpp
index 6b82796..04762b3 100644
--- a/phosphor-power-supply/power_supply.cpp
+++ b/phosphor-power-supply/power_supply.cpp
@@ -211,6 +211,24 @@
     }
 }
 
+void PowerSupply::analyzeMFRFault()
+{
+    if (statusWord & phosphor::pmbus::status_word::MFR_SPECIFIC_FAULT)
+    {
+        if (!mfrFault)
+        {
+            log<level::ERR>(fmt::format("MFR fault: "
+                                        "STATUS_WORD = {:#04x} "
+                                        "STATUS_MFR_SPECIFIC = {:#02x}",
+                                        statusWord, statusMFR)
+                                .c_str());
+        }
+
+        mfrFault = true;
+        determineMFRFault();
+    }
+}
+
 void PowerSupply::analyze()
 {
     using namespace phosphor::pmbus;
@@ -369,21 +387,7 @@
                     pgoodFault = 0;
                 }
 
-                if (statusWord & status_word::MFR_SPECIFIC_FAULT)
-                {
-                    if (!mfrFault)
-                    {
-                        log<level::ERR>(
-                            fmt::format("MFR fault: "
-                                        "STATUS_WORD = {:#04x} "
-                                        "STATUS_MFR_SPECIFIC = {:#02x}",
-                                        statusWord, statusMFR)
-                                .c_str());
-                    }
-
-                    mfrFault = true;
-                    determineMFRFault();
-                }
+                analyzeMFRFault();
 
                 if (statusWord & status_word::VIN_UV_FAULT)
                 {