[tn48m/tn48m-dn series] Upgrade kernel version to 5.10 #45
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
paulmenzel
reviewed
Feb 18, 2021
| self.insmod("prestera_sw.ko") | ||
| self.insmod("prestera_pci.ko") | ||
| # Insert Marvell prestera modules by only probing prestera_pci module | ||
| # Suggested by Taras Chornyi |
There was a problem hiding this comment.
Please put that into the commit message.
There was a problem hiding this comment.
Done and thanks.
| self.insmod("prestera_pci.ko") | ||
| # Insert Marvell prestera modules by only probing prestera_pci module | ||
| # Suggested by Taras Chornyi | ||
| subprocess.call('modprobe prestera_pci', shell=True) |
There was a problem hiding this comment.
Why is self.insmod("prestero_pci.ko") not working anymore?
There was a problem hiding this comment.
Why is
self.insmod("prestero_pci.ko")not working anymore?
Hi Paul,
Because the name of prestera driver is changed from "prestera_sw.ko" to "prestera.ko", it will be better if we use modprobe to probe prestero_pci driver only, modprobe will automatically help us to insert the necessary drivers, like prestera.ko here.
For more details, you can refer to the discussion: #43 (comment)
There was a problem hiding this comment.
I wonder if a method modprobe should be added to packages/base/all/vendor-config-onl/src/, so only self.modprobe("prestero") needs to be used.
There was a problem hiding this comment.
I wonder if a method
modprobeshould be added topackages/base/all/vendor-config-onl/src/, so onlyself.modprobe("prestero")needs to be used.
Yes, the self.modprobe function can be implemented in file: "packages/base/all/vendor-config-onl/src/python/onl/platform/base.py" in the future if needed.
| @@ -16,3 +16,5 @@ | |||
| 0020-accton-as5114.patch | |||
| 0021-tn48m-add-sfp-eeprom-support-to-ethtool.patch | |||
| #0022-marvell-wa-tx-disable.patch | |||
| 0023-delta-tn48m-dn-series-dts.patch | |||
|
|
|||
There was a problem hiding this comment.
Please remove the blank line at the end of the file.
There was a problem hiding this comment.
Done and thanks.
Comment on lines
29
to
31
| # Insert Marvell prestera modules by only probing prestera_pci module | ||
| # Suggested by Taras Chornyi | ||
| subprocess.call('modprobe prestera_pci', shell=True) |
Comment on lines
38
to
40
| # Insert Marvell prestera modules by only probing prestera_pci module | ||
| # Suggested by Taras Chornyi | ||
| subprocess.call('modprobe prestera_pci', shell=True) |
Comment on lines
44
to
46
| # Insert Marvell prestera modules by only probing prestera_pci module | ||
| # Suggested by Taras Chornyi | ||
| subprocess.call('modprobe prestera_pci', shell=True) |
There was a problem hiding this comment.
Ditto as above. (I won’t comment on the other occurrences.)
chenglin-tsai
force-pushed
the
kernel-5.10
branch
from
b0e2991
to
272224a
Compare
The 'packages/base/any/kernels/5.10-lts/patches/0023-delta-tn48m-dn-series-dts.patch' is just a copy from kernel 5.6. |
|
Here are the out-of-Linux-kernel-tree switch driver messages. |
Could you please add that to the git commit message? |
chenglin-tsai
force-pushed
the
kernel-5.10
branch
from
272224a
to
ddc0448
Compare
Sure. Added. |
In kernel 5.10, the driver 'prestera_sw' is renamed to 'prestera', so using the 'self.modprobe' to probe 'prestera_pci', which makes the 'prestera' will be also loaded [1]. [1]: dentproject#43 (comment) The 'packages/base/any/kernels/5.10-lts/patches/0023-delta-tn48m-dn-series-dts.patch' is a copy from kernel 5.6 Signed-off-by: Chenglin Tsai <chenglin.tsai@deltaww.com>
chenglin-tsai
force-pushed
the
kernel-5.10
branch
from
ddc0448
to
f41abe2
Compare
Mickey201
reviewed
Feb 23, 2021
| @@ -16,3 +16,4 @@ | |||
| 0020-accton-as5114.patch | |||
| 0021-tn48m-add-sfp-eeprom-support-to-ethtool.patch | |||
| #0022-marvell-wa-tx-disable.patch | |||
There was a problem hiding this comment.
This Line:
#22-marvell-wa-tx-disable.patch
should be removed and you can use:
0022-delta-tn48m-dn-series-dts.patch
There was a problem hiding this comment.
@Mickey201, No problem, updated in e633451. Thanks for the suggestions.
Mickey201
reviewed
Feb 23, 2021
Yes, in the test log, I saw the Marvell firmware 2.8.0 and Marvell prestera drivers are successfully loaded in kernel 5.10. dentOS_tn4810m_kernel_5.10_onlpdump_2021_0218.log |
Since the codes in 0022-marvell-wa-tx-disable.patch is already merged into kernel 5.10, and we don't need them anymore. So modify the patch number of tn48m-dn from 23 to 22. [1]: dentproject#45 (comment) Signed-off-by: Chenglin Tsai <chenglin.tsai@deltaww.com>
Mickey201
approved these changes
Feb 24, 2021
taraschornyiplv
approved these changes
Feb 24, 2021
|
@sonoble As pointed by @paulmenzel in #44 commits from the pull request will be squashed and merged to main branch as one commit. Is it possible to enable Rebase and Merge option |
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.
Upgrade kernel version to 5.10 on tn48m and tn48m-dn series.
Test logs:
dentOS_tn4810m_kernel_5.10_onlpdump_2021_0218.log
dentOS_tn48m_kernel_5.10_onlpdump_2021_0218.log
dentOS_tn48m-poe_kernel_5.10_onlpdump_2021_0218.log
Signed-off-by: Chenglin Tsai chenglin.tsai@deltaww.com