Skip to content

[201911] soft-reboot - support ssd_fw_update #1518

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
abdosi merged 4 commits into from
May 5, 2021
Merged

[201911] soft-reboot - support ssd_fw_update #1518

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37e5757
add ssd_fw_update plugin and set the reboot_type as soft-reboot inste…
sujinmkang Mar 19, 2021
5431c36
change ssd_fw_update to ssd_fw_upgrade
sujinmkang Mar 19, 2021
f085bbe
add ssd_fw_upgrade to fast and cold reboot and put the platform reboo…
sujinmkang Mar 19, 2021
00d291c
rename ssd_fw_update plugin
sujinmkang Mar 23, 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 scripts/fast-reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ WATCHDOG_UTIL="/usr/bin/watchdogutil"
DEVPATH="/usr/share/sonic/device"
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
PLATFORM_PLUGIN="${REBOOT_TYPE}_plugin"
SSD_FW_UPDATE="ssd-fw-upgrade"

# Require 100M available on the hard drive for warm reboot temp files,
# Size is in 1K blocks:
Expand Down Expand Up @@ -602,6 +603,12 @@ if [ -x ${DEVPATH}/${PLATFORM}/${PLATFORM_PLUGIN} ]; then
${DEVPATH}/${PLATFORM}/${PLATFORM_PLUGIN}
fi

# Run platform specific ssd firmware update plugin
if [ -x ${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ]; then
debug "Updating ssd fw for ${REBOOT_TYPE}"
${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ${REBOOT_TYPE}
fi

# Reboot: explicity call Linux native reboot under sbin
debug "Rebooting with ${REBOOT_METHOD} to ${NEXT_SONIC_IMAGE} ..."
exec ${REBOOT_METHOD}
Expand Down
9 changes: 9 additions & 0 deletions scripts/reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,14 @@ REBOOT_TIME=$(date)
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)
DEVPATH="/usr/share/sonic/device"
REBOOT_SCRIPT_NAME=$(basename $0)
REBOOT_TYPE="${REBOOT_SCRIPT_NAME}"
PLAT_REBOOT="platform_reboot"
REBOOT_CAUSE_FILE="/host/reboot-cause/reboot-cause.txt"
PLATFORM_REBOOT_PRE_CHECK="platform_reboot_pre_check"
VERBOSE=no
EXIT_NEXT_IMAGE_NOT_EXISTS=4
SSD_FW_UPDATE="ssd-fw-upgrade"

function debug()
{
Expand Down Expand Up @@ -130,6 +133,12 @@ if [ -x /sbin/hwclock ]; then
/sbin/hwclock -w || /bin/true
fi

# Run platform specific ssd firmware update plugin
if [ -x ${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ]; then
debug "Updating ssd fw for ${REBOOT_TYPE}"
${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ${REBOOT_TYPE}
fi

if [ -x ${DEVPATH}/${PLATFORM}/${PLAT_REBOOT} ]; then
VERBOSE=yes debug "Rebooting with platform ${PLATFORM} specific tool ..."
exec ${DEVPATH}/${PLATFORM}/${PLAT_REBOOT} $@
Expand Down
10 changes: 8 additions & 2 deletions scripts/soft-reboot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ REBOOT_TIME=$(date)
PLATFORM=$(sonic-cfggen -H -v DEVICE_METADATA.localhost.platform)
ASIC_TYPE=$(sonic-cfggen -y /etc/sonic/sonic_version.yml -v asic_type)
DEVPATH="/usr/share/sonic/device"
REBOOT_SCRIPT_NAME=$(basename $0)
REBOOT_TYPE="${REBOOT_SCRIPT_NAME}"
REBOOT_TYPE="soft-reboot"
REBOOT_METHOD="/sbin/kexec -e"
PLATFORM_PLUGIN="${REBOOT_TYPE}_plugin"
SSD_FW_UPDATE="ssd-fw-upgrade"
REBOOT_CAUSE_FILE="/host/reboot-cause/reboot-cause.txt"
WATCHDOG_UTIL="/usr/bin/watchdogutil"
VERBOSE=no
Expand Down Expand Up @@ -174,6 +174,12 @@ if [ -x ${DEVPATH}/${PLATFORM}/${PLATFORM_PLUGIN} ]; then
${DEVPATH}/${PLATFORM}/${PLATFORM_PLUGIN}
fi

# Run platform specific ssd firmware update plugin
if [ -x ${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ]; then
debug "Updating ssd fw for ${REBOOT_TYPE}"
${DEVPATH}/${PLATFORM}/${SSD_FW_UPDATE} ${REBOOT_TYPE}
fi

# Reboot: explicitly call Linux native reboot under sbin
debug "Rebooting with ${REBOOT_METHOD} to ${NEXT_SONIC_IMAGE} ..."
exec ${REBOOT_METHOD}
Expand Down