diff options
| author | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-01-25 12:04:59 -0500 |
| commit | d31dd3b596190bdecbd109e404f16bd208fe32ba (patch) | |
| tree | d862bd67736079799b474d876f38b75032ade5b6 /drivers/net/macb.c | |
| parent | 2c871f9e084b2c03d1961884228a6901387ab8d6 (diff) | |
| parent | 683b7c2a170a71bded99bb9e7dfd26372427ca1c (diff) | |
Merge branch '2020-01-24-master-imports'
- Enable fastboot on some MediaTek platforms
- DMA enchancements
- Assorted bugfixes
Diffstat (limited to 'drivers/net/macb.c')
| -rw-r--r-- | drivers/net/macb.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/net/macb.c b/drivers/net/macb.c index 83594253787..0d4929bec13 100644 --- a/drivers/net/macb.c +++ b/drivers/net/macb.c @@ -327,8 +327,6 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, macb->tx_ring[tx_head].addr = paddr; barrier(); macb_flush_ring_desc(macb, TX); - /* Do we need check paddr and length is dcache line aligned? */ - flush_dcache_range(paddr, paddr + ALIGN(length, ARCH_DMA_MINALIGN)); macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART)); /* @@ -344,7 +342,7 @@ static int _macb_send(struct macb_device *macb, const char *name, void *packet, udelay(1); } - dma_unmap_single(packet, length, paddr); + dma_unmap_single(packet, length, DMA_TO_DEVICE); if (i <= MACB_TX_TIMEOUT) { if (ctrl & MACB_BIT(TX_UNDERRUN)) |