kernel: bump 4.19 to 4.19.115

Refreshed all patches.

Remove upstreamed:
- 600-ipv6-addrconf-call-ipv6_mc_up-for-non-Ethernet-inter.patch
- 184-USB-serial-option-add-Wistron-Neweb-D19Q1.patch

Fixes:
- CVE-2020-8647
- CVE-2020-8648 (potentially)
- CVE-2020-8649

Compile-tested on: cns3xxx
Runtime-tested on: cns3xxx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

7 files changed, 24 insertions, 24 deletions

diff --git a/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch b/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
index 4a5ea36144..5d7e769246 100644
--- a/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
+++ b/target/linux/mvebu/patches-4.19/300-mvneta-tx-queue-workaround.patch
@@ -9,7 +9,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
 ---
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -4272,6 +4272,15 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4271,6 +4271,15 @@ static int mvneta_ethtool_set_eee(struct
  	return phylink_ethtool_set_eee(pp->phylink, eee);
  }
  
@@ -25,7 +25,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
  static const struct net_device_ops mvneta_netdev_ops = {
  	.ndo_open            = mvneta_open,
  	.ndo_stop            = mvneta_stop,
-@@ -4282,6 +4291,7 @@ static const struct net_device_ops mvnet
+@@ -4281,6 +4290,7 @@ static const struct net_device_ops mvnet
  	.ndo_fix_features    = mvneta_fix_features,
  	.ndo_get_stats64     = mvneta_get_stats64,
  	.ndo_do_ioctl        = mvneta_ioctl,
diff --git a/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch b/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch
index a5553a3e96..f56d726a28 100644
--- a/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch
+++ b/target/linux/mvebu/patches-4.19/531-net-mvneta-Add-support-for-2500Mbps-SGMII.patch
@@ -32,7 +32,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  #define MVNETA_MIB_COUNTERS_BASE                 0x3000
  #define      MVNETA_MIB_LATE_COLLISION           0x7c
  #define MVNETA_DA_FILT_SPEC_MCAST                0x3400
-@@ -3359,6 +3361,7 @@ static void mvneta_validate(struct net_d
+@@ -3358,6 +3360,7 @@ static void mvneta_validate(struct net_d
  	if (state->interface != PHY_INTERFACE_MODE_NA &&
  	    state->interface != PHY_INTERFACE_MODE_QSGMII &&
  	    state->interface != PHY_INTERFACE_MODE_SGMII &&
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	    !phy_interface_mode_is_8023z(state->interface) &&
  	    !phy_interface_mode_is_rgmii(state->interface)) {
  		bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
-@@ -3371,9 +3374,15 @@ static void mvneta_validate(struct net_d
+@@ -3370,9 +3373,15 @@ static void mvneta_validate(struct net_d
  
  	/* Asymmetric pause is unsupported */
  	phylink_set(mask, Pause);
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	if (!phy_interface_mode_is_8023z(state->interface)) {
  		/* 10M and 100M are only supported in non-802.3z mode */
-@@ -3434,12 +3443,14 @@ static void mvneta_mac_config(struct net
+@@ -3433,12 +3442,14 @@ static void mvneta_mac_config(struct net
  	struct mvneta_port *pp = netdev_priv(ndev);
  	u32 new_ctrl0, gmac_ctrl0 = mvreg_read(pp, MVNETA_GMAC_CTRL_0);
  	u32 new_ctrl2, gmac_ctrl2 = mvreg_read(pp, MVNETA_GMAC_CTRL_2);
@@ -74,7 +74,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	new_clk = gmac_clk & ~MVNETA_GMAC_1MS_CLOCK_ENABLE;
  	new_an = gmac_an & ~(MVNETA_GMAC_INBAND_AN_ENABLE |
  			     MVNETA_GMAC_INBAND_RESTART_AN |
-@@ -3472,7 +3483,7 @@ static void mvneta_mac_config(struct net
+@@ -3471,7 +3482,7 @@ static void mvneta_mac_config(struct net
  		if (state->duplex)
  			new_an |= MVNETA_GMAC_CONFIG_FULL_DUPLEX;
  
@@ -83,7 +83,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  			new_an |= MVNETA_GMAC_CONFIG_GMII_SPEED;
  		else if (state->speed == SPEED_100)
  			new_an |= MVNETA_GMAC_CONFIG_MII_SPEED;
-@@ -3511,10 +3522,18 @@ static void mvneta_mac_config(struct net
+@@ -3510,10 +3521,18 @@ static void mvneta_mac_config(struct net
  			    MVNETA_GMAC_FORCE_LINK_DOWN);
  	}
  
diff --git a/target/linux/mvebu/patches-4.19/533-net-mvneta-Dont-advertise-2.5G-modes.patch b/target/linux/mvebu/patches-4.19/533-net-mvneta-Dont-advertise-2.5G-modes.patch
index 01b101283c..e85a61d197 100644
--- a/target/linux/mvebu/patches-4.19/533-net-mvneta-Dont-advertise-2.5G-modes.patch
+++ b/target/linux/mvebu/patches-4.19/533-net-mvneta-Dont-advertise-2.5G-modes.patch
@@ -27,7 +27,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3361,7 +3361,6 @@ static void mvneta_validate(struct net_d
+@@ -3360,7 +3360,6 @@ static void mvneta_validate(struct net_d
  	if (state->interface != PHY_INTERFACE_MODE_NA &&
  	    state->interface != PHY_INTERFACE_MODE_QSGMII &&
  	    state->interface != PHY_INTERFACE_MODE_SGMII &&
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	    !phy_interface_mode_is_8023z(state->interface) &&
  	    !phy_interface_mode_is_rgmii(state->interface)) {
  		bitmap_zero(supported, __ETHTOOL_LINK_MODE_MASK_NBITS);
-@@ -3375,14 +3374,9 @@ static void mvneta_validate(struct net_d
+@@ -3374,14 +3373,9 @@ static void mvneta_validate(struct net_d
  	/* Asymmetric pause is unsupported */
  	phylink_set(mask, Pause);
  
diff --git a/target/linux/mvebu/patches-4.19/534-net-mvneta-remove-redundant-check-for.patch b/target/linux/mvebu/patches-4.19/534-net-mvneta-remove-redundant-check-for.patch
index fd774e0839..435ef92a12 100644
--- a/target/linux/mvebu/patches-4.19/534-net-mvneta-remove-redundant-check-for.patch
+++ b/target/linux/mvebu/patches-4.19/534-net-mvneta-remove-redundant-check-for.patch
@@ -18,7 +18,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -4268,8 +4268,7 @@ static int mvneta_ethtool_set_eee(struct
+@@ -4267,8 +4267,7 @@ static int mvneta_ethtool_set_eee(struct
  
  	/* The Armada 37x documents do not give limits for this other than
  	 * it being an 8-bit register. */
diff --git a/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch b/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch
index 272beb6950..ecd38e3baa 100644
--- a/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch
+++ b/target/linux/mvebu/patches-4.19/535-net-marvell-neta-add-comphy-support.patch
@@ -31,7 +31,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	struct mvneta_bm *bm_priv;
  	struct mvneta_bm_pool *pool_long;
-@@ -3168,6 +3170,8 @@ static void mvneta_start_dev(struct mvne
+@@ -3167,6 +3169,8 @@ static void mvneta_start_dev(struct mvne
  {
  	int cpu;
  
@@ -40,7 +40,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	mvneta_max_rx_size_set(pp, pp->pkt_size);
  	mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
  
-@@ -3230,6 +3234,8 @@ static void mvneta_stop_dev(struct mvnet
+@@ -3229,6 +3233,8 @@ static void mvneta_stop_dev(struct mvnet
  
  	mvneta_tx_reset(pp);
  	mvneta_rx_reset(pp);
@@ -49,7 +49,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void mvneta_percpu_enable(void *arg)
-@@ -3355,6 +3361,7 @@ static int mvneta_set_mac_addr(struct ne
+@@ -3354,6 +3360,7 @@ static int mvneta_set_mac_addr(struct ne
  static void mvneta_validate(struct net_device *ndev, unsigned long *supported,
  			    struct phylink_link_state *state)
  {
@@ -57,7 +57,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	__ETHTOOL_DECLARE_LINK_MODE_MASK(mask) = { 0, };
  
  	/* We only support QSGMII, SGMII, 802.3z and RGMII modes */
-@@ -3375,8 +3382,13 @@ static void mvneta_validate(struct net_d
+@@ -3374,8 +3381,13 @@ static void mvneta_validate(struct net_d
  	phylink_set(mask, Pause);
  
  	/* Half-duplex at speeds higher than 100Mbit is unsupported */
@@ -73,7 +73,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	if (!phy_interface_mode_is_8023z(state->interface)) {
  		/* 10M and 100M are only supported in non-802.3z mode */
-@@ -3390,6 +3402,11 @@ static void mvneta_validate(struct net_d
+@@ -3389,6 +3401,11 @@ static void mvneta_validate(struct net_d
  		   __ETHTOOL_LINK_MODE_MASK_NBITS);
  	bitmap_and(state->advertising, state->advertising, mask,
  		   __ETHTOOL_LINK_MODE_MASK_NBITS);
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static int mvneta_mac_link_state(struct net_device *ndev,
-@@ -3401,7 +3418,9 @@ static int mvneta_mac_link_state(struct
+@@ -3400,7 +3417,9 @@ static int mvneta_mac_link_state(struct
  	gmac_stat = mvreg_read(pp, MVNETA_GMAC_STATUS);
  
  	if (gmac_stat & MVNETA_GMAC_SPEED_1000)
@@ -96,7 +96,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	else if (gmac_stat & MVNETA_GMAC_SPEED_100)
  		state->speed = SPEED_100;
  	else
-@@ -3516,12 +3535,20 @@ static void mvneta_mac_config(struct net
+@@ -3515,12 +3534,20 @@ static void mvneta_mac_config(struct net
  			    MVNETA_GMAC_FORCE_LINK_DOWN);
  	}
  
@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	if (new_ctrl0 != gmac_ctrl0)
  		mvreg_write(pp, MVNETA_GMAC_CTRL_0, new_ctrl0);
  	if (new_ctrl2 != gmac_ctrl2)
-@@ -4434,7 +4461,7 @@ static int mvneta_port_power_up(struct m
+@@ -4433,7 +4460,7 @@ static int mvneta_port_power_up(struct m
  	if (phy_mode == PHY_INTERFACE_MODE_QSGMII)
  		mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_QSGMII_SERDES_PROTO);
  	else if (phy_mode == PHY_INTERFACE_MODE_SGMII ||
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  		mvreg_write(pp, MVNETA_SERDES_CFG, MVNETA_SGMII_SERDES_PROTO);
  	else if (!phy_interface_mode_is_rgmii(phy_mode))
  		return -EINVAL;
-@@ -4451,6 +4478,7 @@ static int mvneta_probe(struct platform_
+@@ -4450,6 +4477,7 @@ static int mvneta_probe(struct platform_
  	struct mvneta_port *pp;
  	struct net_device *dev;
  	struct phylink *phylink;
@@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	const char *dt_mac_addr;
  	char hw_mac_addr[ETH_ALEN];
  	const char *mac_from;
-@@ -4476,6 +4504,14 @@ static int mvneta_probe(struct platform_
+@@ -4475,6 +4503,14 @@ static int mvneta_probe(struct platform_
  		goto err_free_irq;
  	}
  
@@ -149,7 +149,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  	phylink = phylink_create(dev, pdev->dev.fwnode, phy_mode,
  				 &mvneta_phylink_ops);
  	if (IS_ERR(phylink)) {
-@@ -4492,6 +4528,7 @@ static int mvneta_probe(struct platform_
+@@ -4491,6 +4527,7 @@ static int mvneta_probe(struct platform_
  	pp = netdev_priv(dev);
  	spin_lock_init(&pp->lock);
  	pp->phylink = phylink;
diff --git a/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch b/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch
index bac9a55cf0..dcaeb18fa3 100644
--- a/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch
+++ b/target/linux/mvebu/patches-4.19/536-net-marvell-neta-disable-comphy-when-setting-mode.patch
@@ -28,7 +28,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3166,11 +3166,26 @@ static int mvneta_setup_txqs(struct mvne
+@@ -3165,11 +3165,26 @@ static int mvneta_setup_txqs(struct mvne
  	return 0;
  }
  
@@ -56,7 +56,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
  	mvneta_max_rx_size_set(pp, pp->pkt_size);
  	mvneta_txq_max_tx_size_set(pp, pp->pkt_size);
-@@ -3542,12 +3557,15 @@ static void mvneta_mac_config(struct net
+@@ -3541,12 +3556,15 @@ static void mvneta_mac_config(struct net
  	if (state->speed == SPEED_2500)
  		new_ctrl4 |= MVNETA_GMAC4_SHORT_PREAMBLE_ENABLE;
  
diff --git a/target/linux/mvebu/patches-4.19/537-net-mvneta-add-2500baset-support.patch b/target/linux/mvebu/patches-4.19/537-net-mvneta-add-2500baset-support.patch
index 9186ceb0da..639d5541fe 100644
--- a/target/linux/mvebu/patches-4.19/537-net-mvneta-add-2500baset-support.patch
+++ b/target/linux/mvebu/patches-4.19/537-net-mvneta-add-2500baset-support.patch
@@ -24,7 +24,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -3402,6 +3402,7 @@ static void mvneta_validate(struct net_d
+@@ -3401,6 +3401,7 @@ static void mvneta_validate(struct net_d
  		phylink_set(mask, 1000baseX_Full);
  	}
  	if (pp->comphy || state->interface == PHY_INTERFACE_MODE_2500BASEX) {