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

Commit e0a1272c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'systemport-next' 



Florian Fainelli says:

====================
net: systemport: DMA and MAC fixes

This patch series contains a critical fix in how the DMA unmapping of packet
is done, as well as a less critical fix in how we disable the Ethernet MAC
RX/TX functions.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents bd508065 00b91c69

drivers/net/ethernet/broadcom/bcmsysport.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -479,7 +479,7 @@ static unsigned int bcm_sysport_desc_rx(struct bcm_sysport_priv *priv, 
		cb = &priv->rx_cbs[priv->rx_read_ptr];

		cb = &priv->rx_cbs[priv->rx_read_ptr];

		skb = cb->skb;

		skb = cb->skb;

		dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr),

		dma_unmap_single(kdev, dma_unmap_addr(cb, dma_addr),

				dma_unmap_len(cb, dma_len), DMA_FROM_DEVICE);

				RX_BUF_LENGTH, DMA_FROM_DEVICE);





		/* Extract the Receive Status Block prepended */

		/* Extract the Receive Status Block prepended */

		rsb = (struct rsb *)skb->data;

		rsb = (struct rsb *)skb->data;
@@ -1244,6 +1244,12 @@ static inline void umac_enable_set(struct bcm_sysport_priv *priv, 
	else

	else

		reg &= ~(CMD_RX_EN | CMD_TX_EN);

		reg &= ~(CMD_RX_EN | CMD_TX_EN);

	umac_writel(priv, reg, UMAC_CMD);

	umac_writel(priv, reg, UMAC_CMD);



	/* UniMAC stops on a packet boundary, wait for a full-sized packet

	 * to be processed (1 msec).

	 */

	if (enable == 0)

		usleep_range(1000, 2000);

}

}





static inline int umac_reset(struct bcm_sysport_priv *priv)

static inline int umac_reset(struct bcm_sysport_priv *priv)