--- v7
+++ v10
@@ -13,7 +13,7 @@
2 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
-index 73f087c..ca84995 100644
+index 9239d80..d2cc513c 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2.h
@@ -295,6 +295,8 @@
@@ -25,8 +25,8 @@
/* Buffer Manager registers */
#define MVPP2_BM_POOL_BASE_REG(pool) (0x6000 + ((pool) * 4))
-@@ -764,6 +766,7 @@
- #define MSS_SRAM_SIZE 0x800
+@@ -763,6 +765,7 @@
+ /* MSS Flow control */
#define FC_QUANTA 0xFFFF
#define FC_CLK_DIVIDER 100
+#define MSS_THRESHOLD_STOP 768
@@ -34,10 +34,10 @@
/* RX buffer constants */
#define MVPP2_SKB_SHINFO_SIZE \
diff --git a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-index 6e59d07..19a3f38 100644
+index 761f745..8b4073c 100644
--- a/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
+++ b/drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c
-@@ -1134,14 +1134,19 @@ static inline void mvpp2_qvec_interrupt_disable(struct mvpp2_queue_vector *qvec)
+@@ -1133,14 +1133,19 @@ static inline void mvpp2_qvec_interrupt_disable(struct mvpp2_queue_vector *qvec)
static void mvpp2_interrupts_mask(void *arg)
{
struct mvpp2_port *port = arg;
@@ -46,7 +46,7 @@
/* If the thread isn't used, don't do anything */
- if (smp_processor_id() > port->priv->nthreads)
-+ if (cpu >= port->priv->nthreads)
++ if (cpu > port->priv->nthreads)
return;
- mvpp2_thread_write(port->priv,
@@ -60,7 +60,7 @@
}
/* Unmask the current thread's Rx/Tx interrupts.
-@@ -1151,20 +1156,25 @@ static void mvpp2_interrupts_mask(void *arg)
+@@ -1150,20 +1155,25 @@ static void mvpp2_interrupts_mask(void *arg)
static void mvpp2_interrupts_unmask(void *arg)
{
struct mvpp2_port *port = arg;
@@ -70,7 +70,7 @@
/* If the thread isn't used, don't do anything */
- if (smp_processor_id() > port->priv->nthreads)
-+ if (cpu >= port->priv->nthreads)
++ if (cpu > port->priv->nthreads)
return;
+ thread = mvpp2_cpu_to_thread(port->priv, cpu);
@@ -90,7 +90,7 @@
}
static void
-@@ -1189,6 +1199,9 @@ static void mvpp2_interrupts_unmask(void *arg)
+@@ -1188,6 +1198,9 @@ static void mvpp2_interrupts_unmask(void *arg)
mvpp2_thread_write(port->priv, v->sw_thread_id,
MVPP2_ISR_RX_TX_MASK_REG(port->id), val);
@@ -100,7 +100,7 @@
}
}
-@@ -2394,6 +2407,20 @@ static void mvpp2_txp_max_tx_size_set(struct mvpp2_port *port)
+@@ -2393,6 +2406,20 @@ static void mvpp2_txp_max_tx_size_set(struct mvpp2_port *port)
}
}
@@ -121,7 +121,7 @@
/* Set the number of packets that will be received before Rx interrupt
* will be generated by HW.
*/
-@@ -2649,6 +2676,9 @@ static int mvpp2_rxq_init(struct mvpp2_port *port,
+@@ -2648,6 +2675,9 @@ static int mvpp2_rxq_init(struct mvpp2_port *port,
mvpp2_rx_pkts_coal_set(port, rxq);
mvpp2_rx_time_coal_set(port, rxq);