Skip to content

Commit

Permalink
net: usb: ax88179_178a: improve reset check
Browse files Browse the repository at this point in the history
commit 7be4cb7 upstream.

After ecf848e ("net: usb: ax88179_178a: fix link status when link is
set to down/up") to not reset from usbnet_open after the reset from
usbnet_probe at initialization stage to speed up this, some issues have
been reported.

It seems to happen that if the initialization is slower, and some time
passes between the probe operation and the open operation, the second reset
from open is necessary too to have the device working. The reason is that
if there is no activity with the phy, this is "disconnected".

In order to improve this, the solution is to detect when the phy is
"disconnected", and we can use the phy status register for this. So we will
only reset the device from reset operation in this situation, that is, only
if necessary.

The same bahavior is happening when the device is stopped (link set to
down) and later is restarted (link set to up), so if the phy keeps working
we only need to enable the mac again, but if enough time passes between the
device stop and restart, reset is necessary, and we can detect the
situation checking the phy status register too.

cc: [email protected] # 6.6+
Fixes: ecf848e ("net: usb: ax88179_178a: fix link status when link is set to down/up")
Reported-by: Yongqin Liu <[email protected]>
Reported-by: Antje Miederhöfer <[email protected]>
Reported-by: Arne Fitzenreiter <[email protected]>
Tested-by: Yongqin Liu <[email protected]>
Tested-by: Antje Miederhöfer <[email protected]>
Signed-off-by: Jose Ignacio Tornos Martinez <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
jtornosm authored and gregkh committed Jun 27, 2024
1 parent 78a6136 commit f08e079
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions drivers/net/usb/ax88179_178a.c
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,6 @@ struct ax88179_data {
u32 wol_supported;
u32 wolopts;
u8 disconnecting;
u8 initialized;
};

struct ax88179_int_data {
Expand Down Expand Up @@ -1676,12 +1675,21 @@ static int ax88179_reset(struct usbnet *dev)

static int ax88179_net_reset(struct usbnet *dev)
{
struct ax88179_data *ax179_data = dev->driver_priv;
u16 tmp16;

if (ax179_data->initialized)
ax88179_read_cmd(dev, AX_ACCESS_PHY, AX88179_PHY_ID, GMII_PHY_PHYSR,
2, &tmp16);
if (tmp16) {
ax88179_read_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
2, 2, &tmp16);
if (!(tmp16 & AX_MEDIUM_RECEIVE_EN)) {
tmp16 |= AX_MEDIUM_RECEIVE_EN;
ax88179_write_cmd(dev, AX_ACCESS_MAC, AX_MEDIUM_STATUS_MODE,
2, 2, &tmp16);
}
} else {
ax88179_reset(dev);
else
ax179_data->initialized = 1;
}

return 0;
}
Expand Down

0 comments on commit f08e079

Please sign in to comment.