phosphor-bmc-code-memt: Support redfish remote firmware update with static layout image

* phosphor-bmc-code-memt: Support redfish remote firmware update with static layout image
@ 2019-11-15  2:24 Bright Cheng/WYHQ/Wiwynn
  2019-11-15  2:51 ` Lei YU
  0 siblings, 1 reply; 6+ messages in thread
From: Bright Cheng/WYHQ/Wiwynn @ 2019-11-15  2:24 UTC (permalink / raw)
  To: openbmc, 'Adriana Kobylak',
	Gunnar Mills, Lei Yu, Ratan Gupta, Jayanth Othayoth
  Cc: 'Neeraj Ladkani',
	Delphine Chiu/WYHQ/Wiwynn, Bonnie Lo/WYHQ/Wiwynn


[-- Attachment #1.1: Type: text/plain, Size: 1345 bytes --]

Hi Adriana,

We add some modifications for phosphor-bmc-code-mgmt can support remote BMC update for static layout.

Do you agree these modifications?

phosphor-bmc-code-memt doesn't support static-layout remote update since static layout fw package could only has "image-bmc" in the package.

Following are the modifications
1. Add a name list for static layout only has image-bmc in the fw package and modify related image file checking.
2. Add checking ApplyTime property for static layout to decide whether reboot to apply update process or not.

Please find the patch for these modifications in the attachment.

Thanks in advanced for any insight !

---------------------------------------------------------------------------------------------------------------------------------------------------------------
This email contains confidential or legally privileged information and is for the sole use of its intended recipient. 
Any unauthorized review, use, copying or distribution of this email or the content of this email is strictly prohibited.
If you are not the intended recipient, you may reply to the sender and should delete this e-mail immediately.
---------------------------------------------------------------------------------------------------------------------------------------------------------------

[-- Attachment #1.2: Type: text/html, Size: 5578 bytes --]

[-- Attachment #2: 0001-add-namelist-to-support-image-bmc-and-using-systemca.patch --]
[-- Type: application/octet-stream, Size: 6430 bytes --]

From a0fd6dc5dc538048e2bf4950b73f7f1a77dfb372 Mon Sep 17 00:00:00 2001
From: bright <bright_cheng@wiwynn.com>
Date: Thu, 12 Sep 2019 17:25:34 +0800
Subject: [PATCH] add namelist to support image bmc and using systemcall to
 reboot BMC

---
 activation.cpp       | 20 +++++++++++++++++---
 download_manager.cpp |  4 ++++
 images.hpp           |  2 ++
 item_updater.cpp     | 19 ++++++++++++++-----
 static/flash.cpp     | 22 +++++++++++++++++++---
 5 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/activation.cpp b/activation.cpp
index 0c18821..1ff8eff 100644
--- a/activation.cpp
+++ b/activation.cpp
@@ -78,7 +78,6 @@ void Activation::unsubscribeFromSystemdSignals()
 
 auto Activation::activation(Activations value) -> Activations
 {
-
     if ((value != softwareServer::Activation::Activations::Active) &&
         (value != softwareServer::Activation::Activations::Activating))
     {
@@ -200,7 +199,23 @@ auto Activation::activation(Activations value) -> Activations
         // Create active association
         parent.createActiveAssociation(path);
 
-        log<level::INFO>("BMC image ready, need reboot to get activated.");
+        if (Activation::checkApplyTimeImmediate() == true)
+        {
+            log<level::INFO>("Image Active. ApplyTime is immediate, "
+                             "rebooting BMC.");
+            auto reply = std::system("/sbin/reboot");
+            if (reply < 0)
+            {
+                log<level::ALERT>("Error in trying to reboot the BMC. "
+                                  "The BMC needs to be manually rebooted to complete "
+                                  "the image activation.");
+            }
+        }
+        else
+        {
+            log<level::INFO>("BMC image ready, need reboot to get activated.");
+        }
+
         return softwareServer::Activation::activation(
             softwareServer::Activation::Activations::Active);
 #endif
@@ -212,7 +227,6 @@ auto Activation::activation(Activations value) -> Activations
     }
     return softwareServer::Activation::activation(value);
 }
-
 void Activation::deleteImageManagerObject()
 {
     // Call the Delete object for <versionID> inside image_manager
diff --git a/download_manager.cpp b/download_manager.cpp
index 6357ee8..a6beee7 100644
--- a/download_manager.cpp
+++ b/download_manager.cpp
@@ -30,6 +30,8 @@ void Download::downloadViaTFTP(std::string fileName, std::string serverAddress)
 {
     using Argument = xyz::openbmc_project::Common::InvalidArgument;
 
+    fprintf(stdout, "TFTP download start \r\n");
+
     // Sanitize the fileName string
     if (!fileName.empty())
     {
@@ -43,6 +45,7 @@ void Download::downloadViaTFTP(std::string fileName, std::string serverAddress)
         log<level::ERR>("Error FileName is empty");
         elog<InvalidArgument>(Argument::ARGUMENT_NAME("FileName"),
                               Argument::ARGUMENT_VALUE(fileName.c_str()));
+        fprintf(stdout, "fileName is empty: %s \r\n", fileName.c_str());
         return;
     }
 
@@ -51,6 +54,7 @@ void Download::downloadViaTFTP(std::string fileName, std::string serverAddress)
         log<level::ERR>("Error ServerAddress is empty");
         elog<InvalidArgument>(Argument::ARGUMENT_NAME("ServerAddress"),
                               Argument::ARGUMENT_VALUE(serverAddress.c_str()));
+        fprintf(stdout, "serverAddress is empty: %s \r\n", serverAddress.c_str());
         return;
     }
 
diff --git a/images.hpp b/images.hpp
index 97b8f7f..ceac336 100644
--- a/images.hpp
+++ b/images.hpp
@@ -13,6 +13,8 @@ namespace image
 // BMC flash image file name list.
 const std::vector<std::string> bmcImages = {"image-kernel", "image-rofs",
                                             "image-rwfs", "image-u-boot"};
+// BMC flash image file name list (image-bmc)
+const std::vector<std::string> bmcFlashImages = {"image-bmc"};
 
 } // namespace image
 } // namespace software
diff --git a/item_updater.cpp b/item_updater.cpp
index 21fb6e0..911ddb0 100644
--- a/item_updater.cpp
+++ b/item_updater.cpp
@@ -358,16 +358,25 @@ ItemUpdater::ActivationStatus
 {
     bool invalid = false;
 
-    for (auto& bmcImage : bmcImages)
+    for (auto& bmcFlashImage : bmcFlashImages)
     {
         fs::path file(filePath);
-        file /= bmcImage;
+        file /= bmcFlashImage;
         std::ifstream efile(file.c_str());
         if (efile.good() != 1)
         {
-            log<level::ERR>("Failed to find the BMC image.",
-                            entry("IMAGE=%s", bmcImage.c_str()));
-            invalid = true;
+            for (auto& bmcImage : bmcImages)
+            {
+                fs::path file(filePath);
+                file /= bmcImage;
+                std::ifstream efile(file.c_str());
+                if (efile.good() != 1)
+                {
+                    log<level::ERR>("Failed to find the BMC image.",
+                                    entry("IMAGE=%s", bmcImage.c_str()));
+                    invalid = true;
+                }
+            }
         }
     }
 
diff --git a/static/flash.cpp b/static/flash.cpp
index 82c2393..b3f8640 100644
--- a/static/flash.cpp
+++ b/static/flash.cpp
@@ -6,6 +6,7 @@
 #include "images.hpp"
 
 #include <experimental/filesystem>
+#include <fstream>
 
 namespace
 {
@@ -28,10 +29,25 @@ void Activation::flashWrite()
     // the image to flash during reboot.
     fs::path uploadDir(IMG_UPLOAD_DIR);
     fs::path toPath(PATH_INITRAMFS);
-    for (auto& bmcImage : phosphor::software::image::bmcImages)
+    for (auto& bmcFlashImage : phosphor::software::image::bmcFlashImages)
     {
-        fs::copy_file(uploadDir / versionId / bmcImage, toPath / bmcImage,
-                      fs::copy_options::overwrite_existing);
+        fs::path file(uploadDir.c_str());
+        file /= versionId;
+        file /= bmcFlashImage;
+        std::ifstream efile(file.c_str());
+        if (efile.good() != 1)
+        {
+            for (auto& bmcImage : phosphor::software::image::bmcImages)
+            {
+                fs::copy_file(uploadDir / versionId / bmcImage, toPath / bmcImage,
+                              fs::copy_options::overwrite_existing);
+            }
+        }
+        else
+        {
+            fs::copy_file(uploadDir / versionId / bmcFlashImage, toPath / bmcFlashImage,
+                          fs::copy_options::overwrite_existing);
+        }
     }
 }
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 6+ messages in thread