diff options
Diffstat (limited to 'target/linux/octeontx')
2 files changed, 8 insertions, 24 deletions
diff --git a/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch b/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch index 362f4bc7ed..efd13da5ec 100644 --- a/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch +++ b/target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch @@ -17,8 +17,6 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> drivers/net/ethernet/cavium/thunder/thunder_xcv.c | 31 ++++++++++++++++++----- 3 files changed, 35 insertions(+), 11 deletions(-) -diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c -index 5e5c4d7..805c02a 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -55,6 +55,7 @@ struct bgx { @@ -29,7 +27,7 @@ index 5e5c4d7..805c02a 100644 }; static struct bgx *bgx_vnic[MAX_BGX_THUNDER]; -@@ -841,12 +842,12 @@ static void bgx_poll_for_link(struct work_struct *work) +@@ -841,12 +842,12 @@ static void bgx_poll_for_link(struct wor queue_delayed_work(lmac->check_link, &lmac->dwork, HZ * 2); } @@ -44,7 +42,7 @@ index 5e5c4d7..805c02a 100644 return PHY_INTERFACE_MODE_SGMII; } -@@ -912,7 +913,8 @@ static int bgx_lmac_enable(struct bgx *bgx, u8 lmacid) +@@ -912,7 +913,8 @@ static int bgx_lmac_enable(struct bgx *b if (phy_connect_direct(&lmac->netdev, lmac->phydev, bgx_lmac_handler, @@ -54,7 +52,7 @@ index 5e5c4d7..805c02a 100644 return -ENODEV; phy_start_aneg(lmac->phydev); -@@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *bgx) +@@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *b bgx->lmac[lmac].lmacid = lmac; phy_np = of_parse_phandle(node, "phy-handle", 0); @@ -63,7 +61,7 @@ index 5e5c4d7..805c02a 100644 /* If there is no phy or defective firmware presents * this cortina phy, for which there is no driver * support, ignore it. -@@ -1390,7 +1394,6 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1390,7 +1394,6 @@ static int bgx_probe(struct pci_dev *pde bgx->max_lmac = 1; bgx->bgx_id = MAX_BGX_PER_CN81XX - 1; bgx_vnic[bgx->bgx_id] = bgx; @@ -71,7 +69,7 @@ index 5e5c4d7..805c02a 100644 } /* On 81xx all are DLMs and on 83xx there are 3 BGX QLMs and one -@@ -1407,6 +1410,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1407,6 +1410,8 @@ static int bgx_probe(struct pci_dev *pde if (err) goto err_enable; @@ -80,11 +78,9 @@ index 5e5c4d7..805c02a 100644 bgx_init_hw(bgx); /* Enable all LMACs */ -diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h -index 23acdc5..2bba9d1 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h -@@ -226,7 +226,7 @@ void bgx_lmac_internal_loopback(int node, int bgx_idx, +@@ -226,7 +226,7 @@ void bgx_lmac_internal_loopback(int node void bgx_lmac_get_pfc(int node, int bgx_idx, int lmacid, void *pause); void bgx_lmac_set_pfc(int node, int bgx_idx, int lmacid, void *pause); @@ -93,8 +89,6 @@ index 23acdc5..2bba9d1 100644 void xcv_setup_link(bool link_up, int link_speed); u64 bgx_get_rx_stats(int node, int bgx_idx, int lmac, int idx); -diff --git a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c -index 578c7f8..7e0c4cb 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_xcv.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_xcv.c @@ -65,7 +65,7 @@ MODULE_LICENSE("GPL v2"); @@ -143,6 +137,3 @@ index 578c7f8..7e0c4cb 100644 writeq_relaxed(cfg, xcv->reg_base + XCV_DLL_CTL); /* Enable compensation controller and force the --- -2.7.4 - diff --git a/target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch b/target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch index db57f6dcca..ef7aef3a8a 100644 --- a/target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch +++ b/target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch @@ -13,8 +13,6 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com> drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 ++++ 2 files changed, 63 insertions(+) -diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c -index 805c02a..0690966 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1344,6 +1344,54 @@ static int bgx_init_phy(struct bgx *bgx) @@ -72,7 +70,7 @@ index 805c02a..0690966 100644 static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) { int err; -@@ -1414,6 +1462,8 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1414,6 +1462,8 @@ static int bgx_probe(struct pci_dev *pde xcv_init_hw(bgx->phy_mode); bgx_init_hw(bgx); @@ -81,7 +79,7 @@ index 805c02a..0690966 100644 /* Enable all LMACs */ for (lmac = 0; lmac < bgx->lmac_count; lmac++) { err = bgx_lmac_enable(bgx, lmac); -@@ -1424,6 +1474,10 @@ static int bgx_probe(struct pci_dev *pdev, const struct pci_device_id *ent) +@@ -1424,6 +1474,10 @@ static int bgx_probe(struct pci_dev *pde bgx_lmac_disable(bgx, --lmac); goto err_enable; } @@ -92,8 +90,6 @@ index 805c02a..0690966 100644 } return 0; -diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h -index 2bba9d1..be9148f9 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h @@ -179,6 +179,15 @@ @@ -112,6 +108,3 @@ index 2bba9d1..be9148f9 100644 #define BGX_MSIX_VEC_0_29_ADDR 0x400000 /* +(0..29) << 4 */ #define BGX_MSIX_VEC_0_29_CTL 0x400008 --- -2.7.4 - |