| Message ID | 1415288981-3862-1-git-send-email-ckeepax@opensource.wolfsonmicro.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Date: Thu, 6 Nov 2014 15:49:41 +0000 > commit 3cc81d85ee01 ("asix: Don't reset PHY on if_up for ASIX 88772") > causes the ethernet on Arndale to no longer function. This appears to > be because the Arndale ethernet requires a full reset before it will > function correctly, however simply reverting the above patch causes > problems with ethtool settings getting reset. > > It seems the problem is that the ethernet is not properly reset during > bind, and indeed the code in ax88772_bind that resets the device is a > very small subset of the actual ax88772_reset function. This patch uses > ax88772_reset in place of the existing reset code in ax88772_bind which > removes some code duplication and fixes the ethernet on Arndale. > > It is still possible that the original patch causes some issues with > suspend and resume but that seems like a separate issue and I haven't > had a chance to test that yet. > > Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> > Tested-by: Riku Voipio <riku.voipio@linaro.org> > --- > > Hi, > > I wasn't 100% sure which branch to base this off so I based it on Dave > Miller's net-next branch, which seemed logical. Since it fixes a regression that is upstream already, I'm applying this to the net tree. Thanks. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index 2c05f6c..816d511 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -465,19 +465,7 @@ static int ax88772_bind(struct usbnet *dev, struct usb_interface *intf) return ret; } - ret = asix_sw_reset(dev, AX_SWRESET_IPPD | AX_SWRESET_PRL); - if (ret < 0) - return ret; - - msleep(150); - - ret = asix_sw_reset(dev, AX_SWRESET_CLEAR); - if (ret < 0) - return ret; - - msleep(150); - - ret = asix_sw_reset(dev, embd_phy ? AX_SWRESET_IPRL : AX_SWRESET_PRTE); + ax88772_reset(dev); /* Read PHYID register *AFTER* the PHY was reset properly */ phyid = asix_get_phyid(dev);
commit 3cc81d85ee01 ("asix: Don't reset PHY on if_up for ASIX 88772") causes the ethernet on Arndale to no longer function. This appears to be because the Arndale ethernet requires a full reset before it will function correctly, however simply reverting the above patch causes problems with ethtool settings getting reset. It seems the problem is that the ethernet is not properly reset during bind, and indeed the code in ax88772_bind that resets the device is a very small subset of the actual ax88772_reset function. This patch uses ax88772_reset in place of the existing reset code in ax88772_bind which removes some code duplication and fixes the ethernet on Arndale. It is still possible that the original patch causes some issues with suspend and resume but that seems like a separate issue and I haven't had a chance to test that yet. Signed-off-by: Charles Keepax <ckeepax@opensource.wolfsonmicro.com> Tested-by: Riku Voipio <riku.voipio@linaro.org> --- Hi, I wasn't 100% sure which branch to base this off so I based it on Dave Miller's net-next branch, which seemed logical. Thanks, Charles drivers/net/usb/asix_devices.c | 14 +------------- 1 files changed, 1 insertions(+), 13 deletions(-)