diff options
| author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2022-01-20 16:13:22 +0300 |
|---|---|---|
| committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2022-01-22 05:21:32 +0300 |
| commit | 3342379336e6e0e9e87e2ddbf275dde91d8c6f57 (patch) | |
| tree | 0ff830ff9a64de94d3f9aca42578391bcf2512bb | |
| parent | 04777e3acd3b4342f74d3f74cf936a9c7507f476 (diff) | |
| download | openbmc-3342379336e6e0e9e87e2ddbf275dde91d8c6f57.tar.xz | |
meta-ampere: mtjade: fix services start fail
Fix ampere-mac-update and ampere-gpio-handling starts failure,
including:
- Update ampere_update_mac.sh to recheck if the first MAC Address
reading fail. Also fix incorrect checking if setting new MAC Address
success or not.
- Fix typo in SCP failover service.
Tested:
1. Check if the ampere_update_mac.service starts succesfully.
2. Check if no error report from iS0_scp_auth_failure
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: I6c03e352d8d51030d04cd303e438835e5b724afe
| -rw-r--r-- | meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh | 15 | ||||
| -rw-r--r-- | meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb | 2 |
2 files changed, 11 insertions, 6 deletions
diff --git a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh index 8182b4c8d2..56692390a9 100644 --- a/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh +++ b/meta-ampere/meta-jade/recipes-ampere/platform/ampere-mac-update/ampere_update_mac.sh @@ -12,8 +12,15 @@ ifconfig ${ETHERNET_NCSI} down ifconfig ${ETHERNET_NCSI} up # Read FRU Board Custom Field 1 to get the MAC address -CUSTOM_FIELD_1=$(busctl get-property xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/Mt_Jade_Motherboard xyz.openbmc_project.FruDevice BOARD_INFO_AM1) -MAC_ADDR=$(echo "$CUSTOM_FIELD_1" | cut -d "\"" -f 2) +for i in {1..10}; do + if CUSTOM_FIELD_1=$(busctl get-property xyz.openbmc_project.FruDevice /xyz/openbmc_project/FruDevice/Mt_Jade_Motherboard xyz.openbmc_project.FruDevice BOARD_INFO_AM1); + then + MAC_ADDR=$(echo "$CUSTOM_FIELD_1" | cut -d "\"" -f 2) + echo "mac-update: detect BMC MAC $MAC_ADDR at loop $i" + break + fi + sleep 2 +done # Check if BMC MAC address is exported if [ -z "${MAC_ADDR}" ]; then @@ -29,9 +36,7 @@ if [[ $ENV_MAC_ADDR =~ $MAC_ADDR ]]; then fi # Request to update the MAC address -fw_setenv ${ENV_ETH} "${MAC_ADDR}" - -if fw_setenv ${ENV_ETH} "${MAC_ADDR}"; +if ! fw_setenv ${ENV_ETH} "${MAC_ADDR}"; then echo "ERROR: Fail to set MAC address to ${ENV_ETH}" exit 1 diff --git a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb index bf019edbef..62b25b1f12 100644 --- a/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb +++ b/meta-ampere/meta-jade/recipes-phosphor/gpio/ampere-gpio-handling.bb @@ -17,7 +17,7 @@ SRC_URI += " \ " AMPERE_MONITOR_INSTANCES = " \ - reboot_ack shutdown_ack id_button iS0_scp_auth_failure \ + reboot_ack shutdown_ack id_button S0_scp_auth_failure \ S0_overtemp S0_hightemp_start S0_hightemp_stop \ S1_overtemp S1_hightemp_start S1_hightemp_stop \ S0_fault_alert_start S0_fault_alert_stop \ |