202012 thermal fix

device/barefoot/x86_64-accton_as9516_32d-r0/platform.json

@@ -61,6 +61,45 @@
             {
                 "name": "com_e_driver-i2c-4-33:memory-temp"
             },
+            {
+                "name": "tmp75-i2c-3-48:chip-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-49:exhaust2-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4a:exhaust-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4b:intake-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4c:tofino-temp"
+            },
+            {
+                "name": "tmp75-i2c-3-4d:intake2-temp"
+            },
+            {
+                "name": "coretemp-isa-0000:package-id-0"
+            },
+            {
+                "name": "coretemp-isa-0000:core-0"
+            },
+            {
+                "name": "coretemp-isa-0000:core-1"
+            },
+            {
+                "name": "coretemp-isa-0000:core-2"
+            },
+            {
+                "name": "coretemp-isa-0000:core-3"
+            },
+            {
+                "name": "psu_driver-i2c-7-59:psu2-temp1"
+            },
+            {
+                "name": "psu_driver-i2c-7-59:psu2-temp2"
+            },
             {
                 "name": "psu_driver-i2c-7-59:psu2-temp1"
             },

device/barefoot/x86_64-accton_as9516_32d-r0/thermal_thresholds.json

@@ -0,0 +1,52 @@
+{
+    "thermals": [
+        {
+            "com_e_driver-i2c-4-33:cpu-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "com_e_driver-i2c-4-33:memory-temp" : [85.0, 75.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-48:chip-temp" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-49:exhaust2-temp" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4a:exhaust-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4b:intake-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4c:tofino-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4d:intake2-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:package-id-0" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-0" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-1" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-2" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-3" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp1" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp2" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp3" : [60.0, 50.0, 11.0, 1.0]
+        }
+    ]
+}

device/barefoot/x86_64-accton_wedge100bf_32x-r0/platform.json

@@ -49,45 +49,51 @@
             }
         ],
         "thermals": [
+            {
+                "name": "com_e_driver-i2c-4-33:cpu-temp"
+            },
             {
                 "name": "com_e_driver-i2c-4-33:memory-temp"
             },
             {
-                "name": "com_e_driver-i2c-4-33:cpu-temp"
+                "name": "psu_driver-i2c-7-59:psu2-temp1"
             },
             {
-                "name": "pfe1100-i2c-7-59:temp1"
+                "name": "psu_driver-i2c-7-59:psu2-temp2"
             },
             {
-                "name": "pfe1100-i2c-7-59:temp2"
+                "name": "psu_driver-i2c-7-5a:psu1-temp1"
             },
             {
-                "name": "pfe1100-i2c-7-5a:temp1"
+                "name": "psu_driver-i2c-7-5a:psu1-temp2"
             },
             {
-                "name": "pfe1100-i2c-7-5a:temp2"
+                "name": "tmp75-i2c-3-48:chip-temp"
             },
             {
-                "name": "tmp75-i2c-3-48:outlet-middle-temp"
+                "name": "tmp75-i2c-3-49:exhaust2-temp"
             },
             {
-                "name": "tmp75-i2c-3-49:inlet-middle-temp"
+                "name": "tmp75-i2c-3-4a:exhaust-temp"
             },
             {
-                "name": "tmp75-i2c-3-4a:inlet-left-temp"
+                "name": "tmp75-i2c-3-4b:intake-temp"
             },
             {
-                "name": "tmp75-i2c-3-4b:switch-temp"
+                "name": "tmp75-i2c-3-4c:tofino-temp"
             },
             {
-                "name": "tmp75-i2c-3-4c:inlet-right-temp"
+                "name": "tmp75-i2c-3-4d:intake2-temp"
             },
             {
                 "name": "tmp75-i2c-8-48:outlet-right-temp"
             },
             {
                 "name": "tmp75-i2c-8-49:outlet-left-temp"
             },
+            {
+                "name": "pch_haswell-virtual-0:temp1"
+            },
             {
                 "name": "coretemp-isa-0000:package-id-0"
             },
@@ -102,9 +108,6 @@
             },
             {
                 "name": "coretemp-isa-0000:core-3"
-            },
-            {
-                "name": "pch_haswell-virtual-0:temp1"
             }
         ],
         "sfps": [

device/barefoot/x86_64-accton_wedge100bf_32x-r0/thermal_thresholds.json

@@ -0,0 +1,64 @@
+{
+    "thermals": [
+        {
+            "com_e_driver-i2c-4-33:cpu-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "com_e_driver-i2c-4-33:memory-temp" : [85.0, 75.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp1" : [50.0, 40.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-59:psu2-temp2" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp1" : [50.0, 40.0, 11.0, 1.0]
+        },
+        {
+            "psu_driver-i2c-7-5a:psu1-temp2" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-48:chip-temp" : [90.0, 80.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-49:exhaust2-temp" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4a:exhaust-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4b:intake-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4c:tofino-temp" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-3-4d:intake2-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-8-48:outlet-right-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "tmp75-i2c-8-49:outlet-left-temp" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "pch_haswell-virtual-0:temp1" : [60.0, 50.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:package-id-0" : [80.0, 70.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-0" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-1" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-2" : [99.0, 89.0, 11.0, 1.0]
+        },
+        {
+            "coretemp-isa-0000:core-3" : [99.0, 89.0, 11.0, 1.0]
+        }
+    ]
+}

platform/barefoot/sonic-platform-modules-bfn-montara/sonic_platform/chassis.py

@@ -10,6 +10,7 @@
     from sonic_platform.fan_drawer import fan_drawer_list_get
     from sonic_platform.thermal import thermal_list_get
     from eeprom import Eeprom
+    from sonic_platform.thermal_manager import ThermalManager
 
     from sonic_platform.platform_thrift_client import pltfm_mgr_ready
     from sonic_platform.platform_thrift_client import thrift_try
@@ -40,6 +41,12 @@ def __init__(self):
         self.__thermals = None
         self.__psu_list = None
         self.__sfp_list = None
+        self.__thermal_mngr = None
+        self.__polling_thermal_time = 30
+
+        self.ready = False
+        self.phy_port_cur_state = {}
+        self.qsfp_interval = self.QSFP_CHECK_INTERVAL
 
         self.ready = False
         self.phy_port_cur_state = {}
@@ -111,6 +118,16 @@ def _sfp_list(self):
     def _sfp_list(self, value):
         pass
 
+    @property
+    def _thermal_mngr(self):
+        if self.__thermal_mngr is None:
+            self.__thermal_mngr = ThermalManager(self.__polling_thermal_time)
+        return self.__thermal_mngr
+
+    @_thermal_mngr.setter
+    def _thermal_mngr(self, value):
+        self.__thermal_mngr = ThermalManager(value)
+
     def __update_port_info(self):
         def qsfp_max_port_get(client):
             return client.pltfm_mgr.pltfm_mgr_qsfp_get_max_port()
@@ -333,3 +350,10 @@ def get_status_led(self):
             specified.
         """
         return self.system_led
+
+    def get_thermal_manager(self):
+        return self._thermal_mngr
+
+    def __del__(self):
+        if self.__thermal_mngr is not None:
+            self.__thermal_mngr.stop()