Add support for tx power threshold warning/alarm and FlatMem (sonic-n…

…et#66) * [sff8436.py]Add support for txpower warning/alarm and FlatMem * also update sfputil.QSFP_CHANNL_THRESHOLD_WIDTH to 24
vdahiya12 · Nov 19, 2019 · d22f0a0 · d22f0a0
1 parent 9bae794
commit d22f0a0
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 2 deletions.
diff --git a/sonic_platform_base/sonic_sfp/sff8436.py b/sonic_platform_base/sonic_sfp/sff8436.py
@@ -772,6 +772,14 @@ def calc_rx_power(self, eeprom_data, offset, size):
             'DataNotReady':
                 {'offset': 0,
                  'bit': 0,
+                 'type': 'bitvalue'},
+            'IntL':
+                {'offset': 0,
+                 'bit': 1,
+                 'type': 'bitvalue'},
+            'FlatMem':
+                {'offset': 0,
+                 'bit': 2,
                  'type': 'bitvalue'}}
 
     dom_channel_status = {
@@ -1333,7 +1341,27 @@ def calc_rx_power(self, eeprom_data, offset, size):
              {'offset':14,
               'size':2,
               'type': 'func',
-              'decode': { 'func':calc_bias}}}
+              'decode': { 'func':calc_bias}},
+        'TxPowerHighAlarm':
+             {'offset':16,
+              'size':2,
+              'type': 'func',
+              'decode': { 'func':calc_rx_power}},
+        'TxPowerLowAlarm':
+             {'offset':18,
+              'size':2,
+              'type': 'func',
+              'decode': { 'func':calc_rx_power}},
+        'TxPowerHighWarning':
+             {'offset':20,
+              'size':2,
+              'type': 'func',
+              'decode': { 'func':calc_rx_power}},
+        'TxPowerLowWarning':
+             {'offset':22,
+              'size':2,
+              'type': 'func',
+              'decode': { 'func':calc_rx_power}}}
 
     dom_channel_monitor_masks = {
         'Rx1PowerHighAlarm':

diff --git a/sonic_platform_base/sonic_sfp/sfputilbase.py b/sonic_platform_base/sonic_sfp/sfputilbase.py
@@ -78,7 +78,7 @@
 QSFP_MODULE_THRESHOLD_OFFSET = 128
 QSFP_MODULE_THRESHOLD_WIDTH = 24
 QSFP_CHANNL_THRESHOLD_OFFSET = 176
-QSFP_CHANNL_THRESHOLD_WIDTH = 16
+QSFP_CHANNL_THRESHOLD_WIDTH = 24
 QSFP_CHANNL_MON_MASK_OFFSET = 242
 QSFP_CHANNL_MON_MASK_WIDTH = 4