[24.04_linux-nvidia-7.0-next] Pull Request - lan743x driver commits#474
[24.04_linux-nvidia-7.0-next] Pull Request - lan743x driver commits#474dthompso wants to merge 3 commits into
Conversation
Wire phylink_ethtool_nway_reset() as the .nway_reset ethtool operation, allowing userspace to restart PHY autonegotiation via 'ethtool -r'. Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de> Reviewed-by: Russel King (Oracle) <rmk+kernel@armlinux.org.uk> Link: https://patch.msgid.link/20260223085442.42852-1-nb@tipi-net.de Signed-off-by: Paolo Abeni <pabeni@redhat.com> (cherry picked from commit 8636385) Signed-off-by: David Thompson <davthompson@nvidia.com>
A warm reset on boards using an EEPROM-only strap configuration (where no MAC address is set in the image) can cause the driver to incorrectly revert to RGMII mode. This occurs because the ENET_CONFIG_LOAD_STARTED bit may not persist or behave as expected. Update pci11x1x_strap_get_status() to use revision-specific validation: - For PCI11x1x A0: Continue using the legacy check (config load started or reset protection) to validate the SGMII strap. - For PCI11x1x B0 and later: Use the newly available STRAP_READ_USE_SGMII_EN_ bit in the upper strap register to validate the lower SGMII_EN bit. This ensures the SGMII interface is correctly identified even after a warm reboot. Signed-off-by: Thangaraj Samynathan <thangaraj.s@microchip.com> Link: https://patch.msgid.link/20260318063228.17110-1-thangaraj.s@microchip.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit e783e40) Signed-off-by: David Thompson <davthompson@nvidia.com>
The variable chip_rev stores the value read from the FPGA_REV register and represents the FPGA revision. Rename it to fpga_rev to better reflect its meaning. No functional change intended. Signed-off-by: Thangaraj Samynathan <thangaraj.s@microchip.com> Link: https://patch.msgid.link/20260410085710.9246-1-thangaraj.s@microchip.com Signed-off-by: Jakub Kicinski <kuba@kernel.org> (cherry picked from commit 469faa5) Signed-off-by: David Thompson <davthompson@nvidia.com>
BaseOS Kernel ReviewSummaryReviewed 3 commit(s); 1 finding(s) recorded. Findings: Critical: 0, High: 1, Medium: 0, Low: 0 Latest watcher review: open review Generated test plan: open test plan Kernel deb build: failed (failure log, build artifacts) Head: This comment is maintained by nv-pr-bot. It is updated when the GitHub watcher publishes a newer review. |
|
@dthompso This PR is targeting the wrong kernel. Please target 26.04_linux-nvidia which flows the the 24.04 7.0 kernel. Please also open a PR for 26.04_linux-nvidia-bos so that the patches are present there as well to keep those kernels in sync. |
|
It looks like Boro caught an upstream bug here: https://baseos-internal-tools.nvidia.com:4001/reviews/NVIDIA/NV-Kernels/474/latest.html This is not related to this specific PR. I've sent a fix: https://lore.kernel.org/all/20260626163218.3591486-1-arighi@nvidia.com/ @dthompso I've added you in cc, can you take a look? Thanks. |
|
The 3 patches in this PR are already in "26.04-linux-nvidia" branch, via #416 So, this PR can be closed. |
I missed that this PR was referencing patches that had already been applied to 7.0 kernels. I may be mistaken, but I think you intended this PR to be for the patches that were recently merged into the 6.17-HWE kernel via #469 8173d22 net: lan743x: permit VLAN-tagged packets up to configured MTU Those patches are not present in the 7.0 kernels. |
|
I have a new PR coming for bringing into the 2 patches above into "26.04-linux-nvidia". I don't need this PR anymore. |
|
Closing PR per above. |
6 participants
These three upstream patches provide fixes to the Microchip lan743x driver,
plus add capability for using "ethtool -r" to restart autonegotiation on
the interface.
469faa5 net: lan743x: rename chip_rev to fpga_rev
e783e40 net: lan743x: fix SGMII detection on PCI1xxxx B0+ during warm reset
8636385 net: microchip: lan743x: add ethtool nway_reset support
These patches picked clean and were tested on BlueField-4 hardware,
which uses the board-level Microchip LAN743x device.
LP: https://bugs.launchpad.net/ubuntu/+source/linux-nvidia-6.17/+bug/2152064