catalina: fw-version: add PCIeSwitchConfig and HDD CPLD

Summary: Add a new firmware version service to fill up PCIeSwitchConfig and HDD CPLD firmware version to settings object. This commit relies on: https://gerrit.openbmc.org/c/openbmc/openbmc/+/76433 https://gerrit.openbmc.org/c/openbmc/openbmc/+/76443 Test results: ``` root@bmc:~# mfg-tool version-display 2>/dev/null | grep HGX_pcieswitchconfig_0 "HGX_pcieswitchconfig_0": "01300524", root@bmc:~# mfg-tool version-display 2>/dev/null | grep Catalina_HDD_cpld "Catalina_HDD_cpld": "00010100", ``` X-link: facebookexternal/openbmc.quanta#4507 Reviewed By: williamspatrick Differential Revision: D67030857 fbshipit-source-id: 47d9e537396b6419ea8a240c425ec4cabff6fdb7
facebook · Jan 9, 2025 · ab3aae7 · ab3aae7
1 parent a0e832c
commit ab3aae7
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/meta-facebook/meta-catalina/recipes-catalina/fw-versions/files/hdd-cpld b/meta-facebook/meta-catalina/recipes-catalina/fw-versions/files/hdd-cpld
@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+version=$(fw-util hdd --version cpld | awk '{print $NF}')
+echo "version: $version"
+
+busctl set-property \
+    xyz.openbmc_project.Settings \
+    /xyz/openbmc_project/software/chassis/Catalina_HDD_cpld \
+    xyz.openbmc_project.Software.Version \
+    Version "s" "$version"
diff --git a/...talina/fw-versions/files/hmc-hgx-fw-gpu-2 → ...talina/fw-versions/files/hmc-hgx-fw-gpu-1 b/...talina/fw-versions/files/hmc-hgx-fw-gpu-2 → ...talina/fw-versions/files/hmc-hgx-fw-gpu-1
@@ -6,15 +6,15 @@ retry_delay_sec=10
 
 for ((i=1; i<=max_retry_count; i++))
 do
-    if ! version=$(hmc-util --version HGX_FW_GPU_2); then
+    if ! version=$(hmc-util --version HGX_FW_GPU_1); then
         echo "failed to get version, retry after ${retry_delay_sec} seconds (count: ${i})"
         sleep "$retry_delay_sec"
     else
         version=$(echo "$version" | awk '{print $NF}')
         echo "version: $version"
         busctl set-property \
             xyz.openbmc_project.Settings \
-            /xyz/openbmc_project/software/chassis/HGX_gpu_2 \
+            /xyz/openbmc_project/software/chassis/HGX_gpu_1 \
             xyz.openbmc_project.Software.Version \
             Version "s" "$version"
         exit 0

diff --git a/...a/fw-versions/files/hmc-hgx-inforom-gpu-2 → ...a/fw-versions/files/hmc-hgx-inforom-gpu-1 b/...a/fw-versions/files/hmc-hgx-inforom-gpu-2 → ...a/fw-versions/files/hmc-hgx-inforom-gpu-1
@@ -6,15 +6,15 @@ retry_delay_sec=10
 
 for ((i=1; i<=max_retry_count; i++))
 do
-    if ! version=$(hmc-util --version HGX_InfoROM_GPU_2); then
+    if ! version=$(hmc-util --version HGX_InfoROM_GPU_1); then
         echo "failed to get version, retry after ${retry_delay_sec} seconds (count: ${i})"
         sleep "$retry_delay_sec"
     else
         version=$(echo "$version" | awk '{print $NF}')
         echo "version: $version"
         busctl set-property \
             xyz.openbmc_project.Settings \
-            /xyz/openbmc_project/software/chassis/HGX_inforom_gpu_2 \
+            /xyz/openbmc_project/software/chassis/HGX_inforom_gpu_1 \
             xyz.openbmc_project.Software.Version \
             Version "s" "$version"
         exit 0

diff --git a/meta-facebook/meta-catalina/recipes-catalina/fw-versions/files/hmc-hgx-pcieswitchconfig-0 b/meta-facebook/meta-catalina/recipes-catalina/fw-versions/files/hmc-hgx-pcieswitchconfig-0
@@ -0,0 +1,24 @@
+#!/bin/bash
+set -e
+
+max_retry_count=30
+retry_delay_sec=10
+
+for ((i=1; i<=max_retry_count; i++))
+do
+    if ! version=$(hmc-util --version HGX_PCIeSwitchConfig_0); then
+        echo "failed to get version, retry after ${retry_delay_sec} seconds (count: ${i})"
+        sleep "$retry_delay_sec"
+    else
+        version=$(echo "$version" | awk '{print $NF}')
+        echo "version: $version"
+        busctl set-property \
+            xyz.openbmc_project.Settings \
+            /xyz/openbmc_project/software/chassis/HGX_pcieswitchconfig_0 \
+            xyz.openbmc_project.Software.Version \
+            Version "s" "$version"
+        exit 0
+    fi
+done
+
+exit 1
diff --git a/meta-facebook/meta-catalina/recipes-catalina/fw-versions/fw-versions_0.1.bb b/meta-facebook/meta-catalina/recipes-catalina/fw-versions/fw-versions_0.1.bb
@@ -21,6 +21,7 @@ FW_TOOLS = "\
     pdb-vr-n1,catalina-sys-init.service,,multi-user.target,0 \
     pdb-vr-n2,catalina-sys-init.service,,multi-user.target,0 \
     scm-cpld,catalina-sys-init.service,,multi-user.target,0 \
+    hdd-cpld,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-fw-bmc-0,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-fw-cpld-0,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-fw-cpu-0,catalina-sys-init.service,,multi-user.target,0 \
@@ -33,9 +34,10 @@ FW_TOOLS = "\
     hmc-hgx-fw-fpga-0,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-fw-fpga-1,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-fw-gpu-0,catalina-sys-init.service,,multi-user.target,0 \
-    hmc-hgx-fw-gpu-2,catalina-sys-init.service,,multi-user.target,0 \
+    hmc-hgx-fw-gpu-1,catalina-sys-init.service,,multi-user.target,0 \
     hmc-hgx-inforom-gpu-0,catalina-sys-init.service,,multi-user.target,0 \
-    hmc-hgx-inforom-gpu-2,catalina-sys-init.service,,multi-user.target,0 \
+    hmc-hgx-inforom-gpu-1,catalina-sys-init.service,,multi-user.target,0 \
+    hmc-hgx-pcieswitchconfig-0,catalina-sys-init.service,,multi-user.target,0 \
 "
 
 LOCAL_URI = " \