Skip to content

Commit 84f5c25

Browse files
andywongaristaandywongarista
committed
Fix rx power and tx power scale
1 parent 80deff4 commit 84f5c25

File tree

4 files changed

+35
-35
lines changed

4 files changed

+35
-35
lines changed

‎sonic_platform_base/sonic_xcvr/mem_maps/public/cmis.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -79,18 +79,18 @@ def __init__(self, codes):
7979
NumberRegField(consts.VOLTAGE_LOW_ALARM_FIELD, self.get_addr(0x2, 138), size=2, format=">H", scale=10000),
8080
NumberRegField(consts.VOLTAGE_HIGH_WARNING_FIELD, self.get_addr(0x2, 140), size=2, format=">H", scale=10000),
8181
NumberRegField(consts.VOLTAGE_LOW_WARNING_FIELD, self.get_addr(0x2, 142), size=2, format=">H", scale=10000),
82-
NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 176), size=2, format=">H", scale=1000),
83-
NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 178), size=2, format=">H", scale=1000),
84-
NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 180), size=2, format=">H", scale=1000),
85-
NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 182), size=2, format=">H", scale=1000),
82+
NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 176), size=2, format=">H", scale=10000),
83+
NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 178), size=2, format=">H", scale=10000),
84+
NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 180), size=2, format=">H", scale=10000),
85+
NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 182), size=2, format=">H", scale=10000),
8686
NumberRegField(consts.TX_BIAS_HIGH_ALARM_FIELD, self.get_addr(0x2, 184), size=2, format=">H", scale=500),
8787
NumberRegField(consts.TX_BIAS_LOW_ALARM_FIELD, self.get_addr(0x2, 186), size=2, format=">H", scale=500),
8888
NumberRegField(consts.TX_BIAS_HIGH_WARNING_FIELD, self.get_addr(0x2, 188), size=2, format=">H", scale=500),
8989
NumberRegField(consts.TX_BIAS_LOW_WARNING_FIELD, self.get_addr(0x2, 190), size=2, format=">H", scale=500),
90-
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 192), size=2, format=">H", scale=1000),
91-
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 194), size=2, format=">H", scale=1000),
92-
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 196), size=2, format=">H", scale=1000),
93-
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 198), size=2, format=">H", scale=1000),
90+
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0x2, 192), size=2, format=">H", scale=10000),
91+
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0x2, 194), size=2, format=">H", scale=10000),
92+
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0x2, 196), size=2, format=">H", scale=10000),
93+
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0x2, 198), size=2, format=">H", scale=10000),
9494
)
9595

9696
self.LANE_DATAPATH_CTRL = RegGroupField(consts.LANE_DATAPATH_CTRL_FIELD,
@@ -101,15 +101,15 @@ def __init__(self, codes):
101101
NumberRegField(consts.TX_FAULT_FIELD, self.get_addr(0x11, 135)),
102102
NumberRegField(consts.RX_LOS_FIELD, self.get_addr(0x11, 147)),
103103
RegGroupField(consts.TX_POWER_FIELD,
104-
*(NumberRegField("OpticalPowerTx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=1000)
104+
*(NumberRegField("OpticalPowerTx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=10000)
105105
for channel, offset in zip(range(1, 9), range(154, 170, 2)))
106106
),
107107
RegGroupField(consts.TX_BIAS_FIELD,
108108
*(NumberRegField("LaserBiasTx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=500)
109109
for channel, offset in zip(range(1, 9), range(170, 186, 2)))
110110
),
111111
RegGroupField(consts.RX_POWER_FIELD,
112-
*(NumberRegField("OpticalPowerRx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=1000)
112+
*(NumberRegField("OpticalPowerRx%dField" % channel, self.get_addr(0x11, offset), size=2, format=">H", scale=10000)
113113
for channel, offset in zip(range(1, 9), range(186, 202, 2)))
114114
),
115115
)

‎sonic_platform_base/sonic_xcvr/mem_maps/public/sff8436.py

+5-5
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ def __init__(self, codes):
9191
)
9292

9393
self.RX_POWER = RegGroupField(consts.RX_POWER_FIELD,
94-
*(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000)
94+
*(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000)
9595
for channel, offset in zip(range(1, 5), range(34, 41, 2)))
9696
)
9797

@@ -125,10 +125,10 @@ def __init__(self, codes):
125125
)
126126

127127
self.RX_POWER_THRESHOLDS = RegGroupField(consts.RX_POWER_THRESHOLDS_FIELD,
128-
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=1000),
129-
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=1000),
130-
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=1000),
131-
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=1000),
128+
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=10000),
129+
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=10000),
130+
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=10000),
131+
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=10000),
132132
)
133133

