Skip to content

Commit

Permalink
net: i82596: fix dma_alloc_attr for sni_82596
Browse files Browse the repository at this point in the history
[ Upstream commit 61c1d33 ]

Commit 7f683b9 ("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: 7f683b9 ("i825xx: switch to switch to dma_alloc_attrs")
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Thomas Bogendoerfer authored and Greg Kroah-Hartman committed Oct 29, 2019
1 parent 0f99c6b commit e354aa3
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 4 deletions.
4 changes: 3 additions & 1 deletion drivers/net/ethernet/i825xx/lasi_82596.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -199,7 +201,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;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/net/ethernet/i825xx/lib82596.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
4 changes: 3 additions & 1 deletion drivers/net/ethernet/i825xx/sni_82596.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,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)
Expand Down Expand Up @@ -151,7 +153,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);
Expand Down

0 comments on commit e354aa3

Please sign in to comment.