Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1c3ce0c authored by Jonas Gorski's avatar Jonas Gorski Committed by Greg Kroah-Hartman
Browse files

bcm63xx_enet: do not write to random DMA channel on BCM6345 



commit d6213c1f2ad54a964b77471690264ed685718928 upstream.

The DMA controller regs actually point to DMA channel 0, so the write to
ENETDMA_CFG_REG will actually modify a random DMA channel.

Since DMA controller registers do not exist on BCM6345, guard the write
with the usual check for dma_has_sram.

Signed-off-by: default avatarJonas Gorski <jonas.gorski@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarAmit Pundir <amit.pundir@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b913a05a

drivers/net/ethernet/broadcom/bcm63xx_enet.c

+2 −1
Original line number Diff line number Diff line
@@ -1062,6 +1062,7 @@ static int bcm_enet_open(struct net_device *dev) 
	val = enet_readl(priv, ENET_CTL_REG);

	val |= ENET_CTL_ENABLE_MASK;

	enet_writel(priv, val, ENET_CTL_REG);

	if (priv->dma_has_sram)

		enet_dma_writel(priv, ENETDMA_CFG_EN_MASK, ENETDMA_CFG_REG);

	enet_dmac_writel(priv, priv->dma_chan_en_mask,

			 ENETDMAC_CHANCFG, priv->rx_chan);