split i2c read across pages (sonic-net#256)

snider-nokia · Jan 6, 2022 · ee12215 · ee12215
1 parent 92203d2
commit ee12215
Show file tree

Hide file tree

Showing 5 changed files with 117 additions and 99 deletions.
diff --git a/sonic_platform_base/sonic_xcvr/api/public/cmis.py b/sonic_platform_base/sonic_xcvr/api/public/cmis.py
@@ -1834,7 +1834,13 @@ def get_application_advertisement(self):
         }
 
         ret = {}
+        # Read the application advertisment in lower memory
         dic = self.xcvr_eeprom.read(consts.APPLS_ADVT_FIELD)
+
+        if not self.is_flat_memory():
+            # Read the application advertisement in page01
+            dic.update(self.xcvr_eeprom.read(consts.APPLS_ADVT_FIELD_PAGE01))
+
         for app in range(1, 16):
             buf = {}
 

diff --git a/sonic_platform_base/sonic_xcvr/fields/consts.py b/sonic_platform_base/sonic_xcvr/fields/consts.py
@@ -271,6 +271,7 @@
 MODULE_LEVEL_CONTROL = "ModuleControl"
 
 APPLS_ADVT_FIELD = "Applications Advertisement"
+APPLS_ADVT_FIELD_PAGE01 = "Applications Advertisement Pag01"
 CTRLS_ADVT_FIELD = "Supported Controls Advertisement"
 FLAGS_ADVT_FIELD = "Supported Flags Advertisement"
 PAGE_SUPPORT_ADVT_FIELD = "Supported Pages Advertisement"

diff --git a/sonic_platform_base/sonic_xcvr/fields/xcvr_field.py b/sonic_platform_base/sonic_xcvr/fields/xcvr_field.py
@@ -188,7 +188,7 @@ def __init__(self, name, offset, *fields, **kwargs):
         self.format = kwargs.get("format", ">%ds" % self.size)
 
     def decode(self, raw_data, **decoded_deps):
-        return struct.unpack(self.format, raw_data)[0].decode(self.encoding)
+        return struct.unpack(self.format, raw_data)[0].decode(self.encoding, 'ignore')
 
 class CodeRegField(RegField):
     """