From mboxrd@z Thu Jan 1 00:00:00 1970 From: robert.foss@collabora.com Subject: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg Date: Mon, 29 Aug 2016 09:32:19 -0400 Message-ID: <9d5c5525f369f1c4098bda989d73886d11036bae.1472155176.git-series.robert.foss__29584.1726627716$1472477659$gmane$org@collabora.com> References: Cc: Grant Grundler To: freddy@asix.com.tw, Dean_Jenkins@mentor.com, Mark_Craske@mentor.com, davem@davemloft.net, robert.foss@collabora.com, ivecera@redhat.com, john.stultz@linaro.org, vpalatin@chromium.org, stephen@networkplumber.org, grundler@chromium.org, changchias@gmail.com, allan@asix.com.tw, andrew@lunn.ch, tremyfr@gmail.com, colin.king@canonical.com, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, vpalatin@google.com Return-path: Received: from bhuna.collabora.co.uk ([46.235.227.227]:52429 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933443AbcH2Ncw (ORCPT ); Mon, 29 Aug 2016 09:32:52 -0400 In-Reply-To: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org List-ID: From: Robert Foss From: Grant Grundler The miii_nway_restart() causes a PHY link change activity and ax88772_link_reset will be called. link_reset will set AX_CMD_WRITE_MEDIUM_MODE register correctly. The asix_write_medium_mode in reset() fills in a default value to the register which may be different from the negotiation result. So do this first. Ignore the ret value since it's ignored in XXX_link_reset() functions. Signed-off-by: Grant Grundler Signed-off-by: Robert Foss Tested-by: Robert Foss --- drivers/net/usb/asix_devices.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/net/usb/asix_devices.c b/drivers/net/usb/asix_devices.c index dbcdda2..cce2495 100644 --- a/drivers/net/usb/asix_devices.c +++ b/drivers/net/usb/asix_devices.c @@ -928,12 +928,9 @@ static int ax88178_reset(struct usbnet *dev) asix_mdio_write(dev->net, dev->mii.phy_id, MII_CTRL1000, ADVERTISE_1000FULL); + asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT, 0); mii_nway_restart(&dev->mii); - ret = asix_write_medium_mode(dev, AX88178_MEDIUM_DEFAULT, 0); - if (ret < 0) - return ret; - /* Rewrite MAC address */ memcpy(data->mac_addr, dev->net->dev_addr, ETH_ALEN); ret = asix_write_cmd(dev, AX_CMD_WRITE_NODE_ID, 0, 0, ETH_ALEN, -- git-series 0.8.10