aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-05-30 21:39:51 +0200
committerHauke Mehrtens <hauke@hauke-m.de>2018-06-02 15:13:12 +0200
commit2328977fed81cf2fc367d8eea2f9bf04e51a761f (patch)
treeb6e2e89fcc861cf7fdba5e2979d7458ce912a348 /target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
parent6e47c22268d5c89971950052aceda03810c88c75 (diff)
downloadupstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.gz
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.tar.bz2
upstream-2328977fed81cf2fc367d8eea2f9bf04e51a761f.zip
kernel: bump kernel 4.4 to 4.4.135 for 17.01
* Refreshed patches Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch')
-rw-r--r--target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch26
1 files changed, 13 insertions, 13 deletions
diff --git a/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch b/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
index a08d5fdcba..a3966948b6 100644
--- a/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
+++ b/target/linux/mvebu/patches-4.4/033-net-mvneta-Associate-RX-queues-with-each-CPU.patch
@@ -32,9 +32,9 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
#define MVNETA_INTR_NEW_CAUSE 0x25a0
#define MVNETA_INTR_NEW_MASK 0x25a4
-@@ -820,7 +827,13 @@ static void mvneta_port_up(struct mvneta
- mvreg_write(pp, MVNETA_TXQ_CMD, q_map);
+@@ -821,7 +828,13 @@ static void mvneta_port_up(struct mvneta
+ q_map = 0;
/* Enable all initialized RXQs. */
- mvreg_write(pp, MVNETA_RXQ_CMD, BIT(pp->rxq_def));
+ for (queue = 0; queue < rxq_number; queue++) {
@@ -47,7 +47,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
/* Stop the Ethernet port activity */
-@@ -1030,6 +1043,7 @@ static void mvneta_defaults_set(struct m
+@@ -1031,6 +1044,7 @@ static void mvneta_defaults_set(struct m
int cpu;
int queue;
u32 val;
@@ -55,7 +55,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Clear all Cause registers */
mvreg_write(pp, MVNETA_INTR_NEW_CAUSE, 0);
-@@ -1045,13 +1059,23 @@ static void mvneta_defaults_set(struct m
+@@ -1046,13 +1060,23 @@ static void mvneta_defaults_set(struct m
/* Enable MBUS Retry bit16 */
mvreg_write(pp, MVNETA_MBUS_RETRY, 0x20);
@@ -85,7 +85,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
/* Reset RX and TX DMAs */
mvreg_write(pp, MVNETA_PORT_RX_RESET, MVNETA_PORT_RX_DMA_RESET);
-@@ -2178,6 +2202,7 @@ static int mvneta_poll(struct napi_struc
+@@ -2179,6 +2203,7 @@ static int mvneta_poll(struct napi_struc
{
int rx_done = 0;
u32 cause_rx_tx;
@@ -93,7 +93,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
struct mvneta_port *pp = netdev_priv(napi->dev);
struct mvneta_pcpu_port *port = this_cpu_ptr(pp->ports);
-@@ -2209,8 +2234,15 @@ static int mvneta_poll(struct napi_struc
+@@ -2210,8 +2235,15 @@ static int mvneta_poll(struct napi_struc
/* For the case where the last mvneta_poll did not process all
* RX packets
*/
@@ -110,7 +110,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
budget -= rx_done;
if (budget > 0) {
-@@ -2423,19 +2455,27 @@ static void mvneta_cleanup_txqs(struct m
+@@ -2424,19 +2456,27 @@ static void mvneta_cleanup_txqs(struct m
/* Cleanup all Rx queues */
static void mvneta_cleanup_rxqs(struct mvneta_port *pp)
{
@@ -145,7 +145,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
return 0;
-@@ -2459,6 +2499,19 @@ static int mvneta_setup_txqs(struct mvne
+@@ -2460,6 +2500,19 @@ static int mvneta_setup_txqs(struct mvne
return 0;
}
@@ -165,7 +165,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
static void mvneta_start_dev(struct mvneta_port *pp)
{
unsigned int cpu;
-@@ -2476,11 +2529,10 @@ static void mvneta_start_dev(struct mvne
+@@ -2477,11 +2530,10 @@ static void mvneta_start_dev(struct mvne
napi_enable(&port->napi);
}
@@ -181,7 +181,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_MISC_MASK,
MVNETA_CAUSE_PHY_STATUS_CHANGE |
MVNETA_CAUSE_LINK_CHANGE |
-@@ -2756,22 +2808,35 @@ static void mvneta_percpu_disable(void *
+@@ -2757,22 +2809,35 @@ static void mvneta_percpu_disable(void *
static void mvneta_percpu_elect(struct mvneta_port *pp)
{
@@ -227,7 +227,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
}
};
-@@ -2806,12 +2871,22 @@ static int mvneta_percpu_notifier(struct
+@@ -2807,12 +2872,22 @@ static int mvneta_percpu_notifier(struct
mvreg_write(pp, MVNETA_INTR_MISC_MASK, 0);
napi_enable(&port->napi);
@@ -251,7 +251,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
mvreg_write(pp, MVNETA_INTR_NEW_MASK,
MVNETA_RX_INTR_MASK(rxq_number) |
MVNETA_TX_INTR_MASK(txq_number) |
-@@ -2862,7 +2937,7 @@ static int mvneta_percpu_notifier(struct
+@@ -2863,7 +2938,7 @@ static int mvneta_percpu_notifier(struct
static int mvneta_open(struct net_device *dev)
{
struct mvneta_port *pp = netdev_priv(dev);
@@ -260,7 +260,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
pp->pkt_size = MVNETA_RX_PKT_SIZE(pp->dev->mtu);
pp->frag_size = SKB_DATA_ALIGN(MVNETA_RX_BUF_SIZE(pp->pkt_size)) +
-@@ -2892,8 +2967,13 @@ static int mvneta_open(struct net_device
+@@ -2893,8 +2968,13 @@ static int mvneta_open(struct net_device
*/
mvneta_percpu_disable(pp);