Commit 61c1d33d authored by Thomas Bogendoerfer's avatar Thomas Bogendoerfer Committed by David S. Miller
Browse files

net: i82596: fix dma_alloc_attr for sni_82596 



Commit 7f683b92 ("i825xx: switch to switch to dma_alloc_attrs")
switched dma allocation over to dma_alloc_attr, but didn't convert
the SNI part to request consistent DMA memory. This broke sni_82596
since driver doesn't do dma_cache_sync for performance reasons.
Fix this by using different DMA_ATTRs for lasi_82596 and sni_82596.

Fixes: 7f683b92 ("i825xx: switch to switch to dma_alloc_attrs")
Signed-off-by: default avatarThomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 63dfb793

drivers/net/ethernet/i825xx/lasi_82596.c

+3 −1
Original line number Diff line number Diff line
@@ -96,6 +96,8 @@ 


#define OPT_SWAP_PORT	0x0001	/* Need to wordswp on the MPU port */



#define LIB82596_DMA_ATTR	DMA_ATTR_NON_CONSISTENT



#define DMA_WBACK(ndev, addr, len) \

	do { dma_cache_sync((ndev)->dev.parent, (void *)addr, len, DMA_TO_DEVICE); } while (0)
@@ -200,7 +202,7 @@ static int __exit lan_remove_chip(struct parisc_device *pdev) 


	unregister_netdev (dev);

	dma_free_attrs(&pdev->dev, sizeof(struct i596_private), lp->dma,

		       lp->dma_addr, DMA_ATTR_NON_CONSISTENT);

		       lp->dma_addr, LIB82596_DMA_ATTR);

	free_netdev (dev);

	return 0;

}

drivers/net/ethernet/i825xx/lib82596.c

+2 −2
Original line number Diff line number Diff line
@@ -1065,7 +1065,7 @@ static int i82596_probe(struct net_device *dev) 


	dma = dma_alloc_attrs(dev->dev.parent, sizeof(struct i596_dma),

			      &lp->dma_addr, GFP_KERNEL,

			      DMA_ATTR_NON_CONSISTENT);

			      LIB82596_DMA_ATTR);

	if (!dma) {

		printk(KERN_ERR "%s: Couldn't get shared memory\n", __FILE__);

		return -ENOMEM;
@@ -1087,7 +1087,7 @@ static int i82596_probe(struct net_device *dev) 
	i = register_netdev(dev);

	if (i) {

		dma_free_attrs(dev->dev.parent, sizeof(struct i596_dma),

			       dma, lp->dma_addr, DMA_ATTR_NON_CONSISTENT);

			       dma, lp->dma_addr, LIB82596_DMA_ATTR);

		return i;

	}

drivers/net/ethernet/i825xx/sni_82596.c

+3 −1
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ 


static const char sni_82596_string[] = "snirm_82596";



#define LIB82596_DMA_ATTR	0



#define DMA_WBACK(priv, addr, len)     do { } while (0)

#define DMA_INV(priv, addr, len)       do { } while (0)

#define DMA_WBACK_INV(priv, addr, len) do { } while (0)
@@ -152,7 +154,7 @@ static int sni_82596_driver_remove(struct platform_device *pdev) 


	unregister_netdev(dev);

	dma_free_attrs(dev->dev.parent, sizeof(struct i596_private), lp->dma,

		       lp->dma_addr, DMA_ATTR_NON_CONSISTENT);

		       lp->dma_addr, LIB82596_DMA_ATTR);

	iounmap(lp->ca);

	iounmap(lp->mpu_port);

	free_netdev (dev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE