From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: [PATCH] net/fec_mpc52xx: fix BUG on missing dma_ops Date: Tue, 31 Mar 2009 13:10:13 -0600 Message-ID: References: <20090331022428.26151.55232.stgit@localhost.localdomain> <0947433F-BDDA-48D8-A59C-BCF321EE465C@kernel.crashing.org> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Cc: netdev@vger.kernel.org, linuxppc-dev@ozlabs.org, David Miller , galak@kernel.crashing.net To: Becky Bruce Return-path: Received: from yx-out-2324.google.com ([74.125.44.28]:58508 "EHLO yx-out-2324.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751257AbZCaTKQ convert rfc822-to-8bit (ORCPT ); Tue, 31 Mar 2009 15:10:16 -0400 Received: by yx-out-2324.google.com with SMTP id 31so2571966yxl.1 for ; Tue, 31 Mar 2009 12:10:14 -0700 (PDT) In-Reply-To: <0947433F-BDDA-48D8-A59C-BCF321EE465C@kernel.crashing.org> Sender: netdev-owner@vger.kernel.org List-ID: Thanks Becky. g. 2009/3/31 Becky Bruce : > > On Mar 30, 2009, at 9:25 PM, Grant Likely wrote: > >> From: Grant Likely >> >> 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. >> >> Signed-off-by: Grant Likely >> --- >> >> Becky, does this look better to you? > > Reviewed-by: Becky Bruce > > I think this is OK now, and Kumar agrees.... > > Thanks! > B > >> >> >> g. >> >> drivers/net/fec_mpc52xx.c | =A0 19 ++++++++++++------- >> 1 files changed, 12 insertions(+), 7 deletions(-) >> >> >> diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c >> index 049b0a7..f99463f 100644 >> --- a/drivers/net/fec_mpc52xx.c >> +++ b/drivers/net/fec_mpc52xx.c >> @@ -129,7 +129,8 @@ static void mpc52xx_fec_free_rx_buffers(struct >> net_device *dev, struct bcom_task >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct sk_buff *skb; >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0skb =3D bcom_retrieve_buffer(s, NULL,= (struct bcom_bd >> **)&bd); >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(&dev->dev, bd->skb_pa= , skb->len, >> DMA_FROM_DEVICE); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(dev->dev.parent, bd->= skb_pa, skb->len, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0DMA= _FROM_DEVICE); >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0kfree_skb(skb); >> =A0 =A0 =A0 =A0} >> } >> @@ -150,7 +151,7 @@ static int mpc52xx_fec_alloc_rx_buffers(struct >> net_device *dev, struct bcom_task >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bd =3D (struct bcom_fec_bd *)bcom_pre= pare_next_buffer(rxtsk); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bd->status =3D FEC_RX_BUFFER_SIZE; >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(&dev->de= v, skb->data, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(dev->dev= =2Eparent, skb->data, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0FEC_R= X_BUFFER_SIZE, DMA_FROM_DEVICE); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_submit_next_buffer(rxtsk, skb); >> @@ -388,7 +389,8 @@ static int mpc52xx_fec_hard_start_xmit(struct sk= _buff >> *skb, struct net_device *d >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_prepare_next_buffer(priv->tx_dma= tsk); >> >> =A0 =A0 =A0 =A0bd->status =3D skb->len | BCOM_FEC_TX_BD_TFD | BCOM_F= EC_TX_BD_TC; >> - =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(&dev->dev, skb->data, sk= b->len, >> DMA_TO_DEVICE); >> + =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(dev->dev.parent, skb->da= ta, skb->len, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= DMA_TO_DEVICE); >> >> =A0 =A0 =A0 =A0bcom_submit_next_buffer(priv->tx_dmatsk, skb); >> >> @@ -430,7 +432,8 @@ static irqreturn_t mpc52xx_fec_tx_interrupt(int = irq, >> void *dev_id) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0struct bcom_fec_bd *bd; >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0skb =3D bcom_retrieve_buffer(priv->tx= _dmatsk, NULL, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(stru= ct bcom_bd **)&bd); >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(&dev->dev, bd->skb_pa= , skb->len, >> DMA_TO_DEVICE); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(dev->dev.parent, bd->= skb_pa, skb->len, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0DMA= _TO_DEVICE); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dev_kfree_skb_irq(skb); >> =A0 =A0 =A0 =A0} >> @@ -455,7 +458,8 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int = irq, >> void *dev_id) >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0rskb =3D bcom_retrieve_buffer(priv->r= x_dmatsk, &status, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0(stru= ct bcom_bd **)&bd); >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(&dev->dev, bd->skb_pa= , rskb->len, >> DMA_FROM_DEVICE); >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 dma_unmap_single(dev->dev.parent, bd->= skb_pa, rskb->len, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0DMA= _FROM_DEVICE); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0/* Test for errors in received frame = */ >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0if (status & BCOM_FEC_RX_BD_ERRORS) { >> @@ -464,7 +468,8 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int = irq, >> void *dev_id) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_= prepare_next_buffer(priv->rx_dmatsk); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bd->status =3D FEC_RX= _BUFFER_SIZE; >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map= _single(&dev->dev, rskb->data, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map= _single(dev->dev.parent, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0= =A0 =A0 rskb->data, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0FEC_RX_BUFFER_SIZE, >> DMA_FROM_DEVICE); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_submit_next_buff= er(priv->rx_dmatsk, rskb); >> @@ -499,7 +504,7 @@ static irqreturn_t mpc52xx_fec_rx_interrupt(int = irq, >> void *dev_id) >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_prepare_next_buf= fer(priv->rx_dmatsk); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bd->status =3D FEC_RX_BUFFER_SIZE; >> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(&dev->de= v, skb->data, >> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 bd->skb_pa =3D dma_map_single(dev->dev= =2Eparent, skb->data, >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0FEC_R= X_BUFFER_SIZE, DMA_FROM_DEVICE); >> >> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0bcom_submit_next_buffer(priv->rx_dmat= sk, skb); > > --=20 Grant Likely, B.Sc., P.Eng. Secret Lab Technologies Ltd.