Backport SFP patches to Turris OS kernel

List of patches for Realtek GPON SFP from https://gitlab.nic.cz/turris/hw/hw_misc/-/issues/19#note_194481:

• 0d035bed2a4a - net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround
• 7a77233ec6d1 - net: sfp: relax bitrate-derived mode check
• 624407d2cf14 - net: sfp: cope with SFPs that set both LOS normal and LOS inverted
• 426c6cbc409c - net: sfp: add workaround for Realtek RTL8672 and RTL9601C chips
• f0b4f8476732 - net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant

cc @mbehun

Here are dependent patches for 5.4 kernel so above Realtek GPON SFP patches could be backported:

• e85d81a1840a
• 1539e0d33bbc
• 0936ebc42f59
• d2e816c0293f
• d900954f57c6
• 8e210b6bdc2c
• ed32abb1ee71
• 6b0da5c9c1a3
• b036a554d080
• 73f5e847d83a
• e117be74c559
• 139d3a212a1f
• 0fbd26a9fb68
• b18432c5a49c

In this order all patches applies cleanly on stable 5.4 kernel.

• e85d81a1840a
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/720-v5.5-net-sfp-move-sfp-sub-state-machines-into-separate-fu.patch

• 1539e0d33bbc
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/721-v5.5-net-sfp-move-tx-disable-on-device-down-to-main-state.patch

• 0936ebc42f59
  In OpenWrt: https://github.com/openwrt/openwrt/blob/openwrt-21.02/target/linux/generic/backport-5.4/722-v5.5-net-sfp-rename-sfp_sm_ins_next-as-sfp_sm_mod_next.patch

• d2e816c0293f
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/723-v5.5-net-sfp-handle-module-remove-outside-state-machine.patch

• d900954f57c6
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/724-v5.5-net-sfp-rename-T_PROBE_WAIT-to-T_SERIAL.patch

• 8e210b6bdc2c
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/727-v5.5-net-sfp-control-TX_DISABLE-and-phy-only-from-main-st.patch

• ed32abb1ee71
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/725-v5.5-net-sfp-parse-SFP-power-requirement-earlier.patch

• 6b0da5c9c1a3
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/732-v5.5-net-sfp-track-upstream-s-attachment-state-in-state-m.patch

• b036a554d080
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/733-v5.5-net-sfp-split-power-mode-switching-from-probe.patch

• 73f5e847d83a
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/734-v5.5-net-sfp-move-module-insert-reporting-out-of-probe.patch

• e117be74c559
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/735-v5.5-net-sfp-allow-sfp-to-probe-slow-to-initialise-GPON-m.patch

• 139d3a212a1f
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/736-v5.5-net-sfp-allow-modules-with-slow-diagnostics-to-probe.patch

• 0fbd26a9fb68 In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/pending-5.4/742-net-sfp-add-more-extended-compliance-codes.patch

• b18432c5a49c Not in OpenWrt, it seems.

List of patches for 5.4 kernel for SFP GPON Nokia modules:

• 181f29da1582
• eefa6f1fa74f
• 63ec1c7c3f3b
• d23751a09401
• 26c97a2d82c4

• 181f29da1582

In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/728-v5.5-net-sfp-split-the-PHY-probe-from-sfp_sm_mod_init.patch

• eefa6f1fa74f
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/729-v5.5-net-sfp-eliminate-mdelay-from-PHY-probe.patch

• 63ec1c7c3f3b
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/730-v5.5-net-sfp-allow-fault-processing-to-transition-to-othe.patch

• d23751a09401
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/backport-5.4/731-v5.5-net-sfp-ensure-TX_FAULT-has-deasserted-before-probin.patch

• 26c97a2d82c4
  In OpenWrt: https://github.com/openwrt/openwrt/blob/5beaa75d94c4a981c580905b84c7ef33caf0c3e2/target/linux/generic/pending-5.4/739-net-avoid-tx-fault-with-Nokia-GPON-module.patch

@jpavlinec Can you take a look at this? @prohar told me that it is compiled on kernel 5.4. However, I would really love to see this in OpenWrt as they takes care of refreshing, removing patches and so on. Because if we will have it in turris-build repository then it is going to be on us and even now we are quite short handed, so... I don't mind whoever will send this to OpenWrt and try to convince it, but it would be really helpful if someone can do it instead of me.

It is a question if we gets into OpenWrt 21.02, because in master they already has testing kernel 5.10, which is in crashlab, though.

assigned to @jpavlinec

added To Do label

assigned to @jschlehofer and unassigned @jpavlinec

marked this issue as related to #283 (closed)

mentioned in issue #283 (closed)

Recently, there was merged SFP support for Turris Omnia in OpenWrt 21.02, so I will take a look.

Link?

• https://github.com/openwrt/openwrt/commit/5e2a2b086cee9a7ba9f765dbf62a62f456b6713a
• https://github.com/openwrt/openwrt/commit/24e564d327943a32181db4568fff43cc18d93b13

Thx. This solution is similar to what we do now. Hopefully I will be able put it all into kernel, so that U-Boot doesn't need to do this. Once that is done this solution will be obsoleted.

added Doing label and removed To Do label

• 0d035bed2a4a - net: sfp: VSOL V2801F / CarlitoxxPro CPGOS03-0490 v2.0 workaround

Accpeted: https://github.com/openwrt/openwrt/pull/4924

• 7a77233ec6d1 - net: sfp: relax bitrate-derived mode check

Missing

• 624407d2cf14 - net: sfp: cope with SFPs that set both LOS normal and LOS inverted

https://github.com/openwrt/openwrt/pull/4937

• 426c6cbc409c - net: sfp: add workaround for Realtek RTL8672 and RTL9601C chips

Accepted: https://github.com/openwrt/openwrt/pull/4924

• f0b4f8476732 - net: sfp: add mode quirk for GPON module Ubiquiti U-Fiber Instant

Missing

Once the PR is accepted, I prepared this one on top of it https://github.com/openwrt/openwrt/commit/62e08914dc44d39c91b14be175ec120da4551be0 to sent it to upstream

removed Doing label

Even though, two patches are missing, we can close it or create a follow-up especially for Ubiquiti U-Fiber SFP module.

https://github.com/openwrt/openwrt/pull/4937 and !488 (merged)

closed

mentioned in issue #333 (closed)