[Mellanox] Optimize SFP related platform API implementation

platform/mellanox/mlnx-platform-api/sonic_platform/chassis.py

@@ -75,6 +75,10 @@ def __del__(self):
         if self.sfp_event_initialized:
             self.sfp_event.deinitialize()
 
+        if self.sfp_module_initialized:
+            from sonic_platform.sfp import deinitialize_sdk_handle
+            deinitialize_sdk_handle(self.sdk_handle)
+
 
     def initialize_psu(self):
         from sonic_platform.psu import Psu
@@ -108,8 +112,14 @@ def initialize_fan(self):
 
     def initialize_sfp(self):
         from sonic_platform.sfp import SFP
+        from sonic_platform.sfp import initialize_sdk_handle
 
         self.sfp_module = SFP
+        self.sdk_handle = initialize_sdk_handle()
+
+        if self.sdk_handle is None:
+            self.sfp_module_initialized = False
+            return
 
         # Initialize SFP list
         port_position_tuple = self._get_port_position_tuple_by_platform_name()
@@ -120,9 +130,9 @@ def initialize_sfp(self):
 
         for index in range(self.PORT_START, self.PORT_END + 1):
             if index in range(self.QSFP_PORT_START, self.PORTS_IN_BLOCK + 1):
-                sfp_module = SFP(index, 'QSFP')
+                sfp_module = SFP(index, 'QSFP', self.sdk_handle)
             else:
-                sfp_module = SFP(index, 'SFP')
+                sfp_module = SFP(index, 'SFP', self.sdk_handle)
             self._sfp_list.append(sfp_module)
 
         self.sfp_module_initialized = True

platform/mellanox/mlnx-platform-api/sonic_platform/sfp.py

@@ -9,7 +9,6 @@
 #############################################################################
 
 try:
-    import os
     import subprocess
     import time
     from sonic_platform_base.sfp_base import SfpBase
@@ -283,59 +282,41 @@
 # Global logger class instance
 logger = Logger()
 
+
+# SDK initializing stuff, called from chassis
+def initialize_sdk_handle():
+    rc, sdk_handle = sx_api_open(None)
+    if (rc != SX_STATUS_SUCCESS):
+        logger.log_warning("Failed to open api handle, please check whether SDK is running.")
+        sdk_handle = None
+
+    return sdk_handle
+
+def deinitialize_sdk_handle(sdk_handle):
+    if sdk_handle is not None:
+        rc = sx_api_close(sdk_handle)
+        if (rc != SX_STATUS_SUCCESS):
+            logger.log_warning("Failed to close api handle.")
+
+        return rc == SXD_STATUS_SUCCESS
+    else:
+         logger.log_warning("Sdk handle is none")
+         return False
+
 class SFP(SfpBase):
     """Platform-specific SFP class"""
 
-    def __init__(self, sfp_index, sfp_type):
+    def __init__(self, sfp_index, sfp_type, sdk_handle):
         self.index = sfp_index + 1
         self.sfp_eeprom_path = "qsfp{}".format(self.index)
         self.sfp_status_path = "qsfp{}_status".format(self.index)
         self._detect_sfp_type(sfp_type)
         self.dom_tx_disable_supported = False
         self._dom_capability_detect()
-        self.sdk_handle = None
+        self.sdk_handle = sdk_handle
         self.sdk_index = sfp_index
 
 
