aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
diff options
context:
space:
mode:
authorKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-17 14:30:40 +0100
committerKoen Vandeputte <koen.vandeputte@ncentric.com>2018-12-18 15:14:39 +0100
commit65044a50ab687274bcec79eb85ac7854f134129f (patch)
tree444e1ff3bba95d5f152038d0b054a7fb01cfe9e0 /target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
parent26b80696041beb28deea2efe18e66a8a2a91e650 (diff)
downloadupstream-65044a50ab687274bcec79eb85ac7854f134129f.tar.gz
upstream-65044a50ab687274bcec79eb85ac7854f134129f.tar.bz2
upstream-65044a50ab687274bcec79eb85ac7854f134129f.zip
kernel: bump 4.4 to 4.4.167
Refreshed all patches. Removed upstreamed: - 203-MIPS-ath79-fix-restart.patch - 330-Revert-MIPS-BCM47XX-Enable-74K-Core-ExternalSync-for.patch - 051-0001-ovl-rename-is_merge-to-is_lowest.patch - 051-0002-ovl-override-creds-with-the-ones-from-the-superblock.patch - 051-0005-ovl-proper-cleanup-of-workdir.patch Altered patches: - 201-extra_optimization.patch - 304-mips_disable_fpu.patch Compile-tested on: ar71xx, cns3xxx, imx6, mpc85xx Runtime-tested on: ar71xx, cns3xxx, imx6, mpc85xx Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch16
1 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch b/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
index efdd08427c..878229cbf7 100644
--- a/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
+++ b/target/linux/mvebu/patches-4.4/042-net-mvneta-Fix-race-condition-during-stopping.patch
@@ -26,7 +26,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Core clock */
struct clk *clk;
-@@ -2858,16 +2859,14 @@ static void mvneta_percpu_disable(void *
+@@ -2857,16 +2858,14 @@ static void mvneta_percpu_disable(void *
disable_percpu_irq(pp->dev->irq);
}
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Use the cpu associated to the rxq when it is online, in all
* the other cases, use the cpu 0 which can't be offline.
*/
-@@ -2911,7 +2910,6 @@ static void mvneta_percpu_elect(struct m
+@@ -2910,7 +2909,6 @@ static void mvneta_percpu_elect(struct m
i++;
}
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
};
static int mvneta_percpu_notifier(struct notifier_block *nfb,
-@@ -2925,6 +2923,14 @@ static int mvneta_percpu_notifier(struct
+@@ -2924,6 +2922,14 @@ static int mvneta_percpu_notifier(struct
switch (action) {
case CPU_ONLINE:
case CPU_ONLINE_FROZEN:
@@ -70,7 +70,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
netif_tx_stop_all_queues(pp->dev);
/* We have to synchronise on tha napi of each CPU
-@@ -2962,6 +2968,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2961,6 +2967,7 @@ static int mvneta_percpu_notifier(struct
MVNETA_CAUSE_LINK_CHANGE |
MVNETA_CAUSE_PSC_SYNC_CHANGE);
netif_tx_start_all_queues(pp->dev);
@@ -78,7 +78,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
break;
case CPU_DOWN_PREPARE:
case CPU_DOWN_PREPARE_FROZEN:
-@@ -2986,7 +2993,9 @@ static int mvneta_percpu_notifier(struct
+@@ -2985,7 +2992,9 @@ static int mvneta_percpu_notifier(struct
case CPU_DEAD:
case CPU_DEAD_FROZEN:
/* Check if a new CPU must be elected now this on is down */
@@ -88,7 +88,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Unmask all ethernet port interrupts */
on_each_cpu(mvneta_percpu_unmask_interrupt, pp, true);
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
-@@ -3038,7 +3047,7 @@ static int mvneta_open(struct net_device
+@@ -3037,7 +3046,7 @@ static int mvneta_open(struct net_device
*/
on_each_cpu(mvneta_percpu_enable, pp, true);
@@ -97,7 +97,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Register a CPU notifier to handle the case where our CPU
* might be taken offline.
*/
-@@ -3071,9 +3080,18 @@ static int mvneta_stop(struct net_device
+@@ -3070,9 +3079,18 @@ static int mvneta_stop(struct net_device
{
struct mvneta_port *pp = netdev_priv(dev);
@@ -116,7 +116,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
on_each_cpu(mvneta_percpu_disable, pp, true);
free_percpu_irq(dev->irq, pp->ports);
mvneta_cleanup_rxqs(pp);
-@@ -3344,7 +3362,9 @@ static int mvneta_config_rss(struct mvn
+@@ -3343,7 +3361,9 @@ static int mvneta_config_rss(struct mvn
mvreg_write(pp, MVNETA_PORT_CONFIG, val);
/* Update the elected CPU matching the new rxq_def */