| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Thu, 25 Jun 2020 13:05:00 +0300
From: Vladimir Oltean <olteanv@...il.com>
To: "David S. Miller" <davem@...emloft.net>,
netdev <netdev@...r.kernel.org>
Cc: Andrew Lunn <andrew@...n.ch>,
Florian Fainelli <f.fainelli@...il.com>,
Vivien Didelot <vivien.didelot@...il.com>,
Claudiu Manoil <claudiu.manoil@....com>,
Alexandru Marginean <alexandru.marginean@....com>
Subject: Re: [PATCH net-next] net: dsa: felix: support half-duplex link modes
On Wed, 24 Jun 2020 at 18:59, Vladimir Oltean <olteanv@...il.com> wrote:
>
> From: Vladimir Oltean <vladimir.oltean@....com>
>
> Ping tested:
>
> [ 11.808455] mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Full - flow control rx/tx
> [ 11.816497] IPv6: ADDRCONF(NETDEV_CHANGE): swp0: link becomes ready
>
> [root@...028ARDB ~] # ethtool -s swp0 advertise 0x4
> [ 18.844591] mscc_felix 0000:00:00.5 swp0: Link is Down
> [ 22.048337] mscc_felix 0000:00:00.5 swp0: Link is Up - 100Mbps/Half - flow control off
>
> [root@...028ARDB ~] # ip addr add 192.168.1.1/24 dev swp0
>
> [root@...028ARDB ~] # ping 192.168.1.2
> PING 192.168.1.2 (192.168.1.2): 56 data bytes
> (...)
> ^C--- 192.168.1.2 ping statistics ---
> 3 packets transmitted, 3 packets received, 0% packet loss
> round-trip min/avg/max = 0.383/0.611/1.051 ms
>
> [root@...028ARDB ~] # ethtool -s swp0 advertise 0x10
> [ 355.637747] mscc_felix 0000:00:00.5 swp0: Link is Down
> [ 358.788034] mscc_felix 0000:00:00.5 swp0: Link is Up - 1Gbps/Half - flow control off
>
> [root@...028ARDB ~] # ping 192.168.1.2
> PING 192.168.1.2 (192.168.1.2): 56 data bytes
> (...)
> ^C
> --- 192.168.1.2 ping statistics ---
> 16 packets transmitted, 16 packets received, 0% packet loss
> round-trip min/avg/max = 0.301/0.384/1.138 ms
>
> Signed-off-by: Vladimir Oltean <vladimir.oltean@....com>
> Reviewed-by: Florian Fainelli <f.fainelli@...il.com>
> ---
> This is a resend (no changes) of:
> https://patchwork.ozlabs.org/project/netdev/patch/20200531122640.1375715-12-olteanv@gmail.com/
> (which in itself was a resend, link to original in that link)
>
> It was extracted out of that series since that's now entangled with
> other development, but this could be applied separately.
>
> drivers/net/dsa/ocelot/felix.c | 4 +++-
> drivers/net/dsa/ocelot/felix_vsc9959.c | 13 ++++++++-----
> 2 files changed, 11 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
> index 25046777c993..55b4129a1f9d 100644
> --- a/drivers/net/dsa/ocelot/felix.c
> +++ b/drivers/net/dsa/ocelot/felix.c
> @@ -194,14 +194,16 @@ static void felix_phylink_validate(struct dsa_switch *ds, int port,
> return;
> }
>
> - /* No half-duplex. */
> phylink_set_port_modes(mask);
> phylink_set(mask, Autoneg);
> phylink_set(mask, Pause);
> phylink_set(mask, Asym_Pause);
> phylink_set(mask, 10baseT_Full);
> + phylink_set(mask, 10baseT_Half);
> phylink_set(mask, 100baseT_Full);
> + phylink_set(mask, 100baseT_Half);
> phylink_set(mask, 1000baseT_Full);
> + phylink_set(mask, 1000baseT_Half);
>
> if (state->interface == PHY_INTERFACE_MODE_INTERNAL ||
> state->interface == PHY_INTERFACE_MODE_2500BASEX ||
> diff --git a/drivers/net/dsa/ocelot/felix_vsc9959.c b/drivers/net/dsa/ocelot/felix_vsc9959.c
> index 2067776773f7..f5e8df584073 100644
> --- a/drivers/net/dsa/ocelot/felix_vsc9959.c
> +++ b/drivers/net/dsa/ocelot/felix_vsc9959.c
> @@ -817,12 +817,12 @@ static void vsc9959_pcs_init_sgmii(struct phy_device *pcs,
>
> phy_write(pcs, MII_BMCR, BMCR_ANRESTART | BMCR_ANENABLE);
> } else {
> + u16 duplex = 0;
> int speed;
>
> - if (state->duplex == DUPLEX_HALF) {
> - phydev_err(pcs, "Half duplex not supported\n");
> - return;
> - }
> + if (state->duplex == DUPLEX_FULL)
> + duplex = BMCR_FULLDPLX;
> +
> switch (state->speed) {
> case SPEED_1000:
> speed = ENETC_PCS_SPEED_1000;
> @@ -848,7 +848,7 @@ static void vsc9959_pcs_init_sgmii(struct phy_device *pcs,
> /* Yes, not a mistake: speed is given by IF_MODE. */
> phy_write(pcs, MII_BMCR, BMCR_RESET |
> BMCR_SPEED1000 |
> - BMCR_FULLDPLX);
> + duplex);
> }
> }
>
> @@ -925,8 +925,11 @@ static void vsc9959_pcs_init(struct ocelot *ocelot, int port,
> ARRAY_SIZE(phy_basic_ports_array),
> pcs->supported);
> linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT, pcs->supported);
> + linkmode_set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT, pcs->supported);
> linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT, pcs->supported);
> + linkmode_set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT, pcs->supported);
> linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT, pcs->supported);
> + linkmode_set_bit(ETHTOOL_LINK_MODE_1000baseT_Half_BIT, pcs->supported);
> if (pcs->interface == PHY_INTERFACE_MODE_2500BASEX ||
> pcs->interface == PHY_INTERFACE_MODE_USXGMII)
> linkmode_set_bit(ETHTOOL_LINK_MODE_2500baseX_Full_BIT,
> --
> 2.25.1
>
Please don't merge this patch. I need to make some changes to it.
Thanks,
-Vladimir
Powered by blists - more mailing lists