Skip to content

Commit 31c5486

Browse files
LorenzoBianconikuba-moo
authored andcommitted
net: ethernet: mtk_wed: add support for devices with more than 4GB of dram
Introduce WED offloading support for boards with more than 4GB of memory. Co-developed-by: Sujuan Chen <sujuan.chen@mediatek.com> Signed-off-by: Sujuan Chen <sujuan.chen@mediatek.com> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Link: https://lore.kernel.org/r/1c7efdf5d384ea7af3c0209723e40b2ee0f956bf.1700239272.git.lorenzo@kernel.org Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 4da325c commit 31c5486

File tree

3 files changed

+11
-5
lines changed

3 files changed

+11
-5
lines changed

drivers/net/ethernet/mediatek/mtk_eth_soc.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1159,15 +1159,18 @@ static int mtk_init_fq_dma(struct mtk_eth *eth)
11591159
phy_ring_tail = eth->phy_scratch_ring + soc->txrx.txd_size * (cnt - 1);
11601160

11611161
for (i = 0; i < cnt; i++) {
1162+
dma_addr_t addr = dma_addr + i * MTK_QDMA_PAGE_SIZE;
11621163
struct mtk_tx_dma_v2 *txd;
11631164

11641165
txd = eth->scratch_ring + i * soc->txrx.txd_size;
1165-
txd->txd1 = dma_addr + i * MTK_QDMA_PAGE_SIZE;
1166+
txd->txd1 = addr;
11661167
if (i < cnt - 1)
11671168
txd->txd2 = eth->phy_scratch_ring +
11681169
(i + 1) * soc->txrx.txd_size;
11691170

11701171
txd->txd3 = TX_DMA_PLEN0(MTK_QDMA_PAGE_SIZE);
1172+
if (MTK_HAS_CAPS(soc->caps, MTK_36BIT_DMA))
1173+
txd->txd3 |= TX_DMA_PREP_ADDR64(addr);
11711174
txd->txd4 = 0;
11721175
if (mtk_is_netsys_v2_or_greater(eth)) {
11731176
txd->txd5 = 0;

drivers/net/ethernet/mediatek/mtk_wed.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -691,10 +691,11 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
691691

692692
for (s = 0; s < MTK_WED_BUF_PER_PAGE; s++) {
693693
struct mtk_wdma_desc *desc = desc_ptr;
694+
u32 ctrl;
694695

695696
desc->buf0 = cpu_to_le32(buf_phys);
696697
if (!mtk_wed_is_v3_or_greater(dev->hw)) {
697-
u32 txd_size, ctrl;
698+
u32 txd_size;
698699

699700
txd_size = dev->wlan.init_buf(buf, buf_phys,
700701
token++);
@@ -708,11 +709,11 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev)
708709
ctrl |= MTK_WDMA_DESC_CTRL_LAST_SEG0 |
709710
FIELD_PREP(MTK_WDMA_DESC_CTRL_LEN1_V2,
710711
MTK_WED_BUF_SIZE - txd_size);
711-
desc->ctrl = cpu_to_le32(ctrl);
712712
desc->info = 0;
713713
} else {
714-
desc->ctrl = cpu_to_le32(token << 16);
714+
ctrl = token << 16 | TX_DMA_PREP_ADDR64(buf_phys);
715715
}
716+
desc->ctrl = cpu_to_le32(ctrl);
716717

717718
desc_ptr += desc_size;
718719
buf += MTK_WED_BUF_SIZE;
@@ -811,6 +812,7 @@ mtk_wed_hwrro_buffer_alloc(struct mtk_wed_device *dev)
811812
buf_phys = page_phys;
812813
for (s = 0; s < MTK_WED_RX_BUF_PER_PAGE; s++) {
813814
desc->buf0 = cpu_to_le32(buf_phys);
815+
desc->token = cpu_to_le32(RX_DMA_PREP_ADDR64(buf_phys));
814816
buf_phys += MTK_WED_PAGE_BUF_SIZE;
815817
desc++;
816818
}

drivers/net/ethernet/mediatek/mtk_wed_wo.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,8 @@ mtk_wed_wo_queue_refill(struct mtk_wed_wo *wo, struct mtk_wed_wo_queue *q,
142142
dma_addr_t addr;
143143
void *buf;
144144

145-
buf = page_frag_alloc(&q->cache, q->buf_size, GFP_ATOMIC);
145+
buf = page_frag_alloc(&q->cache, q->buf_size,
146+
GFP_ATOMIC | GFP_DMA32);
146147
if (!buf)
147148
break;
148149

0 commit comments

Comments
 (0)