Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dell SMF driver hwmon number reorder fix for Dell S6100/Z9100 #2306

Closed

Conversation

paavaanan
Copy link
Contributor

- What I did

  • Dell SMF driver initialiation with hwmon support changes from hwmon0 to hwmon1. This happens when Ingrasys enabled coretemp kernel driver. At the time of coretemp initalization with hwmon it allocates handle [hwmon0] to intel coretemp. Due to non-availablity next order [hwmon1] is alloted to SMF driver.

  • This order changes affects the existing scripts which rely on existing numerbing scheme.

root@sonic-s6100-01:/sys/class/hwmon# ls -lart
total 0
drwxr-xr-x  2 root root 0 Nov 26 05:03 .
lrwxrwxrwx  1 root root 0 Nov 26 05:03 hwmon1 -> ../../devices/platform/SMF.512/hwmon/hwmon1
lrwxrwxrwx  1 root root 0 Nov 26 05:03 hwmon0 -> ../../devices/platform/coretemp.0/hwmon/hwmon0
drwxr-xr-x 40 root root 0 Nov 26 05:03 ..
root@sonic-s6100-01:/sys/class/hwmon# cd ../../dev

- How I did it

  • So, fixed scripts psuutil.py and platform_sensors.py to detect the numbering scheme dynamically from sysfs and construct the valid path accordingly.

- How to verify it

  1. Execute platform_sensors.py
  2. Execute psuutil status

@jleveque
Copy link
Contributor

This appears to be a duplicate of #2305. Why two duplicate PRs?

@paavaanan
Copy link
Contributor Author

This fix is raised for March Branch...

@jleveque
Copy link
Contributor

Since the changes are identical between both branches, we don't need two separate PRs. We can merge the other one into the master branch and then cherry-pick that commit into the March branch. This prevents the need to review 2 PRs and creates less room for error if the PRs drift. I recommend closing this PR and working with #2305 only.

@paavaanan
Copy link
Contributor Author

Thanks Joe!

@paavaanan paavaanan closed this Nov 29, 2018
@paavaanan paavaanan reopened this Feb 8, 2019
@paavaanan
Copy link
Contributor Author

re-opened the PR to merge this fix in March Branch

@jleveque
Copy link
Contributor

jleveque commented Feb 8, 2019

Retest this please.

@paavaanan paavaanan closed this Feb 8, 2019
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Jun 2, 2022
Including change:

