leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drivers: net: octeontx: fix QSGMII

Browse Source 
Revert a change that occured between the Marvell SDK-10.1.1.0
and SDK-10.3.1.1 which broke QSMII phy support.

Signed-off-by: Tim Harvey <tharvey@gateworks.com>
This commit is contained in:
Tim Harvey
2021-03-25 17:07:35 -07:00
committed by Tom Rini
parent 9889a8e562
commit 8c64347b7e
1 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/net/octeontx/bgx.c
View File

@@ -36,7 +36,6 @@ struct lmac {
int dmac; int dmac;
u8 mac[6]; u8 mac[6];
bool link_up; bool link_up;
bool init_pend;
int lmacid; /* ID within BGX */ int lmacid; /* ID within BGX */
int phy_addr; /* ID on board */ int phy_addr; /* ID on board */
struct udevice *dev; struct udevice *dev;
@@ -849,6 +848,7 @@ static int bgx_lmac_enable(struct bgx *bgx, int8_t lmacid)
u64 cfg; u64 cfg;
lmac = &bgx->lmac[lmacid]; lmac = &bgx->lmac[lmacid];
lmac->bgx = bgx;
debug("%s: lmac: %p, lmacid = %d\n", __func__, lmac, lmacid); debug("%s: lmac: %p, lmacid = %d\n", __func__, lmac, lmacid);
@@ -895,16 +895,6 @@ int bgx_poll_for_link(int node, int bgx_idx, int lmacid)
debug("%s: %d, lmac: %d/%d/%d %p\n", debug("%s: %d, lmac: %d/%d/%d %p\n",
__FILE__, __LINE__, __FILE__, __LINE__,
node, bgx_idx, lmacid, lmac); node, bgx_idx, lmacid, lmac);
if (lmac->init_pend) {
ret = bgx_lmac_enable(lmac->bgx, lmacid);
if (ret < 0) {
printf("BGX%d LMAC%d lmac_enable failed\n", bgx_idx,
lmacid);
return ret;
}
lmac->init_pend = 0;
mdelay(100);
}
if (lmac->qlm_mode == QLM_MODE_SGMII || if (lmac->qlm_mode == QLM_MODE_SGMII ||
lmac->qlm_mode == QLM_MODE_RGMII || lmac->qlm_mode == QLM_MODE_RGMII ||
lmac->qlm_mode == QLM_MODE_QSGMII) { lmac->qlm_mode == QLM_MODE_QSGMII) {
@@ -1461,6 +1451,7 @@ int octeontx_bgx_remove(struct udevice *dev)
int octeontx_bgx_probe(struct udevice *dev) int octeontx_bgx_probe(struct udevice *dev)
{ {
int err;
struct bgx *bgx = dev_get_priv(dev); struct bgx *bgx = dev_get_priv(dev);
u8 lmac = 0; u8 lmac = 0;
int qlm[4] = {-1, -1, -1, -1}; int qlm[4] = {-1, -1, -1, -1};
@@ -1540,8 +1531,11 @@ skip_qlm_config:
struct lmac *tlmac = &bgx->lmac[lmac]; struct lmac *tlmac = &bgx->lmac[lmac];
tlmac->dev = dev; tlmac->dev = dev;
tlmac->init_pend = 1; err = bgx_lmac_enable(bgx, lmac);
tlmac->bgx = bgx; if (err) {
printf("BGX%d failed to enable lmac%d\n",
bgx->bgx_id, lmac);
}
} }
return 0; return 0;