8f8d5decc9
Removed because they are upstream: generic/backport-5.15/704-15-v5.19-net-mtk_eth_soc-move-MAC_MCR-setting-to-mac_finish.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=c5c0760adc260d55265c086b9efb350ea6dda38b generic/pending-5.15/735-net-mediatek-mtk_eth_soc-release-MAC_MCR_FORCE_LINK-.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=448cc8b5f743985f6d1d98aa4efb386fef4c3bf2 generic/pending-5.15/736-net-ethernet-mtk_eth_soc-fix-PPE-hanging-issue.patch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=linux-5.15.y&id=9fcadd125044007351905d40c405fadc2d3bb6d6 Add new configuration symbols for tegra target. Tested-by: Stijn Segers <foss@volatilesystems.org> Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> (cherry picked from commit fb2c6e9d4da8753b91f79f4ab2d00c0fd8efa038)
34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
Date: Fri, 20 May 2022 20:11:38 +0200
|
|
Subject: [PATCH] net: ethernet: mtk_eth_soc: convert scratch_ring pointer to
|
|
void
|
|
|
|
Simplify the code converting scratch_ring pointer to void
|
|
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
|
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
|
|
@@ -933,7 +933,7 @@ static int mtk_init_fq_dma(struct mtk_et
|
|
for (i = 0; i < cnt; i++) {
|
|
struct mtk_tx_dma_v2 *txd;
|
|
|
|
- txd = (void *)eth->scratch_ring + i * soc->txrx.txd_size;
|
|
+ txd = eth->scratch_ring + i * soc->txrx.txd_size;
|
|
txd->txd1 = dma_addr + i * MTK_QDMA_PAGE_SIZE;
|
|
if (i < cnt - 1)
|
|
txd->txd2 = eth->phy_scratch_ring +
|
|
--- a/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
+++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.h
|
|
@@ -1029,7 +1029,7 @@ struct mtk_eth {
|
|
struct mtk_rx_ring rx_ring_qdma;
|
|
struct napi_struct tx_napi;
|
|
struct napi_struct rx_napi;
|
|
- struct mtk_tx_dma *scratch_ring;
|
|
+ void *scratch_ring;
|
|
dma_addr_t phy_scratch_ring;
|
|
void *scratch_head;
|
|
struct clk *clks[MTK_CLK_MAX];
|