* 7ff8f75 2022-06-03 | Revert "[portsorch]: Prevent LAG member configuration when port has active ACL binding (sonic-net#2165)" (sonic-net#2306) (HEAD -> 202205, github/202205) [bingwang-ms]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Jun 2, 2022
Including change:

* 7ff8f75 2022-06-03 | Revert "[portsorch]: Prevent LAG member configuration when port has active ACL binding (#2165)" (#2306) (HEAD -> 202205, github/202205) [bingwang-ms]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit to yxieca/sonic-buildimage that referenced this pull request Jun 8, 2022
To included:
* ad8f5e4 2022-06-08 | Revert "[Counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2143)" (sonic-net#2315) (HEAD -> master, origin/master, origin/HEAD) [Ying Xie]
* 2ff763f 2022-06-08 | Fix test_warm_reboot issues blocking PR merge (sonic-net#2309) [Vaibhav Hemant Dixit]
* 05d19ea 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (sonic-net#2308) [Qi Luo]
* a0c3238 2022-06-03 | Add port counter sanity check (sonic-net#2300) [Junhua Zhai]
* 4944f0f 2022-06-03 | Revert "[portsorch]: Prevent LAG member configuration when port has active ACL binding (sonic-net#2165)" (sonic-net#2306) [bingwang-ms]
* eba212d 2022-05-31 | [Counters] Improve performance by polling only configured ports buffer queue/pg counters (sonic-net#2143) [shlomibitton]
* 9999dae 2022-05-28 | [counter] Support gearbox counters (sonic-net#2218) [Junhua Zhai]
* c73cf10 2022-05-28 | Support mock_test infra for dynamic buffer manager and fix issues found during mock test (sonic-net#2234) [Stephen Sun]

Signed-off-by: Ying Xie <[email protected]>
yxieca added a commit that referenced this pull request Jun 9, 2022
To included:
* ad8f5e4 2022-06-08 | Revert "[Counters] Improve performance by polling only configured ports buffer queue/pg counters (#2143)" (#2315) (HEAD -> master, origin/master, origin/HEAD) [Ying Xie]
* 2ff763f 2022-06-08 | Fix test_warm_reboot issues blocking PR merge (#2309) [Vaibhav Hemant Dixit]
* 05d19ea 2022-06-02 | Purge package sonic-db-cli which depends on libswsscommon (#2308) [Qi Luo]
* a0c3238 2022-06-03 | Add port counter sanity check (#2300) [Junhua Zhai]
* 4944f0f 2022-06-03 | Revert "[portsorch]: Prevent LAG member configuration when port has active ACL binding (#2165)" (#2306) [bingwang-ms]
* eba212d 2022-05-31 | [Counters] Improve performance by polling only configured ports buffer queue/pg counters (#2143) [shlomibitton]
* 9999dae 2022-05-28 | [counter] Support gearbox counters (#2218) [Junhua Zhai]
* c73cf10 2022-05-28 | Support mock_test infra for dynamic buffer manager and fix issues found during mock test (#2234) [Stephen Sun]

Signed-off-by: Ying Xie <[email protected]>
robertvolkmann pushed a commit to robertvolkmann/sonic-buildimage that referenced this pull request Jul 26, 2022
Including change:

* 7ff8f75 2022-06-03 | Revert "[portsorch]: Prevent LAG member configuration when port has active ACL binding (sonic-net#2165)" (sonic-net#2306) (HEAD -> 202205, github/202205) [bingwang-ms]

Signed-off-by: Ying Xie <[email protected]>
vivekrnv pushed a commit to vivekrnv/sonic-buildimage that referenced this pull request Aug 26, 2022
vivekrnv added a commit to vivekrnv/sonic-buildimage that referenced this pull request Oct 20, 2022
aedc05ecf [QoS] Support dynamic headroom calculation for Barefoot platforms (sonic-net#2306)
7f4da26f2 [app_ext] [auto-ts] Add available_mem_threshold option (sonic-net#2423)
b25070176 YANG Validation for ConfigDB Updates: Fix Decorator Bug (sonic-net#2405)
f62d1e596 [watermarkstat] Add new warning message for the 'q_shared_multi' counters (sonic-net#2408)
25fda264e [chassis]Add fabric counter cli commands (sonic-net#1860)
ae97e597e Update sonic command doc to add CLIs relative to SONiC fips (sonic-net#2377)
abd5eba49 [generate_dump]: Enhance show techsupport for cisco-8000 platform (sonic-net#2403)
ee15b74a2 Include configuring laser frequency and tx power (sonic-net#2437)
70be50cdc Add a subcommand to display a hexdump of transceiver EEPROM page (sonic-net#2379)
c246801ba Filter port invalid MTU configuration (sonic-net#2378)
362ec9bd7 [show] vnet advertised-route command (sonic-net#2390)
2372e2983 [show priority-group drop counters] Remove backup with cached PG drop counters after 'config reload' (sonic-net#2386)

Signed-off-by: Vivek Reddy Karri <[email protected]>
liat-grozovik pushed a commit that referenced this pull request Oct 23, 2022
aedc05ecf [QoS] Support dynamic headroom calculation for Barefoot platforms (#2306)
7f4da26f2 [app_ext] [auto-ts] Add available_mem_threshold option (#2423)
b25070176 YANG Validation for ConfigDB Updates: Fix Decorator Bug (#2405)
f62d1e596 [watermarkstat] Add new warning message for the 'q_shared_multi' counters (#2408)
25fda264e [chassis]Add fabric counter cli commands (#1860)
ae97e597e Update sonic command doc to add CLIs relative to SONiC fips (#2377)
abd5eba49 [generate_dump]: Enhance show techsupport for cisco-8000 platform (#2403)
ee15b74a2 Include configuring laser frequency and tx power (#2437)
70be50cdc Add a subcommand to display a hexdump of transceiver EEPROM page (#2379)
c246801ba Filter port invalid MTU configuration (#2378)
362ec9bd7 [show] vnet advertised-route command (#2390)
2372e2983 [show priority-group drop counters] Remove backup with cached PG drop counters after 'config reload' (#2386)

Signed-off-by: Vivek Reddy Karri <[email protected]>

Signed-off-by: Vivek Reddy Karri <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants