diff options
| author | Kelvin Lawson <kelvinl@users.sf.net> | 2013-07-18 14:10:50 +0100 |
|---|---|---|
| committer | Kelvin Lawson <kelvinl@users.sf.net> | 2013-07-18 14:56:53 +0100 |
| commit | 15e301a5f0f7aa8aa93bd9b336ea4595f322e8b4 (patch) | |
| tree | a07c06982ddd3510e6a0bf20fec0868775ef8c35 | |
| parent | 40dc575e557c0da6b731c27738f2beaa2dc2acf7 (diff) | |
Merge FEC fix from Freescale 3.5.7 kernel (has not made it into Freescale's 3.0.35 kernel but is definitely present in 3.0.35):
ENGR00264875 enet: fix DMA map/unmap mismatch
Enable "CONFIG_DMA_API_DEBUG" in kernel, and system generate
warning when run up.
WARNING:
/home/b29397/work/projects/linux-2.6-imx/lib/dma-debug.c:865
check_unmap+0x6f8/0x7d8()
net eth0: DMA-API: device driver tries to free DMA memory it
has not allocated [device address=0x00000000443d7040] [size=2048
[<80025f60>] (warn_slowpath_common+0x0/0x6c) from [<80026070>]
(warn_slowpath_fmt+0x38/0x40) r9:00000000 r8:00000800 r7:807bfb0c
r6:807a3d48 r5:00000000
It dma memory map/unmap mismatch issue.
Signed-off-by: Fugang Duan <B38611@freescale.com>
| -rw-r--r-- | drivers/net/fec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 97b2f84ffd71..acdb0b0f0cc4 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -642,7 +642,7 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) data = (__u8 *)__va(bdp->cbd_bufaddr); if (bdp->cbd_bufaddr) - dma_unmap_single(&ndev->dev, bdp->cbd_bufaddr, + dma_unmap_single(&fep->pdev->dev, bdp->cbd_bufaddr, FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); if (id_entry->driver_data & FEC_QUIRK_SWAP_FRAME) @@ -670,7 +670,7 @@ static int fec_rx_poll(struct napi_struct *napi, int budget) netif_receive_skb(skb); } - bdp->cbd_bufaddr = dma_map_single(&ndev->dev, data, + bdp->cbd_bufaddr = dma_map_single(&fep->pdev->dev, data, FEC_ENET_RX_FRSIZE, DMA_FROM_DEVICE); rx_processing_done: /* Clear the status flags for this buffer */ |