watchdog: implement linecard watchdog

Change-Id: I7d6a4b098492af443b73d0af98ac396907bd4df6
aristanetworks · Nov 14, 2022 · 3a5e3c7 · 3a5e3c7
1 parent abfd43d
commit 3a5e3c7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/arista/drivers/scd/watchdog.py b/arista/drivers/scd/watchdog.py
@@ -64,21 +64,22 @@ def remaining(self):
       return self.lastTimeout - elapsed
 
 class ScdWatchdog(Watchdog):
+
    MAX_TIMEOUT = 65535
 
-   def __init__(self, scd, reg=0x0120):
+   def __init__(self, scd, reg=0x0120, action=2):
       self.scd = scd
       self.reg = reg
+      self.action = action
       self.state = WatchdogState(localStorage=Config().watchdog_state_file)
 
-   @staticmethod
-   def armReg(timeout):
+   def armReg(self, timeout):
       regValue = 0
       if timeout > 0:
          # Set enable bit
          regValue |= 1 << 31
          # Powercycle
-         regValue |= 2 << 29
+         regValue |= self.action << 29
          # Timeout value
          regValue |= timeout
       return regValue

diff --git a/arista/platforms/cpu/hedgehog.py b/arista/platforms/cpu/hedgehog.py
@@ -10,7 +10,6 @@
 from ...components.dpm.adm1266 import Adm1266, AdmPin
 from ...components.rpc import LinecardRpcClient
 from ...components.scd import Scd
-from ...components.watchdog import FakeWatchdog
 
 from ...descs.led import LedDesc, LedColor
 from ...descs.sensor import SensorDesc, Position
@@ -44,14 +43,13 @@ def __init__(self, **kwargs):
                     position=Position.OTHER, target=60, overheat=90, critical=95),
       ])
 
-      self.inventory.addWatchdog(FakeWatchdog())
-
       self.rpc = self.newComponent(LinecardRpcClient)
       self.rpc.addLed(
          LedDesc('status', colors=[LedColor.RED, LedColor.GREEN, LedColor.OFF]))
       self.rpc.addPowerCycle(None)
 
-   def addSmbusComponents(self, scd):
+   def addScdComponents(self, scd):
+      scd.createWatchdog(intr=scd.getInterrupt(0), bit=10)
       scd.newComponent(SbTsi, addr=scd.i2cAddr(9, 0x4c), sensors=[
          SensorDesc(diode=0, name='Cpu SBTSI',
                     position=Position.OTHER, target=60, overheat=90, critical=95),

diff --git a/arista/platforms/linecard/clearwater.py b/arista/platforms/linecard/clearwater.py
@@ -83,7 +83,7 @@ def cwMainDomainCommon(self):
       # mode.
       if self.cpu:
          self.createPorts()
-         self.cpu.addSmbusComponents(self.scd)
+         self.cpu.addScdComponents(self.scd)
 
    def mainDomain(self):
       self.cwMainDomainCommon()

diff --git a/arista/platforms/linecard/wolverine.py b/arista/platforms/linecard/wolverine.py
@@ -80,7 +80,7 @@ def mainDomain(self):
       # mode.
       if self.cpu:
          self.createPorts()
-         self.cpu.addSmbusComponents(self.scd)
+         self.cpu.addScdComponents(self.scd)
 
    def controlDomain(self):
       super(Wolverine, self).controlDomain()