commit 1218aa64d109facdd2633f1205e5e4f1be6d8891
author ankita prasad <ankita.prasad@intel.com> Wed Jul 26 05:25:51 2023 +0000
committer ankita prasad <ankita.prasad@intel.com> Thu Aug 03 13:58:03 2023 +0000
tree 46828eab526f394963662bb6d11e24b80ec6cae1
parent 48935a4343cbb81e43f37a9442d72905442300f9

Removing PLD lines to read PFR CPLD Version

PLD GPIO lines are no more supported to read the PFR CPLD version.
Hence, removing the PLD lines related changes. The new format of the PFR CPLD Version is - <MainPLDMajorMinor>-<SVN.RoT>-<CPLD-Hash>

Tested: Flashed on BMC.
BMC booted without any errors. pfr-manager not seeing the
error "Failed to find the GPIO line".
journalctl | grep pfr-manager
Jul 28 04:21:26 bmc-mac562523846e69 pfr-manager[546]: VERSION INFO - cpld_active - 3.0-65a5bc415e9b2bab092351f74863ae6070ac3ef9e1be0ea83a4040aeaac52fcd
Jul 28 04:21:26 bmc-mac562523846e69 pfr-manager[546]: VERSION INFO - bmc_recovery - 0.27-30-g544234
Jul 28 04:21:26 bmc-mac562523846e69 pfr-manager[546]: VERSION INFO - cpld_recovery - 3.0
Jul 28 04:21:26 bmc-mac562523846e69 pfr-manager[546]: Intel PFR service started successfully

Change-Id: I2de7f6ec8925308203577b49f1c4c3458072d967
Signed-off-by: Ankita Prasad <ankita.prasad@intel.com>

libpfr/src/pfr.cpp

diff --git a/libpfr/src/pfr.cpp b/libpfr/src/pfr.cpp
index 0b7fdc4..61c52f0 100644
--- a/libpfr/src/pfr.cpp
+++ b/libpfr/src/pfr.cpp
@@ -81,12 +81,6 @@
     "MAIN_PLD_MINOR_REV_BIT3", "MAIN_PLD_MINOR_REV_BIT2",
     "MAIN_PLD_MINOR_REV_BIT1", "MAIN_PLD_MINOR_REV_BIT0"};
 
-static const std::array<std::string, 8> pldGpioLines = {
-    "SGPIO_PLD_MAJOR_REV_BIT3", "SGPIO_PLD_MAJOR_REV_BIT2",
-    "SGPIO_PLD_MAJOR_REV_BIT1", "SGPIO_PLD_MAJOR_REV_BIT0",
-    "SGPIO_PLD_MINOR_REV_BIT3", "SGPIO_PLD_MINOR_REV_BIT2",
-    "SGPIO_PLD_MINOR_REV_BIT1", "SGPIO_PLD_MINOR_REV_BIT0"};
-
 bool exceptionFlag = true;
 
 void init(std::shared_ptr<sdbusplus::asio::connection> conn,
@@ -330,10 +324,8 @@
 {
     // CPLD SGPIO lines
     gpiod::line mainCPLDLine;
-    gpiod::line pldLine;
-    // read main pld and pld version
+    // read main pld version
     uint8_t mainCPLDVer = 0;
-    uint8_t pldVer = 0;
     // main CPLD
     for (const auto& gLine : mainCPLDGpioLines)
     {
@@ -353,25 +345,6 @@
         }
     }
 
-    // pld lines
-    for (const auto& gLine : pldGpioLines)
-    {
-        uint8_t value = 0;
-        if (getGPIOInput(gLine, pldLine, &value))
-        {
-            pldVer <<= 1;
-            pldVer = pldVer | value;
-        }
-        else
-        {
-            phosphor::logging::log<phosphor::logging::level::ERR>(
-                "Failed to read GPIO line: ",
-                phosphor::logging::entry("MSG=%s", gLine.c_str()));
-            pldVer = 0;
-            break;
-        }
-    }
-
     std::string svnRoTHash = "";
 
     // check if reg 0x00 read 0xde
@@ -405,14 +378,13 @@
 
     // CPLD version format:
     // When PFR CPLD is present
-    // <MainPLDMajorMinor.PLDMajorMinor>-<SVN.RoT>-<CPLD-Hash>
-    // Example: 2.7-1.1-<Hash string>
+    // <MainPLDMajorMinor>-<SVN.RoT>-<CPLD-Hash>
+    // Example: 2-1.1-<Hash string>
 
-    // When Non-PFR CPLD is present -> <MainPLDMajorMinor.PLDMajorMinor>
-    // Example: 2.7
+    // When Non-PFR CPLD is present -> <MainPLDMajorMinor>
+    // Example: 2
 
-    std::string version = std::to_string(mainCPLDVer) + "." +
-                          std::to_string(pldVer) + svnRoTHash;
+    std::string version = std::to_string(mainCPLDVer) + svnRoTHash;
     return version;
 }