[dell-hwmon] Changed variables in psuutil scripts for both Z9100/S6100 platforms #1305
Merged
lguohan merged 2 commits intosonic-net:masterfrom Feb 4, 2018
Merged
Conversation
Contributor
Author
|
Please do merge this change along with this "sonic-net/sonic-platform-modules-dell#26" pull request. This is the real code to introduce hwmon for dell platforms. Both should be in the build to avoid breakage. |
Contributor
|
do we need to have the submodule update included in this pull request as well? |
Contributor
|
@stcheng: Yes, the submodule pointer needs to be updated here before the merge. @paavaanan: Guohan merged sonic-net/sonic-platform-modules-dell#26 earlier today. Can you please update the submodule pointer here now? |
Contributor
Author
|
jileveque, raised a new handle here. |
Contributor
|
@paavaanan: For the future, you could have pushed the submodule update commit to this branch, and it would become part of this PR. That way, all of these changes get merged along with the submodule pointer update in one atomic commit. |
Contributor
Contributor
Author
|
@jleveque I missed the same branch part while raising the pull request. Thanks for pointing this. I raised the submodule request now. |
jleveque
approved these changes
Jan 23, 2018
vmittal-msft
pushed a commit
to vmittal-msft/sonic-buildimage
that referenced
this pull request
Oct 20, 2025
<!--
Please make sure you've read and understood our contributing guidelines:
https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md
** Make sure all your commits include a signature generated with `git
commit -s` **
If this is a bug fix, make sure your description includes "fixes #xxxx",
or
"closes #xxxx" or "resolves #xxxx"
Please provide the following information:
-->
#### Why I did it
To pick latest fixes for BRCM SAI 12.x release
##### Work item tracking
- Microsoft ADO **(33479680)**:
#### How I did it
updated sai release version to 12.3.21.2
[SAI_BRANCH rel_ocp_sai_12_3] [CSP CS00012398825] Backport JIRA
SONIC-105336 to 12.3
Issue Summary: One of the Lossy Queue is seeing more loss than other
lossy queue
Root Cause: The default egress CIR is set to the port speed instead of
zero.
Fix Description: Fixed and new test added.
[CSP CS00012408048] backport SONIC-104790 to to rel_ocp_sai_12_3, DNX:
initialize ecn_stat_id DM field to default value in switch create
ECN stats on the RCY ports is not supported in SAI at the moment
Update git submodules
Update sdk-src/hsdk_6.5.31_SAI_12.3.0_GA from branch
'hsdk_6.5.31_SAI_12.3.0_GA'
to 574f95b9abafb2213747fd5e8894402ab140127c
Merge "[SAI_BRANCH rel_ocp_sai_12_3] ,CSP CS00012334162 ,backport
SDK-397485,SDK-402314 to SAI 12.3 ,fix interrupt IPS_QueueEnteredDel
can't be cleared." into hsdk_6.5.31_SAI_12.3.0_GA
[SAI_BRANCH rel_ocp_sai_12_3] ,CSP CS00012334162 ,backport
SDK-397485,SDK-402314 to SAI 12.3 ,fix interrupt IPS_QueueEnteredDel
can't be cleared.
updated sai release version to 12.3.22.2
[SAI_BRANCH rel_ocp_sai_12_3] [CSP CS00012408043] Backport JIRA
SONIC-106473 to 12.3
JIRA# SONIC-106473
Issue Summary: SAI does not support ECN stats on MC queues, but SONIC
still queries MC queues
Root Cause: SAI does not support ECN stats on multicast queues and
returns Error instead of Debug
Fix Description: Logs changed from Error to Debug
#### How to verify it
Verified this to be working on lab setup
<!--
If PR needs to be backported, then the PR must be tested against the
base branch and the earliest backport release branch and provide tested
image version on these two branches. For example, if the PR is requested
for master, 202211 and 202012, then the requester needs to provide test
results on master and 202012.
-->
#### Which release branch to backport (provide reason below if selected)
<!--
- Note we only backport fixes to a release branch, *not* features!
- Please also provide a reason for the backporting below.
- e.g.
- [x] 202006
-->
- [ ] 201811
- [ ] 201911
- [ ] 202006
- [ ] 202012
- [ ] 202106
- [ ] 202111
- [ ] 202205
- [ ] 202211
#### Tested branch (Please provide the tested image version)
<!--
- Please provide tested image version
- e.g.
- [x] 20201231.100
-->
- [ ] <!-- image version 1 -->
- [ ] <!-- image version 2 -->
#### Description for the changelog
<!--
Write a short (one line) summary that describes the changes in this
pull request for inclusion in the changelog:
-->
<!--
Ensure to add label/tag for the feature raised. example - PR#2174 under
sonic-utilities repo. where, Generic Config and Update feature has been
labelled as GCU.
-->
#### Link to config_db schema for YANG module changes
<!--
Provide a link to config_db schema for the table for which YANG model
is defined
Link should point to correct section on
https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md
-->
#### A picture of a cute animal (not mandatory but encouraged)
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
4 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.
*- What I did
Changed hwmon variables in psuutil scripts for Z9100 and S6100 platforms. Now scripts are full-hwmon compatiable.
- How I did it
Replaced dell_s6100_lpc proc reference to SMF/hwmon1
- How to verify it
Execute the script and expect for same results. Without any issues.
- IMPORTANT NOTE
Please do merge this change along with this "sonic-net/sonic-platform-modules-dell#26" pull request. This is the real code to introduce hwmon for dell platforms. Both should be in the build to avoid breakage.
- Description for the changelog
- A picture of a cute animal (not mandatory but encouraged)