commit 0a385373b28c2a5e68cf2283b299de2e396cb16d
author Jonathan Doman <jonathan.doman@intel.com> Mon Mar 08 17:04:13 2021 -0800
committer Jonathan Doman <jonathan.doman@intel.com> Mon Mar 29 19:58:39 2021 -0700
tree 7d69de0c5663283e13e55f94f9227d847f73bc4c
parent 703a1856a40b117e5e2d9d883ebc46822ee3440c

Defer PPIN read until BIOS enables it

On platforms with AST2600 BMC, we now boot fast enough to read the PPIN
over PECI before the BIOS has a chance to enable it (by default it is
not readable). This commit delays the RdPkgConfig until BIOS is done
with POST.

Without this change, a value of 0 is read (and 0x90 CC - but that's
ignored), which causes us to drop it.

This also removes some unnecessary phosphor namespacing.

Tested:
- Booted from AC cycle, confirmed from journal logs that cpuinfoapp
  delays an extra minute before running through getProcessorInfo. PPIN
  is now set into SerialNumber D-Bus property and shown on Redfish.

Signed-off-by: Jonathan Doman <jonathan.doman@intel.com>
Change-Id: Ie3e8c668c6b24b42ced22fd9e103d1518702d78a

include/cpuinfo.hpp

diff --git a/include/cpuinfo.hpp b/include/cpuinfo.hpp
index 27a7264..d6acbf6 100644
--- a/include/cpuinfo.hpp
+++ b/include/cpuinfo.hpp
@@ -19,8 +19,6 @@
 #include <sdbusplus/asio/object_server.hpp>
 #include <xyz/openbmc_project/Inventory/Decorator/Asset/server.hpp>
 
-namespace phosphor
-{
 namespace cpu_info
 {
 static constexpr char const* cpuInfoObject = "xyz.openbmc_project.CPUInfo";
@@ -53,4 +51,3 @@
 };
 
 } // namespace cpu_info
-} // namespace phosphor

src/cpuinfo_main.cpp

diff --git a/src/cpuinfo_main.cpp b/src/cpuinfo_main.cpp
index 2e8135c..5a3a5ff 100644
--- a/src/cpuinfo_main.cpp
+++ b/src/cpuinfo_main.cpp
@@ -42,8 +42,6 @@
 #include <phosphor-logging/log.hpp>
 #include <sdbusplus/asio/object_server.hpp>
 
-namespace phosphor
-{
 namespace cpu_info
 {
 static constexpr bool debug = false;
@@ -235,12 +233,15 @@
     CPUModel model{};
     uint8_t stepping = 0;
 
-    if (peci_GetCPUID(cpuAddr, &model, &stepping, &cc) != PECI_CC_SUCCESS)
+    // Wait for POST to complete to ensure that BIOS has time to enable the
+    // PPIN. Before BIOS enables it, we would get a 0x90 CC on PECI.
+    if (hostState != HostState::postComplete ||
+        peci_GetCPUID(cpuAddr, &model, &stepping, &cc) != PECI_CC_SUCCESS)
     {
         // Start the PECI check loop
         auto waitTimer = std::make_shared<boost::asio::steady_timer>(io);
         waitTimer->expires_after(
-            std::chrono::seconds(phosphor::cpu_info::peciCheckInterval));
+            std::chrono::seconds(cpu_info::peciCheckInterval));
 
         waitTimer->async_wait(
             [waitTimer, &io, conn, cpu](const boost::system::error_code& ec) {
@@ -502,7 +503,6 @@
 }
 
 } // namespace cpu_info
-} // namespace phosphor
 
 int main(int argc, char* argv[])
 {
@@ -512,7 +512,7 @@
         std::make_shared<sdbusplus::asio::connection>(io);
 
     // CPUInfo Object
-    conn->request_name(phosphor::cpu_info::cpuInfoObject);
+    conn->request_name(cpu_info::cpuInfoObject);
     sdbusplus::asio::object_server server =
         sdbusplus::asio::object_server(conn);
     sdbusplus::bus::bus& bus = static_cast<sdbusplus::bus::bus&>(*conn);
@@ -525,7 +525,7 @@
 
     // shared_ptr conn is global for the service
     // const reference of conn is passed to async calls
-    phosphor::cpu_info::getCpuConfiguration(io, conn, server);
+    cpu_info::getCpuConfiguration(io, conn, server);
 
     io.run();
 

src/speed_select.cpp

diff --git a/src/speed_select.cpp b/src/speed_select.cpp
index 2c1ef6e..c320e39 100644
--- a/src/speed_select.cpp
+++ b/src/speed_select.cpp
@@ -664,7 +664,7 @@
 
     static std::string generatePath(int index)
     {
-        return phosphor::cpu_info::cpuPath + std::to_string(index);
+        return cpuPath + std::to_string(index);
     }
 };