kernel: bump 5.4 to 5.4.92

[openwrt/openwrt.git] / target / linux / generic / pending-5.4 / 770-08-net-ethernet-mtk_eth_soc-cache-hardware-pointer-of-l.patch

diff --git a/target/linux/generic/pending-5.4/770-08-net-ethernet-mtk_eth_soc-cache-hardware-pointer-of-l.patch b/target/linux/generic/pending-5.4/770-08-net-ethernet-mtk_eth_soc-cache-hardware-pointer-of-l.patch
index ddbd751ead6e6b167b07f16aa947908318e72889..a7231d826ceab65699def2a8438b5736469ec1b7 100644 (file)
--- a/target/linux/generic/pending-5.4/770-08-net-ethernet-mtk_eth_soc-cache-hardware-pointer-of-l.patch
+++ b/target/linux/generic/pending-5.4/770-08-net-ethernet-mtk_eth_soc-cache-hardware-pointer-of-l.patch
@@ -20,7 +20,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        dma = mtk_r32(eth, MTK_QTX_DRX_PTR);
  
        desc = mtk_qdma_phys_to_virt(ring, cpu);
-@@ -1389,6 +1389,7 @@ static int mtk_poll_tx_qdma(struct mtk_e
+@@ -1392,6 +1392,7 @@ static int mtk_poll_tx_qdma(struct mtk_e
                cpu = next_cpu;
        }
  
@@ -28,7 +28,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        mtk_w32(eth, cpu, MTK_QTX_CRX_PTR);
  
        return budget;
-@@ -1589,6 +1590,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1592,6 +1593,7 @@ static int mtk_tx_alloc(struct mtk_eth *
        atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
        ring->next_free = &ring->dma[0];
        ring->last_free = &ring->dma[MTK_DMA_SIZE - 1];
@@ -36,7 +36,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        ring->thresh = MAX_SKB_FRAGS;
  
        /* make sure that all changes to the dma ring are flushed before we
-@@ -1602,9 +1604,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1605,9 +1607,7 @@ static int mtk_tx_alloc(struct mtk_eth *
                mtk_w32(eth,
                        ring->phys + ((MTK_DMA_SIZE - 1) * sz),
                        MTK_QTX_CRX_PTR);
@@ -49,7 +49,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
        } else {
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -622,6 +622,7 @@ struct mtk_tx_buf {
+@@ -624,6 +624,7 @@ struct mtk_tx_buf {
   * @phys:             The physical addr of tx_buf
   * @next_free:                Pointer to the next free descriptor
   * @last_free:                Pointer to the last free descriptor
@@ -57,7 +57,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
   * @thresh:           The threshold of minimum amount of free descriptors
   * @free_count:               QDMA uses a linked list. Track how many free descriptors
   *                    are present
-@@ -632,6 +633,7 @@ struct mtk_tx_ring {
+@@ -634,6 +635,7 @@ struct mtk_tx_ring {
        dma_addr_t phys;
        struct mtk_tx_dma *next_free;
        struct mtk_tx_dma *last_free;