blob: 9bbb1ee4ed87e14a696efa2bbb49e084e413d491 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
|
From e33b0e04ddd97a9ed4a04f001255fb23263cfa13 Mon Sep 17 00:00:00 2001
From: Sudheer Anumolu <sudheer.anumolu@amd.com>
Date: Tue, 26 Nov 2019 18:37:56 +0530
Subject: [PATCH 4104/4736] Fix hot plug failure with SFP+RJ45 module. Do force
MDIO only if an external phy is available.
---
drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
index a6fb6754984f..3fcfd7cb04d6 100755
--- a/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
+++ b/drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c
@@ -989,6 +989,13 @@ static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata)
/* Clear the extra AN flag */
pdata->an_again = 0;
+ /* For SFP, only use an external PHY if available */
+ if (phy_data->port_mode == XGBE_PORT_MODE_SFP) {
+ force_mdio_mv_bp_con = 0;
+ if(!phy_data->sfp_phy_avail)
+ return 0;
+ }
+
/* Check for the use of an external PHY */
if (phy_data->phydev_mode == XGBE_MDIO_MODE_NONE) {
if(force_mdio_mv_bp_con) {
@@ -1000,10 +1007,6 @@ static int xgbe_phy_find_phy_device(struct xgbe_prv_data *pdata)
}
}
- /* For SFP, only use an external PHY if available */
- if ((phy_data->port_mode == XGBE_PORT_MODE_SFP) &&
- !phy_data->sfp_phy_avail)
- return 0;
/* Set the proper MDIO mode for the PHY */
ret = pdata->hw_if.set_ext_mii_mode(pdata, phy_data->mdio_addr,
--
2.17.1
|
