Commit bccd19bc authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Paolo Abeni
Browse files

net: ethernet: mtk_eth_soc: introduce mtk_hw_reset utility routine 



This is a preliminary patch to add Wireless Ethernet Dispatcher reset
support.

Reviewed-by: default avatarLeon Romanovsky <leonro@nvidia.com>
Tested-by: default avatarDaniel Golle <daniel@makrotopia.org>
Co-developed-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarSujuan Chen <sujuan.chen@mediatek.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 05cb8b39

drivers/net/ethernet/mediatek/mtk_eth_soc.c

+22 −14
Original line number Diff line number Diff line
@@ -3517,6 +3517,27 @@ static void mtk_set_mcr_max_rx(struct mtk_mac *mac, u32 val) 
		mtk_w32(mac->hw, mcr_new, MTK_MAC_MCR(mac->id));

}



static void mtk_hw_reset(struct mtk_eth *eth)

{

	u32 val;



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

		regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);

		val = RSTCTRL_PPE0_V2;

	} else {

		val = RSTCTRL_PPE0;

	}



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))

		val |= RSTCTRL_PPE1;



	ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2))

		regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,

			     0x3ffffff);

}



static int mtk_hw_init(struct mtk_eth *eth)

{

	u32 dma_mask = ETHSYS_DMA_AG_MAP_PDMA | ETHSYS_DMA_AG_MAP_QDMA |
@@ -3556,22 +3577,9 @@ static int mtk_hw_init(struct mtk_eth *eth) 
		return 0;

	}



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

		regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN, 0);

		val = RSTCTRL_PPE0_V2;

	} else {

		val = RSTCTRL_PPE0;

	}



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_RSTCTRL_PPE1))

		val |= RSTCTRL_PPE1;



	ethsys_reset(eth, RSTCTRL_ETH | RSTCTRL_FE | val);

	mtk_hw_reset(eth);



	if (MTK_HAS_CAPS(eth->soc->caps, MTK_NETSYS_V2)) {

		regmap_write(eth->ethsys, ETHSYS_FE_RST_CHK_IDLE_EN,

			     0x3ffffff);



		/* Set FE to PDMAv2 if necessary */

		val = mtk_r32(eth, MTK_FE_GLO_MISC);

		mtk_w32(eth,  val | BIT(4), MTK_FE_GLO_MISC);