aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/octeontx/patches-4.14
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-15 14:55:36 +0200
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2020-04-16 13:23:52 +0200
commit0232f57e1af6580542c0ed1ce1d76c7cd4084613 (patch)
treee7e624d4c97826e318676c53e114e1a2405c6a2e /target/linux/octeontx/patches-4.14
parent286c407c3d8877e51fa90cbd830f2fedb3ad1f26 (diff)
downloadupstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.gz
upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.tar.bz2
upstream-0232f57e1af6580542c0ed1ce1d76c7cd4084613.zip
kernel: bump 4.14 to 4.14.176
Refreshed all patches. Remove upstreamed: - 0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch - 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch - 003-ARM-dts-oxnas-Fix-clear-mask-property.patch Fixes: - CVE-2020-8647 - CVE-2020-8648 (potentially) - CVE-2020-8649 Compile-tested on: cns3xxx, octeontx Runtime-tested on: cns3xxx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/octeontx/patches-4.14')
-rw-r--r--target/linux/octeontx/patches-4.14/0001-net-thunderx-add-support-for-rgmii-internal-delay-mo.patch14
-rw-r--r--target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch110
2 files changed, 7 insertions, 117 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 cf0f96dce3..212b6ddd80 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
@@ -27,7 +27,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
};
static struct bgx *bgx_vnic[MAX_BGX_THUNDER];
-@@ -841,12 +842,12 @@ static void bgx_poll_for_link(struct wor
+@@ -850,12 +851,12 @@ static void bgx_poll_for_link(struct wor
queue_delayed_work(lmac->check_link, &lmac->dwork, HZ * 2);
}
@@ -42,7 +42,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
return PHY_INTERFACE_MODE_SGMII;
}
-@@ -912,7 +913,8 @@ static int bgx_lmac_enable(struct bgx *b
+@@ -921,7 +922,8 @@ static int bgx_lmac_enable(struct bgx *b
if (phy_connect_direct(&lmac->netdev, lmac->phydev,
bgx_lmac_handler,
@@ -52,7 +52,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
return -ENODEV;
phy_start(lmac->phydev);
-@@ -1287,6 +1289,8 @@ static int bgx_init_of_phy(struct bgx *b
+@@ -1296,6 +1298,8 @@ static int bgx_init_of_phy(struct bgx *b
bgx->lmac[lmac].lmacid = lmac;
phy_np = of_parse_phandle(node, "phy-handle", 0);
@@ -61,7 +61,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
/* 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 *pde
+@@ -1441,7 +1445,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;
@@ -69,7 +69,7 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
}
/* 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 *pde
+@@ -1458,6 +1461,8 @@ static int bgx_probe(struct pci_dev *pde
if (err)
goto err_enable;
@@ -77,10 +77,10 @@ Signed-off-by: Tim Harvey <tharvey@gateworks.com>
+ xcv_init_hw(bgx->phy_mode);
bgx_init_hw(bgx);
- /* Enable all LMACs */
+ bgx_register_intr(pdev);
--- 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
+@@ -235,7 +235,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);
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
deleted file mode 100644
index ef7aef3a8a..0000000000
--- a/target/linux/octeontx/patches-4.14/0001-net-thunderx-workaround-BGX-TX-Underflow-issue.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-From b1e7791e688620c9bb8476ac2d0bc99abeb7f825 Mon Sep 17 00:00:00 2001
-From: Tim Harvey <tharvey@gateworks.com>
-Date: Fri, 29 Dec 2017 16:48:04 -0800
-Subject: [PATCH] net: thunderx: workaround BGX TX Underflow issue
-
-While it is not yet understood why a TX underflow can easily occur
-for SGMII interfaces resulting in a TX wedge. It has been found that
-disabling/re-enabling the LMAC resolves the issue.
-
-Signed-off-by: Tim Harvey <tharvey@gateworks.com>
----
- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 54 +++++++++++++++++++++++
- drivers/net/ethernet/cavium/thunder/thunder_bgx.h | 9 ++++
- 2 files changed, 63 insertions(+)
-
---- 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)
- return bgx_init_of_phy(bgx);
- }
-
-+static irqreturn_t bgx_intr_handler(int irq, void *data)
-+{
-+ struct bgx *bgx = (struct bgx *)data;
-+ struct device *dev = &bgx->pdev->dev;
-+ u64 status, val;
-+ int lmac;
-+
-+ for (lmac = 0; lmac < bgx->lmac_count; lmac++) {
-+ status = bgx_reg_read(bgx, lmac, BGX_GMP_GMI_TXX_INT);
-+ if (status & GMI_TXX_INT_UNDFLW) {
-+ dev_err(dev, "BGX%d lmac%d UNDFLW\n", bgx->bgx_id,
-+ lmac);
-+ val = bgx_reg_read(bgx, lmac, BGX_CMRX_CFG);
-+ val &= ~CMR_EN;
-+ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
-+ val |= CMR_EN;
-+ bgx_reg_write(bgx, lmac, BGX_CMRX_CFG, val);
-+ }
-+ /* clear interrupts */
-+ bgx_reg_write(bgx, lmac, BGX_GMP_GMI_TXX_INT, status);
-+ }
-+
-+ return IRQ_HANDLED;
-+}
-+
-+static int bgx_register_intr(struct pci_dev *pdev)
-+{
-+ struct bgx *bgx = pci_get_drvdata(pdev);
-+ struct device *dev = &pdev->dev;
-+ int num_vec, ret;
-+ char irq_name[32];
-+
-+ /* Enable MSI-X */
-+ num_vec = pci_msix_vec_count(pdev);
-+ ret = pci_alloc_irq_vectors(pdev, num_vec, num_vec, PCI_IRQ_MSIX);
-+ if (ret < 0) {
-+ dev_err(dev, "Req for #%d msix vectors failed\n", num_vec);
-+ return 1;
-+ }
-+ sprintf(irq_name, "BGX%d", bgx->bgx_id);
-+ ret = request_irq(pci_irq_vector(pdev, GMPX_GMI_TX_INT),
-+ bgx_intr_handler, 0, irq_name, bgx);
-+ if (ret)
-+ return 1;
-+
-+ return 0;
-+}
-+
- 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 *pde
- xcv_init_hw(bgx->phy_mode);
- bgx_init_hw(bgx);
-
-+ bgx_register_intr(pdev);
-+
- /* 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 *pde
- bgx_lmac_disable(bgx, --lmac);
- goto err_enable;
- }
-+
-+ /* enable TX FIFO Underflow interrupt */
-+ bgx_reg_modify(bgx, lmac, BGX_GMP_GMI_TXX_INT_ENA_W1S,
-+ GMI_TXX_INT_UNDFLW);
- }
-
- return 0;
---- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-+++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.h
-@@ -179,6 +179,15 @@
- #define BGX_GMP_GMI_TXX_BURST 0x38228
- #define BGX_GMP_GMI_TXX_MIN_PKT 0x38240
- #define BGX_GMP_GMI_TXX_SGMII_CTL 0x38300
-+#define BGX_GMP_GMI_TXX_INT 0x38500
-+#define BGX_GMP_GMI_TXX_INT_W1S 0x38508
-+#define BGX_GMP_GMI_TXX_INT_ENA_W1C 0x38510
-+#define BGX_GMP_GMI_TXX_INT_ENA_W1S 0x38518
-+#define GMI_TXX_INT_PTP_LOST BIT_ULL(4)
-+#define GMI_TXX_INT_LATE_COL BIT_ULL(3)
-+#define GMI_TXX_INT_XSDEF BIT_ULL(2)
-+#define GMI_TXX_INT_XSCOL BIT_ULL(1)
-+#define GMI_TXX_INT_UNDFLW BIT_ULL(0)
-
- #define BGX_MSIX_VEC_0_29_ADDR 0x400000 /* +(0..29) << 4 */
- #define BGX_MSIX_VEC_0_29_CTL 0x400008