diff --git a/sonic_platform_base/sonic_xcvr/mem_maps/public/cmis.py b/sonic_platform_base/sonic_xcvr/mem_maps/public/cmis.py index c9bd92839..4cfb4aa9e 100644 --- a/sonic_platform_base/sonic_xcvr/mem_maps/public/cmis.py +++ b/sonic_platform_base/sonic_xcvr/mem_maps/public/cmis.py @@ -79,18 +79,18 @@ def __init__(self, codes): NumberRegField(consts.VOLTAGE_LOW_ALARM_FIELD, self.get_addr(0x2, 138), size=2, format=">H", scale=10000), NumberRegField(consts.VOLTAGE_HIGH_WARNING_FIELD, self.get_addr(0x2, 140), size=2, format=">H", scale=10000), NumberRegField(consts.VOLTAGE_LOW_WARNING_FIELD, self.get_addr(0x2, 142), size=2, format=">H", scale=10000), - NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 176), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 178), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 180), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 182), size=2, format=">H", scale=1000), + NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 176), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 178), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 180), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 182), size=2, format=">H", scale=10000), NumberRegField(consts.TX_BIAS_HIGH_ALARM_FIELD, self.get_addr(0x2, 184), size=2, format=">H", scale=500), NumberRegField(consts.TX_BIAS_LOW_ALARM_FIELD, self.get_addr(0x2, 186), size=2, format=">H", scale=500), NumberRegField(consts.TX_BIAS_HIGH_WARNING_FIELD, self.get_addr(0x2, 188), size=2, format=">H", scale=500), NumberRegField(consts.TX_BIAS_LOW_WARNING_FIELD, self.get_addr(0x2, 190), size=2, format=">H", scale=500), - NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 192), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 194), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 196), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 198), size=2, format=">H", scale=1000), + NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 192), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 194), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 196), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 198), size=2, format=">H", scale=10000), ) self.LANE_DATAPATH_CTRL = RegGroupField(consts.LANE_DATAPATH_CTRL_FIELD, @@ -101,7 +101,7 @@ def __init__(self, codes): NumberRegField(consts.TX_FAULT_FIELD, self.get_addr(0x11, 135)), NumberRegField(consts.RX_LOS_FIELD, self.get_addr(0x11, 147)), RegGroupField(consts.TX_POWER_FIELD, - *(NumberRegField("OpticalPowerTx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=1000) + *(NumberRegField("OpticalPowerTx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=10000) for channel, offset in zip(range(1, 9), range(154, 170, 2))) ), RegGroupField(consts.TX_BIAS_FIELD, @@ -109,7 +109,7 @@ def __init__(self, codes): for channel, offset in zip(range(1, 9), range(170, 186, 2))) ), RegGroupField(consts.RX_POWER_FIELD, - *(NumberRegField("OpticalPowerRx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=1000) + *(NumberRegField("OpticalPowerRx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=10000) for channel, offset in zip(range(1, 9), range(186, 202, 2))) ), ) diff --git a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8436.py b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8436.py index 51c999975..0e01b1b2b 100644 --- a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8436.py +++ b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8436.py @@ -91,7 +91,7 @@ def __init__(self, codes): ) self.RX_POWER = RegGroupField(consts.RX_POWER_FIELD, - *(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000) + *(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000) for channel, offset in zip(range(1, 5), range(34, 41, 2))) ) @@ -125,10 +125,10 @@ def __init__(self, codes): ) self.RX_POWER_THRESHOLDS = RegGroupField(consts.RX_POWER_THRESHOLDS_FIELD, - NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=1000), + NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=10000), ) self.TX_BIAS_THRESHOLDS = RegGroupField(consts.TX_BIAS_THRESHOLDS_FIELD, diff --git a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8472.py b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8472.py index b4009e3de..b3916e637 100644 --- a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8472.py +++ b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8472.py @@ -118,8 +118,8 @@ def __init__(self, codes): TempField(consts.TEMPERATURE_FIELD, self.get_addr(0xA2, 0, 96), size=2, format=">h", scale=256), VoltageField(consts.VOLTAGE_FIELD, self.get_addr(0xA2, 0, 98), size=2, format=">H", scale=10000), TxBiasField(consts.TX_BIAS_FIELD, self.get_addr(0xA2, 0, 100), size=2, format=">H", scale=500), - TxPowerField(consts.TX_POWER_FIELD, self.get_addr(0xA2, 0, 102), size=2, format=">H", scale=1000), - RxPowerField(consts.RX_POWER_FIELD, self.get_addr(0xA2, 0, 104), size=2, format=">H", scale=1000), + TxPowerField(consts.TX_POWER_FIELD, self.get_addr(0xA2, 0, 102), size=2, format=">H", scale=10000), + RxPowerField(consts.RX_POWER_FIELD, self.get_addr(0xA2, 0, 104), size=2, format=">H", scale=10000), deps=ext_cal_deps ) @@ -136,14 +136,14 @@ def __init__(self, codes): TxBiasField(consts.TX_BIAS_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 18), size=2, format=">H", scale=500), TxBiasField(consts.TX_BIAS_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 20), size=2, format=">H", scale=500), TxBiasField(consts.TX_BIAS_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 22), size=2, format=">H", scale=500), - TxPowerField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 24), size=2, format=">H", scale=1000), - TxPowerField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 26), size=2, format=">H", scale=1000), - TxPowerField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 28), size=2, format=">H", scale=1000), - TxPowerField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 30), size=2, format=">H", scale=1000), - RxPowerField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 32), size=2, format=">H", scale=1000), - RxPowerField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 34), size=2, format=">H", scale=1000), - RxPowerField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 36), size=2, format=">H", scale=1000), - RxPowerField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 38), size=2, format=">H", scale=1000), + TxPowerField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 24), size=2, format=">H", scale=10000), + TxPowerField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 26), size=2, format=">H", scale=10000), + TxPowerField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 28), size=2, format=">H", scale=10000), + TxPowerField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 30), size=2, format=">H", scale=10000), + RxPowerField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 32), size=2, format=">H", scale=10000), + RxPowerField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 34), size=2, format=">H", scale=10000), + RxPowerField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 36), size=2, format=">H", scale=10000), + RxPowerField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 38), size=2, format=">H", scale=10000), deps=ext_cal_deps ) diff --git a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py index e8e52cee0..8e90eb438 100644 --- a/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py +++ b/sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py @@ -107,7 +107,7 @@ def __init__(self, codes): ) self.RX_POWER = RegGroupField(consts.RX_POWER_FIELD, - *(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000) + *(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000) for channel, offset in zip(range(1, 5), range(34, 41, 2))) ) @@ -117,7 +117,7 @@ def __init__(self, codes): ) self.TX_POWER = RegGroupField(consts.TX_POWER_FIELD, - *(NumberRegField("Tx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000) + *(NumberRegField("Tx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000) for channel, offset in zip(range(1, 5), range(50, 58, 2))) ) @@ -146,10 +146,10 @@ def __init__(self, codes): ) self.RX_POWER_THRESHOLDS = RegGroupField(consts.RX_POWER_THRESHOLDS_FIELD, - NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=1000), - NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=1000), + NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=10000), + NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=10000), ) self.TX_BIAS_THRESHOLDS = RegGroupField(consts.TX_BIAS_THRESHOLDS_FIELD, @@ -160,10 +160,10 @@ def __init__(self, codes): ) self.TX_POWER_THRESHOLDS = RegGroupField(consts.TX_POWER_THRESHOLDS_FIELD, - NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 192), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 194), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 196), size=2, format=">H", scale=1000), - NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 198), size=2, format=">H", scale=1000), + NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 192), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 194), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 196), size=2, format=">H", scale=10000), + NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 198), size=2, format=">H", scale=10000), ) def get_addr(self, page, offset, page_size=128):