-    #SDK initializing stuff
-    def _initialize_sdk_handle(self):
-        """
-        reference: device\mellanox\<sku>\pulgins\sfpreset.py
-        """
-        rc, self.sdk_handle = sx_api_open(None)
-        if (rc != SX_STATUS_SUCCESS):
-            logger.log_warning("Failed to open api handle, please check whether SDK is running.")
-            self.sdk_handle = None
-
-        self.mypid = os.getpid()
-
-
-    def _open_sdk(self):
-        if self.sdk_handle is None:
-            self._initialize_sdk_handle()
-
-        rc = sxd_access_reg_init(self.mypid, None, 0)
-        if rc != 0:
-            logger.log_warning("Failed to initializing register access, please check that SDK is running.")
-            return False
-
-        return True
-
-
-    def _close_sdk(self):
-        rc = sxd_access_reg_deinit()
-        if rc != 0:
-            logger.log_warning("Failed to deinitializing register access.")
-            #no further actions here
-
-
-    def _init_sx_meta_data(self):
-        meta = sxd_reg_meta_t()
-        meta.dev_id = DEVICE_ID
-        meta.swid = SWITCH_ID
-        return meta
-
-
     def get_presence(self):
         """
         Retrieves the presence of the device
@@ -1481,14 +1462,8 @@ def get_lpmode(self):
         Returns:
             A Boolean, True if lpmode is enabled, False if disabled
         """
-        handle = self._open_sdk()
-        if handle is None:
-            logger.log_error("SDK handler is missing for sfp %d object" % self.index)
-            return False
-
         admin_pwr_mode, oper_pwr_mode = self.mgmt_phy_mod_pwr_attr_get(SX_MGMT_PHY_MOD_PWR_ATTR_PWR_MODE_E)
 
-        self._close_sdk()
         return oper_pwr_mode == SX_MGMT_PHY_MOD_PWR_MODE_LOW_E
 
 
@@ -1863,16 +1838,10 @@ def reset(self):
 
         refer plugins/sfpreset.py
         """
-        handle = self._open_sdk()
-        if handle is None:
-            logger.log_error("SDK handler is missing for sfp %d object" % self.index)
-            return False
-
         rc = sx_mgmt_phy_mod_reset(self.sdk_handle, self.sdk_index)
         if rc != SX_STATUS_SUCCESS:
             logger.log_warning("sx_mgmt_phy_mod_reset failed, rc = %d" % rc)
 
-        self._close_sdk()
         return rc == SX_STATUS_SUCCESS
 
 
@@ -1927,6 +1896,11 @@ def is_port_admin_status_up(self, log_port):
         assert rc == SXD_STATUS_SUCCESS, "sx_api_port_state_get failed, rc = %d" % rc
 
         admin_state = sx_port_admin_state_t_p_value(admin_state_p)
+
+        delete_sx_port_oper_state_t_p(oper_state_p)
+        delete_sx_port_admin_state_t_p(admin_state_p)
+        delete_sx_port_module_state_t_p(module_state_p)
+
         if admin_state == SX_PORT_ADMIN_STATUS_UP:
             return True
         else:
@@ -1960,6 +1934,8 @@ def get_logical_ports(self):
                and self.is_port_admin_status_up(port_attributes.log_port):
                 log_port_list.append(port_attributes.log_port)
 
+        delete_sx_port_attributes_t_arr(port_attributes_list)
+        delete_uint32_t_p(port_cnt_p)
         return log_port_list
 
 
@@ -2017,19 +1993,14 @@ def set_lpmode(self, lpmode):
         Returns:
             A boolean, True if lpmode is set successfully, False if not
         """
-        handle = self._open_sdk()
-        if handle is None:
-            logger.log_error("SDK handler is missing for sfp %d object" % self.index)
-            return False
-
         log_port_list = self.get_logical_ports()
         if lpmode:
             self._set_lpmode_raw(log_port_list, SX_MGMT_PHY_MOD_PWR_ATTR_PWR_MODE_E, SX_MGMT_PHY_MOD_PWR_MODE_LOW_E)
             logger.log_info("Enabled low power mode for module [%d]" % (self.sdk_index))
         else:
             self._set_lpmode_raw(log_port_list, SX_MGMT_PHY_MOD_PWR_ATTR_PWR_MODE_E, SX_MGMT_PHY_MOD_PWR_MODE_AUTO_E)
             logger.log_info( "Disabled low power mode for module [%d]" % (self.sdk_index))
-        self._close_sdk()
+
         return True