mirror
/
openwrt
mirror of https://git.openwrt.org/openwrt/openwrt.git
1
0
Fork 0
Code Releases Activity

kernel: bump 4.9 to 4.9.205 

Refreshed all patches.

Altered patches:
- 402-mtd-support-layerscape.patch

Fixes:
- CVE-2019-18660

Compile-tested on: ar71xx
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
This commit is contained in:
Koen Vandeputte 2019-11-29 10:53:02 +01:00
parent 2777947a75
commit bd3b8480ab
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-version.mk
View File

@ -2,10 +2,10 @@
LINUX_RELEASE?=1 LINUX_RELEASE?=1
LINUX_VERSION-4.9 = .202 LINUX_VERSION-4.9 = .205
LINUX_VERSION-4.14 = .156 LINUX_VERSION-4.14 = .156
LINUX_KERNEL_HASH-4.9.202 = 8108ec1cd10fc40821c84e9f087dba10b1767aad66596f4a36925faef55e4ebf LINUX_KERNEL_HASH-4.9.205 = 98b9e8644706acc0cf51022372bb263b59a1d2bbe3ccd7ce6bd9bc7378c78b05
LINUX_KERNEL_HASH-4.14.156 = f8889feb0cbd7df36ff35bd4c72c1e2010567621bfcb218fcfa501bc5c7787c0 LINUX_KERNEL_HASH-4.14.156 = f8889feb0cbd7df36ff35bd4c72c1e2010567621bfcb218fcfa501bc5c7787c0
remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1)))) remove_uri_prefix=$(subst git://,,$(subst http://,,$(subst https://,,$(1))))

4
target/linux/brcm63xx/patches-4.9/001-4.15-10-bcm63xx_enet-do-not-rely-on-probe-order.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1739,10 +1739,8 @@ static int bcm_enet_probe(struct platfor @@ -1740,10 +1740,8 @@ static int bcm_enet_probe(struct platfor
const char *clk_name; const char *clk_name;
int i, ret; int i, ret;
@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); res_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1); res_irq_rx = platform_get_resource(pdev, IORESOURCE_IRQ, 1);
@@ -2714,11 +2712,8 @@ static int bcm_enetsw_probe(struct platf @@ -2715,11 +2713,8 @@ static int bcm_enetsw_probe(struct platf
struct resource *res_mem; struct resource *res_mem;
int ret, irq_rx, irq_tx; int ret, irq_rx, irq_tx;

16
target/linux/brcm63xx/patches-4.9/001-4.15-11-bcm63xx_enet-use-managed-functions-for-clock-ioremap.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1784,14 +1784,14 @@ static int bcm_enet_probe(struct platfor @@ -1785,14 +1785,14 @@ static int bcm_enet_probe(struct platfor
clk_name = "enet1"; clk_name = "enet1";
} }
@ -30,7 +30,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
/* initialize default and fetch platform data */ /* initialize default and fetch platform data */
priv->rx_ring_size = BCMENET_DEF_RX_DESC; priv->rx_ring_size = BCMENET_DEF_RX_DESC;
@@ -1819,7 +1819,7 @@ static int bcm_enet_probe(struct platfor @@ -1820,7 +1820,7 @@ static int bcm_enet_probe(struct platfor
if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) { if (priv->mac_id == 0 && priv->has_phy && !priv->use_external_mii) {
/* using internal PHY, enable clock */ /* using internal PHY, enable clock */
@ -39,7 +39,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
if (IS_ERR(priv->phy_clk)) { if (IS_ERR(priv->phy_clk)) {
ret = PTR_ERR(priv->phy_clk); ret = PTR_ERR(priv->phy_clk);
priv->phy_clk = NULL; priv->phy_clk = NULL;
@@ -1827,7 +1827,7 @@ static int bcm_enet_probe(struct platfor @@ -1828,7 +1828,7 @@ static int bcm_enet_probe(struct platfor
} }
ret = clk_prepare_enable(priv->phy_clk); ret = clk_prepare_enable(priv->phy_clk);
if (ret) if (ret)
@ -48,7 +48,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
} }
/* do minimal hardware init to be able to probe mii bus */ /* do minimal hardware init to be able to probe mii bus */
@@ -1921,14 +1921,8 @@ out_uninit_hw: @@ -1922,14 +1922,8 @@ out_uninit_hw:
if (priv->phy_clk) if (priv->phy_clk)
clk_disable_unprepare(priv->phy_clk); clk_disable_unprepare(priv->phy_clk);
@ -63,7 +63,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
out: out:
free_netdev(dev); free_netdev(dev);
return ret; return ret;
@@ -1964,12 +1958,10 @@ static int bcm_enet_remove(struct platfo @@ -1965,12 +1959,10 @@ static int bcm_enet_remove(struct platfo
} }
/* disable hw block clocks */ /* disable hw block clocks */
@ -78,7 +78,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
free_netdev(dev); free_netdev(dev);
return 0; return 0;
@@ -2752,26 +2744,20 @@ static int bcm_enetsw_probe(struct platf @@ -2753,26 +2745,20 @@ static int bcm_enetsw_probe(struct platf
if (ret) if (ret)
goto out; goto out;
@ -111,7 +111,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
priv->rx_chan = 0; priv->rx_chan = 0;
priv->tx_chan = 1; priv->tx_chan = 1;
@@ -2803,15 +2789,6 @@ static int bcm_enetsw_probe(struct platf @@ -2804,15 +2790,6 @@ static int bcm_enetsw_probe(struct platf
out_disable_clk: out_disable_clk:
clk_disable_unprepare(priv->mac_clk); clk_disable_unprepare(priv->mac_clk);
@ -127,7 +127,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
out: out:
free_netdev(dev); free_netdev(dev);
return ret; return ret;
@@ -2823,20 +2800,13 @@ static int bcm_enetsw_remove(struct plat @@ -2824,20 +2801,13 @@ static int bcm_enetsw_remove(struct plat
{ {
struct bcm_enet_priv *priv; struct bcm_enet_priv *priv;
struct net_device *dev; struct net_device *dev;

4
target/linux/brcm63xx/patches-4.9/001-4.15-12-bcm63xx_enet-drop-unneeded-NULL-phy_clk-check.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1918,8 +1918,7 @@ out_free_mdio: @@ -1919,8 +1919,7 @@ out_free_mdio:
out_uninit_hw: out_uninit_hw:
/* turn off mdc clock */ /* turn off mdc clock */
enet_writel(priv, 0, ENET_MIISC_REG); enet_writel(priv, 0, ENET_MIISC_REG);
@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
out_disable_clk_mac: out_disable_clk_mac:
clk_disable_unprepare(priv->mac_clk); clk_disable_unprepare(priv->mac_clk);
@@ -1958,9 +1957,7 @@ static int bcm_enet_remove(struct platfo @@ -1959,9 +1958,7 @@ static int bcm_enet_remove(struct platfo
} }
/* disable hw block clocks */ /* disable hw block clocks */

4
target/linux/brcm63xx/patches-4.9/001-4.16-01-bcm63xx_enet-just-use-enet-as-the-clock-name.patch
View File

@ -13,7 +13,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1736,7 +1736,6 @@ static int bcm_enet_probe(struct platfor @@ -1737,7 +1737,6 @@ static int bcm_enet_probe(struct platfor
struct bcm63xx_enet_platform_data *pd; struct bcm63xx_enet_platform_data *pd;
struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx; struct resource *res_mem, *res_irq, *res_irq_rx, *res_irq_tx;
struct mii_bus *bus; struct mii_bus *bus;
@ -21,7 +21,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
int i, ret; int i, ret;
if (!bcm_enet_shared_base[0]) if (!bcm_enet_shared_base[0])
@@ -1777,14 +1776,12 @@ static int bcm_enet_probe(struct platfor @@ -1778,14 +1777,12 @@ static int bcm_enet_probe(struct platfor
if (priv->mac_id == 0) { if (priv->mac_id == 0) {
priv->rx_chan = 0; priv->rx_chan = 0;
priv->tx_chan = 1; priv->tx_chan = 1;

4
target/linux/brcm63xx/patches-4.9/001-4.16-02-bcm63xx_enet-use-platform-data-for-dma-channel-numbe.patch
View File

@ -45,7 +45,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
/* /*
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1772,15 +1772,6 @@ static int bcm_enet_probe(struct platfor @@ -1773,15 +1773,6 @@ static int bcm_enet_probe(struct platfor
priv->irq_tx = res_irq_tx->start; priv->irq_tx = res_irq_tx->start;
priv->mac_id = pdev->id; priv->mac_id = pdev->id;
@ -61,7 +61,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
if (IS_ERR(priv->mac_clk)) { if (IS_ERR(priv->mac_clk)) {
ret = PTR_ERR(priv->mac_clk); ret = PTR_ERR(priv->mac_clk);
@@ -1812,6 +1803,8 @@ static int bcm_enet_probe(struct platfor @@ -1813,6 +1804,8 @@ static int bcm_enet_probe(struct platfor
priv->dma_chan_width = pd->dma_chan_width; priv->dma_chan_width = pd->dma_chan_width;
priv->dma_has_sram = pd->dma_has_sram; priv->dma_has_sram = pd->dma_has_sram;
priv->dma_desc_shift = pd->dma_desc_shift; priv->dma_desc_shift = pd->dma_desc_shift;

2
target/linux/brcm63xx/patches-4.9/001-4.16-03-bcm63xx_enet-remove-pointless-mac_id-check.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1807,7 +1807,7 @@ static int bcm_enet_probe(struct platfor @@ -1808,7 +1808,7 @@ static int bcm_enet_probe(struct platfor
priv->tx_chan = pd->tx_chan; priv->tx_chan = pd->tx_chan;
} }

4
target/linux/brcm63xx/patches-4.9/001-4.16-04-bcm63xx_enet-use-platform-device-id-directly-for-mii.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1770,7 +1770,6 @@ static int bcm_enet_probe(struct platfor @@ -1771,7 +1771,6 @@ static int bcm_enet_probe(struct platfor
dev->irq = priv->irq = res_irq->start; dev->irq = priv->irq = res_irq->start;
priv->irq_rx = res_irq_rx->start; priv->irq_rx = res_irq_rx->start;
priv->irq_tx = res_irq_tx->start; priv->irq_tx = res_irq_tx->start;
@ -23,7 +23,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
priv->mac_clk = devm_clk_get(&pdev->dev, "enet"); priv->mac_clk = devm_clk_get(&pdev->dev, "enet");
if (IS_ERR(priv->mac_clk)) { if (IS_ERR(priv->mac_clk)) {
@@ -1838,7 +1837,7 @@ static int bcm_enet_probe(struct platfor @@ -1839,7 +1838,7 @@ static int bcm_enet_probe(struct platfor
bus->priv = priv; bus->priv = priv;
bus->read = bcm_enet_mdio_read_phylib; bus->read = bcm_enet_mdio_read_phylib;
bus->write = bcm_enet_mdio_write_phylib; bus->write = bcm_enet_mdio_write_phylib;

2
target/linux/brcm63xx/patches-4.9/402_bcm63xx_enet_vlan_incoming_fixed.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -1635,7 +1635,7 @@ static int compute_hw_mtu(struct bcm_ene @@ -1636,7 +1636,7 @@ static int compute_hw_mtu(struct bcm_ene
actual_mtu = mtu; actual_mtu = mtu;
/* add ethernet header + vlan tag size */ /* add ethernet header + vlan tag size */

22
target/linux/brcm63xx/patches-4.9/404-NET-bcm63xx_enet-move-phy_-dis-connect-into-probe-re.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -870,10 +870,8 @@ static int bcm_enet_open(struct net_devi @@ -871,10 +871,8 @@ static int bcm_enet_open(struct net_devi
struct bcm_enet_priv *priv; struct bcm_enet_priv *priv;
struct sockaddr addr; struct sockaddr addr;
struct device *kdev; struct device *kdev;
@ -26,7 +26,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
void *p; void *p;
u32 val; u32 val;
@@ -881,40 +879,10 @@ static int bcm_enet_open(struct net_devi @@ -882,40 +880,10 @@ static int bcm_enet_open(struct net_devi
kdev = &priv->pdev->dev; kdev = &priv->pdev->dev;
if (priv->has_phy) { if (priv->has_phy) {
@ -68,7 +68,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
} }
/* mask all interrupts and request them */ /* mask all interrupts and request them */
@@ -924,7 +892,7 @@ static int bcm_enet_open(struct net_devi @@ -925,7 +893,7 @@ static int bcm_enet_open(struct net_devi
ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev); ret = request_irq(dev->irq, bcm_enet_isr_mac, 0, dev->name, dev);
if (ret) if (ret)
@ -77,7 +77,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0, ret = request_irq(priv->irq_rx, bcm_enet_isr_dma, 0,
dev->name, dev); dev->name, dev);
@@ -1086,8 +1054,8 @@ static int bcm_enet_open(struct net_devi @@ -1087,8 +1055,8 @@ static int bcm_enet_open(struct net_devi
enet_dmac_writel(priv, priv->dma_chan_int_mask, enet_dmac_writel(priv, priv->dma_chan_int_mask,
ENETDMAC_IRMASK, priv->tx_chan); ENETDMAC_IRMASK, priv->tx_chan);
@ -88,7 +88,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
else else
bcm_enet_adjust_link(dev); bcm_enet_adjust_link(dev);
@@ -1128,10 +1096,6 @@ out_freeirq_rx: @@ -1129,10 +1097,6 @@ out_freeirq_rx:
out_freeirq: out_freeirq:
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
@ -99,7 +99,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
return ret; return ret;
} }
@@ -1236,10 +1200,6 @@ static int bcm_enet_stop(struct net_devi @@ -1237,10 +1201,6 @@ static int bcm_enet_stop(struct net_devi
free_irq(priv->irq_rx, dev); free_irq(priv->irq_rx, dev);
free_irq(dev->irq, dev); free_irq(dev->irq, dev);
@ -110,7 +110,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
return 0; return 0;
} }
@@ -1821,14 +1781,46 @@ static int bcm_enet_probe(struct platfor @@ -1822,14 +1782,46 @@ static int bcm_enet_probe(struct platfor
/* do minimal hardware init to be able to probe mii bus */ /* do minimal hardware init to be able to probe mii bus */
bcm_enet_hw_preinit(priv); bcm_enet_hw_preinit(priv);
@ -158,7 +158,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
} }
bus = priv->mii_bus; bus = priv->mii_bus;
@@ -1852,6 +1844,35 @@ static int bcm_enet_probe(struct platfor @@ -1853,6 +1845,35 @@ static int bcm_enet_probe(struct platfor
dev_err(&pdev->dev, "unable to register mdio bus\n"); dev_err(&pdev->dev, "unable to register mdio bus\n");
goto out_free_mdio; goto out_free_mdio;
} }
@ -194,7 +194,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
} else { } else {
/* run platform code to initialize PHY device */ /* run platform code to initialize PHY device */
@@ -1859,44 +1880,16 @@ static int bcm_enet_probe(struct platfor @@ -1860,44 +1881,16 @@ static int bcm_enet_probe(struct platfor
pd->mii_config(dev, 1, bcm_enet_mdio_read_mii, pd->mii_config(dev, 1, bcm_enet_mdio_read_mii,
bcm_enet_mdio_write_mii)) { bcm_enet_mdio_write_mii)) {
dev_err(&pdev->dev, "unable to configure mdio bus\n"); dev_err(&pdev->dev, "unable to configure mdio bus\n");
@ -243,7 +243,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
if (priv->mii_bus) if (priv->mii_bus)
mdiobus_unregister(priv->mii_bus); mdiobus_unregister(priv->mii_bus);
@@ -1904,6 +1897,9 @@ out_free_mdio: @@ -1905,6 +1898,9 @@ out_free_mdio:
if (priv->mii_bus) if (priv->mii_bus)
mdiobus_free(priv->mii_bus); mdiobus_free(priv->mii_bus);
@ -253,7 +253,7 @@ Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
out_uninit_hw: out_uninit_hw:
/* turn off mdc clock */ /* turn off mdc clock */
enet_writel(priv, 0, ENET_MIISC_REG); enet_writel(priv, 0, ENET_MIISC_REG);
@@ -1934,6 +1930,7 @@ static int bcm_enet_remove(struct platfo @@ -1935,6 +1931,7 @@ static int bcm_enet_remove(struct platfo
enet_writel(priv, 0, ENET_MIISC_REG); enet_writel(priv, 0, ENET_MIISC_REG);
if (priv->has_phy) { if (priv->has_phy) {

2
target/linux/brcm63xx/patches-4.9/408-bcm63xx_enet-enable-rgmii-clock-on-external-ports.patch
View File

@ -32,7 +32,7 @@ Subject: [PATCH 54/81] bcm63xx_enet: enable rgmii clock on external ports
#define ENETSW_MDIOC_EXT_MASK (1 << 16) #define ENETSW_MDIOC_EXT_MASK (1 << 16)
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -2205,6 +2205,18 @@ static int bcm_enetsw_open(struct net_de @@ -2206,6 +2206,18 @@ static int bcm_enetsw_open(struct net_de
priv->sw_port_link[i] = 0; priv->sw_port_link[i] = 0;
} }

12
target/linux/brcm63xx/patches-4.9/423-bcm63xx_enet_add_b53_support.patch
View File

@ -20,7 +20,7 @@
#include <bcm63xx_dev_enet.h> #include <bcm63xx_dev_enet.h>
#include "bcm63xx_enet.h" #include "bcm63xx_enet.h"
@@ -1950,7 +1951,8 @@ static int bcm_enet_remove(struct platfo @@ -1951,7 +1952,8 @@ static int bcm_enet_remove(struct platfo
return 0; return 0;
} }
@ -30,7 +30,7 @@
.probe = bcm_enet_probe, .probe = bcm_enet_probe,
.remove = bcm_enet_remove, .remove = bcm_enet_remove,
.driver = { .driver = {
@@ -1959,6 +1961,42 @@ struct platform_driver bcm63xx_enet_driv @@ -1960,6 +1962,42 @@ struct platform_driver bcm63xx_enet_driv
}, },
}; };
@ -73,7 +73,7 @@
/* /*
* switch mii access callbacks * switch mii access callbacks
*/ */
@@ -2217,29 +2255,6 @@ static int bcm_enetsw_open(struct net_de @@ -2218,29 +2256,6 @@ static int bcm_enetsw_open(struct net_de
enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i)); enetsw_writeb(priv, rgmii_ctrl, ENETSW_RGMII_CTRL_REG(i));
} }
@ -103,7 +103,7 @@
/* initialize flow control buffer allocation */ /* initialize flow control buffer allocation */
enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0, enet_dma_writel(priv, ENETDMA_BUFALLOC_FORCE_MASK | 0,
ENETDMA_BUFALLOC_REG(priv->rx_chan)); ENETDMA_BUFALLOC_REG(priv->rx_chan));
@@ -2698,6 +2713,9 @@ static int bcm_enetsw_probe(struct platf @@ -2699,6 +2714,9 @@ static int bcm_enetsw_probe(struct platf
struct bcm63xx_enetsw_platform_data *pd; struct bcm63xx_enetsw_platform_data *pd;
struct resource *res_mem; struct resource *res_mem;
int ret, irq_rx, irq_tx; int ret, irq_rx, irq_tx;
@ -113,7 +113,7 @@
if (!bcm_enet_shared_base[0]) if (!bcm_enet_shared_base[0])
return -EPROBE_DEFER; return -EPROBE_DEFER;
@@ -2780,6 +2798,43 @@ static int bcm_enetsw_probe(struct platf @@ -2781,6 +2799,43 @@ static int bcm_enetsw_probe(struct platf
priv->pdev = pdev; priv->pdev = pdev;
priv->net_dev = dev; priv->net_dev = dev;
@ -157,7 +157,7 @@
return 0; return 0;
out_disable_clk: out_disable_clk:
@@ -2801,6 +2856,9 @@ static int bcm_enetsw_remove(struct plat @@ -2802,6 +2857,9 @@ static int bcm_enetsw_remove(struct plat
priv = netdev_priv(dev); priv = netdev_priv(dev);
unregister_netdev(dev); unregister_netdev(dev);

2
target/linux/brcm63xx/patches-4.9/424-bcm63xx_enet_no_request_mem_region.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -2757,9 +2757,9 @@ static int bcm_enetsw_probe(struct platf @@ -2758,9 +2758,9 @@ static int bcm_enetsw_probe(struct platf
if (ret) if (ret)
goto out; goto out;

2
target/linux/brcm63xx/patches-4.9/804-bcm63xx_enet_63268_rgmii_ports.patch
View File

@ -1,6 +1,6 @@
--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c --- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c
+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c +++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c
@@ -2252,6 +2252,10 @@ static int bcm_enetsw_open(struct net_de @@ -2253,6 +2253,10 @@ static int bcm_enetsw_open(struct net_de
rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i)); rgmii_ctrl = enetsw_readb(priv, ENETSW_RGMII_CTRL_REG(i));
rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN; rgmii_ctrl |= ENETSW_RGMII_CTRL_GMII_CLK_EN;

6
target/linux/generic/backport-4.9/090-net-generalize-napi_complete_done.patch
View File

@ -1150,7 +1150,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
return work_done; return work_done;
--- a/drivers/net/ethernet/ti/cpsw.c --- a/drivers/net/ethernet/ti/cpsw.c
+++ b/drivers/net/ethernet/ti/cpsw.c +++ b/drivers/net/ethernet/ti/cpsw.c
@@ -843,7 +843,7 @@ static int cpsw_rx_poll(struct napi_stru @@ -844,7 +844,7 @@ static int cpsw_rx_poll(struct napi_stru
} }
if (num_rx < budget) { if (num_rx < budget) {
@ -1227,7 +1227,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
} }
--- a/drivers/net/ethernet/toshiba/tc35815.c --- a/drivers/net/ethernet/toshiba/tc35815.c
+++ b/drivers/net/ethernet/toshiba/tc35815.c +++ b/drivers/net/ethernet/toshiba/tc35815.c
@@ -1639,7 +1639,7 @@ static int tc35815_poll(struct napi_stru @@ -1641,7 +1641,7 @@ static int tc35815_poll(struct napi_stru
spin_unlock(&lp->rx_lock); spin_unlock(&lp->rx_lock);
if (received < budget) { if (received < budget) {
@ -1346,7 +1346,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
--- a/drivers/net/wireless/ath/ath10k/pci.c --- a/drivers/net/wireless/ath/ath10k/pci.c
+++ b/drivers/net/wireless/ath/ath10k/pci.c +++ b/drivers/net/wireless/ath/ath10k/pci.c
@@ -2804,7 +2804,7 @@ static int ath10k_pci_napi_poll(struct n @@ -2803,7 +2803,7 @@ static int ath10k_pci_napi_poll(struct n
done = ath10k_htt_txrx_compl_task(ar, budget); done = ath10k_htt_txrx_compl_task(ar, budget);
if (done < budget) { if (done < budget) {

4
target/linux/generic/pending-4.9/161-mtd-part-add-generic-parsing-of-linux-part-probe.patch
View File

@ -40,7 +40,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
errors per {size} bytes". errors per {size} bytes".
--- a/drivers/mtd/maps/physmap_of.c --- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c +++ b/drivers/mtd/maps/physmap_of.c
@@ -113,47 +113,9 @@ static struct mtd_info *obsolete_probe(s @@ -104,47 +104,9 @@ static struct mtd_info *obsolete_probe(s
static const char * const part_probe_types_def[] = { static const char * const part_probe_types_def[] = {
"cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL }; "cmdlinepart", "RedBoot", "ofpart", "ofoldpart", NULL };
@ -88,7 +88,7 @@ Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
const struct of_device_id *match; const struct of_device_id *match;
struct device_node *dp = dev->dev.of_node; struct device_node *dp = dev->dev.of_node;
struct resource res; struct resource res;
@@ -317,14 +279,8 @@ static int of_flash_probe(struct platfor @@ -300,14 +262,8 @@ static int of_flash_probe(struct platfor
info->cmtd->dev.parent = &dev->dev; info->cmtd->dev.parent = &dev->dev;
mtd_set_of_node(info->cmtd, dp); mtd_set_of_node(info->cmtd, dp);

2
target/linux/lantiq/patches-4.9/0031-I2C-MIPS-lantiq-add-FALC-ON-i2c-bus-master.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
--- a/drivers/i2c/busses/Kconfig --- a/drivers/i2c/busses/Kconfig
+++ b/drivers/i2c/busses/Kconfig +++ b/drivers/i2c/busses/Kconfig
@@ -643,6 +643,16 @@ config I2C_MESON @@ -644,6 +644,16 @@ config I2C_MESON
If you say yes to this option, support will be included for the If you say yes to this option, support will be included for the
I2C interface on the Amlogic Meson family of SoCs. I2C interface on the Amlogic Meson family of SoCs.

8
target/linux/layerscape/patches-4.9/402-mtd-support-layerscape.patch
View File

@ -335,16 +335,16 @@ Signed-off-by: Yangbo Lu <yangbo.lu@nxp.com>
#include <linux/of.h> #include <linux/of.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/of_platform.h> #include <linux/of_platform.h>
@@ -209,6 +210,9 @@ static int of_flash_probe(struct platfor @@ -201,6 +202,9 @@ static int of_flash_probe(struct platfor
return err; return err;
} }
+ if (of_property_read_bool(dp->parent, "big-endian")) + if (of_property_read_bool(dp->parent, "big-endian"))
+ info->list[i].map.swap = CFI_BIG_ENDIAN; + info->list[i].map.swap = CFI_BIG_ENDIAN;
+ +
err = -ENOMEM; simple_map_init(&info->list[i].map);
info->list[i].map.virt = ioremap(info->list[i].map.phys,
info->list[i].map.size); /*
--- a/drivers/mtd/nand/Kconfig --- a/drivers/mtd/nand/Kconfig
+++ b/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig
@@ -438,7 +438,7 @@ config MTD_NAND_FSL_ELBC @@ -438,7 +438,7 @@ config MTD_NAND_FSL_ELBC