52a82ce3dd
This just copies the files from the kernel 4.14 specific folders into the kernel 4.19 specific folder, no changes are done to the files in this commit. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
55 lines
1.9 KiB
Diff
55 lines
1.9 KiB
Diff
From 2355a6546a053b1c16ebefd6ce1f0cccc00e1da5 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
|
|
Date: Thu, 12 Oct 2017 10:21:25 +0200
|
|
Subject: [PATCH] net: phy: broadcom: support new device flag for setting
|
|
master mode
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Some of Broadcom's PHYs run by default in slave mode with Automatic
|
|
Slave/Master configuration disabled. It stops them from working properly
|
|
with some devices.
|
|
|
|
So far it has been verified for BCM54210E and BCM50212E which don't
|
|
work well with Intel's I217-LM and I218-LM:
|
|
http://ark.intel.com/products/60019/Intel-Ethernet-Connection-I217-LM
|
|
http://ark.intel.com/products/71307/Intel-Ethernet-Connection-I218-LM
|
|
I was told there is massive ping loss.
|
|
|
|
This commit adds support for a new flag which can be set by an ethernet
|
|
driver to fixup PHY setup.
|
|
|
|
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
|
|
Signed-off-by: David S. Miller <davem@davemloft.net>
|
|
---
|
|
drivers/net/phy/broadcom.c | 6 ++++++
|
|
include/linux/brcmphy.h | 1 +
|
|
2 files changed, 7 insertions(+)
|
|
|
|
--- a/drivers/net/phy/broadcom.c
|
|
+++ b/drivers/net/phy/broadcom.c
|
|
@@ -43,6 +43,12 @@ static int bcm54210e_config_init(struct
|
|
val &= ~BCM54810_SHD_CLK_CTL_GTXCLK_EN;
|
|
bcm_phy_write_shadow(phydev, BCM54810_SHD_CLK_CTL, val);
|
|
|
|
+ if (phydev->dev_flags & PHY_BRCM_EN_MASTER_MODE) {
|
|
+ val = phy_read(phydev, MII_CTRL1000);
|
|
+ val |= CTL1000_AS_MASTER | CTL1000_ENABLE_MASTER;
|
|
+ phy_write(phydev, MII_CTRL1000, val);
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--- a/include/linux/brcmphy.h
|
|
+++ b/include/linux/brcmphy.h
|
|
@@ -64,6 +64,7 @@
|
|
#define PHY_BRCM_EXT_IBND_TX_ENABLE 0x00002000
|
|
#define PHY_BRCM_CLEAR_RGMII_MODE 0x00004000
|
|
#define PHY_BRCM_DIS_TXCRXC_NOENRGY 0x00008000
|
|
+#define PHY_BRCM_EN_MASTER_MODE 0x00010000
|
|
|
|
/* Broadcom BCM7xxx specific workarounds */
|
|
#define PHY_BRCM_7XXX_REV(x) (((x) >> 8) & 0xff)
|