diff options
author | Zhang Run <zhang.run@zte.com.cn> | 2019-01-24 00:48:49 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2019-01-25 01:33:11 -0500 |
commit | 6eea3527e68acc22483f4763c8682f223eb90029 (patch) | |
tree | 1ba039513c7e868fb0a54ed6d70a78c7cc765507 /drivers/net/usb | |
parent | d524e6416aeb2854bbeef2bb596803914fe286c0 (diff) |
net: usb: asix: ax88772_bind return error when hw_reset fail
The ax88772_bind() should return error code immediately when the PHY
was not reset properly through ax88772a_hw_reset().
Otherwise, The asix_get_phyid() will block when get the PHY
Identifier from the PHYSID1 MII registers through asix_mdio_read()
due to the PHY isn't ready. Furthermore, it will produce a lot of
error message cause system crash.As follows:
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to write
reg index 0x0000: -71
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to send
software reset: ffffffb9
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to write
reg index 0x0000: -71
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to enable
software MII access
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to read
reg index 0x0000: -71
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to write
reg index 0x0000: -71
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to enable
software MII access
asix 1-1:1.0 (unnamed net_device) (uninitialized): Failed to read
reg index 0x0000: -71
...
Signed-off-by: Zhang Run <zhang.run@zte.com.cn>
Reviewed-by: Yang Wei <yang.wei9@zte.com.cn>
Tested-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r-- | drivers/net/usb/asix_devices.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index b654f05b2ccd..3d93993e74da 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c | |||
@@ -739,8 +739,13 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) | |||
739 | asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG, 0, 0, 1, &chipcode, 0); | 739 | asix_read_cmd(dev, AX_CMD_STATMNGSTS_REG, 0, 0, 1, &chipcode, 0); |
740 | chipcode &= AX_CHIPCODE_MASK; | 740 | chipcode &= AX_CHIPCODE_MASK; |
741 | 741 | ||
742 | (chipcode == AX_AX88772_CHIPCODE) ? ax88772_hw_reset(dev, 0) : | 742 | ret = (chipcode == AX_AX88772_CHIPCODE) ? ax88772_hw_reset(dev, 0) : |
743 | ax88772a_hw_reset(dev, 0); | 743 | ax88772a_hw_reset(dev, 0); |
744 | |||
745 | if (ret < 0) { | ||
746 | netdev_dbg(dev->net, "Failed to reset AX88772: %d\n", ret); | ||
747 | return ret; | ||
748 | } | ||
744 | 749 | ||
745 | /* Read PHYID register *AFTER* the PHY was reset properly */ | 750 | /* Read PHYID register *AFTER* the PHY was reset properly */ |
746 | phyid = asix_get_phyid(dev); | 751 | phyid = asix_get_phyid(dev); |