SFP network issue since 6.18.53

[ewpa]

When updating bpi-r4 from 6.18.52 to 6.18.53, end1 (SFP 10G fiber plugged into R4 port labelled SFP/LAN) is no longer getting an IP address.
I have not diagnosed this very far. I notice it works on 7.0 and 7.1 but not later 7.x.
I will try and get a bisect.

[frank-w]

I backported a fix for linkflap from 7.3 in the pcs..maybe this is the cause? 7.2 has this fix too

[frank-w]

e57f45d

You can try reverting this

[ewpa]

Thank you, I was already working backwards reverting -- just found a quicker build machine. Reverting this single commit was enough to remove that regression: commit a638fab.

[frank-w]

Oh,this commit breaks for you? This is a mainline commit which should not break as far as i see

https://elixir.bootlin.com/linux/v7.2.8/source/include/linux/kconfig.h#L73

It is an OR between builtin and module

[ewpa]

I will re-check on my usual build machine.

[ewpa]

You are correct, I'll retry and revert e57f45d

[ewpa]

I reverted both e57f45d and e69eb61 and this did not help.

[frank-w]

Try reverting this:

c364e92 net: ethernet: mtk_eth_soc: fix supported_interface set after phylink_create

git revert c364e9232680

Do you have linkup in broken state?

ethtool end1
ethtool --show-eee end1
ethtool -k end1
ip -d link show end1

Does
tcpdump -ni end1 port 67 or port 68
Show only discover?

Have you tried again reverting the commit you've found (a638fab), but i guess this should not break and does not make any difference.

[ewpa]

Thank you for your suggestions :-)

Try reverting this:
net: ethernet: mtk_eth_soc: fix supported_interface set after phylink_create

git revert e4b4d8410c7c

I merged the revert, but no fix:

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 4dc6d526f4ff..2221155b828f 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -5844,11 +5844,6 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                mac_ops = &rt5350_phylink_ops;
 
