Skip to content

Commit

Permalink
Support multiple pcie configuration file and change the pcie status t…
Browse files Browse the repository at this point in the history
…able name to match with pcied changes (#7886)

Why I did it
Support multiple pcie configuration file and change the pcie status table name
This is to match with below two PRs.
sonic-net/sonic-platform-common#195
sonic-net/sonic-platform-daemons#189

How I did it
Check pcie configuration file with wild card and change the device status table name

How to verify it
Restart with changes and see if the pcie check works as expected.
  • Loading branch information
sujinmkang authored and qiluo-msft committed Jun 17, 2021
1 parent e851a42 commit d67a5b8
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions files/image_config/pcie-check/pcie-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ VERBOSE="no"
RESULTS="PCIe Device Checking All Test"
EXPECTED="PCIe Device Checking All Test ----------->>> PASSED"
MAX_WAIT_SECONDS=15
PCIE_STATUS_TABLE="PCIE_DEVICES|status"

function debug()
{
Expand All @@ -19,7 +20,7 @@ function check_and_rescan_pcie_devices()
PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)

if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie*.yaml ]; then
debug "pcie.yaml does not exist! Can't check PCIe status!"
exit
fi
Expand All @@ -37,7 +38,7 @@ function check_and_rescan_pcie_devices()
fi

if [ "$(eval $PCIE_CHK_CMD)" = "$EXPECTED" ]; then
redis-cli -n 6 HSET "PCIE_DEVICES" "status" "PASSED"
redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "PASSED"
debug "PCIe check passed"
exit
else
Expand All @@ -53,7 +54,7 @@ function check_and_rescan_pcie_devices()

done
debug "PCIe check failed"
redis-cli -n 6 HSET "PCIE_DEVICES" "status" "FAILED"
redis-cli -n 6 HSET $PCIE_STATUS_TABLE "status" "FAILED"
}

check_and_rescan_pcie_devices

0 comments on commit d67a5b8

Please sign in to comment.