linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: robert.foss@collabora.com
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
Cc: Grant Grundler <grundler@google.com>
Subject: [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg
Date: Mon, 29 Aug 2016 09:32:24 -0400	[thread overview]
Message-ID: <1472477566-32096-5-git-send-email-robert.foss@collabora.com> (raw)
In-Reply-To: <cover.c702ef6af13be7c1282a2f2d3189281fdc327abe.1472155176.git-series.robert.foss@collabora.com>

From: Grant Grundler <grundler@chromium.org>

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 <grundler@google.com>
Signed-off-by: Robert Foss <robert.foss@collabora.com>
Tested-by: Robert Foss <robert.foss@collabora.com>
---
 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,
-- 
2.7.4

  parent reply	other threads:[~2016-08-29 13:36 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-08-25 20:06 [PATCH v3 0/5] net/usb: asix driver improvements robert.foss
2016-08-25 20:06 ` [PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss
2016-08-25 20:06 ` [PATCH v3 2/5] net: asix: Avoid looping when the device is disconnected robert.foss
2016-08-25 20:06 ` [PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss
2016-11-10 12:01   ` Jon Hunter
2016-11-14  8:50     ` ASIX_Allan [Home]
2016-11-14  9:34       ` Jon Hunter
2016-11-14  9:45         ` ASIX_Allan [Office]
2016-11-18 15:09           ` Jon Hunter
2016-11-22 15:34             ` Jon Hunter
2016-11-29  8:54               ` ASIX_Allan [Office]
2016-11-29 10:51                 ` Jon Hunter
2016-08-25 20:06 ` [PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss
2016-08-25 20:06 ` [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg robert.foss
2016-09-01 16:43   ` Eric Dumazet
2016-09-01 16:47     ` Robert Foss
2016-09-01 17:02       ` Eric Dumazet
2016-09-06 16:41         ` Grant Grundler
2016-09-06 21:48           ` Robert Foss
2016-08-25 20:06 ` [PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss
2016-08-25 20:06 ` [PATCH v3 2/5] net: asix: Avoid looping when the device is disconnected robert.foss
2016-08-25 20:06 ` [PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss
2016-08-25 20:06 ` [PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss
2016-08-25 20:06 ` [PATCH v3 5/5] net: asix: autoneg will set WRITE_MEDIUM reg robert.foss
2016-08-27  4:24 ` [PATCH v3 0/5] net/usb: asix driver improvements David Miller
2016-08-29 13:32 ` [PATCH v3 1/5] net: asix: Add in_pm parameter robert.foss
2016-08-29 13:32 ` [PATCH v3 2/5] net: asix: Avoid looping when the device is disconnected robert.foss
2016-08-29 13:32 ` [PATCH v3 3/5] net: asix: Fix AX88772x resume failures robert.foss
2016-08-29 13:32 ` [PATCH v3 4/5] net: asix: see 802.3 spec for phy reset robert.foss
2016-08-29 13:32 ` robert.foss [this message]
2016-08-31 17:28 ` [PATCH v3 0/5] net/usb: asix driver improvements Robert Foss
2016-09-01  4:07 ` David Miller

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1472477566-32096-5-git-send-email-robert.foss@collabora.com \
    --to=robert.foss@collabora.com \
    --cc=Dean_Jenkins@mentor.com \
    --cc=Mark_Craske@mentor.com \
    --cc=allan@asix.com.tw \
    --cc=andrew@lunn.ch \
    --cc=changchias@gmail.com \
    --cc=colin.king@canonical.com \
    --cc=davem@davemloft.net \
    --cc=freddy@asix.com.tw \
    --cc=grundler@chromium.org \
    --cc=grundler@google.com \
    --cc=ivecera@redhat.com \
    --cc=john.stultz@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=stephen@networkplumber.org \
    --cc=tremyfr@gmail.com \
    --cc=vpalatin@chromium.org \
    --cc=vpalatin@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).