matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Mellanox] Fix issue: cannot find label port for logical port when logical port number is larger than 64 (#13710) (#13962)

Browse Source
This commit is contained in:
mssonicbld 2023-03-06 16:47:31 +08:00 committed by GitHub
parent 523cd8dab5
commit aea96da04d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
platform/mellanox/mlnx-platform-api/sonic_platform/sfp_event.py
View File

@ -332,11 +332,9 @@ class sfp_event:
pkt = new_uint8_t_arr(pkt_size) pkt = new_uint8_t_arr(pkt_size)
recv_info_p = new_sx_receive_info_t_p() recv_info_p = new_sx_receive_info_t_p()
pmpe_t = sx_event_pmpe_t() pmpe_t = sx_event_pmpe_t()
port_attributes_list = new_sx_port_attributes_t_arr(64)
port_cnt_p = new_uint32_t_p() port_cnt_p = new_uint32_t_p()
uint32_t_p_assign(port_cnt_p,64) uint32_t_p_assign(port_cnt_p, 0)
label_port_list = [] label_port_list = []
label_port = None
module_state = 0 module_state = 0
rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p) rc = sx_lib_host_ifc_recv(fd_p, pkt, pkt_size_p, recv_info_p)
@ -352,31 +350,44 @@ class sfp_event:
module_state = pmpe_t.module_state module_state = pmpe_t.module_state
error_type = pmpe_t.error_type error_type = pmpe_t.error_type
module_id = pmpe_t.module_id module_id = pmpe_t.module_id
slot_id = pmpe_t.slot_id # For non-modular chassis, it should return 0 slot_id = pmpe_t.slot_id # For non-modular chassis, it should return 0
if module_state == SDK_SFP_STATE_ERR: if module_state == SDK_SFP_STATE_ERR:
logger.log_error("Receive PMPE error event on module {}: status {} error type {}".format(module_id, module_state, error_type)) logger.log_error("Receive PMPE error event on module {}: status {} error type {}".format(module_id, module_state, error_type))
elif module_state == SDK_SFP_STATE_DIS: elif module_state == SDK_SFP_STATE_DIS:
logger.log_info("Receive PMPE disable event on module {}: status {}".format(module_id, module_state)) logger.log_notice("Receive PMPE disable event on module {}: status {}".format(module_id, module_state))
elif module_state == SDK_SFP_STATE_IN or module_state == SDK_SFP_STATE_OUT: elif module_state == SDK_SFP_STATE_IN or module_state == SDK_SFP_STATE_OUT:
logger.log_info("Receive PMPE plug in/out event on module {}: status {}".format(module_id, module_state)) logger.log_notice("Receive PMPE plug in/out event on module {}: status {}".format(module_id, module_state))
elif module_state == SDK_SFP_STATE_UNKNOWN: elif module_state == SDK_SFP_STATE_UNKNOWN:
unknown = True unknown = True
else: else:
logger.log_error("Receive PMPE unknown event on module {}: status {}".format(module_id, module_state)) logger.log_error("Receive PMPE unknown event on module {}: status {}".format(module_id, module_state))
for i in range(port_list_size): # Call sx_api_port_device_get with port_cnt_p=0, SDK will return the logical port number
logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i) rc = sx_api_port_device_get(self.handle, 1, 0, None, port_cnt_p)
rc = sx_api_port_device_get(self.handle, 1 , 0, port_attributes_list, port_cnt_p) if rc != SX_STATUS_SUCCESS:
logger.log_error("Failed to get logical port number")
status = False
else:
port_cnt = uint32_t_p_value(port_cnt_p) port_cnt = uint32_t_p_value(port_cnt_p)
for i in range(port_cnt): port_attributes_list = new_sx_port_attributes_t_arr(port_cnt)
port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,i) rc = sx_api_port_device_get(self.handle, 1, 0, port_attributes_list, port_cnt_p)
if port_attributes.log_port == logical_port: if rc != SX_STATUS_SUCCESS:
label_port = slot_id * DeviceDataManager.get_linecard_max_port_count() + port_attributes.port_mapping.module_port logger.log_error("Failed to get logical port attributes")
break status = False
else:
for i in range(port_list_size):
label_port = None
logical_port = sx_port_log_id_t_arr_getitem(logical_port_list, i)
for j in range(port_cnt):
port_attributes = sx_port_attributes_t_arr_getitem(port_attributes_list,j)
if port_attributes.log_port == logical_port:
label_port = slot_id * DeviceDataManager.get_linecard_max_port_count() + port_attributes.port_mapping.module_port
break
if label_port is not None: if label_port is not None:
label_port_list.append(label_port) label_port_list.append(label_port)
delete_sx_port_attributes_t_arr(port_attributes_list)
if unknown: if unknown:
SFP_ports_with_unknown_event = set(label_port_list) - self.RJ45_port_set SFP_ports_with_unknown_event = set(label_port_list) - self.RJ45_port_set
@ -389,7 +400,9 @@ class sfp_event:
delete_uint32_t_p(pkt_size_p) delete_uint32_t_p(pkt_size_p)
delete_uint8_t_arr(pkt) delete_uint8_t_arr(pkt)
delete_sx_receive_info_t_p(recv_info_p) delete_sx_receive_info_t_p(recv_info_p)
delete_sx_port_attributes_t_arr(port_attributes_list)
delete_uint32_t_p(port_cnt_p) delete_uint32_t_p(port_cnt_p)
if not label_port_list:
logger.log_error('Dropping PMPE event due to label port not found')
return status, label_port_list, module_state, error_type return status, label_port_list, module_state, error_type