Commit a66d79ee authored by Sujuan Chen's avatar Sujuan Chen Committed by David S. Miller
Browse files

net: ethernet: mtk_wed: add wcid overwritten support for wed v1 



All wed versions should enable the wcid overwritten feature,
since the wcid size is controlled by the wlan driver.

Tested-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Co-developed-by: default avatarBo Jiao <bo.jiao@mediatek.com>
Signed-off-by: default avatarBo Jiao <bo.jiao@mediatek.com>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent a6e3d86e

drivers/net/ethernet/mediatek/mtk_wed.c

+8 −5
Original line number Diff line number Diff line
@@ -526,10 +526,10 @@ mtk_wed_dma_disable(struct mtk_wed_device *dev) 
			MTK_WED_WPDMA_RX_D_RX_DRV_EN);

		wed_clr(dev, MTK_WED_WDMA_GLO_CFG,

			MTK_WED_WDMA_GLO_CFG_TX_DDONE_CHK);

	}



	mtk_wed_set_512_support(dev, false);

}

}



static void

mtk_wed_stop(struct mtk_wed_device *dev)
@@ -1290,9 +1290,10 @@ mtk_wed_start(struct mtk_wed_device *dev, u32 irq_mask) 
		if (mtk_wed_rro_cfg(dev))

			return;



		mtk_wed_set_512_support(dev, dev->wlan.wcid_512);

	}



	mtk_wed_set_512_support(dev, dev->wlan.wcid_512);



	mtk_wed_dma_enable(dev);

	dev->running = true;

}
@@ -1358,11 +1359,13 @@ mtk_wed_attach(struct mtk_wed_device *dev) 
	}



	mtk_wed_hw_init_early(dev);

	if (hw->version == 1)

	if (hw->version == 1) {

		regmap_update_bits(hw->hifsys, HIFSYS_DMA_AG_MAP,

				   BIT(hw->index), 0);

	else

	} else {

		dev->rev_id = wed_r32(dev, MTK_WED_REV_ID);

		ret = mtk_wed_wo_init(hw);

	}

out:

	if (ret)

		mtk_wed_detach(dev);

drivers/net/ethernet/mediatek/mtk_wed_regs.h

+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ struct mtk_wdma_desc { 
	__le32 info;

} __packed __aligned(4);



#define MTK_WED_REV_ID					0x004



#define MTK_WED_RESET					0x008

#define MTK_WED_RESET_TX_BM				BIT(0)

#define MTK_WED_RESET_TX_FREE_AGENT			BIT(4)

include/linux/soc/mediatek/mtk_wed.h

+3 −0
Original line number Diff line number Diff line
@@ -85,6 +85,9 @@ struct mtk_wed_device { 
	int irq;

	u8 version;



	/* used by wlan driver */

	u32 rev_id;



	struct mtk_wed_ring tx_ring[MTK_WED_TX_QUEUES];

	struct mtk_wed_ring rx_ring[MTK_WED_RX_QUEUES];

	struct mtk_wed_ring txfree_ring;