Skip to content

Commit

Permalink
net: ethernet: mediatek: Refine the timing of GDM/PSE setup
Browse files Browse the repository at this point in the history
Refine the timing of GDM/PSE setup, move it from mtk_hw_init
to mtk_open. This is recommended by the mt762x HW design to
do GDM/PSE setup only after PDMA has been started.

We exclude mt7628 in mtk_gdm_config function since it is a old IP
and there is no GDM/PSE block on it.

Signed-off-by: MarkLee <Mark-MC.Lee@mediatek.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
MarkLee authored and David S. Miller committed Nov 14, 2019
1 parent 8d3f4a9 commit 5ac9eda
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions drivers/net/ethernet/mediatek/mtk_eth_soc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2184,6 +2184,9 @@ static void mtk_gdm_config(struct mtk_eth *eth, u32 config)
{
int i;

if (MTK_HAS_CAPS(eth->soc->caps, MTK_SOC_MT7628))
return;

for (i = 0; i < MTK_MAC_COUNT; i++) {
u32 val = mtk_r32(eth, MTK_GDMA_FWD_CFG(i));

Expand Down Expand Up @@ -2222,6 +2225,8 @@ static int mtk_open(struct net_device *dev)
if (err)
return err;

mtk_gdm_config(eth, MTK_GDMA_TO_PDMA);

napi_enable(&eth->tx_napi);
napi_enable(&eth->rx_napi);
mtk_tx_irq_enable(eth, MTK_TX_DONE_INT);
Expand Down Expand Up @@ -2405,8 +2410,6 @@ static int mtk_hw_init(struct mtk_eth *eth)
mtk_w32(eth, MTK_RX_DONE_INT, MTK_QDMA_INT_GRP2);
mtk_w32(eth, 0x21021000, MTK_FE_INT_GRP);

mtk_gdm_config(eth, MTK_GDMA_TO_PDMA);

return 0;

err_disable_pm:
Expand Down

0 comments on commit 5ac9eda

Please sign in to comment.