From: Ondrej Zary <linux@rainbow-software.org>
To: Samuel Chessman <chessman@tux.org>
Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 05/11] tlan: Restart autonegotiation on link loss
Date: Mon, 30 Jun 2014 18:38:31 +0200 [thread overview]
Message-ID: <1404146317-3094-6-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1404146317-3094-1-git-send-email-linux@rainbow-software.org>
When link is lost on a card which uses internal PHY for 10 Mbit speeds,
restart autonegotiation to allow switching between 10 and 100 Mbps speeds.
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
drivers/net/ethernet/ti/tlan.c | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/drivers/net/ethernet/ti/tlan.c b/drivers/net/ethernet/ti/tlan.c
index 31d4a96..1b64ddc 100644
--- a/drivers/net/ethernet/ti/tlan.c
+++ b/drivers/net/ethernet/ti/tlan.c
@@ -2721,6 +2721,7 @@ static void tlan_phy_finish_auto_neg(struct net_device *dev)
else if (!(mode & 0x0080) && (mode & 0x0040))
priv->tlan_full_duplex = true;
+ /* switch to internal PHY for 10 Mbps */
if ((!(mode & 0x0180)) &&
(priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) &&
(priv->phy_num != 0)) {
@@ -2788,6 +2789,21 @@ static void tlan_phy_monitor(unsigned long data)
dev->name);
tlan_dio_write8(dev->base_addr, TLAN_LED_REG, 0);
netif_carrier_off(dev);
+ if (priv->adapter->flags & TLAN_ADAPTER_USE_INTERN_10) {
+ /* power down internal PHY */
+ u16 data = MII_GC_PDOWN | MII_GC_LOOPBK |
+ MII_GC_ISOLATE;
+
+ tlan_mii_sync(dev->base_addr);
+ tlan_mii_write_reg(dev, priv->phy[0],
+ MII_GEN_CTL, data);
+ /* set to external PHY */
+ priv->phy_num = 1;
+ /* restart autonegotiation */
+ tlan_set_timer(dev, 4 * HZ / 10,
+ TLAN_TIMER_PHY_PDOWN);
+ return;
+ }
}
}
--
Ondrej Zary
next prev parent reply other threads:[~2014-06-30 16:42 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-30 16:38 [PATCH 0/11 v3] tlan: Link handling improvements and Olicom fixes Ondrej Zary
2014-06-30 16:38 ` [PATCH 01/11] tlan: Enable activity LED on Olicom OC-2325 and OC-2326 Ondrej Zary
2014-06-30 16:38 ` [PATCH 02/11] tlan: Enable link monitoring Ondrej Zary
2014-06-30 16:38 ` [PATCH 03/11] tlan: Add ethtool support Ondrej Zary
2014-06-30 16:38 ` [PATCH 04/11] tlan: Fix MAC address byte order on OC-2325/OC-2326 Ondrej Zary
2014-06-30 16:38 ` Ondrej Zary [this message]
2014-06-30 16:38 ` [PATCH 06/11] tlan: Don't scream if no link Ondrej Zary
2014-06-30 16:38 ` [PATCH 07/11] tlan: Make autonegotiation faster Ondrej Zary
2014-06-30 16:38 ` [PATCH 08/11] tlan: Add PHY reset timeout Ondrej Zary
2014-06-30 16:38 ` [PATCH 09/11] tlan: Don't disable internal PHY on cards that use it in 10 Mbps mode Ondrej Zary
2014-06-30 16:38 ` [PATCH 10/11] tlan: Enable device at resume Ondrej Zary
2014-06-30 16:38 ` [PATCH 11/11] tlan: Isolate external PHY when using internal PHY Ondrej Zary
2014-07-08 0:09 ` [PATCH 0/11 v3] tlan: Link handling improvements and Olicom fixes David Miller
-- strict thread matches above, loose matches on Subject: below --
2014-06-21 14:47 [PATCH 0/11 v2] " Ondrej Zary
2014-06-21 14:47 ` [PATCH 05/11] tlan: Restart autonegotiation on link loss Ondrej Zary
2014-06-21 17:06 ` Sergei Shtylyov
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=1404146317-3094-6-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=chessman@tux.org \
--cc=linux-kernel@vger.kernel.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