Commit 3abc0e55 authored by Rex Lu's avatar Rex Lu Committed by David S. Miller
Browse files

net: mtk: wed: add dma mask limitation and GFP_DMA32 for device with more than 4GB DRAM 



Limit tx/rx buffer address to 32-bit address space for board with more
than 4GB DRAM.

Fixes: 804775df ("net: ethernet: mtk_eth_soc: add support for Wireless Ethernet Dispatch (WED)")
Fixes: 6757d345 ("net: ethernet: mtk_wed: introduce hw_rro support for MT7988")
Tested-by: default avatarDaniel Pawlik <pawlik.dan@gmail.com>
Tested-by: default avatarMatteo Croce <teknoraver@meta.com>
Signed-off-by: default avatarRex Lu <rex.lu@mediatek.com>
Co-developed-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: default avatarSimon Horman <horms@kernel.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent d5d790ba

drivers/net/ethernet/mediatek/mtk_wed.c

+6 −2
Original line number Diff line number Diff line
@@ -677,7 +677,7 @@ mtk_wed_tx_buffer_alloc(struct mtk_wed_device *dev) 
		void *buf;

		int s;



		page = __dev_alloc_page(GFP_KERNEL);

		page = __dev_alloc_page(GFP_KERNEL | GFP_DMA32);

		if (!page)

			return -ENOMEM;
@@ -800,7 +800,7 @@ mtk_wed_hwrro_buffer_alloc(struct mtk_wed_device *dev) 
		struct page *page;

		int s;



		page = __dev_alloc_page(GFP_KERNEL);

		page = __dev_alloc_page(GFP_KERNEL | GFP_DMA32);

		if (!page)

			return -ENOMEM;
@@ -2426,6 +2426,10 @@ mtk_wed_attach(struct mtk_wed_device *dev) 
	dev->version = hw->version;

	dev->hw->pcie_base = mtk_wed_get_pcie_base(dev);



	ret = dma_set_mask_and_coherent(hw->dev, DMA_BIT_MASK(32));

	if (ret)

		goto out;



	if (hw->eth->dma_dev == hw->eth->dev &&

	    of_dma_is_coherent(hw->eth->dev->of_node))

		mtk_eth_set_dma_device(hw->eth, hw->dev);