fix sfp eeprom unreadable after switching from SW to FW control mode #9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Junchao-Mellanox
suggested changes
Jul 12, 2024
yuazhe
force-pushed
the
fix_sfp_eeprom_unreadable
branch
4 times, most recently
from
b1c5927
to
2084eea
Compare
yuazhe
force-pushed
the
fix_sfp_eeprom_unreadable
branch
5 times, most recently
from
b56fa74
to
fe54188
Compare
yuazhe
pushed a commit
that referenced
this pull request
Jul 12, 2024
Why I did it Advance dhcpmon to a3c5381 in 202305 branch. a3c5381 - (HEAD, origin/master, origin/HEAD, master) Merge pull request src: Add libnl3 build.sh script #11 from jcaiMR/dev/jcai_fix_err_log (11 days ago) [StormLiangMS] c5ef7e7 - Change common_libs dependencies from buster to bullseye (Updating docker-orchagent/syncd Dockerfile and start.sh #9) 824a144 - replace atoi with strtol (Rename hostname #6) (10 weeks ago) [Mai Bui] 32c0c3f - Fix libswsscommon package installation for non-amd64 (README.md leaves out docker-database #7) (10 weeks ago) [Saikrishna Arcot] Work item tracking Microsoft ADO (25048723): How I did it How to verify it Run test_dhcp_relay.py, no failure
| @@ -488,6 +488,12 @@ def get_presence(self): | |||
| return False | |||
| eeprom_raw = self._read_eeprom(0, 1, log_on_error=False) | |||
| return eeprom_raw is not None | |||
|
|
|||
| def is_eeprom_ready(self, wait_time): | |||
There was a problem hiding this comment.
Suggest to have a function like this:
@classmethod
def wait_sfp_eeprom_ready(cls, sfp_list, wait_time):
not_ready_list = sfp_list
while wait_time > 0:
not_ready_list = [s for s in not_ready_list if s.state == STATE_FW_CONTROL and s._read_eeprom(0, 2,False) is None]
if not_ready_list:
time.sleep(0.1)
wait_time -= 0.1
else:
return
for s in not_ready_list:
logger.log_error(f'SFP {s.sdk_index} eeprom is not ready')| @@ -1691,8 +1697,26 @@ def initialize_sfp_modules(cls, sfp_list): | |||
| if not s.in_stable_state(): | |||
| logger.log_error(f'SFP {index} is not in stable state after initializing, state={s.state}') | |||
| logger.log_notice(f'SFP {index} is in state {s.state} after module initialization') | |||
|
|
|||
|
|
|||
|
|
|||
There was a problem hiding this comment.
Simple call the function:
cls.wait_sfp_eeprom_ready(sfp_list, 2)
| ready_sfp_set = wait_ready_task.get_ready_set() | ||
| for sfp_index in ready_sfp_set: | ||
| s = self._sfp_list[sfp_index] | ||
| s.on_event(sfp.EVENT_RESET_DONE) | ||
| if s.in_stable_state(): | ||
| if s.get_control_type() == SFP_FW_CONTROL and not s.is_eeprom_ready(2): |
There was a problem hiding this comment.
Simple call the function:
self.sfp_module.SFP.wait_sfp_eeprom_ready([s], 2)
fe54188
to
673cee2
Compare
Signed-off-by: Yuanzhe, Liu <[email protected]>
yuazhe
force-pushed
the
fix_sfp_eeprom_unreadable
branch
from
673cee2
to
3120e41
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Why I did it
Work item tracking
How I did it
How to verify it
Which release branch to backport (provide reason below if selected)
Tested branch (Please provide the tested image version)
Description for the changelog
Link to config_db schema for YANG module changes
A picture of a cute animal (not mandatory but encouraged)