netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, jogo@openwrt.org, bert@biot.com,
	Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next 3/3] net: phy: mdio-gpio: Handle phy_ignore_ta_mask
Date: Tue, 12 May 2015 10:33:26 -0700	[thread overview]
Message-ID: <1431452006-3219-4-git-send-email-f.fainelli@gmail.com> (raw)
In-Reply-To: <1431452006-3219-1-git-send-email-f.fainelli@gmail.com>

Update mdiobb_read() to read whether the PHY has a broken turn-around,
and if it does, ignore it to make the read succeeed.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
---
 drivers/net/phy/mdio-bitbang.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/net/phy/mdio-bitbang.c b/drivers/net/phy/mdio-bitbang.c
index daec9b05d168..61a543c788cc 100644
--- a/drivers/net/phy/mdio-bitbang.c
+++ b/drivers/net/phy/mdio-bitbang.c
@@ -165,8 +165,11 @@ static int mdiobb_read(struct mii_bus *bus, int phy, int reg)
 
 	ctrl->ops->set_mdio_dir(ctrl, 0);
 
-	/* check the turnaround bit: the PHY should be driving it to zero */
-	if (mdiobb_get_bit(ctrl) != 0) {
+	/* check the turnaround bit: the PHY should be driving it to zero, if this
+	 * PHY is listed in phy_ignore_ta_mask as having broken TA, skip that
+	 */
+	if (mdiobb_get_bit(ctrl) != 0 &&
+	    !(bus->phy_ignore_ta_mask & (1 << phy))) {
 		/* PHY didn't drive TA low -- flush any bits it
 		 * may be trying to send.
 		 */
-- 
2.1.0

  parent reply	other threads:[~2015-05-12 17:33 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-12 14:56 [PATCH] mdio-gpio: Optionally ignore TA errors Bert Vermeulen
2015-05-12 17:08 ` Florian Fainelli
2015-05-12 17:33 ` [PATCH net-next 0/3] net: phy: broken turn-around support Florian Fainelli
2015-05-12 17:33   ` [PATCH net-next 1/3] net: phy: Add phy_ignore_ta_mask to account for broken turn-around Florian Fainelli
2015-05-12 17:33   ` [PATCH net-next 2/3] of: mdio: Add a "broken-turn-around" property Florian Fainelli
2015-05-12 17:33   ` Florian Fainelli [this message]
2015-05-13 11:17     ` [PATCH net-next 3/3] net: phy: mdio-gpio: Handle phy_ignore_ta_mask Bert Vermeulen
2015-05-12 20:43   ` [PATCH net-next 0/3] net: phy: broken turn-around support Bert Vermeulen
2015-05-12 20:56     ` Florian Fainelli
2015-05-14 17:41   ` 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=1431452006-3219-4-git-send-email-f.fainelli@gmail.com \
    --to=f.fainelli@gmail.com \
    --cc=bert@biot.com \
    --cc=davem@davemloft.net \
    --cc=jogo@openwrt.org \
    --cc=netdev@vger.kernel.org \
    /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).