From 2cc9fb92d4081ce42553feddb34bb01c92a8a354 Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Tue, 23 Apr 2019 16:33:42 +0000 Subject: [PATCH] Revert "[devices]: Watchdog support for DellEMC S6100 (#2741)" This reverts commit 3a24c611080c9ee7f04df4678d4e2d309b0747ca. --- .../debian/platform-modules-s6100.install | 2 -- .../s6100/scripts/platform_watchdog_disable.sh | 13 ------------- .../s6100/scripts/platform_watchdog_enable.sh | 8 -------- .../s6100/scripts/s6100_platform.sh | 5 ----- 4 files changed, 28 deletions(-) delete mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_disable.sh delete mode 100755 platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_enable.sh diff --git a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install index 84821746a4..89550dd846 100644 --- a/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install +++ b/platform/broadcom/sonic-platform-modules-dell/debian/platform-modules-s6100.install @@ -5,7 +5,5 @@ common/io_rd_wr.py usr/local/bin common/fstrim.timer etc/systemd/system common/fstrim.service etc/systemd/system s6100/scripts/platform_sensors.py usr/local/bin -s6100/scripts/platform_watchdog_enable.sh usr/local/bin -s6100/scripts/platform_watchdog_disable.sh usr/local/bin s6100/scripts/sensors usr/bin s6100/systemd/platform-modules-s6100.service etc/systemd/system diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_disable.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_disable.sh deleted file mode 100755 index c3a90f3e89..0000000000 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_disable.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -#This script is used to disable SMF Watchdog Timer - -wd_status=-1 -enabled=0 - -# Disable Watchdog if enabled -wd_status=$(io_rd_wr.py --get --offset 0x207 | cut -d " " -f3) - -if [[ $wd_status -eq $enabled ]]; then - echo "Disabling Watchdog Timer.." - io_rd_wr.py --set --val 1 --offset 0x207 -fi diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_enable.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_enable.sh deleted file mode 100755 index 804627b5e2..0000000000 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/platform_watchdog_enable.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -#This script is used to enable SMF Watchdog Timer - -# Set watchdog to 180 seconds -io_rd_wr.py --set --val 3 --offset 0x206 - -# Enable watchdog timer -io_rd_wr.py --set --val 0 --offset 0x207 diff --git a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh index 9c02d4774e..6b5e2a0745 100755 --- a/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh +++ b/platform/broadcom/sonic-platform-modules-dell/s6100/scripts/s6100_platform.sh @@ -205,11 +205,6 @@ if [[ "$1" == "init" ]]; then modprobe dell_s6100_iom_cpld modprobe dell_s6100_lpc - # Disable Watcdog Timer - if [[ -e /usr/local/bin/platform_watchdog_disable.sh ]]; then - exec /usr/local/bin/platform_watchdog_disable.sh - fi - cpu_board_mux "new_device" switch_board_mux "new_device" sys_eeprom "new_device"