diff options
| author | Ye Li <ye.li@nxp.com> | 2017-09-05 01:45:21 -0500 |
|---|---|---|
| committer | Ye Li <ye.li@nxp.com> | 2017-09-05 03:27:08 -0500 |
| commit | 3795e87172103f383569e1710d8feefd46fcccf7 (patch) | |
| tree | 83a684e05981f9237f849b4ec36500f42ebf366c | |
| parent | ba0c1f75a7aa33b5f0fcedc3416fbb38f4166eda (diff) | |
MLK-16369 eth: fec: Fix DM driver issue in recv
When using ethernet DM driver, the recv interface has a change with non-DM
interface, that driver needs to set the packet pointer and provide it to upper
layer to process.
In fec driver, the fecmxc_recv functions does not handle the packet pointer parameter.
This may cause crash in upper layer processing because the packet pointer is not set.
This patch allocates a buffer for the packet pointer and free it through free_pkt interface.
Signed-off-by: Ye Li <ye.li@nxp.com>
Reviewed-by: Peng Fan <peng.fan@nxp.com>
| -rw-r--r-- | drivers/net/fec_mxc.c | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/drivers/net/fec_mxc.c b/drivers/net/fec_mxc.c index 41dd3bbed4..4c9fd73def 100644 --- a/drivers/net/fec_mxc.c +++ b/drivers/net/fec_mxc.c @@ -808,7 +808,16 @@ static int fec_recv(struct eth_device *dev) uint16_t bd_status; ulong addr, size, end; int i; + +#ifdef CONFIG_DM_ETH + *packetp = memalign(ARCH_DMA_MINALIGN, FEC_MAX_PKT_SIZE); + if (*packetp == 0) { + printf("%s: error allocating packetp\n", __func__); + return -ENOMEM; + } +#else ALLOC_CACHE_ALIGN_BUFFER(uchar, buff, FEC_MAX_PKT_SIZE); +#endif /* Check if any critical events have happened */ ievent = readl(&fec->eth->ievent); @@ -884,8 +893,13 @@ static int fec_recv(struct eth_device *dev) #ifdef CONFIG_FEC_MXC_SWAP_PACKET swap_packet((uint32_t *)addr, frame_length); #endif + +#ifdef CONFIG_DM_ETH + memcpy(*packetp, (char *)addr, frame_length); +#else memcpy(buff, (char *)addr, frame_length); net_process_received_packet(buff, frame_length); +#endif len = frame_length; } else { if (bd_status & FEC_RBD_ERR) @@ -919,6 +933,16 @@ static int fec_recv(struct eth_device *dev) return len; } +static int fecmxc_free_pkt(struct udevice *dev, uchar *packet, int length) +{ +#ifdef CONFIG_DM_ETH + if (packet) + free(packet); +#endif + + return 0; +} + static void fec_set_dev_name(char *dest, int dev_id) { sprintf(dest, (dev_id == -1) ? "FEC" : "FEC%i", dev_id); @@ -1215,6 +1239,7 @@ static const struct eth_ops fecmxc_ops = { .start = fecmxc_init, .send = fecmxc_send, .recv = fecmxc_recv, + .free_pkt = fecmxc_free_pkt, .stop = fecmxc_halt, .write_hwaddr = fecmxc_set_hwaddr, .read_rom_hwaddr = fecmxc_read_rom_hwaddr, |