From efc28a68304715b0a714742c2efb81156cef8958 Mon Sep 17 00:00:00 2001 From: Ying Xie Date: Tue, 23 Apr 2019 09:35:20 -0700 Subject: [PATCH] Revert "[devices]: Watchdog enable/disable in DellEMC S6100 (#2730)" (#2817) This reverts commit 22d17da09c0dd42ffe828c8b5b3dcf2aef7cd472. --- .../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 d024d90e9e..eef7c10630 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 @@ -4,7 +4,5 @@ common/dell_i2c_utils.sh usr/local/bin common/io_rd_wr.py usr/local/bin common/platform_reboot usr/share/sonic/device/x86_64-dell_s6100_c2538-r0 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 f8480f5673..1ac6ce93bc 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 @@ -226,11 +226,6 @@ if [[ "$1" == "init" ]]; then modprobe dell_s6100_iom_cpld modprobe dell_s6100_lpc - # Disable Watchdog 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"