From bee56d62b209088454d166d1efae4825a2b175df Mon Sep 17 00:00:00 2001
From: Chalapathi <chalapathix.venkataramashetty@intel.com>
Date: Fri, 14 Feb 2020 15:43:49 +0000
Subject: Update PFR event mappings in mainapp.

Updated the last panic reason, recovery reason and major/minor code
event log mappings, as per latest PFR document changes

Tested:
1. Update BIOS fw via Redfish
POST: https://<BMC_IP>/redfish/v1/UpdateService
Upload binary: <BIOS binary file>
2. Validate in redfish event logs:
   GET: https://<BMC_IP>/redfish/v1/Systems/system/LogServices/EventLog/Entries

    {
      "@odata.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
      "@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog
                   /Entries/1581504982",
      "@odata.type": "#LogEntry.v1_4_0.LogEntry",
      "Created": "2020-02-12T10:56:22+00:00",
      "EntryType": "Event",
      "Id": "1581504982",
      "Message": "BIOS firmware update to version 10069-fixme
                  completed successfully.",
      "MessageArgs": [
        "BIOS",
        "10069-fixme"
      ],
      "MessageId": "OpenBMC.0.1.FirmwareUpdateCompleted",
      "Name": "System Event Log Entry",
      "Severity": "OK"
    },
    {
      "@odata.context": "/redfish/v1/$metadata#LogEntry.LogEntry",
      "@odata.id": "/redfish/v1/Systems/system/LogServices/EventLog
                   /Entries/1581505600_2",
      "@odata.type": "#LogEntry.v1_4_0.LogEntry",
      "Created": "2020-02-12T11:06:40+00:00",
      "EntryType": "Event",
      "Id": "1581505600_2",
      "Message": "BMC firmware panic occurred due to BMC
                  update intent.",
      "MessageArgs": [
        "BMC update intent"
      ],
      "MessageId": "OpenBMC.0.1.BMCFirmwarePanicReason",
      "Name": "System Event Log Entry",
      "Severity": "Warning"
    }

Change-Id: Ic6eb10757ba7af9e610f8563a86d9a3ec2b83a4c
Signed-off-by: Chalapathi <chalapathix.venkataramashetty@intel.com>
---
 intel-pfr-manager/service/src/mainapp.cpp | 43 ++++++++++---------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/intel-pfr-manager/service/src/mainapp.cpp b/intel-pfr-manager/service/src/mainapp.cpp
index ae80912..cbd2082 100644
--- a/intel-pfr-manager/service/src/mainapp.cpp
+++ b/intel-pfr-manager/service/src/mainapp.cpp
@@ -63,10 +63,10 @@ static const boost::container::flat_map<uint8_t,
     recoveryReasonMap = {
         {0x01,
          {"BIOSFirmwareRecoveryReason",
-          "PCH active image authentication failure"}},
+          "BIOS active image authentication failure"}},
         {0x02,
          {"BIOSFirmwareRecoveryReason",
-          "PCH recovery image authentication failure"}},
+          "BIOS recovery image authentication failure"}},
         {0x03, {"MEFirmwareRecoveryReason", "ME launch failure"}},
         {0x04, {"BIOSFirmwareRecoveryReason", "ACM launch failure"}},
         {0x05, {"BIOSFirmwareRecoveryReason", "IBB launch failure"}},
@@ -85,30 +85,17 @@ static const boost::container::flat_map<uint8_t,
 static const boost::container::flat_map<uint8_t,
                                         std::pair<std::string, std::string>>
     panicReasonMap = {
-        {0x01, {"CPLDFirmwarePanicReason", "CPLD watchdog expired"}},
-        {0x02, {"BMCFirmwarePanicReason", "BMC watchdog expired"}},
-        {0x03, {"MEFirmwarePanicReason", "ME watchdog expired"}},
-        {0x04, {"BIOSFirmwarePanicReason", "ACM watchdog expired"}},
-        {0x05, {"BIOSFirmwarePanicReason", "IBB watchdog expired"}},
-        {0x06, {"BIOSFirmwarePanicReason", "OBB watchdog expired"}},
-        {0x07,
-         {"BMCFirmwarePanicReason", "BMC active image authentication failure"}},
-        {0x08,
-         {"BMCFirmwarePanicReason",
-          "BMC recovery image authentication failure"}},
+        {0x01, {"BIOSFirmwarePanicReason", "BIOS update intent"}},
+        {0x02, {"BMCFirmwarePanicReason", "BMC update intent"}},
+        {0x03, {"BMCFirmwarePanicReason", "BMC reset detected"}},
+        {0x04, {"BMCFirmwarePanicReason", "BMC watchdog expired"}},
+        {0x05, {"MEFirmwarePanicReason", "ME watchdog expired"}},
+        {0x06, {"BIOSFirmwarePanicReason", "ACM watchdog expired"}},
+        {0x07, {"BIOSFirmwarePanicReason", "IBB watchdog expired"}},
+        {0x08, {"BIOSFirmwarePanicReason", "OBB watchdog expired"}},
         {0x09,
          {"BIOSFirmwarePanicReason",
-          "PCH active image authentication failure"}},
-        {0x0A,
-         {"BIOSFirmwarePanicReason",
-          "PCH recovery image authentication failure"}},
-        {0x0B, {"MEFirmwarePanicReason", "ME authentication failure"}},
-        {0x0C,
-         {"BIOSFirmwarePanicReason",
-          "ACM or IBB or OBB authentication failure"}},
-        {0x0D, {"BIOSFirmwarePanicReason", "PCH update intent"}},
-        {0x0E, {"BMCFirmwarePanicReason", "BMC update intent"}},
-        {0x0F, {"BMCFirmwarePanicReason", "BMC reset detected"}}};
+          "ACM or IBB or OBB authentication failure"}}};
 
 // Firmware resiliency major map.
 // {<CPLD association>, {<Redfish MessageID>, <Error reason> })
@@ -119,12 +106,8 @@ static const boost::container::flat_map<uint8_t,
          {"BMCFirmwareResiliencyError", "BMC image authentication failed"}},
         {0x02,
          {"BIOSFirmwareResiliencyError", "BIOS image authentication failed"}},
-        {0x03, {"BMCFirmwareResiliencyError", "BMC boot failed"}},
-        {0x04, {"MEFirmwareResiliencyError", "ME boot failed"}},
-        {0x05, {"BIOSFirmwareResiliencyError", "ACM boot failed"}},
-        {0x06, {"BIOSFirmwareResiliencyError", "BIOS boot failed"}},
-        {0x07, {"BIOSFirmwareResiliencyError", "Update from PCH failed"}},
-        {0x08, {"BIOSFirmwarePanicReason", "Update from BMC failed"}}};
+        {0x03, {"BIOSFirmwareResiliencyError", "Update from BIOS failed"}},
+        {0x04, {"BMCFirmwareResiliencyError", "Update from BMC failed"}}};
 
 static void updateDbusPropertiesCache()
 {
-- 
cgit v1.2.3