usbnet: asix AX88772: leave the carrier control to phylink

ASIX AX88772B based USB 10/100 Ethernet adapter doesn't come
up ("carrier off"), despite the built-in 100BASE-FX PHY positive link
indication. The internal PHY is configured (using EEPROM) in fixed
100 Mbps full duplex mode.

The primary problem appears to be using carrier_netif_{on,off}() while,
at the same time, delegating carrier management to phylink. Use only the
latter and remove "manual control" in the asix driver.

I don't have any other AX88772 board here, but the problem doesn't seem
specific to a particular board or settings - it's probably
timing-dependent.

Remove unused asix_adjust_link() as well.

Signed-off-by: Krzysztof Hałasa <khalasa@piap.pl>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Link: https://patch.msgid.link/m3plhmdfte.fsf_-_@t19.piap.pl
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/usb/asix.h b/drivers/net/usb/asix.h
index 74162190bccc10e37232bbc3b698b112a96b5af6..8531b804021aa4f7e4bba8a8f2c5e5e7173daa9e 100644 (file)
--- a/drivers/net/usb/asix.h
+++ b/drivers/net/usb/asix.h
@@ -224,7 +224,6 @@ int asix_write_rx_ctl(struct usbnet *dev, u16 mode, int in_pm);
 
 u16 asix_read_medium_status(struct usbnet *dev, int in_pm);
 int asix_write_medium_mode(struct usbnet *dev, u16 mode, int in_pm);
-void asix_adjust_link(struct net_device *netdev);
 
 int asix_write_gpio(struct usbnet *dev, u16 value, int sleep, int in_pm);
 

diff --git a/drivers/net/usb/asix_common.c b/drivers/net/usb/asix_common.c
index 72ffc89b477ad81b2cd810b43f3cccedd8044b1e..7fd763917ae2cf6f4242a054416130ba820c8c73 100644 (file)
--- a/drivers/net/usb/asix_common.c
+++ b/drivers/net/usb/asix_common.c
@@ -414,28 +414,6 @@ int asix_write_medium_mode(struct usbnet *dev, u16 mode, int in_pm)
        return ret;
 }
 
-/* set MAC link settings according to information from phylib */
-void asix_adjust_link(struct net_device *netdev)
-{
-       struct phy_device *phydev = netdev->phydev;
-       struct usbnet *dev = netdev_priv(netdev);
-       u16 mode = 0;
-
-       if (phydev->link) {
-               mode = AX88772_MEDIUM_DEFAULT;
-
-               if (phydev->duplex == DUPLEX_HALF)
-                       mode &= ~AX_MEDIUM_FD;
-
-               if (phydev->speed != SPEED_100)
-                       mode &= ~AX_MEDIUM_PS;
-       }
-
-       asix_write_medium_mode(dev, mode, 0);
-       phy_print_status(phydev);
-       usbnet_link_change(dev, phydev->link, 0);
-}
-
 int asix_write_gpio(struct usbnet *dev, u16 value, int sleep, int in_pm)
 {
        int ret;

diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c
index da24941a6e44468d0665c7c290ff7623369ecf80..9b0318fb50b55cfdf5dfdc3930c621548d99d0bf 100644 (file)
--- a/drivers/net/usb/asix_devices.c
+++ b/drivers/net/usb/asix_devices.c
@@ -752,7 +752,6 @@ static void ax88772_mac_link_down(struct phylink_config *config,
        struct usbnet *dev = netdev_priv(to_net_dev(config->dev));
 
        asix_write_medium_mode(dev, 0, 0);
-       usbnet_link_change(dev, false, false);
 }
 
 static void ax88772_mac_link_up(struct phylink_config *config,
@@ -783,7 +782,6 @@ static void ax88772_mac_link_up(struct phylink_config *config,
                m |= AX_MEDIUM_RFC;
 
        asix_write_medium_mode(dev, m, 0);
-       usbnet_link_change(dev, true, false);
 }
 
 static const struct phylink_mac_ops ax88772_phylink_mac_ops = {
@@ -1350,10 +1348,9 @@ static const struct driver_info ax88772_info = {
        .description = "ASIX AX88772 USB 2.0 Ethernet",
        .bind = ax88772_bind,
        .unbind = ax88772_unbind,
-       .status = asix_status,
        .reset = ax88772_reset,
        .stop = ax88772_stop,
-       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR | FLAG_MULTI_PACKET,
+       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET,
        .rx_fixup = asix_rx_fixup_common,
        .tx_fixup = asix_tx_fixup,
 };
@@ -1362,11 +1359,9 @@ static const struct driver_info ax88772b_info = {
        .description = "ASIX AX88772B USB 2.0 Ethernet",
        .bind = ax88772_bind,
        .unbind = ax88772_unbind,
-       .status = asix_status,
        .reset = ax88772_reset,
        .stop = ax88772_stop,
-       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-                FLAG_MULTI_PACKET,
+       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET,
        .rx_fixup = asix_rx_fixup_common,
        .tx_fixup = asix_tx_fixup,
        .data = FLAG_EEPROM_MAC,
@@ -1376,11 +1371,9 @@ static const struct driver_info lxausb_t1l_info = {
        .description = "Linux Automation GmbH USB 10Base-T1L",
        .bind = ax88772_bind,
        .unbind = ax88772_unbind,
-       .status = asix_status,
        .reset = ax88772_reset,
        .stop = ax88772_stop,
-       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-                FLAG_MULTI_PACKET,
+       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET,
        .rx_fixup = asix_rx_fixup_common,
        .tx_fixup = asix_tx_fixup,
        .data = FLAG_EEPROM_MAC,
@@ -1412,10 +1405,8 @@ static const struct driver_info hg20f9_info = {
        .description = "HG20F9 USB 2.0 Ethernet",
        .bind = ax88772_bind,
        .unbind = ax88772_unbind,
-       .status = asix_status,
        .reset = ax88772_reset,
-       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_LINK_INTR |
-                FLAG_MULTI_PACKET,
+       .flags = FLAG_ETHER | FLAG_FRAMING_AX | FLAG_MULTI_PACKET,
        .rx_fixup = asix_rx_fixup_common,
        .tx_fixup = asix_tx_fixup,
        .data = FLAG_EEPROM_MAC,