UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: sgi: ioc3-eth: don't abuse dma_direct_* calls 

dma_direct_ is a low-level API that must never be used by drivers
directly.  Switch to use the proper DMA API instead.

Fixes: ed870f6a7a ("net: sgi: ioc3-eth: use dma-direct for dma allocations")
Signed-off-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Thomas Bogendoerfer <tbogendoerfer@suse.de>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Christoph Hellwig 2019-11-04 11:45:11 +01:00 committed by David S. Miller
parent b6b556afd2
commit 4dd147471d
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/ethernet/sgi/ioc3-eth.c
View File

@ -48,7 +48,7 @@
#include <linux/etherdevice.h>
#include <linux/ethtool.h>
#include <linux/skbuff.h>
#include <linux/dma-direct.h>
#include <linux/dma-mapping.h>
#include <net/ip.h>
@ -1242,8 +1242,8 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
ioc3_stop(ip);
/* Allocate rx ring. 4kb = 512 entries, must be 4kb aligned */
ip->rxr = dma_direct_alloc_pages(ip->dma_dev, RX_RING_SIZE,
&ip->rxr_dma, GFP_ATOMIC, 0);
ip->rxr = dma_alloc_coherent(ip->dma_dev, RX_RING_SIZE, &ip->rxr_dma,
GFP_ATOMIC);
if (!ip->rxr) {
pr_err("ioc3-eth: rx ring allocation failed\n");
err = -ENOMEM;
@ -1251,9 +1251,8 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
}
/* Allocate tx rings. 16kb = 128 bufs, must be 16kb aligned */
ip->txr = dma_direct_alloc_pages(ip->dma_dev, TX_RING_SIZE,
&ip->txr_dma,
GFP_KERNEL | __GFP_ZERO, 0);
ip->txr = dma_alloc_coherent(ip->dma_dev, TX_RING_SIZE, &ip->txr_dma,
GFP_KERNEL | __GFP_ZERO);
if (!ip->txr) {
pr_err("ioc3-eth: tx ring allocation failed\n");
err = -ENOMEM;
@ -1313,11 +1312,11 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
out_stop:
del_timer_sync(&ip->ioc3_timer);
if (ip->rxr)
dma_direct_free_pages(ip->dma_dev, RX_RING_SIZE, ip->rxr,
ip->rxr_dma, 0);
dma_free_coherent(ip->dma_dev, RX_RING_SIZE, ip->rxr,
ip->rxr_dma);
if (ip->txr)
dma_direct_free_pages(ip->dma_dev, TX_RING_SIZE, ip->txr,
ip->txr_dma, 0);
dma_free_coherent(ip->dma_dev, TX_RING_SIZE, ip->txr,
ip->txr_dma);
out_res:
pci_release_regions(pdev);
out_free:
@ -1335,10 +1334,8 @@ static void ioc3_remove_one(struct pci_dev *pdev)
struct net_device *dev = pci_get_drvdata(pdev);
struct ioc3_private *ip = netdev_priv(dev);
dma_direct_free_pages(ip->dma_dev, RX_RING_SIZE, ip->rxr,
ip->rxr_dma, 0);
dma_direct_free_pages(ip->dma_dev, TX_RING_SIZE, ip->txr,
ip->txr_dma, 0);
dma_free_coherent(ip->dma_dev, RX_RING_SIZE, ip->rxr, ip->rxr_dma);
dma_free_coherent(ip->dma_dev, TX_RING_SIZE, ip->txr, ip->txr_dma);
unregister_netdev(dev);
del_timer_sync(&ip->ioc3_timer);