diff options
author | Thanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com> | 2015-12-02 05:06:13 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-12-02 15:58:49 -0500 |
commit | 723cda5b055851f5e8bf61aacd8008c43c99e801 (patch) | |
tree | 6f04fa3ea43d2e51c525c48a33eede7fec5515ba | |
parent | 83e4bf7a7486532df2dc3db27e0e07a250990ed2 (diff) |
net: thunderx: Force to load octeon-mdio before bgx driver.
Signed-off-by: Thanneeru Srinivasulu <tsrinivasulu@caviumnetworks.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 3 | ||||
-rw-r--r-- | drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index 180aa9fabf48..2574a7ea1c0e 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c | |||
@@ -1009,6 +1009,9 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1009 | struct bgx *bgx = NULL; | 1009 | struct bgx *bgx = NULL; |
1010 | u8 lmac; | 1010 | u8 lmac; |
1011 | 1011 | ||
1012 | /* Load octeon mdio driver */ | ||
1013 | octeon_mdiobus_force_mod_depencency(); | ||
1014 | |||
1012 | bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL); | 1015 | bgx = devm_kzalloc(dev, sizeof(*bgx), GFP_KERNEL); |
1013 | if (!bgx) | 1016 | if (!bgx) |
1014 | return -ENOMEM; | 1017 | return -ENOMEM; |
diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h index 07b7ec66c60d..89a02fa26f79 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h | |||
@@ -182,6 +182,7 @@ enum MCAST_MODE { | |||
182 | #define BCAST_ACCEPT 1 | 182 | #define BCAST_ACCEPT 1 |
183 | #define CAM_ACCEPT 1 | 183 | #define CAM_ACCEPT 1 |
184 | 184 | ||
185 | void octeon_mdiobus_force_mod_depencency(void); | ||
185 | void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac); | 186 | void bgx_add_dmac_addr(u64 dmac, int node, int bgx_idx, int lmac); |
186 | unsigned bgx_get_map(int node); | 187 | unsigned bgx_get_map(int node); |
187 | int bgx_get_lmac_count(int node, int bgx); | 188 | int bgx_get_lmac_count(int node, int bgx); |