Cleanup downstream lan78xx#7295
Conversation
bd213ee to
899790f
Compare
899790f to
0d85bf0
Compare
|
@pelwell I'm in favour of removing unneeded downstream code. Are you happy this is okay? |
|
Aside from the spurious extra blank line, I'm happy with these. I am, however, nervous about the proposed reversion of 8633b35 - I only see one other read of LAN88XX_INT_STS, and that is conditional on |
That's why I wanted to check beforehand. I will try to build a regression setup and test with and without. But this can be merged in a follow-up PR. The downshift patches [1] have also been merged, so we can revert the downstream equivalent in the future too. |
0d85bf0 to
f9ce828
Compare
This reverts commit abe92ec.
This reverts commit 9c78c6d.
This reverts commit 98fb76f.
…-broken Remove the downstream microchip,eee-enabled and microchip,tx-lpi-timer properties from the Pi 3B+ PHY node. These were consumed by the downstream lan78xx driver patches which have been reverted now that upstream (since v6.17) integrates EEE via the phylink LPI API with eee_enabled_default=true and lpi_timer_default=50. Replace the eee dtparam with standard eee-broken-1000t/eee-broken-100tx properties. Setting dtparam=eee=off adds the eee-broken properties to prevent EEE negotiation. EEE is enabled by default. Drop the tx_lpi_timer dtparam as the LPI timer is now managed by phylink and configurable via ethtool --set-eee. Signed-off-by: Nicolai Buchwitz <[email protected]>
f9ce828 to
53dc136
Compare
The downstream
microchip,eee-enabledandmicrochip,tx-lpi-timerDT properties and the corresponding driver-side get/set_eee changes are superseded by Oleksij Rempel's proper phylink LPI integration that landed in 6.17 (673d455). That series addsmac_enable_tx_lpi/mac_disable_tx_lpicallbacks, setseee_enabled_default = trueandlpi_timer_default = 50, so EEE works out of the box without any downstream driver patches.This reverts both downstream driver patches and converts the DT to use standard
eee-broken-*PHY properties (same approach as the genet EEE cleanup in 54a9cd7), keeping the dtparam=eee=off` override working for users who need to disable EEE.Also reverts the downstream
SOF_TIMESTAMPING_TX_SOFTWAREpatch which added a duplicateget_ts_infoentry - the same fix was upstreamed independently in v6.0 (33e6b16), leaving a harmless but confusing duplicate in the ethtool_ops struct.8633b35 ("lan78xx: Ack pending PHY ints when resetting") is also a candidate for revert, as the phylink refactoring reworked the IRQ ack path. @pelwell, thoughts?