kernel: bump 5.4 to 5.4.52

[openwrt/staging/wigyori.git] / target / linux / mvebu / patches-5.4 / 015-net-mvneta-make-tx-buffer-array-agnostic.patch

diff --git a/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch b/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch
index d44a3f1a4920cd129379d441986af293332029ec..1146c1f2b8696df90782e08fde22d86c8df12965 100644 (file)
--- a/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch
+++ b/target/linux/mvebu/patches-5.4/015-net-mvneta-make-tx-buffer-array-agnostic.patch
@@ -14,7 +14,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/marvell/mvneta.c
 +++ b/drivers/net/ethernet/marvell/mvneta.c
-@@ -563,6 +563,20 @@ struct mvneta_rx_desc {
+@@ -565,6 +565,20 @@ struct mvneta_rx_desc {
  };
  #endif
  
@@ -35,7 +35,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  struct mvneta_tx_queue {
        /* Number of this TX queue, in the range 0-7 */
        u8 id;
-@@ -578,8 +592,8 @@ struct mvneta_tx_queue {
+@@ -580,8 +594,8 @@ struct mvneta_tx_queue {
        int tx_stop_threshold;
        int tx_wake_threshold;
  
@@ -46,7 +46,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        /* Index of last TX DMA descriptor that was inserted */
        int txq_put_index;
-@@ -1791,14 +1805,9 @@ static void mvneta_txq_bufs_free(struct
+@@ -1793,14 +1807,9 @@ static void mvneta_txq_bufs_free(struct
        int i;
  
        for (i = 0; i < num; i++) {
@@ -62,7 +62,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
                mvneta_txq_inc_get(txq);
  
-@@ -1806,9 +1815,12 @@ static void mvneta_txq_bufs_free(struct
+@@ -1808,9 +1817,12 @@ static void mvneta_txq_bufs_free(struct
                        dma_unmap_single(pp->dev->dev.parent,
                                         tx_desc->buf_phys_addr,
                                         tx_desc->data_size, DMA_TO_DEVICE);
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
  
        netdev_tx_completed_queue(nq, pkts_compl, bytes_compl);
-@@ -2333,16 +2345,19 @@ static inline void
+@@ -2335,16 +2347,19 @@ static inline void
  mvneta_tso_put_hdr(struct sk_buff *skb,
                   struct mvneta_port *pp, struct mvneta_tx_queue *txq)
  {
@@ -99,7 +99,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        mvneta_txq_inc_put(txq);
  }
  
-@@ -2351,6 +2366,7 @@ mvneta_tso_put_data(struct net_device *d
+@@ -2353,6 +2368,7 @@ mvneta_tso_put_data(struct net_device *d
                    struct sk_buff *skb, char *data, int size,
                    bool last_tcp, bool is_last)
  {
@@ -107,7 +107,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct mvneta_tx_desc *tx_desc;
  
        tx_desc = mvneta_txq_next_desc_get(txq);
-@@ -2364,7 +2380,8 @@ mvneta_tso_put_data(struct net_device *d
+@@ -2366,7 +2382,8 @@ mvneta_tso_put_data(struct net_device *d
        }
  
        tx_desc->command = 0;
@@ -117,7 +117,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        if (last_tcp) {
                /* last descriptor in the TCP packet */
-@@ -2372,7 +2389,7 @@ mvneta_tso_put_data(struct net_device *d
+@@ -2374,7 +2391,7 @@ mvneta_tso_put_data(struct net_device *d
  
                /* last descriptor in SKB */
                if (is_last)
@@ -126,7 +126,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        }
        mvneta_txq_inc_put(txq);
        return 0;
-@@ -2457,6 +2474,7 @@ static int mvneta_tx_frag_process(struct
+@@ -2459,6 +2476,7 @@ static int mvneta_tx_frag_process(struct
        int i, nr_frags = skb_shinfo(skb)->nr_frags;
  
        for (i = 0; i < nr_frags; i++) {
@@ -134,7 +134,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                skb_frag_t *frag = &skb_shinfo(skb)->frags[i];
                void *addr = skb_frag_address(frag);
  
-@@ -2476,12 +2494,13 @@ static int mvneta_tx_frag_process(struct
+@@ -2478,12 +2496,13 @@ static int mvneta_tx_frag_process(struct
                if (i == nr_frags - 1) {
                        /* Last descriptor */
                        tx_desc->command = MVNETA_TXD_L_DESC | MVNETA_TXD_Z_PAD;
@@ -150,7 +150,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mvneta_txq_inc_put(txq);
        }
  
-@@ -2509,6 +2528,7 @@ static netdev_tx_t mvneta_tx(struct sk_b
+@@ -2511,6 +2530,7 @@ static netdev_tx_t mvneta_tx(struct sk_b
        struct mvneta_port *pp = netdev_priv(dev);
        u16 txq_id = skb_get_queue_mapping(skb);
        struct mvneta_tx_queue *txq = &pp->txqs[txq_id];
@@ -158,7 +158,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct mvneta_tx_desc *tx_desc;
        int len = skb->len;
        int frags = 0;
-@@ -2541,16 +2561,17 @@ static netdev_tx_t mvneta_tx(struct sk_b
+@@ -2543,16 +2563,17 @@ static netdev_tx_t mvneta_tx(struct sk_b
                goto out;
        }
  
@@ -178,7 +178,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                mvneta_txq_inc_put(txq);
                tx_desc->command = tx_cmd;
                /* Continue with other skb fragments */
-@@ -3136,9 +3157,8 @@ static int mvneta_txq_sw_init(struct mvn
+@@ -3138,9 +3159,8 @@ static int mvneta_txq_sw_init(struct mvn
  
        txq->last_desc = txq->size - 1;
  
@@ -190,7 +190,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                dma_free_coherent(pp->dev->dev.parent,
                                  txq->size * MVNETA_DESC_ALIGNED_SIZE,
                                  txq->descs, txq->descs_phys);
-@@ -3150,7 +3170,7 @@ static int mvneta_txq_sw_init(struct mvn
+@@ -3152,7 +3172,7 @@ static int mvneta_txq_sw_init(struct mvn
                                           txq->size * TSO_HEADER_SIZE,
                                           &txq->tso_hdrs_phys, GFP_KERNEL);
        if (!txq->tso_hdrs) {
@@ -199,7 +199,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                dma_free_coherent(pp->dev->dev.parent,
                                  txq->size * MVNETA_DESC_ALIGNED_SIZE,
                                  txq->descs, txq->descs_phys);
-@@ -3203,7 +3223,7 @@ static void mvneta_txq_sw_deinit(struct
+@@ -3205,7 +3225,7 @@ static void mvneta_txq_sw_deinit(struct
  {
        struct netdev_queue *nq = netdev_get_tx_queue(pp->dev, txq->id);