Re: [Bug #14057] Strange network timeouts w/ e100

[Ian Campbell]

On Wed, 2009-08-26 at 15:11 -0700, David Miller wrote: 
> From: "Rafael J. Wysocki" <rjw@xxxxxxx>
> Date: Wed, 26 Aug 2009 23:12:03 +0200
> 
> >> Krzysztof has a patch which has corrected this issue for me.  Thanks,
> > 
> > Thanks for the update.
> > 
> > Do you have a pointer to the patch, please?
> 
> commit 6ff9c2e7fa8ca63a575792534b63c5092099c286
> Author: Krzysztof HaÅasa <khc@xxxxxxxxx>
> Date:   Sun Aug 23 19:02:13 2009 -0700
> 
>     E100: fix interaction with swiotlb on X86.

This fixes 303d67c2 which has been included in at least the 2.6.27.29
and 2.6.30.5 stable releases so I think this should be a candidate for
those stable branches too.

Ian.

> 
>     E100 places it's RX packet descriptors inside skb->data and uses them
>     with bidirectional streaming DMA mapping. Data in descriptors is
>     accessed simultaneously by the chip (writing status and size when
>     a packet is received) and CPU (reading to check if the packet was
>     received). This isn't a valid usage of PCI DMA API, which requires use
>     of the coherent (consistent) memory for such purpose. Unfortunately e100
>     chips working in "simplified" RX mode have to store received data
>     directly after the descriptor. Fixing the driver to conform to the API
>     would require using unsupported "flexible" RX mode or receiving data
>     into a coherent memory and using CPU to copy it to network buffers.
>     
>     This patch, while not yet making the driver conform to the PCI DMA API,
>     allows it to work correctly on X86 with swiotlb (while not breaking
>     other architectures).
>     
>     Signed-off-by: Krzysztof HaÅasa <khc@xxxxxxxxx>
>     Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> 
> diff --git a/drivers/net/e100.c b/drivers/net/e100.c
> index 41b648a..3a6735d 100644
> --- a/drivers/net/e100.c
> +++ b/drivers/net/e100.c
> @@ -1899,7 +1899,7 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx,
>  				nic->ru_running = RU_SUSPENDED;
>  		pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr,
>  					       sizeof(struct rfd),
> -					       PCI_DMA_BIDIRECTIONAL);
> +					       PCI_DMA_FROMDEVICE);
>  		return -ENODATA;
>  	}
>  
> NrybXÇv^)Þ{.n+{zXÜ}Æz&j:+vzZ++zfh~izw?&)ßf^jÇym@Aa0hi
-- 
Ian Campbell

Q:	Why did the chicken cross the road?
A:	To see his friend Gregory peck.

Q:	Why did the chicken cross the playground?
A:	To get to the other slide.

Attachment: signature.asc
Description: This is a digitally signed message part