Commit 62f6924c authored by Arun Chandran's avatar Arun Chandran Committed by David S. Miller

net: macb: Add on the fly CPU endianness detection

Program management descriptor's access mode according to the
dynamically detected CPU endianness.
Signed-off-by: default avatarArun Chandran <achandran@mvista.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
Tested-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 759c9359
...@@ -1578,6 +1578,7 @@ static u32 macb_dbw(struct macb *bp) ...@@ -1578,6 +1578,7 @@ static u32 macb_dbw(struct macb *bp)
static void macb_configure_dma(struct macb *bp) static void macb_configure_dma(struct macb *bp)
{ {
u32 dmacfg; u32 dmacfg;
u32 tmp, ncr;
if (macb_is_gem(bp)) { if (macb_is_gem(bp)) {
dmacfg = gem_readl(bp, DMACFG) & ~GEM_BF(RXBS, -1L); dmacfg = gem_readl(bp, DMACFG) & ~GEM_BF(RXBS, -1L);
...@@ -1586,10 +1587,23 @@ static void macb_configure_dma(struct macb *bp) ...@@ -1586,10 +1587,23 @@ static void macb_configure_dma(struct macb *bp)
dmacfg = GEM_BFINS(FBLDO, bp->dma_burst_length, dmacfg); dmacfg = GEM_BFINS(FBLDO, bp->dma_burst_length, dmacfg);
dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L); dmacfg |= GEM_BIT(TXPBMS) | GEM_BF(RXBMS, -1L);
dmacfg &= ~GEM_BIT(ENDIA_PKT); dmacfg &= ~GEM_BIT(ENDIA_PKT);
/* Tell the chip to byteswap descriptors on big-endian hosts */
#ifdef __BIG_ENDIAN /* Find the CPU endianness by using the loopback bit of net_ctrl
dmacfg |= GEM_BIT(ENDIA_DESC); * register. save it first. When the CPU is in big endian we
#endif * need to program swaped mode for management descriptor access.
*/
ncr = macb_readl(bp, NCR);
__raw_writel(MACB_BIT(LLB), bp->regs + MACB_NCR);
tmp = __raw_readl(bp->regs + MACB_NCR);
if (tmp == MACB_BIT(LLB))
dmacfg &= ~GEM_BIT(ENDIA_DESC);
else
dmacfg |= GEM_BIT(ENDIA_DESC); /* CPU in big endian */
/* Restore net_ctrl */
macb_writel(bp, NCR, ncr);
if (bp->dev->features & NETIF_F_HW_CSUM) if (bp->dev->features & NETIF_F_HW_CSUM)
dmacfg |= GEM_BIT(TXCOEN); dmacfg |= GEM_BIT(TXCOEN);
else else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment