diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-06-22 14:12:26 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-06-27 00:57:16 +0200 |
commit | f1cd14448221d6114c6c150a8e78fa360bbb47dd (patch) | |
tree | 274fb20de58fe215640645243aabe1b54f9bd9da /target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch | |
parent | f2795132bae896374e21f45b3ea75396c9de8b34 (diff) | |
download | upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.tar.gz upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.tar.bz2 upstream-f1cd14448221d6114c6c150a8e78fa360bbb47dd.zip |
kernel: bump 5.15 to 5.15.49
Deleted (upstreamed):
generic/backport-5.15/702-v5.19-34-net-ethernet-mtk_eth_soc-fix-misuse-of-mem-alloc-int.patch [1]
[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.49&id=fcba12a4308143f1f1dcb0face8b3ffb51edcc5c
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch')
-rw-r--r-- | target/linux/generic/backport-5.15/702-v5.19-28-net-ethernet-mtk_eth_soc-convert-ring-dma-pointer-to.patch | 18 |
1 files changed, 9 insertions, 9 deletions
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 75944f56bf..a956639239 100644 --- 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 +@@ -946,18 +946,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 +@@ -965,13 +962,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 +@@ -1388,7 +1384,7 @@ static struct mtk_rx_ring *mtk_get_rx_ri ring = ð->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 +@@ -1440,7 +1436,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 +@@ -1647,7 +1643,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 * +@@ -1792,7 +1788,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 * +@@ -1822,7 +1818,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 * +@@ -1937,7 +1933,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 +@@ -1999,7 +1995,7 @@ static void mtk_rx_clean(struct mtk_eth if (!ring->data[i]) continue; |