[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#225
Merged
mssonicbld merged 2 commits intoAzure:202305from Jan 18, 2024
Merged
Conversation
Collaborator
mssonicbld
commented
Jan 18, 2024
mssonicbld
commented
… unreliable los settings (#17768) For 40G optics there is SAI handling of T0 facing ports to be set with SR4 type and unreliable los set for a fixed set of ports. For this property to be invoked the requirement is set phy_unlos_msft=1 in config.bcm. This change is to meet the requirement and once this property is set, the los/interface type settings is applied by SAI on the required ports. Why I did it For Arista-7060CX-32S-Q32 T1, 40G ports RX_ERR minimalization during connected device reboot can be achieved by turning on Unreliable LOS and SR4 media_type for all ports which are connected to T0. The property phy_unlos_msft=1 is to exclusively enable this property. Microsoft ADO: 25941176 How I did it Changes in SAI and turning on property How to verify it Ran the changes on a testbed and verified configurations are as intended. with property admin@sonic2:~$ bcmcmd "phy diag xe8 dsc config" | grep -C 2 "LOS" Brdfe_on = 0 Media Type = 2 Unreliable LOS = 1 Scrambling Disable = 0 Lane Config from PCS = 0 without property admin@sonic:~$ bcmcmd "phy diag xe8 dsc config" | grep -C 2 "LOS" Brdfe_on = 0 Media Type = 0 Unreliable LOS = 0 Scrambling Disable = 0 Lane Config from PCS = 0 Signed-off-by: vaibhav-dahiya <[email protected]>
theasianpianist
pushed a commit
to theasianpianist/sonic-buildimage-msft
that referenced
this pull request
Apr 9, 2024
jon-nokia
pushed a commit
to jon-nokia/sonic-buildimage-msft
that referenced
this pull request
May 3, 2024
…y (#17476) #### Why I did it src/linkmgrd ``` * 79c3872 - (HEAD -> master, origin/master, origin/HEAD) [active-standby] Fix `show mux status` inconsistency introduced by orchagent rollback (Azure#225) (24 hours ago) [Jing Zhang] * ba913c0 - [warmboot] use config_db connector to update mux mode config instead of CLI (Azure#223) (2 days ago) [Jing Zhang] ``` #### How I did it #### How to verify it #### Description for the changelog
prabhataravind
added a commit
that referenced
this pull request
Aug 11, 2025
…AD automatically (#1491) #### Why I did it src/sonic-utilities ``` * 7df1bf3b - (HEAD -> 202506, origin/202506) Merge pull request #225 from mssonicbld/sonicbld/202506-merge (3 hours ago) [mssonicbld] |\ | * 1b02df07 - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (3 hours ago) [Sonic Automation] |/| | * 63544291 - Revert "[SPM] Rename the variable tag to docker-image-reference" (#4026) (5 hours ago) [mssonicbld] * | 87aa69a7 - Merge pull request #222 from mssonicbld/sonicbld/202506-merge (27 hours ago) [mssonicbld] |\ \ | * | d784b5ef - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (27 hours ago) [Sonic Automation] |/| | | |/ | * 3a849b64 - Added json support intfutil (#4023) (28 hours ago) [mssonicbld] * | de3fcdf1 - Merge pull request #219 from mssonicbld/sonicbld/202506-merge (3 days ago) [mssonicbld] |\ \ | * | d2bf2c40 - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (3 days ago) [Sonic Automation] |/| | | |/ | * 562fab54 - sfputil and sfpshow eeprom and DOM CLI enhancement to display data for all CMIS transceivers (#4017) (3 days ago) [mssonicbld] | * c1cb1488 - [sfputil] Use host lane mask as part of rx-output enable/disable (#4018) (3 days ago) [mssonicbld] * | b4fe690c - Merge pull request #218 from mssonicbld/sonicbld/202506-merge (4 days ago) [mssonicbld] |\ \ | * | 7eeaceca - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (4 days ago) [Sonic Automation] |/| | | |/ | * 95fd12bc - [Mellanox][Smartswitch]Added dpu status output (#4014) (4 days ago) [mssonicbld] | * 070aae09 - Fix for #23205 [Smartswitch] Issues caused due to introduction of the chassisd/sonic-utiltiies changes for consecutive admin state changes (#4015) (4 days ago) [mssonicbld] | * f2e9ed47 - [SPM] Rename the variable tag to docker-image-reference (#4011) (5 days ago) [mssonicbld] * | e3a05360 - Merge pull request #214 from mssonicbld/sonicbld/202506-merge (7 days ago) [mssonicbld] * | 1c262abf - Merge branch '202505' of https://github.com/sonic-net/sonic-utilities into 202506 (7 days ago) [Sonic Automation] |/ * 5eac9e32 - [db_migrator] Fix parse_xml fails when minigraph has SonicQosProfile (#4009) (8 days ago) [mssonicbld] * a3989b42 - Exclude Smart Switch from modular chassis operations/checks (#4008) (8 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.