-       if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_2P5GPHY) &&
-           id == MTK_GMAC2_ID)
-               __set_bit(PHY_INTERFACE_MODE_INTERNAL,
-                         mac->phylink_config.supported_interfaces);
-
        /* LPI wake-up timing is only verified on MTK_GMAC_EEE SoCs */
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_GMAC_EEE)) {
                phy_interface_copy(mac->phylink_config.lpi_interfaces,
@@ -5871,6 +5866,11 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
 
        mac->phylink = phylink;
 
+       if (MTK_HAS_CAPS(mac->hw->soc->caps, MTK_2P5GPHY) &&
+           id == MTK_GMAC2_ID)
+               __set_bit(PHY_INTERFACE_MODE_INTERNAL,
+                         mac->phylink_config.supported_interfaces);
+
        SET_NETDEV_DEV(eth->netdev[id], eth->dev);
        eth->netdev[id]->watchdog_timeo = 5 * HZ;
        eth->netdev[id]->netdev_ops = &mtk_netdev_ops;

Do you have linkup in broken state?

ethtool end1

Settings for end1:
	Supported ports: [ MII ]
	Supported link modes:   10baseT/Half 10baseT/Full
	                        100baseT/Half 100baseT/Full
	                        1000baseT/Half 1000baseT/Full
	                        10000baseT/Full
	                        2500baseX/Full
	                        1000baseKX/Full
	                        10000baseKX4/Full
	                        10000baseKR/Full
	                        10000baseR_FEC
	                        1000baseX/Full
	                        10000baseCR/Full
	                        10000baseSR/Full
	                        10000baseLR/Full
	                        10000baseLRM/Full
	                        10000baseER/Full
	                        2500baseT/Full
	                        5000baseT/Full
	                        100baseT1/Full
	                        1000baseT1/Full
	                        100baseFX/Half 100baseFX/Full
	                        10baseT1L/Full
	                        10baseT1S/Full
	                        10baseT1S/Half 10baseT1S_P2MP/Half 10baseT1BRR/Full
	Supported pause frame use: Symmetric Receive-only
	Supports auto-negotiation: Yes
	Supported FEC modes: Not reported
	Advertised link modes:  10baseT/Half 10baseT/Full
	                        100baseT/Half 100baseT/Full
	                        1000baseT/Half 1000baseT/Full
	                        10000baseT/Full
	                        2500baseX/Full
	                        1000baseKX/Full
	                        10000baseKX4/Full
	                        10000baseKR/Full
	                        10000baseR_FEC
	                        1000baseX/Full
	                        10000baseCR/Full
	                        10000baseSR/Full
	                        10000baseLR/Full
	                        10000baseLRM/Full
	                        10000baseER/Full
	                        2500baseT/Full
	                        5000baseT/Full
	                        100baseT1/Full
	                        1000baseT1/Full
	                        100baseFX/Half 100baseFX/Full
	                        10baseT1L/Full
	                        10baseT1S/Full
	                        10baseT1S/Half 10baseT1S_P2MP/Half 10baseT1BRR/Full
	Advertised pause frame use: Symmetric Receive-only
	Advertised auto-negotiation: Yes
	Advertised FEC modes: Not reported
	Speed: Unknown!
	Duplex: Unknown! (255)
	Auto-negotiation: on
	Port: MII
	PHYAD: 0
	Transceiver: internal
        Current message level: 0x000000ff (255)
                               drv probe link timer ifdown ifup rx_err tx_err
	Link detected: no

ethtool --show-eee end1

netlink error: Operation not supported

ethtool -k end1

Features for end1:
rx-checksumming: on
tx-checksumming: on
	tx-checksum-ipv4: on
	tx-checksum-ip-generic: off [fixed]
	tx-checksum-ipv6: on
	tx-checksum-fcoe-crc: off [fixed]
	tx-checksum-sctp: off [fixed]
scatter-gather: on
	tx-scatter-gather: on
	tx-scatter-gather-fraglist: off [fixed]
tcp-segmentation-offload: on
	tx-tcp-segmentation: on
	tx-tcp-ecn-segmentation: off [fixed]
	tx-tcp-mangleid-segmentation: off
	tx-tcp6-segmentation: on
	tx-tcp-accecn-segmentation: off [fixed]
generic-segmentation-offload: on
generic-receive-offload: on
large-receive-offload: off
rx-vlan-offload: off [fixed]
tx-vlan-offload: on
ntuple-filters: off [fixed]
receive-hashing: off [fixed]
highdma: off [fixed]
rx-vlan-filter: off [fixed]
vlan-challenged: off [fixed]
tx-gso-robust: off [fixed]
tx-fcoe-segmentation: off [fixed]
tx-gre-segmentation: off [fixed]
tx-gre-csum-segmentation: off [fixed]
tx-ipxip4-segmentation: off [fixed]
tx-ipxip6-segmentation: off [fixed]
tx-udp_tnl-segmentation: off [fixed]
tx-udp_tnl-csum-segmentation: off [fixed]
tx-gso-partial: off [fixed]
tx-tunnel-remcsum-segmentation: off [fixed]
tx-sctp-segmentation: off [fixed]
tx-esp-segmentation: off [fixed]
tx-udp-segmentation: off [fixed]
tx-gso-list: off [fixed]
tx-nocache-copy: off
loopback: off [fixed]
rx-fcs: off [fixed]
rx-all: off [fixed]
tx-vlan-stag-hw-insert: off [fixed]
rx-vlan-stag-hw-parse: off [fixed]
rx-vlan-stag-filter: off [fixed]
l2-fwd-offload: off [fixed]
hw-tc-offload: on
esp-hw-offload: off [fixed]
esp-tx-csum-hw-offload: off [fixed]
rx-udp_tunnel-port-offload: off [fixed]
tls-hw-tx-offload: off [fixed]
tls-hw-rx-offload: off [fixed]
rx-gro-hw: off [fixed]
tls-hw-record: off [fixed]
rx-gro-list: off
macsec-hw-offload: off [fixed]
rx-udp-gro-forwarding: off
hsr-tag-ins-offload: off [fixed]
hsr-tag-rm-offload: off [fixed]
hsr-fwd-offload: off [fixed]
hsr-dup-offload: off [fixed]

ip -d link show end1

4: end1: <NO-CARRIER,BROADCAST,MULTICAST,UP> mtu 1500 qdisc mq state DOWN mode DEFAULT group default qlen 1000
    link/ether 7a:5e:6d:e8:e7:0c brd ff:ff:ff:ff:ff:ff promiscuity 0 allmulti 0 minmtu 68 maxmtu 2022 addrgenmode none numtxqueues 16 numrxqueues 1 gso_max_size 65536 gso_max_segs 65535 tso_max_size 65536 tso_max_segs 65535 gro_max_size 65536 gso_ipv4_max_size 65536 gro_ipv4_max_size 65536 parentbus platform parentdev 15100000.ethernet 

Does tcpdump -ni end1 port 67 or port 68 Show only discover?

Nothing, but IPv4 address is static.

Have you tried again reverting the commit you've found (a638fab), but i guess this should not break and does not make any difference.

I will try this next, thank you.

[frank-w]

ok, so you do not get a link-up...basicly no dhcp-issue. which sfp is this exactly (vendor/product)? as it is 10G fibre i expect it is the usxgmii path and no phy...and possibly no quirk applied

[ewpa]

Reverting (a638fab) did not change things.

Xicom SFP+-LRB-FC. Aliexpress call it Xicom 10G SFP+ Module BIDI SC Simplex Optical Fiber Module 20km Singlemode 1270/1330nm Compatible with Cisco/Mikrotik SFP Switch

sfp sfp2: module OEM              SFP+-LRB-SC      rev A0

[frank-w]

could you try reverting

9edd644 – mtk_eth_soc: populate lpi_interfaces to fix EEE support

?

there is no quirk defined for this vendor/PN

[ewpa]

I merge reverted 9edd644 as follows, but it did not appear to change the behavior.

diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 2221155b828f..d6c55027e33e 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -5652,7 +5652,7 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
        phy_interface_t phy_mode;
        struct phylink *phylink;
        struct mtk_mac *mac;
-       int id, err, i, count;
+       int id, err, count;
        unsigned int sid;
        int txqs = 1;
        u32 val;
@@ -5732,8 +5732,8 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
        mac->phylink_config.type = PHYLINK_NETDEV;
        mac->phylink_config.mac_capabilities = MAC_ASYM_PAUSE | MAC_SYM_PAUSE |
                MAC_10 | MAC_100 | MAC_1000 | MAC_2500FD;
-       /* LPI above 1 Gbps is not supported */
-       mac->phylink_config.lpi_capabilities = MAC_100FD | MAC_1000FD;
+       mac->phylink_config.lpi_capabilities = MAC_100FD | MAC_1000FD |
+               MAC_2500FD;
        mac->phylink_config.lpi_timer_default = 1000;
        mac->phylink_config.num_available_pcs = 0;
 
@@ -5844,18 +5844,6 @@ static int mtk_add_mac(struct mtk_eth *eth, struct device_node *np)
        if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
                mac_ops = &rt5350_phylink_ops;
 
-       /* LPI wake-up timing is only verified on MTK_GMAC_EEE SoCs */
-       if (MTK_HAS_CAPS(eth->soc->caps, MTK_GMAC_EEE)) {
-               phy_interface_copy(mac->phylink_config.lpi_interfaces,
-                                  mac->phylink_config.supported_interfaces);
-               __clear_bit(PHY_INTERFACE_MODE_2500BASEX,
-                           mac->phylink_config.lpi_interfaces);
-               for (i = 0; i < PHY_INTERFACE_MODE_MAX; i++)
-                       if (mtk_interface_mode_is_xgmii(eth, i))
-                               __clear_bit(i,
-                                           mac->phylink_config.lpi_interfaces);
-       }
-
        phylink = phylink_create(&mac->phylink_config,
                                 of_fwnode_handle(mac->of_node),
                                 phy_mode, mac_ops);
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.h b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
index bd9cca1d4d1b..e7a5b3f3692f 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
@@ -1110,7 +1110,6 @@ enum mkt_eth_capabilities {
        MTK_XGMAC_BIT,
        MTK_XGMAC_V2_BIT,
        MTK_36BIT_DMA_BIT,
-       MTK_GMAC_EEE_BIT,
 
        /* MUX BITS*/
        MTK_ETH_MUX_GDM1_TO_GMAC1_ESW_BIT,
@@ -1162,7 +1161,6 @@ enum mkt_eth_capabilities {
 #define MTK_XGMAC              BIT_ULL(MTK_XGMAC_BIT)
 #define MTK_XGMAC_V2           BIT_ULL(MTK_XGMAC_V2_BIT)
 #define MTK_36BIT_DMA  BIT_ULL(MTK_36BIT_DMA_BIT)
-#define MTK_GMAC_EEE           BIT_ULL(MTK_GMAC_EEE_BIT)
 
 #define MTK_ETH_MUX_GDM1_TO_GMAC1_ESW          \
        BIT_ULL(MTK_ETH_MUX_GDM1_TO_GMAC1_ESW_BIT)
@@ -1265,7 +1263,7 @@ enum mkt_eth_capabilities {
 #define MT7981_CAPS  (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | MTK_GMAC2_GEPHY | \
                      MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \
                      MTK_MUX_U3_GMAC23_TO_QPHY | MTK_U3_COPHY_V2 | \
-                     MTK_RSTCTRL_PPE1 | MTK_SRAM | MTK_PDMA_INT | MTK_GMAC_EEE)
+                     MTK_RSTCTRL_PPE1 | MTK_SRAM | MTK_PDMA_INT)
 
 #define MT7986_CAPS  (MTK_GMAC1_SGMII | MTK_GMAC2_SGMII | \
                      MTK_MUX_GMAC12_TO_GEPHY_SGMII | MTK_QDMA | \

[frank-w]

are you sure. 6.18.52 was working correctly? i do not see any other commits that may break here (including clk and pinctrl)