From: Koen Vandeputte Date: Wed, 20 Nov 2019 06:57:36 +0000 (+0100) Subject: brcm2708: remove useless patches X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=723f4a41196c1ac2304fb7540aff822274c01043;p=openwrt%2Fstaging%2Fblocktrron.git brcm2708: remove useless patches The first adds some stuff while the second one just reverts it. Remove both patches. This is done is a separate commit on purpose to make it clear. Signed-off-by: Koen Vandeputte --- diff --git a/target/linux/brcm2708/patches-4.19/950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch b/target/linux/brcm2708/patches-4.19/950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch deleted file mode 100644 index a09d49f2fd..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0748-net-bcmgenet-Workaround-for-Pi-4B-network-issue.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 82a6bacc6df57c05093bea3f628d4d0b5f7a49a2 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 2 Aug 2019 22:25:27 +0100 -Subject: [PATCH 748/806] net: bcmgenet: Workaround for Pi 4B network issue - -Some combinations of Pi 4Bs and Ethernet switches don't reliably get a -DCHP-assigned IP address, leaving the unit with a self=assigned 169.254 -address. - -Forcing renegotiation has been found to be an effective workaround, so -add an automatic renegotiation after the link comes up for the first -time; enable it with genet.force_reneg=y - by default it is disabled. - -See: https://github.com/raspberrypi/linux/issues/3108 - -Signed-off-by: Phil Elwell ---- - .../net/ethernet/broadcom/genet/bcmgenet.c | 22 +++++++++++++++++++ - 1 file changed, 22 insertions(+) - ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -72,6 +72,10 @@ - #define GENET_RDMA_REG_OFF (priv->hw_params->rdma_offset + \ - TOTAL_DESC * DMA_DESC_SIZE) - -+static bool force_reneg = false; -+module_param(force_reneg, bool, 0444); -+MODULE_PARM_DESC(force_reneg, "Force a renegotiation after the initial link-up"); -+ - static inline void bcmgenet_writel(u32 value, void __iomem *offset) - { - /* MIPS chips strapped for BE will automagically configure the -@@ -2612,6 +2616,7 @@ static void bcmgenet_irq_task(struct wor - unsigned int status; - struct bcmgenet_priv *priv = container_of( - work, struct bcmgenet_priv, bcmgenet_irq_work); -+ static int first_link = 1; - - netif_dbg(priv, intr, priv->dev, "%s\n", __func__); - -@@ -2625,9 +2630,26 @@ static void bcmgenet_irq_task(struct wor - phy_init_hw(priv->dev->phydev); - - /* Link UP/DOWN event */ -- if (status & UMAC_IRQ_LINK_EVENT) -+ if (status & UMAC_IRQ_LINK_EVENT) { - phy_mac_interrupt(priv->dev->phydev); - -+ if (priv->dev->phydev->link && first_link) { -+ first_link = 0; -+ /* -+ * HACK: Some Pi4Bs, when paired with some switches, -+ * come up in a strange state where they are unable to -+ * transmit, causing them to fail to get an IP address. -+ * Although the failure mechanism is not yet understood, -+ * forcing renegotiation at this point has been shown -+ * to be effective in avoiding the problem. -+ */ -+ if (force_reneg) { -+ dev_info(&priv->pdev->dev, -+ "Forcing renegotiation\n"); -+ genphy_restart_aneg(priv->dev->phydev); -+ } -+ } -+ } - } - - /* bcmgenet_isr1: handle Rx and Tx priority queues */ diff --git a/target/linux/brcm2708/patches-4.19/950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch b/target/linux/brcm2708/patches-4.19/950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch deleted file mode 100644 index d7512dacd8..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0754-Revert-net-bcmgenet-Workaround-for-Pi-4B-network-iss.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 024173b78ac6c6ce9dca879274b1e8a8e9000738 Mon Sep 17 00:00:00 2001 -From: Phil Elwell -Date: Fri, 9 Aug 2019 08:52:16 +0100 -Subject: [PATCH 754/806] Revert "net: bcmgenet: Workaround for Pi 4B network - issue" - -This reverts commit 9c0770ea7682a84a22c33410ef6870af258abacc. ---- - .../net/ethernet/broadcom/genet/bcmgenet.c | 22 ------------------- - 1 file changed, 22 deletions(-) - ---- a/drivers/net/ethernet/broadcom/genet/bcmgenet.c -+++ b/drivers/net/ethernet/broadcom/genet/bcmgenet.c -@@ -72,10 +72,6 @@ - #define GENET_RDMA_REG_OFF (priv->hw_params->rdma_offset + \ - TOTAL_DESC * DMA_DESC_SIZE) - --static bool force_reneg = false; --module_param(force_reneg, bool, 0444); --MODULE_PARM_DESC(force_reneg, "Force a renegotiation after the initial link-up"); -- - static inline void bcmgenet_writel(u32 value, void __iomem *offset) - { - /* MIPS chips strapped for BE will automagically configure the -@@ -2616,7 +2612,6 @@ static void bcmgenet_irq_task(struct wor - unsigned int status; - struct bcmgenet_priv *priv = container_of( - work, struct bcmgenet_priv, bcmgenet_irq_work); -- static int first_link = 1; - - netif_dbg(priv, intr, priv->dev, "%s\n", __func__); - -@@ -2630,26 +2625,9 @@ static void bcmgenet_irq_task(struct wor - phy_init_hw(priv->dev->phydev); - - /* Link UP/DOWN event */ -- if (status & UMAC_IRQ_LINK_EVENT) { -+ if (status & UMAC_IRQ_LINK_EVENT) - phy_mac_interrupt(priv->dev->phydev); - -- if (priv->dev->phydev->link && first_link) { -- first_link = 0; -- /* -- * HACK: Some Pi4Bs, when paired with some switches, -- * come up in a strange state where they are unable to -- * transmit, causing them to fail to get an IP address. -- * Although the failure mechanism is not yet understood, -- * forcing renegotiation at this point has been shown -- * to be effective in avoiding the problem. -- */ -- if (force_reneg) { -- dev_info(&priv->pdev->dev, -- "Forcing renegotiation\n"); -- genphy_restart_aneg(priv->dev->phydev); -- } -- } -- } - } - - /* bcmgenet_isr1: handle Rx and Tx priority queues */