| Message ID | E1UmBIR-0006KM-1m@rmk-PC.arm.linux.org.uk |
|---|---|
| State | Awaiting Upstream, archived |
| Delegated to: | David Miller |
| Headers | show |
On Tue, 2013-06-11 at 00:14 +0100, Russell King wrote: > The fallback to 32-bit DMA mask is rather odd: > if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && > !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { > 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; > } > } > pci_using_dac = 0; > } > 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. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +++++------ > 1 files changed, 5 insertions(+), 6 deletions(-) Thanks Russell, I will add this to my queue.
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c index d30fbdd..e1945c9 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c @@ -7301,14 +7301,13 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) pci_using_dac = 1; } else { err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32)); - if (err) { + 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; - } + if (err) { + dev_err(&pdev->dev, + "No usable DMA configuration, aborting\n"); + goto err_dma; } pci_using_dac = 0; }
The fallback to 32-bit DMA mask is rather odd: if (!dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)) && !dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(64))) { 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; } } pci_using_dac = 0; } 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. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-)