CR-1126348 display Config Mode & Max Power when these are non zero va…

…lues and fix mechanical error info in xbmgmt/xbutil examine reports (Xilinx#6493) * CR-1126348 display Config Mode only when it is a non zero value Signed-off-by: Rajkumar Rampelli <[email protected]> * Fix mechanical report on versal Signed-off-by: Rajkumar Rampelli <[email protected]> * Fix review comments Signed-off-by: Rajkumar Rampelli <[email protected]> * minor fix Signed-off-by: Rajkumar Rampelli <[email protected]> * Fix max power watts print on versal platform Signed-off-by: Rajkumar Rampelli <[email protected]> * Fix review comments Signed-off-by: Rajkumar Rampelli <[email protected]>
Sawwave · Apr 1, 2022 · 7f7cab2 · 7f7cab2
1 parent 7540225
commit 7f7cab2
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/src/runtime_src/core/common/sensor.cpp b/src/runtime_src/core/common/sensor.cpp
@@ -438,11 +438,14 @@ read_electrical(const xrt_core::device * device)
     if (!current.empty() || !voltage.empty() || !power.empty())
       return read_data_driven_electrical(current, voltage, power);
     else
-      is_data_driven = false;
+      return sensor_array;
   }
   catch(const xrt_core::query::no_such_key&) {
     is_data_driven = false;
   }
+  catch(const xrt_core::query::exception&) {
+    is_data_driven = false;
+  }
   catch (const std::exception& ex) {
     sensor_array.push_back({"", sensor_array.put("error_msg", ex.what())});
   }
@@ -465,12 +468,18 @@ read_thermals(const xrt_core::device * device)
   //Check if requested sensor data can be retrieved in data driven model.
   try {
     output = xrt_core::device_query<xq::sdm_sensor_info>(device, xq::sdm_sensor_info::sdr_req_type::thermal);
-    if (output.empty())
-      is_data_driven = false;
+    if (output.empty()) {
+      thermal_array.put("error_msg", "Information unavailable");
+      root.add_child("thermals", thermal_array);
+      return root;
+    }
   }
   catch(const xrt_core::query::no_such_key&) {
     is_data_driven = false;
   }
+  catch(const xrt_core::query::exception&) {
+    is_data_driven = false;
+  }
   catch (const std::exception& ex) {
     thermal_array.push_back({"", thermal_array.put("error_msg", ex.what())});
     root.add_child("thermals", thermal_array);
@@ -494,12 +503,18 @@ read_mechanical(const xrt_core::device * device)
   //Check if requested sensor data can be retrieved in data driven model.
   try {
     output = xrt_core::device_query<xq::sdm_sensor_info>(device, xq::sdm_sensor_info::sdr_req_type::mechanical);
-    if (output.empty())
-      is_data_driven = false;
+    if (output.empty()) {
+      fan_array.put("error_msg", "Information unavailable");
+      root.add_child("fans", fan_array);
+      return root;
+    }
   }
   catch(const xrt_core::query::no_such_key&) {
     is_data_driven = false;
   }
+  catch(const xrt_core::query::exception&) {
+    is_data_driven = false;
+  }
   catch (const std::exception& ex) {
     fan_array.push_back({"", fan_array.put("error_msg", ex.what())});
     root.add_child("fans", fan_array);

diff --git a/src/runtime_src/core/pcie/linux/device_linux.cpp b/src/runtime_src/core/pcie/linux/device_linux.cpp
@@ -266,7 +266,7 @@ struct sdm_sensor_info
     }
 
     if (path.empty())
-      return result_type();
+      throw xrt_core::query::sysfs_error("target hwmon_sdm sysfs path /sys/bus/pci/devices/<bdf>/hwmon/hwmon*/ not found");
 
     return get_sdm_sensors(device, req_type, path);
   } //get()

diff --git a/src/runtime_src/core/tools/xbmgmt2/ReportPlatform.cpp b/src/runtime_src/core/tools/xbmgmt2/ReportPlatform.cpp
@@ -28,6 +28,7 @@
 #include <boost/algorithm/string.hpp>
 
 static boost::format fmtBasic("  %-20s : %s\n");
+static boost::format fmtBasicHex("  %-20s : 0x%x\n");
 
 void
 ReportPlatform::getPropertyTreeInternal( const xrt_core::device * device,
@@ -198,7 +199,7 @@ ReportPlatform::getPropertyTree20202( const xrt_core::device * device,
   dev_prop.put("board_type", xrt_core::device_query<xrt_core::query::board_name>(device));
   dev_prop.put("board_name", info.mName.empty() ? "N/A" : info.mName);
   dev_prop.put("config_mode", info.mConfigMode);
-  dev_prop.put("max_power_watts", info.mMaxPower.empty() ? "N/A" : info.mMaxPower);
+  dev_prop.put("max_power_watts", info.mMaxPower);
   pt_platform.add_child("device_properties", dev_prop);
 
   //Flashable partition running on FPGA
@@ -342,8 +343,12 @@ ReportPlatform::writeReport( const xrt_core::device* /*_pDevice*/,
   _output << "Device properties\n";
   _output << fmtBasic % "Type" % string_or_NA(dev_properties.get<std::string>("board_type"));
   _output << fmtBasic % "Name" % string_or_NA(dev_properties.get<std::string>("board_name"));
-  _output << fmtBasic % "Config Mode" % string_or_NA(dev_properties.get<std::string>("config_mode"));
-  _output << fmtBasic % "Max Power" % string_or_NA(dev_properties.get<std::string>("max_power_watts"));
+  auto config_mode = dev_properties.get<unsigned int>("config_mode");
+  if (config_mode != 0)
+    _output << fmtBasicHex % "Config Mode" % config_mode;
+  auto max_power_str = dev_properties.get<std::string>("max_power_watts");
+  if (!max_power_str.empty())
+    _output << fmtBasic % "Max Power" % max_power_str;
   _output << std::endl;
 
   _output << "Flashable partitions running on FPGA\n";

diff --git a/src/runtime_src/core/tools/xbmgmt2/flash/flasher.cpp b/src/runtime_src/core/tools/xbmgmt2/flash/flasher.cpp
@@ -290,11 +290,12 @@ int Flasher::getBoardInfo(BoardInfo& board)
         board.mName = sdr_info[BDINFO_NAME];
         board.mRev = sdr_info[BDINFO_REV];
         board.mFanPresence = sdr_info[BDINFO_FAN_PRESENCE][0];
-        board.mMaxPower = sdr_info[BDINFO_MAX_PWR];
         board.mMacAddr0 = sdr_info[BDINFO_MAC0].compare(unassigned_mac) ?
             sdr_info[BDINFO_MAC0] : std::move(std::string("Unassigned"));
         board.mMacAddr1 = sdr_info[BDINFO_MAC1].compare(unassigned_mac) ?
             sdr_info[BDINFO_MAC1] : std::move(std::string("Unassigned"));
+        board.mConfigMode = 0;
+        board.mMaxPower = "";
         return 0;
     }
     if (ret != 0)