Commit dc4ff9bb authored by Russell King's avatar Russell King

DMA-API: net: intel/igb: fix 32-bit DMA mask handling

The fallback to 32-bit DMA mask is rather odd:
	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64));
	if (!err) {
		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
		if (!err)
			pci_using_dac = 1;
	} else {
		err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));
		if (err) {
			err = dma_set_coherent_mask(&pdev->dev,
						    DMA_BIT_MASK(32));
			if (err) {
				dev_err(&pdev->dev,
					"No usable DMA configuration, aborting\n");
				goto err_dma;
			}
		}
	}
This means we only set the coherent DMA mask in the fallback path if
the DMA mask set failed, which is silly.  This fixes it to set the
coherent DMA mask only if dma_set_mask() succeeded, and to error out
if either fails.
Acked-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 718a39eb
...@@ -2034,23 +2034,17 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent) ...@@ -2034,23 +2034,17 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
return err; return err;
pci_using_dac = 0; pci_using_dac = 0;
err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
if (!err) { if (!err) {
err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64));
if (!err)
pci_using_dac = 1; pci_using_dac = 1;
} else { } else {
err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
if (err) {
err = dma_set_coherent_mask(&pdev->dev,
DMA_BIT_MASK(32));
if (err) { if (err) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"No usable DMA configuration, aborting\n"); "No usable DMA configuration, aborting\n");
goto err_dma; goto err_dma;
} }
} }
}
err = pci_request_selected_regions(pdev, pci_select_bars(pdev, err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
IORESOURCE_MEM), IORESOURCE_MEM),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment