Skip to content

Add pcie-check service to check PCIe devices at boot #4771

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sujinmkang merged 14 commits into from
Jul 13, 2020
Merged

Add pcie-check service to check PCIe devices at boot #4771

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
736e2e1
PCIe Monitor service
sujinmkang Jun 13, 2020
95bc36b
Add rescan to pcie-mon.service when it fails to get all pcie devices
sujinmkang Jun 17, 2020
c938619
space
sujinmkang Jun 17, 2020
a6fa285
Clean up
sujinmkang Jun 18, 2020
d9ca93b
review comments
sujinmkang Jun 19, 2020
365552b
update the pcie status in state db
sujinmkang Jun 23, 2020
78604b9
update the failed pcie status once at the end
sujinmkang Jun 23, 2020
09472f7
Update the pcie_status in STATE_DB and rename the service
sujinmkang Jun 23, 2020
d7f2d50
Add log to exit the service if the configuration file doesn't exist.
sujinmkang Jun 24, 2020
f096d2c
fix the build failure
sujinmkang Jun 29, 2020
1604ef8
Redo the pcie rescan for pcie-check failed case.
sujinmkang Jul 3, 2020
c406a26
review comments
sujinmkang Jul 6, 2020
61eb853
review comments
sujinmkang Jul 7, 2020
a25a5a6
review comments
sujinmkang Jul 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions files/build_templates/pcie-chk.timer
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[Unit]
Description=Start the pcie-chk.service in 10 seconds after boot

[Timer]
OnBootSec=10sec
Unit=pcie-chk.service

[Install]
WantedBy=timers.target
9 changes: 9 additions & 0 deletions files/build_templates/sonic_debian_extension.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,15 @@ sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd.service $FILESYSTEM_ROO
echo "procdockerstatsd.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/procdockerstatsd/procdockerstatsd $FILESYSTEM_ROOT/usr/bin/

# Copy systemd timer configuration
sudo cp $BUILD_TEMPLATES/pcie-chk.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
sudo LANG=C chroot $FILESYSTEM_ROOT systemctl enable pcie-chk.timer

# Copy pcie-chk service files
sudo cp $IMAGE_CONFIGS/pcie-chk/pcie-chk.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
echo "pcie-chk.service" | sudo tee -a $GENERATED_SERVICE_FILE
sudo cp $IMAGE_CONFIGS/pcie-chk.sh $FILESYSTEM_ROOT/usr/bin/

# Copy systemd timer configuration
# It implements delayed start of services
sudo cp $BUILD_TEMPLATES/process-reboot-cause.timer $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
Expand Down
8 changes: 8 additions & 0 deletions files/image_config/pcie-chk/pcie-chk.service
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[Unit]
Description=Check the PCIe device presence and status
After=rc.local.service

[Service]
Type=simple
ExecStart=/usr/bin/pcie-chk.sh

33 changes: 33 additions & 0 deletions files/image_config/pcie-chk/pcie-chk.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#! /bin/bash
## Check the platform PCIe device presence and status

VERBOSE="no"
RESULTS="PCIe Device Checking All Test"
PCIE_CHK_CMD=`sudo pcieutil pcie-check |grep "$RESULTS"`
EXPECTED="PCIe Device Checking All Test ----------->>> PASSED"
MAX_RESCAN=15

function debug()
{
/usr/bin/logger "$0 : $1"
if [[ x"${VERBOSE}" == x"yes" ]]; then
echo "$(date) $0: $1"
fi
}

function check_and_rescan_pcie_devices()
{
for i in $(seq 1 1 $MAX_RESCAN)
do
if [ "$PCIE_CHK_CMD" = "$EXPECTED" ]; then
debug "PCIe check passed"
exit
else
debug "PCIe check failed, try pci bus rescan"
echo 1 > /sys/bus/pci/rescan
fi
sleep 1
done
}

check_and_rescan_pcie_devices