Skip to contentSkip to conversation

net/fec_mpc52xx: fix BUG on missing dma_ops

PATCH In review Grant Likely 2 participants 2 messages Mar 30, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net/fec_mpc52xx: fix BUG on missing dma_ops

From: Grant Likely <[email protected]>

The driver triggers a BUG_ON() when allocating DMA buffers if the arch/powerpc dma_ops from the of_platform device are not copied into net_device structure.

---
David, do you want to pick this one up right away, or should I merge it through Ben's powerpc tree?

g.

 drivers/net/fec_mpc52xx.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/fec_mpc52xx.c +3 -0
index 049b0a7..215207d 100644
@@ -928,6 +928,9 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
 	if (!request_mem_region(mem.start, sizeof(struct mpc52xx_fec), DRIVER_NAME))
 		return -EBUSY;
 
+	/* Copy the PowerPC dma_ops from the of_device */
+	set_dma_ops(&ndev->dev, get_dma_ops(&op->dev));
+
 	/* Init ether ndev with what we have */
 	ndev->open		= mpc52xx_fec_open;
 	ndev->stop		= mpc52xx_fec_close;
#1 lore raw
Quoted 10 lines · Grant Likely

From: Grant Likely <[email protected]>

The driver triggers a BUG_ON() when allocating DMA buffers if the arch/powerpc dma_ops from the of_platform device are not copied into net_device structure.

---
David, do you want to pick this one up right away, or should I merge it through Ben's powerpc tree?

Grant,

I really think you need to do what Kumar did for gianfar (http://patchwork.ozlabs.org/patch/24562/) - your patch just fixes the dma_ops problem, not the problem with getting to the correct archdata, which contains an offset (dma_data) that is used to form a bus address used in the various dma operations. Grep for get_dma_direct_offset in arch/powerpc and you'll see it used in the various dma operations.

Cheers,
B

Quoted 29 lines

g.

drivers/net/fec_mpc52xx.c | 3 +++

1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/fec_mpc52xx.c +3 -0
index 049b0a7..215207d 100644
@@ -928,6 +928,9 @@ mpc52xx_fec_probe(struct of_device *op, const  
 struct of_device_id *match)
 	if (!request_mem_region(mem.start, sizeof(struct mpc52xx_fec),  
 DRIVER_NAME))
 		return -EBUSY;
 
+	/* Copy the PowerPC dma_ops from the of_device */
+	set_dma_ops(&ndev->dev, get_dma_ops(&op->dev));
+
 	/* Init ether ndev with what we have */
	ndev->open		= mpc52xx_fec_open;
	ndev->stop		= mpc52xx_fec_close;

_______________________________________________
Linuxppc-dev mailing list
[email protected]
https://ozlabs.org/mailman/listinfo/linuxppc-dev