diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-23 15:00:22 +0200 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2017-07-28 23:49:35 +0200 |
commit | 69acb2533ab3adc4136b151dc9a286dccf523142 (patch) | |
tree | 5ac3048429fe7206b47f279a70c94df93e380a60 /target/linux/mvebu | |
parent | a5822dbd0f12054d04d1415a98ae995f5438ccd8 (diff) | |
download | upstream-69acb2533ab3adc4136b151dc9a286dccf523142.tar.gz upstream-69acb2533ab3adc4136b151dc9a286dccf523142.tar.bz2 upstream-69acb2533ab3adc4136b151dc9a286dccf523142.zip |
kernel: update kernel 4.4 to version 4.4.79
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu')
7 files changed, 8 insertions, 63 deletions
diff --git a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch index 1d98c7decc..c398a47341 100644 --- a/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch +++ b/target/linux/mvebu/patches-4.4/030-mvneta-consolidate-autoneg-enabling.patch @@ -43,7 +43,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> } mvneta_set_ucast_table(pp, -1); -@@ -3230,9 +3243,6 @@ static int mvneta_port_power_up(struct m +@@ -3228,9 +3241,6 @@ static int mvneta_port_power_up(struct m return -EINVAL; } diff --git a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch index 626b511c45..dc4a224b74 100644 --- a/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch +++ b/target/linux/mvebu/patches-4.4/031-mvneta-implement-ethtool-autonegotiation-control.patch @@ -118,7 +118,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> mvneta_set_ucast_table(pp, -1); mvneta_set_special_mcast_table(pp, -1); mvneta_set_other_mcast_table(pp, -1); -@@ -2956,10 +2962,43 @@ int mvneta_ethtool_get_settings(struct n +@@ -2954,10 +2960,43 @@ int mvneta_ethtool_get_settings(struct n int mvneta_ethtool_set_settings(struct net_device *dev, struct ethtool_cmd *cmd) { struct mvneta_port *pp = netdev_priv(dev); diff --git a/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch b/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch index 54c93998f6..83782a0b4f 100644 --- a/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch +++ b/target/linux/mvebu/patches-4.4/032-net-mvneta-Make-the-default-queue-related-for-each-p.patch @@ -120,7 +120,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> for_each_online_cpu(cpu) { if (i == online_cpu_idx) -@@ -3363,6 +3364,8 @@ static int mvneta_probe(struct platform_ +@@ -3361,6 +3362,8 @@ static int mvneta_probe(struct platform_ strcmp(managed, "in-band-status") == 0); pp->cpu_notifier.notifier_call = mvneta_percpu_notifier; diff --git a/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch b/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch index 629c44c8a1..9d729b50bb 100644 --- a/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch +++ b/target/linux/mvebu/patches-4.4/034-net-mvneta-Add-naive-RSS-support.patch @@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static void mvneta_start_dev(struct mvneta_port *pp) { unsigned int cpu; -@@ -3231,6 +3250,106 @@ static int mvneta_ethtool_get_sset_count +@@ -3229,6 +3248,106 @@ static int mvneta_ethtool_get_sset_count return -EOPNOTSUPP; } @@ -169,7 +169,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> static const struct net_device_ops mvneta_netdev_ops = { .ndo_open = mvneta_open, .ndo_stop = mvneta_stop, -@@ -3255,6 +3374,10 @@ const struct ethtool_ops mvneta_eth_tool +@@ -3253,6 +3372,10 @@ const struct ethtool_ops mvneta_eth_tool .get_strings = mvneta_ethtool_get_strings, .get_ethtool_stats = mvneta_ethtool_get_stats, .get_sset_count = mvneta_ethtool_get_sset_count, @@ -180,7 +180,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> }; /* Initialize hw */ -@@ -3446,6 +3569,8 @@ static int mvneta_probe(struct platform_ +@@ -3444,6 +3567,8 @@ static int mvneta_probe(struct platform_ pp->rxq_def = rxq_def; diff --git a/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch b/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch index 2bd7a88032..d88336701d 100644 --- a/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch +++ b/target/linux/mvebu/patches-4.4/036-net-mvneta-fix-trivial-cut-off-issue-in-mvneta_ethto.patch @@ -13,7 +13,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net> --- a/drivers/net/ethernet/marvell/mvneta.c +++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -3242,26 +3242,25 @@ static void mvneta_ethtool_update_stats( +@@ -3240,26 +3240,25 @@ static void mvneta_ethtool_update_stats( const struct mvneta_statistic *s; void __iomem *base = pp->base; u32 high, low, val; diff --git a/target/linux/mvebu/patches-4.4/037-net-mvneta-Fix-for_each_present_cpu-usage.patch b/target/linux/mvebu/patches-4.4/037-net-mvneta-Fix-for_each_present_cpu-usage.patch deleted file mode 100644 index 9ded5b71fe..0000000000 --- a/target/linux/mvebu/patches-4.4/037-net-mvneta-Fix-for_each_present_cpu-usage.patch +++ /dev/null @@ -1,55 +0,0 @@ -From: Gregory CLEMENT <gregory.clement@free-electrons.com> -Date: Thu, 4 Feb 2016 22:09:23 +0100 -Subject: [PATCH] net: mvneta: Fix for_each_present_cpu usage - -This patch convert the for_each_present in on_each_cpu, instead of -applying on the present cpus it will be applied only on the online cpus. -This fix a bug reported on -http://thread.gmane.org/gmane.linux.ports.arm.kernel/468173. - -Using the macro on_each_cpu (instead of a for_each_* loop) also ensures -that all the calls will be done all at once. - -Fixes: f86428854480 ("net: mvneta: Statically assign queues to CPUs") -Reported-by: Stefan Roese <stefan.roese@gmail.com> -Suggested-by: Jisheng Zhang <jszhang@marvell.com> -Suggested-by: Russell King <rmk+kernel@arm.linux.org.uk> -Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> -Signed-off-by: David S. Miller <davem@davemloft.net> ---- - ---- a/drivers/net/ethernet/marvell/mvneta.c -+++ b/drivers/net/ethernet/marvell/mvneta.c -@@ -2562,7 +2562,7 @@ static void mvneta_start_dev(struct mvne - mvneta_port_enable(pp); - - /* Enable polling on the port */ -- for_each_present_cpu(cpu) { -+ for_each_online_cpu(cpu) { - struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu); - - napi_enable(&port->napi); -@@ -2587,7 +2587,7 @@ static void mvneta_stop_dev(struct mvnet - - phy_stop(pp->phy_dev); - -- for_each_present_cpu(cpu) { -+ for_each_online_cpu(cpu) { - struct mvneta_pcpu_port *port = per_cpu_ptr(pp->ports, cpu); - - napi_disable(&port->napi); -@@ -3055,13 +3055,11 @@ err_cleanup_rxqs: - static int mvneta_stop(struct net_device *dev) - { - struct mvneta_port *pp = netdev_priv(dev); -- int cpu; - - mvneta_stop_dev(pp); - mvneta_mdio_remove(pp); - unregister_cpu_notifier(&pp->cpu_notifier); -- for_each_present_cpu(cpu) -- smp_call_function_single(cpu, mvneta_percpu_disable, pp, true); -+ on_each_cpu(mvneta_percpu_disable, pp, true); - free_percpu_irq(dev->irq, pp->ports); - mvneta_cleanup_rxqs(pp); - mvneta_cleanup_txqs(pp); diff --git a/target/linux/mvebu/patches-4.4/126-phy-marvell-88E1512-add-flow-control-support.patch b/target/linux/mvebu/patches-4.4/126-phy-marvell-88E1512-add-flow-control-support.patch index e731c4ddf5..cfb0202196 100644 --- a/target/linux/mvebu/patches-4.4/126-phy-marvell-88E1512-add-flow-control-support.patch +++ b/target/linux/mvebu/patches-4.4/126-phy-marvell-88E1512-add-flow-control-support.patch @@ -15,7 +15,7 @@ Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c -@@ -1142,7 +1142,7 @@ static struct phy_driver marvell_drivers +@@ -1148,7 +1148,7 @@ static struct phy_driver marvell_drivers .phy_id = MARVELL_PHY_ID_88E1510, .phy_id_mask = MARVELL_PHY_ID_MASK, .name = "Marvell 88E1510", |