* [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls
@ 2019-11-03 10:34 Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags Thomas Bogendoerfer
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Thomas Bogendoerfer @ 2019-11-03 10:34 UTC (permalink / raw)
To: Ralf Baechle, David S. Miller, linux-mips, netdev, linux-kernel
Cc: Christoph Hellwig
From: Christoph Hellwig <hch@lst.de>
dma_direct_ is a low-level API that must never be used by drivers
directly. Switch to use the proper DMA API instead.
Change in v2:
- ensure that tx ring is 16kB aligned
Fixes: ed870f6a7aa2 ("net: sgi: ioc3-eth: use dma-direct for dma allocations")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 33 +++++++++++++++++----------------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index deb636d653f3..4879dedf1f60 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -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>
@@ -89,6 +89,7 @@ struct ioc3_private {
struct device *dma_dev;
u32 *ssram;
unsigned long *rxr; /* pointer to receiver ring */
+ void *tx_ring;
struct ioc3_etxd *txr;
dma_addr_t rxr_dma;
dma_addr_t txr_dma;
@@ -1242,8 +1243,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,14 +1252,16 @@ 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);
- if (!ip->txr) {
+ ip->tx_ring = dma_alloc_coherent(ip->dma_dev, TX_RING_SIZE + SZ_16K - 1,
+ &ip->txr_dma, GFP_KERNEL | __GFP_ZERO);
+ if (!ip->tx_ring) {
pr_err("ioc3-eth: tx ring allocation failed\n");
err = -ENOMEM;
goto out_stop;
}
+ /* Align TX ring */
+ ip->txr = PTR_ALIGN(ip->tx_ring, SZ_16K);
+ ip->txr_dma = ALIGN(ip->txr_dma, SZ_16K);
ioc3_init(dev);
@@ -1313,11 +1316,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);
- 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, RX_RING_SIZE, ip->rxr,
+ ip->rxr_dma);
+ if (ip->tx_ring)
+ dma_free_coherent(ip->dma_dev, TX_RING_SIZE, ip->tx_ring,
+ ip->txr_dma);
out_res:
pci_release_regions(pdev);
out_free:
@@ -1335,10 +1338,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->tx_ring, ip->txr_dma);
unregister_netdev(dev);
del_timer_sync(&ip->ioc3_timer);
--
2.16.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
@ 2019-11-03 10:34 ` Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 3/4] net: sgi: ioc3-eth: simplify setting the DMA mask Thomas Bogendoerfer
` (2 subsequent siblings)
3 siblings, 0 replies; 8+ messages in thread
From: Thomas Bogendoerfer @ 2019-11-03 10:34 UTC (permalink / raw)
To: Ralf Baechle, David S. Miller, linux-mips, netdev, linux-kernel
Cc: Christoph Hellwig
From: Christoph Hellwig <hch@lst.de>
dma_alloc_coherent always zeroes memory, there is no need for
__GFP_ZERO. Also doing a GFP_ATOMIC allocation just before a GFP_KERNEL
one is clearly bogus.
Fixes: ed870f6a7aa2 ("net: sgi: ioc3-eth: use dma-direct for dma allocations")
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 4879dedf1f60..d1546f04d1fd 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1244,7 +1244,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
/* Allocate rx ring. 4kb = 512 entries, must be 4kb aligned */
ip->rxr = dma_alloc_coherent(ip->dma_dev, RX_RING_SIZE, &ip->rxr_dma,
- GFP_ATOMIC);
+ GFP_KERNEL);
if (!ip->rxr) {
pr_err("ioc3-eth: rx ring allocation failed\n");
err = -ENOMEM;
@@ -1253,7 +1253,7 @@ 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->tx_ring = dma_alloc_coherent(ip->dma_dev, TX_RING_SIZE + SZ_16K - 1,
- &ip->txr_dma, GFP_KERNEL | __GFP_ZERO);
+ &ip->txr_dma, GFP_KERNEL);
if (!ip->tx_ring) {
pr_err("ioc3-eth: tx ring allocation failed\n");
err = -ENOMEM;
--
2.16.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [net v2 3/4] net: sgi: ioc3-eth: simplify setting the DMA mask
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags Thomas Bogendoerfer
@ 2019-11-03 10:34 ` Thomas Bogendoerfer
2019-11-03 18:41 ` Sergei Shtylyov
2019-11-03 10:34 ` [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA Thomas Bogendoerfer
2019-11-04 0:34 ` [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Christoph Hellwig
3 siblings, 1 reply; 8+ messages in thread
From: Thomas Bogendoerfer @ 2019-11-03 10:34 UTC (permalink / raw)
To: Ralf Baechle, David S. Miller, linux-mips, netdev, linux-kernel
Cc: Christoph Hellwig
From: Christoph Hellwig <hch@lst.de>
There is no need to fall back to a lower mask these days, the DMA mask
just communictes the hardware supported features.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index d1546f04d1fd..83abc8a13508 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1174,26 +1174,14 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
struct ioc3 *ioc3;
unsigned long ioc3_base, ioc3_size;
u32 vendor, model, rev;
- int err, pci_using_dac;
+ int err;
/* Configure DMA attributes. */
- err = pci_set_dma_mask(pdev, DMA_BIT_MASK(64));
- if (!err) {
- pci_using_dac = 1;
- err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(64));
- if (err < 0) {
- pr_err("%s: Unable to obtain 64 bit DMA for consistent allocations\n",
- pci_name(pdev));
- goto out;
- }
- } else {
- err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
- if (err) {
- pr_err("%s: No usable DMA configuration, aborting.\n",
- pci_name(pdev));
- goto out;
- }
- pci_using_dac = 0;
+ err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+ if (err) {
+ pr_err("%s: No usable DMA configuration, aborting.\n",
+ pci_name(pdev));
+ goto out;
}
if (pci_enable_device(pdev))
@@ -1205,8 +1193,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto out_disable;
}
- if (pci_using_dac)
- dev->features |= NETIF_F_HIGHDMA;
+ dev->features |= NETIF_F_HIGHDMA;
err = pci_request_regions(pdev, "ioc3");
if (err)
--
2.16.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 3/4] net: sgi: ioc3-eth: simplify setting the DMA mask Thomas Bogendoerfer
@ 2019-11-03 10:34 ` Thomas Bogendoerfer
2019-11-03 18:45 ` Sergei Shtylyov
2019-11-04 0:34 ` [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Christoph Hellwig
3 siblings, 1 reply; 8+ messages in thread
From: Thomas Bogendoerfer @ 2019-11-03 10:34 UTC (permalink / raw)
To: Ralf Baechle, David S. Miller, linux-mips, netdev, linux-kernel
Cc: Christoph Hellwig
From: Christoph Hellwig <hch@lst.de>
Set NETIF_F_HIGHDMA together with the NETIF_F_IP_CSUM flag insted of
letting the second assignment overwrite it. Probably doesn't matter
in practice as none of the systems a IOC3 is usually found in has
highmem to start with.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
drivers/net/ethernet/sgi/ioc3-eth.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/sgi/ioc3-eth.c b/drivers/net/ethernet/sgi/ioc3-eth.c
index 83abc8a13508..d242906ae233 100644
--- a/drivers/net/ethernet/sgi/ioc3-eth.c
+++ b/drivers/net/ethernet/sgi/ioc3-eth.c
@@ -1193,8 +1193,6 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto out_disable;
}
- dev->features |= NETIF_F_HIGHDMA;
-
err = pci_request_regions(pdev, "ioc3");
if (err)
goto out_free;
@@ -1278,7 +1276,7 @@ static int ioc3_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
dev->netdev_ops = &ioc3_netdev_ops;
dev->ethtool_ops = &ioc3_ethtool_ops;
dev->hw_features = NETIF_F_IP_CSUM | NETIF_F_RXCSUM;
- dev->features = NETIF_F_IP_CSUM;
+ dev->features = NETIF_F_IP_CSUM | NETIF_F_HIGHDMA;
sw_physid1 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID1);
sw_physid2 = ioc3_mdio_read(dev, ip->mii.phy_id, MII_PHYSID2);
--
2.16.4
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA
2019-11-03 10:34 ` [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA Thomas Bogendoerfer
@ 2019-11-03 18:45 ` Sergei Shtylyov
0 siblings, 0 replies; 8+ messages in thread
From: Sergei Shtylyov @ 2019-11-03 18:45 UTC (permalink / raw)
To: Thomas Bogendoerfer, Ralf Baechle, David S. Miller, linux-mips,
netdev, linux-kernel
Cc: Christoph Hellwig
On 11/03/2019 01:34 PM, Thomas Bogendoerfer wrote:
> From: Christoph Hellwig <hch@lst.de>
>
> Set NETIF_F_HIGHDMA together with the NETIF_F_IP_CSUM flag insted of
Instead. :-)
> letting the second assignment overwrite it. Probably doesn't matter
> in practice as none of the systems a IOC3 is usually found in has
s/a/an/ (before IOC3).
> highmem to start with.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
Your sign-off is also needed, even if you just post the other's
patches.
[...]
MBR, Sergei
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
` (2 preceding siblings ...)
2019-11-03 10:34 ` [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA Thomas Bogendoerfer
@ 2019-11-04 0:34 ` Christoph Hellwig
2019-11-04 0:45 ` (metabare) net: sgi: ioc3-eth Carlo Pisani
3 siblings, 1 reply; 8+ messages in thread
From: Christoph Hellwig @ 2019-11-04 0:34 UTC (permalink / raw)
To: Thomas Bogendoerfer
Cc: Ralf Baechle, David S. Miller, linux-mips, netdev, linux-kernel,
Christoph Hellwig
On Sun, Nov 03, 2019 at 11:34:30AM +0100, Thomas Bogendoerfer wrote:
> From: Christoph Hellwig <hch@lst.de>
>
> dma_direct_ is a low-level API that must never be used by drivers
> directly. Switch to use the proper DMA API instead.
>
> Change in v2:
> - ensure that tx ring is 16kB aligned
FYI, I think this should be a separate patch. The lack of explicitly
alignment was just as broken before this patch as it is now.
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2019-11-04 0:46 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-03 10:34 [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 2/4] net: sgi: ioc3-eth: fix usage of GFP_* flags Thomas Bogendoerfer
2019-11-03 10:34 ` [net v2 3/4] net: sgi: ioc3-eth: simplify setting the DMA mask Thomas Bogendoerfer
2019-11-03 18:41 ` Sergei Shtylyov
2019-11-03 10:34 ` [net v2 4/4] net: sgi: ioc3-eth: fix setting NETIF_F_HIGHDMA Thomas Bogendoerfer
2019-11-03 18:45 ` Sergei Shtylyov
2019-11-04 0:34 ` [net v2 1/4] net: sgi: ioc3-eth: don't abuse dma_direct_* calls Christoph Hellwig
2019-11-04 0:45 ` (metabare) net: sgi: ioc3-eth Carlo Pisani
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).