From: John Crispin <john@phrozen.org>
To: davem@davemloft.net
Cc: nbd@nbd.name, netdev@vger.kernel.org,
linux-mediatek@lists.infradead.org,
John Crispin <john@phrozen.org>
Subject: [PATCH V2 02/22] net-next: mediatek: fix gigabit and flow control advertisement
Date: Mon, 9 May 2016 12:03:54 +0200 [thread overview]
Message-ID: <1462788254-40572-3-git-send-email-john@phrozen.org> (raw)
In-Reply-To: <1462788254-40572-1-git-send-email-john@phrozen.org>
The current code will not setup the PHYs advertisement features correctly.
Fix this and properly advertise Gigabit features and properly handle
asymmetric pause frames.
Signed-off-by: John Crispin <john@phrozen.org>
---
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
index 28f169f..a76aec20 100644
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
@@ -133,6 +133,8 @@ static int mtk_mdio_read(struct mii_bus *bus, int phy_addr, int phy_reg)
static void mtk_phy_link_adjust(struct net_device *dev)
{
struct mtk_mac *mac = netdev_priv(dev);
+ u16 lcl_adv, rmt_adv = 0;
+ u8 flowctrl;
u32 mcr = MAC_MCR_MAX_RX_1536 | MAC_MCR_IPG_CFG |
MAC_MCR_FORCE_MODE | MAC_MCR_TX_EN |
MAC_MCR_RX_EN | MAC_MCR_BACKOFF_EN |
@@ -154,7 +156,16 @@ static void mtk_phy_link_adjust(struct net_device *dev)
mcr |= MAC_MCR_FORCE_DPX;
if (mac->phy_dev->pause)
- mcr |= MAC_MCR_FORCE_RX_FC | MAC_MCR_FORCE_TX_FC;
+ rmt_adv = LPA_PAUSE_CAP;
+ if (mac->phy_dev->asym_pause)
+ rmt_adv |= LPA_PAUSE_ASYM;
+
+ lcl_adv = mii_advertise_flowctrl(FLOW_CTRL_RX | FLOW_CTRL_TX);
+ flowctrl = mii_resolve_flowctrl_fdx(lcl_adv, rmt_adv);
+ if (flowctrl & FLOW_CTRL_TX)
+ mcr |= MAC_MCR_FORCE_TX_FC;
+ if (flowctrl & FLOW_CTRL_RX)
+ mcr |= MAC_MCR_FORCE_RX_FC;
mtk_w32(mac->hw, mcr, MTK_MAC_MCR(mac->id));
@@ -236,7 +247,8 @@ static int mtk_phy_connect(struct mtk_mac *mac)
mac->phy_dev->autoneg = AUTONEG_ENABLE;
mac->phy_dev->speed = 0;
mac->phy_dev->duplex = 0;
- mac->phy_dev->supported &= PHY_BASIC_FEATURES;
+ mac->phy_dev->supported &= PHY_GBIT_FEATURES | SUPPORTED_Pause |
+ ~SUPPORTED_Asym_Pause;
mac->phy_dev->advertising = mac->phy_dev->supported |
ADVERTISED_Autoneg;
phy_start_aneg(mac->phy_dev);
--
1.7.10.4
next prev parent reply other threads:[~2016-05-09 10:04 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-09 10:03 [PATCH V2 00/22] net-next: mediatek: various fixes and IRQ grouping John Crispin
2016-05-09 10:03 ` [PATCH V2 01/22] net-next: mediatek: use mdiobus_free() in favour of kfree() John Crispin
2016-05-09 12:07 ` Andrew Lunn
2016-05-09 10:03 ` John Crispin [this message]
2016-05-09 10:03 ` [PATCH V2 03/22] net-next: mediatek: add fixed-phy support John Crispin
2016-05-09 10:03 ` [PATCH V2 04/22] net-next: mediatek: properly handle RGMII modes John Crispin
2016-05-09 12:09 ` Andrew Lunn
2016-05-09 10:03 ` [PATCH V2 05/22] net-next: mediatek: fix DQL support John Crispin
2016-05-09 10:03 ` [PATCH V2 06/22] net-next: mediatek: add missing return code check John Crispin
2016-05-09 10:03 ` [PATCH V2 07/22] net-next: mediatek: fix missing free of scratch memory John Crispin
2016-05-09 10:04 ` [PATCH V2 08/22] net-next: mediatek: invalid buffer lookup in mtk_tx_map() John Crispin
2016-05-09 10:04 ` [PATCH V2 09/22] net-next: mediatek: dropped rx packets are not being counted properly John Crispin
2016-05-09 10:04 ` [PATCH V2 10/22] net-next: mediatek: add next data pointer coherency protection John Crispin
2016-05-09 10:04 ` [PATCH V2 11/22] net-next: mediatek: disable all interrupts during probe John Crispin
2016-05-09 10:04 ` [PATCH V2 13/22] net-next: mediatek: increase watchdog_timeo John Crispin
2016-05-09 10:04 ` [PATCH V2 15/22] net-next: mediatek: only wake the queue if it is stopped John Crispin
2016-05-09 10:04 ` [PATCH V2 17/22] net-next: mediatek: remove superfluous register reads John Crispin
[not found] ` <1462788254-40572-1-git-send-email-john-Pj+rj9U5foFAfugRpC6u6w@public.gmane.org>
2016-05-09 10:04 ` [PATCH V2 12/22] net-next: mediatek: fix threshold value John Crispin
2016-05-09 10:04 ` [PATCH V2 14/22] net-next: mediatek: fix off by one in the TX ring allocation John Crispin
2016-05-09 10:04 ` [PATCH V2 16/22] net-next: mediatek: remove superfluous queue wake up call John Crispin
2016-05-09 10:04 ` [PATCH V2 18/22] net-next: mediatek: don't use intermediate variables to store IRQ masks John Crispin
2016-05-09 10:04 ` [PATCH V2 20/22] net-next: mediatek: add support for IRQ grouping John Crispin
2016-05-09 10:04 ` [PATCH V2 19/22] net-next: mediatek: add IRQ locking John Crispin
2016-05-09 10:04 ` [PATCH V2 21/22] net-next: mediatek: change my email address John Crispin
2016-05-09 10:04 ` [PATCH V2 22/22] MAINTAINERS: " John Crispin
2016-05-09 16:02 ` [PATCH V2 00/22] net-next: mediatek: various fixes and IRQ grouping David Miller
2016-05-09 16:25 ` John Crispin
2016-05-09 16:28 ` David Miller
2016-05-09 16:34 ` John Crispin
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=1462788254-40572-3-git-send-email-john@phrozen.org \
--to=john@phrozen.org \
--cc=davem@davemloft.net \
--cc=linux-mediatek@lists.infradead.org \
--cc=nbd@nbd.name \
--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).