134134
self.TX_BIAS_THRESHOLDS = RegGroupField(consts.TX_BIAS_THRESHOLDS_FIELD,

‎sonic_platform_base/sonic_xcvr/mem_maps/public/sff8472.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ def __init__(self, codes):
118118
TempField(consts.TEMPERATURE_FIELD, self.get_addr(0xA2, 0, 96), size=2, format=">h", scale=256),
119119
VoltageField(consts.VOLTAGE_FIELD, self.get_addr(0xA2, 0, 98), size=2, format=">H", scale=10000),
120120
TxBiasField(consts.TX_BIAS_FIELD, self.get_addr(0xA2, 0, 100), size=2, format=">H", scale=500),
121-
TxPowerField(consts.TX_POWER_FIELD, self.get_addr(0xA2, 0, 102), size=2, format=">H", scale=1000),
122-
RxPowerField(consts.RX_POWER_FIELD, self.get_addr(0xA2, 0, 104), size=2, format=">H", scale=1000),
121+
TxPowerField(consts.TX_POWER_FIELD, self.get_addr(0xA2, 0, 102), size=2, format=">H", scale=10000),
122+
RxPowerField(consts.RX_POWER_FIELD, self.get_addr(0xA2, 0, 104), size=2, format=">H", scale=10000),
123123
deps=ext_cal_deps
124124
)
125125

@@ -136,14 +136,14 @@ def __init__(self, codes):
136136
TxBiasField(consts.TX_BIAS_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 18), size=2, format=">H", scale=500),
137137
TxBiasField(consts.TX_BIAS_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 20), size=2, format=">H", scale=500),
138138
TxBiasField(consts.TX_BIAS_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 22), size=2, format=">H", scale=500),
139-
TxPowerField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 24), size=2, format=">H", scale=1000),
140-
TxPowerField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 26), size=2, format=">H", scale=1000),
141-
TxPowerField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 28), size=2, format=">H", scale=1000),
142-
TxPowerField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 30), size=2, format=">H", scale=1000),
143-
RxPowerField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 32), size=2, format=">H", scale=1000),
144-
RxPowerField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 34), size=2, format=">H", scale=1000),
145-
RxPowerField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 36), size=2, format=">H", scale=1000),
146-
RxPowerField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 38), size=2, format=">H", scale=1000),
139+
TxPowerField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 24), size=2, format=">H", scale=10000),
140+
TxPowerField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 26), size=2, format=">H", scale=10000),
141+
TxPowerField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 28), size=2, format=">H", scale=10000),
142+
TxPowerField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 30), size=2, format=">H", scale=10000),
143+
RxPowerField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(0xA2, 0, 32), size=2, format=">H", scale=10000),
144+
RxPowerField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(0xA2, 0, 34), size=2, format=">H", scale=10000),
145+
RxPowerField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(0xA2, 0, 36), size=2, format=">H", scale=10000),
146+
RxPowerField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(0xA2, 0, 38), size=2, format=">H", scale=10000),
147147
deps=ext_cal_deps
148148
)
149149

‎sonic_platform_base/sonic_xcvr/mem_maps/public/sff8636.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def __init__(self, codes):
107107
)
108108

109109
self.RX_POWER = RegGroupField(consts.RX_POWER_FIELD,
110-
*(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000)
110+
*(NumberRegField("Rx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000)
111111
for channel, offset in zip(range(1, 5), range(34, 41, 2)))
112112
)
113113

@@ -117,7 +117,7 @@ def __init__(self, codes):
117117
)
118118

119119
self.TX_POWER = RegGroupField(consts.TX_POWER_FIELD,
120-
*(NumberRegField("Tx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=1000)
120+
*(NumberRegField("Tx%dPowerField" % channel, self.get_addr(0, offset), size=2, format=">H", scale=10000)
121121
for channel, offset in zip(range(1, 5), range(50, 58, 2)))
122122
)
123123

@@ -146,10 +146,10 @@ def __init__(self, codes):
146146
)
147147

148148
self.RX_POWER_THRESHOLDS = RegGroupField(consts.RX_POWER_THRESHOLDS_FIELD,
149-
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=1000),
150-
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=1000),
151-
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=1000),
152-
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=1000),
149+
NumberRegField(consts.RX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 176), size=2, format=">H", scale=10000),
150+
NumberRegField(consts.RX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 178), size=2, format=">H", scale=10000),
151+
NumberRegField(consts.RX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 180), size=2, format=">H", scale=10000),
152+
NumberRegField(consts.RX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 182), size=2, format=">H", scale=10000),
153153
)
154154

155155
self.TX_BIAS_THRESHOLDS = RegGroupField(consts.TX_BIAS_THRESHOLDS_FIELD,
@@ -160,10 +160,10 @@ def __init__(self, codes):
160160
)
161161

162162
self.TX_POWER_THRESHOLDS = RegGroupField(consts.TX_POWER_THRESHOLDS_FIELD,
163-
NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 192), size=2, format=">H", scale=1000),
164-
NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 194), size=2, format=">H", scale=1000),
165-
NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 196), size=2, format=">H", scale=1000),
166-
NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 198), size=2, format=">H", scale=1000),
163+
NumberRegField(consts.TX_POWER_HIGH_ALARM_FIELD, self.get_addr(3, 192), size=2, format=">H", scale=10000),
164+
NumberRegField(consts.TX_POWER_LOW_ALARM_FIELD, self.get_addr(3, 194), size=2, format=">H", scale=10000),
165+
NumberRegField(consts.TX_POWER_HIGH_WARNING_FIELD, self.get_addr(3, 196), size=2, format=">H", scale=10000),
166+
NumberRegField(consts.TX_POWER_LOW_WARNING_FIELD, self.get_addr(3, 198), size=2, format=">H", scale=10000),
167167
)
168168

169169
def get_addr(self, page, offset, page_size=128):

0 commit comments

Comments
 (0)