Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1238922 > unrolled thread

remove dma_supported and pci_dma_supported as public APIs

Started byChristoph Hellwig <hch@lst.de>
First post2015-10-03 17:30 +0200
Last post2015-10-03 17:40 +0200
Articles 9 — 2 participants

Back to article view | Back to linux.kernel

Contents

  remove dma_supported and pci_dma_supported as public APIs Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    [PATCH 09/15] mpsc: use dma_set_mask insted of dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    [PATCH 06/15] cx25821: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    [PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
      Re: [PATCH 05/15] cx88: use pci_set_dma_mask insted of  pci_dma_supported Mauro Carvalho Chehab <mchehab@osg.samsung.com> - 2015-10-03 19:00 +0200
    [PATCH 13/15] usbnet: remove ifdefed out call to dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    [PATCH 08/15] netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:30 +0200
    [PATCH 02/15] tw68-core: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:40 +0200
    [PATCH 01/15] pcnet32: use pci_set_dma_mask insted of pci_dma_supported Christoph Hellwig <hch@lst.de> - 2015-10-03 17:40 +0200

#1238922 — remove dma_supported and pci_dma_supported as public APIs

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subjectremove dma_supported and pci_dma_supported as public APIs
Message-ID<qfwV4-5K3-13@gated-at.bofh.it>
All driver should be using dma_set_mask / pci_set_dma_mask to try
to set the dma mask instead of just querying it.  Without that some
iommu implementations may not work.

pci_dma_supported is removed entirely, but dma_supported stays for
dma_ops implementations for now.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [next] | [standalone]

#1238923 — [PATCH 09/15] mpsc: use dma_set_mask insted of dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subject[PATCH 09/15] mpsc: use dma_set_mask insted of dma_supported
Message-ID<qfwV5-5K3-53@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/tty/serial/mpsc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/tty/serial/mpsc.c b/drivers/tty/serial/mpsc.c
index 82bb6d1..11e084e 100644
--- a/drivers/tty/serial/mpsc.c
+++ b/drivers/tty/serial/mpsc.c
@@ -755,7 +755,7 @@ static int mpsc_alloc_ring_mem(struct mpsc_port_info *pi)
 		pi->port.line);
 
 	if (!pi->dma_region) {
-		if (!dma_supported(pi->port.dev, 0xffffffff)) {
+		if (!dma_set_mask(pi->port.dev, 0xffffffff)) {
 			printk(KERN_ERR "MPSC: Inadequate DMA support\n");
 			rc = -ENXIO;
 		} else if ((pi->dma_region = dma_alloc_noncoherent(pi->port.dev,
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238924 — [PATCH 06/15] cx25821: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subject[PATCH 06/15] cx25821: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfwV6-5K3-57@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/media/pci/cx25821/cx25821-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/cx25821/cx25821-core.c b/drivers/media/pci/cx25821/cx25821-core.c
index 559f829..dbc695f 100644
--- a/drivers/media/pci/cx25821/cx25821-core.c
+++ b/drivers/media/pci/cx25821/cx25821-core.c
@@ -1319,7 +1319,7 @@ static int cx25821_initdev(struct pci_dev *pci_dev,
 		dev->pci_lat, (unsigned long long)dev->base_io_addr);
 
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
+	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
 		pr_err("%s/0: Oops: no 32bit PCI DMA ???\n", dev->name);
 		err = -EIO;
 		goto fail_irq;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238927 — [PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subject[PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfwV6-5K3-59@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/media/pci/cx88/cx88-alsa.c  | 2 +-
 drivers/media/pci/cx88/cx88-mpeg.c  | 2 +-
 drivers/media/pci/cx88/cx88-video.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
index 7f8dc60..0703a81 100644
--- a/drivers/media/pci/cx88/cx88-alsa.c
+++ b/drivers/media/pci/cx88/cx88-alsa.c
@@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
 		return err;
 	}
 
-	if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {
 		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
 		err = -EIO;
 		cx88_core_put(core, pci);
diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
index 34f5057..9b3b565 100644
--- a/drivers/media/pci/cx88/cx88-mpeg.c
+++ b/drivers/media/pci/cx88/cx88-mpeg.c
@@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
 	if (pci_enable_device(dev->pci))
 		return -EIO;
 	pci_set_master(dev->pci);
-	if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {
 		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
 		return -EIO;
 	}
diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
index 400e5ca..f12af31 100644
--- a/drivers/media/pci/cx88/cx88-video.c
+++ b/drivers/media/pci/cx88/cx88-video.c
@@ -1311,7 +1311,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
 	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
 
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32))) {
 		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
 		err = -EIO;
 		goto fail_core;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238957 — Re: [PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported

FromMauro Carvalho Chehab <mchehab@osg.samsung.com>
Date2015-10-03 19:00 +0200
SubjectRe: [PATCH 05/15] cx88: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfyka-7FN-19@gated-at.bofh.it>
In reply to#1238927
Hi Christoph,


Em Sat,  3 Oct 2015 17:19:29 +0200
Christoph Hellwig <hch@lst.de> escreveu:

> This ensures the dma mask that is supported by the driver is recorded
> in the device structure.


For this and the other patches touching at drivers/media:

Acked-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

> 
> Signed-off-by: Christoph Hellwig <hch@lst.de>
> ---
>  drivers/media/pci/cx88/cx88-alsa.c  | 2 +-
>  drivers/media/pci/cx88/cx88-mpeg.c  | 2 +-
>  drivers/media/pci/cx88/cx88-video.c | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c
> index 7f8dc60..0703a81 100644
> --- a/drivers/media/pci/cx88/cx88-alsa.c
> +++ b/drivers/media/pci/cx88/cx88-alsa.c
> @@ -890,7 +890,7 @@ static int snd_cx88_create(struct snd_card *card, struct pci_dev *pci,
>  		return err;
>  	}
>  
> -	if (!pci_dma_supported(pci,DMA_BIT_MASK(32))) {
> +	if (!pci_set_dma_mask(pci,DMA_BIT_MASK(32))) {
>  		dprintk(0, "%s/1: Oops: no 32bit PCI DMA ???\n",core->name);
>  		err = -EIO;
>  		cx88_core_put(core, pci);
> diff --git a/drivers/media/pci/cx88/cx88-mpeg.c b/drivers/media/pci/cx88/cx88-mpeg.c
> index 34f5057..9b3b565 100644
> --- a/drivers/media/pci/cx88/cx88-mpeg.c
> +++ b/drivers/media/pci/cx88/cx88-mpeg.c
> @@ -393,7 +393,7 @@ static int cx8802_init_common(struct cx8802_dev *dev)
>  	if (pci_enable_device(dev->pci))
>  		return -EIO;
>  	pci_set_master(dev->pci);
> -	if (!pci_dma_supported(dev->pci,DMA_BIT_MASK(32))) {
> +	if (!pci_set_dma_mask(dev->pci,DMA_BIT_MASK(32))) {
>  		printk("%s/2: Oops: no 32bit PCI DMA ???\n",dev->core->name);
>  		return -EIO;
>  	}
> diff --git a/drivers/media/pci/cx88/cx88-video.c b/drivers/media/pci/cx88/cx88-video.c
> index 400e5ca..f12af31 100644
> --- a/drivers/media/pci/cx88/cx88-video.c
> +++ b/drivers/media/pci/cx88/cx88-video.c
> @@ -1311,7 +1311,7 @@ static int cx8800_initdev(struct pci_dev *pci_dev,
>  	       dev->pci_lat,(unsigned long long)pci_resource_start(pci_dev,0));
>  
>  	pci_set_master(pci_dev);
> -	if (!pci_dma_supported(pci_dev,DMA_BIT_MASK(32))) {
> +	if (!pci_set_dma_mask(pci_dev,DMA_BIT_MASK(32))) {
>  		printk("%s/0: Oops: no 32bit PCI DMA ???\n",core->name);
>  		err = -EIO;
>  		goto fail_core;
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238928 — [PATCH 13/15] usbnet: remove ifdefed out call to dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subject[PATCH 13/15] usbnet: remove ifdefed out call to dma_supported
Message-ID<qfwV6-5K3-61@gated-at.bofh.it>
In reply to#1238922
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/net/usb/usbnet.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index b4cf107..9497d51 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -1661,12 +1661,6 @@ usbnet_probe (struct usb_interface *udev, const struct usb_device_id *prod)
 	 * bind() should set rx_urb_size in that case.
 	 */
 	dev->hard_mtu = net->mtu + net->hard_header_len;
-#if 0
-// dma_supported() is deeply broken on almost all architectures
-	// possible with some EHCI controllers
-	if (dma_supported (&udev->dev, DMA_BIT_MASK(64)))
-		net->features |= NETIF_F_HIGHDMA;
-#endif
 
 	net->netdev_ops = &usbnet_netdev_ops;
 	net->watchdog_timeo = TX_TIMEOUT_JIFFIES;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238930 — [PATCH 08/15] netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:30 +0200
Subject[PATCH 08/15] netup_unidvb: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfwV6-5K3-73@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/media/pci/netup_unidvb/netup_unidvb_core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
index 6d8bf627..511144f 100644
--- a/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
+++ b/drivers/media/pci/netup_unidvb/netup_unidvb_core.c
@@ -809,7 +809,7 @@ static int netup_unidvb_initdev(struct pci_dev *pci_dev,
 		"%s(): board vendor 0x%x, revision 0x%x\n",
 		__func__, board_vendor, board_revision);
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev, 0xffffffff)) {
+	if (!pci_set_dma_mask(pci_dev, 0xffffffff)) {
 		dev_err(&pci_dev->dev,
 			"%s(): 32bit PCI DMA is not supported\n", __func__);
 		goto pci_detect_err;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238933 — [PATCH 02/15] tw68-core: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:40 +0200
Subject[PATCH 02/15] tw68-core: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfx4J-5VP-3@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/media/pci/tw68/tw68-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/media/pci/tw68/tw68-core.c b/drivers/media/pci/tw68/tw68-core.c
index 04706cc..8c5655d 100644
--- a/drivers/media/pci/tw68/tw68-core.c
+++ b/drivers/media/pci/tw68/tw68-core.c
@@ -257,7 +257,7 @@ static int tw68_initdev(struct pci_dev *pci_dev,
 		dev->name, pci_name(pci_dev), dev->pci_rev, pci_dev->irq,
 		dev->pci_lat, (u64)pci_resource_start(pci_dev, 0));
 	pci_set_master(pci_dev);
-	if (!pci_dma_supported(pci_dev, DMA_BIT_MASK(32))) {
+	if (!pci_set_dma_mask(pci_dev, DMA_BIT_MASK(32))) {
 		pr_info("%s: Oops: no 32bit PCI DMA ???\n", dev->name);
 		err = -EIO;
 		goto fail1;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [next] | [standalone]

#1238937 — [PATCH 01/15] pcnet32: use pci_set_dma_mask insted of pci_dma_supported

FromChristoph Hellwig <hch@lst.de>
Date2015-10-03 17:40 +0200
Subject[PATCH 01/15] pcnet32: use pci_set_dma_mask insted of pci_dma_supported
Message-ID<qfx4K-5VP-27@gated-at.bofh.it>
In reply to#1238922
This ensures the dma mask that is supported by the driver is recorded
in the device structure.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 drivers/net/ethernet/amd/pcnet32.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/amd/pcnet32.c b/drivers/net/ethernet/amd/pcnet32.c
index bc8b04f..e2afabf 100644
--- a/drivers/net/ethernet/amd/pcnet32.c
+++ b/drivers/net/ethernet/amd/pcnet32.c
@@ -1500,7 +1500,7 @@ pcnet32_probe_pci(struct pci_dev *pdev, const struct pci_device_id *ent)
 		return -ENODEV;
 	}
 
-	if (!pci_dma_supported(pdev, PCNET32_DMA_MASK)) {
+	if (!pci_set_dma_mask(pdev, PCNET32_DMA_MASK)) {
 		if (pcnet32_debug & NETIF_MSG_PROBE)
 			pr_err("architecture does not support 32bit PCI busmaster DMA\n");
 		return -ENODEV;
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web