kernel: 5.15: update Aquantia PHY driver to v6.1 code

[openwrt/openwrt.git] / target / linux / generic / backport-5.15 / 702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch

diff --git a/target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch b/target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch
index 75944f56bf0d38fc0441738d33255667c87b5e43..1ecb5e71b3a700c911f5486c5545dad5c5023d7d 100644 (file)
--- a/target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch
+++ b/target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch
@@ -10,7 +10,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
 
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c
-@@ -935,18 +935,15 @@ static int mtk_init_fq_dma(struct mtk_et
+@@ -947,18 +947,15 @@ static int mtk_init_fq_dma(struct mtk_et
        return 0;
  }
  
@@ -33,7 +33,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
        return &ring->buf[idx];
  }
-@@ -954,13 +951,12 @@ static struct mtk_tx_buf *mtk_desc_to_tx
+@@ -966,13 +963,12 @@ static struct mtk_tx_buf *mtk_desc_to_tx
  static struct mtk_tx_dma *qdma_to_pdma(struct mtk_tx_ring *ring,
                                       struct mtk_tx_dma *dma)
  {
@@ -50,7 +50,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  }
  
  static void mtk_tx_unmap(struct mtk_eth *eth, struct mtk_tx_buf *tx_buf,
-@@ -1377,7 +1373,7 @@ static struct mtk_rx_ring *mtk_get_rx_ri
+@@ -1389,7 +1385,7 @@ static struct mtk_rx_ring *mtk_get_rx_ri
  
                ring = &eth->rx_ring[i];
                idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);
@@ -59,7 +59,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                if (rxd->rxd2 & RX_DMA_DONE) {
                        ring->calc_idx_update = true;
                        return ring;
-@@ -1429,7 +1425,7 @@ static int mtk_poll_rx(struct napi_struc
+@@ -1441,7 +1437,7 @@ static int mtk_poll_rx(struct napi_struc
                        goto rx_done;
  
                idx = NEXT_DESP_IDX(ring->calc_idx, ring->dma_size);
@@ -68,7 +68,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                data = ring->data[idx];
  
                if (!mtk_rx_get_desc(eth, &trxd, rxd))
-@@ -1633,7 +1629,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
+@@ -1648,7 +1644,7 @@ static int mtk_poll_tx_pdma(struct mtk_e
  
                mtk_tx_unmap(eth, tx_buf, true);
  
@@ -77,7 +77,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                ring->last_free = desc;
                atomic_inc(&ring->free_count);
  
-@@ -1778,7 +1774,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1793,7 +1789,7 @@ static int mtk_tx_alloc(struct mtk_eth *
                int next = (i + 1) % MTK_DMA_SIZE;
                u32 next_ptr = ring->phys + next * sz;
  
@@ -86,7 +86,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                txd->txd2 = next_ptr;
                txd->txd3 = TX_DMA_LS0 | TX_DMA_OWNER_CPU;
                txd->txd4 = 0;
-@@ -1808,7 +1804,7 @@ static int mtk_tx_alloc(struct mtk_eth *
+@@ -1823,7 +1819,7 @@ static int mtk_tx_alloc(struct mtk_eth *
  
        ring->dma_size = MTK_DMA_SIZE;
        atomic_set(&ring->free_count, MTK_DMA_SIZE - 2);
@@ -95,7 +95,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        ring->last_free = (void *)txd;
        ring->last_free_ptr = (u32)(ring->phys + ((MTK_DMA_SIZE - 1) * sz));
        ring->thresh = MAX_SKB_FRAGS;
-@@ -1920,7 +1916,7 @@ static int mtk_rx_alloc(struct mtk_eth *
+@@ -1938,7 +1934,7 @@ static int mtk_rx_alloc(struct mtk_eth *
                if (unlikely(dma_mapping_error(eth->dma_dev, dma_addr)))
                        return -ENOMEM;
  
@@ -104,7 +104,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
                rxd->rxd1 = (unsigned int)dma_addr;
  
                if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
-@@ -1982,7 +1978,7 @@ static void mtk_rx_clean(struct mtk_eth
+@@ -2000,7 +1996,7 @@ static void mtk_rx_clean(struct mtk_eth
                        if (!ring->data[i])
                                continue;
  
@@ -115,7 +115,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
  
 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
 +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
-@@ -688,7 +688,7 @@ struct mtk_tx_buf {
+@@ -689,7 +689,7 @@ struct mtk_tx_buf {
   *                    are present
   */
  struct mtk_tx_ring {
@@ -124,7 +124,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
        struct mtk_tx_buf *buf;
        dma_addr_t phys;
        struct mtk_tx_dma *next_free;
-@@ -718,7 +718,7 @@ enum mtk_rx_flags {
+@@ -719,7 +719,7 @@ enum mtk_rx_flags {
   * @calc_idx:         The current head of ring
   */
  struct mtk_rx_ring {