[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <trinity-ac9a840b-cb06-4710-827a-4c4423686074-1666551838763@3c-app-gmx-bs01>
Date: Sun, 23 Oct 2022 21:03:58 +0200
From: Frank Wunderlich <frank-w@...lic-files.de>
To: "Russell King (Oracle)" <linux@...linux.org.uk>
Cc: Frank Wunderlich <linux@...web.de>,
linux-mediatek@...ts.infradead.org,
Alexander Couzens <lynxis@...0.eu>,
Felix Fietkau <nbd@....name>, John Crispin <john@...ozen.org>,
Sean Wang <sean.wang@...iatek.com>,
Mark Lee <Mark-MC.Lee@...iatek.com>,
"David S. Miller" <davem@...emloft.net>,
Eric Dumazet <edumazet@...gle.com>,
Jakub Kicinski <kuba@...nel.org>,
Paolo Abeni <pabeni@...hat.com>,
Matthias Brugger <matthias.bgg@...il.com>,
netdev@...r.kernel.org, linux-arm-kernel@...ts.infradead.org,
linux-kernel@...r.kernel.org
Subject: Aw: Re: Re: [PATCH v2] net: mtk_sgmii: implement mtk_pcs_ops
> Gesendet: Sonntag, 23. Oktober 2022 um 19:52 Uhr
> Von: "Russell King (Oracle)" <linux@...linux.org.uk>
> Hi Frank,
>
> Based on this, could you give the following patch a try - it replaces
> my previous patch.
looks better now:
root@...-r3:~# ip link set eth1 up
[ 59.437700] mtk_soc_eth 15100000.ethernet eth1: configuring for inband/1000base-x link mode
root@...-r3:~# [ 59.446191] interface-mode: 21 advertise: 0x1a0 link timer:0x98968
[ 59.503145] offset:0 0x2c1140
[ 59.509329] offset:4 0x4d544950
[ 59.512284] offset:8 0x40e041a0
[ 59.515446] offset:32 0x3112011a
[ 59.518598] mtk_soc_eth 15100000.ethernet eth1: Link is Up - 1Gbps/Full - flow control off
[ 59.530096] IPv6: ADDRCONF(NETDEV_CHANGE): eth1: link becomes ready
root@...-r3:~# ip a a 192.168.0.19/24 dev eth1
root@...-r3:~# ping 192.168.0.10
PING 192.168.0.10 (192.168.0.10) 56(84) bytes of data.
64 bytes from 192.168.0.10: icmp_seq=1 ttl=64 time=0.863 ms
64 bytes from 192.168.0.10: icmp_seq=2 ttl=64 time=0.491 ms
^C
--- 192.168.0.10 ping statistics ---
2 packets transmitted, 2 received, 0% packet loss, time 1071ms
rtt min/avg/max/mdev = 0.491/0.677/0.863/0.186 ms
root@...-r3:~# ethtool eth1
[ 128.027246] offset:0 0x2c1140
[ 128.027264] offset:4 0x4d544950
[ 128.030230] offset:8 0x40e041a0
Settings for eth[ 128.033411] offset:32 0x3112011a
1:
Supported p[ 128.036798] offset:0 0x2c1140
[ 128.041287] offset:4 0x4d544950
Supported link[ 128.045636] offset:8 0x40e041a0
modes: 1000baseX/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: Yes
Supported FEC modes: Not reported
Advertised link modes: 1000baseX/Full
Advertised pause frame use: Symmetric Receive-only
Advertised auto-negotiation: Yes
Advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: on
Port: FIBRE
PHYAD: 0
Transceiver: internal
Current message level: 0x000000ff (255)
drv probe link timer ifdown ifup rx_err tx_err
Link detected: yes
root@...-r3:~#
root@...-r3:~# iperf3 -c 192.168.0.21
Connecting to host 192.168.0.21, port 5201
[ 5] local 192.168.0.19 port 50992 connected to 192.168.0.21 port 5201
[ ID] Interval Transfer Bitrate Retr Cwnd
[ 5] 0.00-1.00 sec 114 MBytes 960 Mbits/sec 0 450 KBytes
[ 5] 1.00-2.00 sec 112 MBytes 940 Mbits/sec 0 450 KBytes
[ 5] 2.00-3.00 sec 113 MBytes 948 Mbits/sec 0 450 KBytes
[ 5] 3.00-4.00 sec 112 MBytes 940 Mbits/sec 0 450 KBytes
[ 5] 4.00-5.00 sec 112 MBytes 941 Mbits/sec 0 450 KBytes
[ 5] 5.00-6.00 sec 112 MBytes 941 Mbits/sec 0 450 KBytes
[ 5] 6.00-7.00 sec 113 MBytes 948 Mbits/sec 0 450 KBytes
[ 5] 7.00-8.00 sec 112 MBytes 939 Mbits/sec 0 450 KBytes
[ 5] 8.00-9.00 sec 112 MBytes 940 Mbits/sec 0 450 KBytes
[ 5] 9.00-10.00 sec 113 MBytes 947 Mbits/sec 0 450 KBytes
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.00 sec 1.10 GBytes 944 Mbits/sec 0 sender
[ 5] 0.00-10.06 sec 1.10 GBytes 938 Mbits/sec receiver
iperf Done.
root@...-r3:~# iperf3 -c 192.168.0.21 -R
Connecting to host 192.168.0.21, port 5201
Reverse mode, remote host 192.168.0.21 is sending
[ 5] local 192.168.0.19 port 38736 connected to 192.168.0.21 port 5201
[ ID] Interval Transfer Bitrate
[ 5] 0.00-1.00 sec 112 MBytes 937 Mbits/sec
[ 5] 1.00-2.00 sec 112 MBytes 940 Mbits/sec
[ 5] 2.00-3.00 sec 112 MBytes 939 Mbits/sec
[ 5] 3.00-4.00 sec 112 MBytes 940 Mbits/sec
[ 5] 4.00-5.00 sec 112 MBytes 940 Mbits/sec
[ 5] 5.00-6.00 sec 112 MBytes 940 Mbits/sec
[ 5] 6.00-7.00 sec 112 MBytes 940 Mbits/sec
[ 5] 7.00-8.00 sec 112 MBytes 941 Mbits/sec
[ 5] 8.00-9.00 sec 112 MBytes 940 Mbits/sec
[ 5] 9.00-10.00 sec 112 MBytes 940 Mbits/sec
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.06 sec 1.10 GBytes 936 Mbits/sec 0 sender
[ 5] 0.00-10.00 sec 1.09 GBytes 940 Mbits/sec receiver
iperf Done.
root@...-r3:~#
so now checking the first gmac (mt7531 switch-chip, fixed link with 2500baseX - sgmii, but i can only test 1G on a switchport not the full 2g5):
root@...-r3:~# ip link set eth1 down
[ 128.050136] offset:32 0x3112011a
[ 266.426857] mtk_soc_eth 15100000.ethernet eth1: Link is Down
root@...-r3:~# ip link set eth0 up
[ 277.257578] mtk_soc_eth 15100000.ethernet eth0: configuring for fixed/2500base-x link mode
[ 277.266007] mtk_soc_eth 15100000.ethernet eth0: Link is Up - 2.5Gbps/Full - flow control rx/tx
root@...-r3:~#
root@...-r3:~# ip a a 192.168.0.19/24 dev wan
root@...-r3:~# ip link set wan up
[ 373.687223] mt7530 mdio-bus:1f wan: configuring for phy/gmii link mode
root@...-r3:~# [ 373.698593] mt7530 mdio-bus:1f wan: Link is Up - 1Gbps/Full - flow control rx/tx
[ 373.706061] IPv6: ADDRCONF(NETDEV_CHANGE): wan: link becomes ready
root@...-r3:~# ip a a 192.168.0.19/24 dev wan
root@...-r3:~# ip link set wan up
[ 373.687223] mt7530 mdio-bus:1f wan: configuring for phy/gmii link mode
root@...-r3:~# [ 373.698593] mt7530 mdio-bus:1f wan: Link is Up - 1Gbps/Full - flow control rx/tx
[ 373.706061] IPv6: ADDRCONF(NETDEV_CHANGE): wan: link becomes ready
root@...-r3:~# ping 192.168.0.10
PING 192.168.0.10 (192.168.0.10) 56(84) bytes of data.
64 bytes from 192.168.0.10: icmp_seq=1 ttl=64 time=0.964 ms
64 bytes from 192.168.0.10: icmp_seq=2 ttl=64 time=0.523 ms
^C
--- 192.168.0.10 ping statistics ---
2 packets transmitted, 2 received, 0% packet loss, time 1001ms
rtt min/avg/max/mdev = 0.523/0.743/0.964/0.220 ms
root@...-r3:~# iperf3 -c 192.168.0.21
Connecting to host 192.168.0.21, port 5201
[ 5] local 192.168.0.19 port 48332 connected to 192.168.0.21 port 5201
[ ID] Interval Transfer Bitrate Retr Cwnd
[ 5] 0.00-1.00 sec 115 MBytes 962 Mbits/sec 0 641 KBytes
[ 5] 1.00-2.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 2.00-3.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 3.00-4.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 4.00-5.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 5.00-6.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 6.00-7.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 7.00-8.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 8.00-9.00 sec 112 MBytes 944 Mbits/sec 0 641 KBytes
[ 5] 9.00-10.00 sec 111 MBytes 933 Mbits/sec 0 641 KBytes
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.00 sec 1.10 GBytes 944 Mbits/sec 0 sender
[ 5] 0.00-10.06 sec 1.10 GBytes 937 Mbits/sec receiver
iperf Done.
root@...-r3:~# iperf3 -c 192.168.0.21 -R
Connecting to host 192.168.0.21, port 5201
Reverse mode, remote host 192.168.0.21 is sending
[ 5] local 192.168.0.19 port 51822 connected to 192.168.0.21 port 5201
[ ID] Interval Transfer Bitrate
[ 5] 0.00-1.00 sec 112 MBytes 937 Mbits/sec
[ 5] 1.00-2.00 sec 112 MBytes 941 Mbits/sec
[ 5] 2.00-3.00 sec 112 MBytes 939 Mbits/sec
[ 5] 3.00-4.00 sec 112 MBytes 940 Mbits/sec
[ 5] 4.00-5.00 sec 112 MBytes 938 Mbits/sec
[ 5] 5.00-6.00 sec 112 MBytes 940 Mbits/sec
[ 5] 6.00-7.00 sec 112 MBytes 938 Mbits/sec
[ 5] 7.00-8.00 sec 112 MBytes 941 Mbits/sec
[ 5] 8.00-9.00 sec 112 MBytes 940 Mbits/sec
[ 5] 9.00-10.00 sec 112 MBytes 940 Mbits/sec
- - - - - - - - - - - - - - - - - - - - - - - - -
[ ID] Interval Transfer Bitrate Retr
[ 5] 0.00-10.06 sec 1.10 GBytes 936 Mbits/sec 0 sender
[ 5] 0.00-10.00 sec 1.09 GBytes 939 Mbits/sec receiver
iperf Done.
root@...-r3:~# ethtool eth0
Settings for eth0:
Supported ports: [ MII ]
Supported link modes: 2500baseT/Full
Supported pause frame use: Symmetric Receive-only
Supports auto-negotiation: Yes
Supported FEC modes: Not reported
Advertised link modes: 2500baseT/Full
Advertised pause frame use: Symmetric Receive-only
Advertised auto-negotiation: Yes
Advertised FEC modes: Not reported
Link partner advertised link modes: 2500baseT/Full
Link partner advertised pause frame use: Symmetric
Link partner advertised auto-negotiation: No
Link partner advertised FEC modes: Not reported
Speed: 2500Mb/s
Duplex: Full
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: yes
root@...-r3:~# ethtool wan
Settings for wan:
Supported ports: [ TP MII ]
Supported link modes: 10baseT/Half 10baseT/Full
100baseT/Half 100baseT/Full
1000baseT/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/Full
Advertised pause frame use: Symmetric Receive-only
Advertised auto-negotiation: Yes
Advertised FEC modes: Not reported
Link partner advertised link modes: 10baseT/Half 10baseT/Full
100baseT/Half 100baseT/Full
1000baseT/Full
Link partner advertised pause frame use: Symmetric
Link partner advertised auto-negotiation: Yes
Link partner advertised FEC modes: Not reported
Speed: 1000Mb/s
Duplex: Full
Auto-negotiation: on
master-slave cfg: preferred slave
master-slave status: master
Port: Twisted Pair
PHYAD: 0
Transceiver: external
MDI-X: Unknown
Supports Wake-on: d
Wake-on: d
Link detected: yes
root@...-r3:~#
looks good too :)
if you fix this typo you can send the patch and add my tested-by:
regmap_read(mpcs->regmap, SGMSYS_SGMII_MODE, &val);
- if (interface = == PHY_INTERFACE_MODE_SGMII)
+ if (interface == PHY_INTERFACE_MODE_SGMII)
val |= SGMII_IF_MODE_BIT0;
else
val &= ~SGMII_IF_MODE_BIT0;
should i send an update for my patch including this:
state->duplex = DUPLEX_FULL;
or do you want to read the duplex from the advertisement like stated before?
regmap_read(mpcs->regmap, SGMSYS_PCS_CONTROL_1, &bm);
regmap_read(mpcs->regmap, SGMSYS_PCS_CONTROL_1 + 8, &adv);
phylink_mii_c22_pcs_decode_state(state, bm >> 16, adv >> 16);
regards Frank
Powered by blists - more mailing lists