Skip to content

[pcie.yaml] Move pcie configuration file path to platform directory #6475

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 10 commits into from
Feb 21, 2021
Merged

[pcie.yaml] Move pcie configuration file path to platform directory #6475

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b7af5ba
enhance pcie-mon
sujinmkang Dec 4, 2020
4b45d30
move pcie configuration file to platform directory from plugin directory
sujinmkang Jan 17, 2021
88f323d
clean up
sujinmkang Jan 17, 2021
b3699e7
clean up
sujinmkang Jan 17, 2021
953fd26
since pcie-check.timer was removed, pcie-check.service needs to be ad…
sujinmkang Jan 25, 2021
282ab88
Removing pcie-check.timer and adding pcie-check.service to multi-user…
sujinmkang Jan 26, 2021
5b12d33
Merge branch 'master' into pcied
sujinmkang Feb 5, 2021
bd40023
remove/add extra spaces added during merge
sujinmkang Feb 9, 2021
3fd8ab6
revert some wording back to master change
sujinmkang Feb 9, 2021
6f7fb27
fixed typo
sujinmkang Feb 10, 2021
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
7 changes: 7 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,13 @@ platform/**/*-none-any.whl
platform/**/.pybuild
platform/**/debian/*
platform/**/build
platform/**/*.ko
platform/**/*.mod.c
platform/**/*.mod.o
platform/**/*.o
platform/**/*.d
platform/**/*.cmd
platform/**/*.order
platform/broadcom/sonic-platform-modules-dell/s5232f/sonic_platform/ipmihelper.py
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_ich.c
platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
Expand Down
0 ...86_64-arista_7050_qx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7050_qx32s/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ...6_64-arista_7050cx3_32s/plugins/pcie.yaml → ...rista/x86_64-arista_7050cx3_32s/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ...86_64-arista_7060_cx32s/plugins/pcie.yaml → ...arista/x86_64-arista_7060_cx32s/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ...86_64-arista_7260cx3_64/plugins/pcie.yaml → ...arista/x86_64-arista_7260cx3_64/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ...ica/x86_64-cel_e1031-r0/plugins/pcie.yaml → ...ce/celestica/x86_64-cel_e1031-r0pcie.yaml
View file
Open in desktop
File renamed without changes.
0 .../x86_64-cel_seastone-r0/plugins/pcie.yaml → ...elestica/x86_64-cel_seastone-r0/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ..._64-dell_s6000_s1220-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6000_s1220-r0/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ..._64-dell_s6100_c2538-r0/plugins/pcie.yaml → ...dell/x86_64-dell_s6100_c2538-r0/pcie.yaml
View file
Open in desktop
File renamed without changes.
9 changes: 0 additions & 9 deletions files/build_templates/pcie-check.timer
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 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 @@ -495,10 +495,6 @@ sudo cp $IMAGE_CONFIGS/constants/constants.yml $FILESYSTEM_ROOT/etc/sonic/
sudo cp $IMAGE_CONFIGS/sudoers/sudoers $FILESYSTEM_ROOT/etc/
sudo cp $IMAGE_CONFIGS/sudoers/sudoers.lecture $FILESYSTEM_ROOT/etc/

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

# Copy pcie-check service files
sudo cp $IMAGE_CONFIGS/pcie-check/pcie-check.service $FILESYSTEM_ROOT_USR_LIB_SYSTEMD_SYSTEM
echo "pcie-check.service" | sudo tee -a $GENERATED_SERVICE_FILE
Expand Down
3 changes: 3 additions & 0 deletions files/image_config/pcie-check/pcie-check.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ After=rc.local.service database.service
[Service]
Type=simple
ExecStart=/usr/bin/pcie-check.sh

[Install]
WantedBy=multi-user.target
7 changes: 4 additions & 3 deletions files/image_config/pcie-check/pcie-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ function debug()

function check_and_rescan_pcie_devices()
{
PCIE_CHK_CMD='sudo pcieutil check | grep "$RESULTS"'
PCIE_CHK_CMD='sudo pcieutil check |grep "$RESULTS"'
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)

if [ ! -f /usr/share/sonic/device/$PLATFORM/plugins/pcie.yaml ]; then
debug "pcie.yaml does not exist! Can't check PCIe status!"
if [ ! -f /usr/share/sonic/device/$PLATFORM/pcie.yaml ]; then
debug "pcie.yaml does not exist! can't check PCIe status!"

exit
fi

Expand Down
0 ...orm-modules-bfn-montara/plugins/pcie.yaml → ...ic-platform-modules-bfn-montara/pcie.yaml
View file
Open in desktop
File renamed without changes.
0 ...orm-modules-bfn-newport/plugins/pcie.yaml → ...ic-platform-modules-bfn-newport/pcie.yaml
View file
Open in desktop
File renamed without changes.