leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c21b8ebc2f
linux/drivers/net/ethernet
History
Russell King c21b8ebc2f DMA-API: net: intel/igbvf: 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: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
2013-09-21 21:01:14 +01:00
..
3com
8390 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
adaptec
adi net: bfin_mac: use dev_get_platdata() 2013-08-30 17:43:35 -04:00
aeroflex drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
allwinner
alteon
amd MIPS: DECstation I/O ASIC DMA interrupt handling fix 2013-09-13 11:57:40 +02:00
apple
arc ethernet/arc/arc_emac: Fix huge delays in large file copies 2013-09-05 14:25:10 -04:00
atheros
broadcom bcm63xx_enet: remove deprecated IRQF_DISABLED 2013-09-11 16:09:58 -04:00
brocade DMA-API: net: brocade/bna/bnad.c: fix 32-bit DMA mask handling 2013-09-17 15:32:38 +01:00
cadence Remove GENERIC_HARDIRQ config option 2013-09-13 15:09:52 +02:00
calxeda net: calxedaxgmac: fix xgmac_xmit DMA mapping error handling 2013-09-03 22:21:16 -04:00
chelsio Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-09-06 09:36:28 -07:00
cirrus net: ep93xx_eth: use dev_get_platdata() 2013-08-30 17:43:35 -04:00
cisco driver/net: enic: update enic maintainers and driver 2013-09-05 12:39:33 -04:00
davicom net: dm9000: use dev_get_platdata() 2013-08-30 17:43:35 -04:00
dec net: tulip: use pci_{get,set}_drvdata() 2013-09-03 22:38:46 -04:00
dlink sundance: Add netpoll support 2013-08-20 15:05:03 -07:00
emulex Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
faraday drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
freescale Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
fujitsu
hp
i825xx
ibm ibmveth: Fix little endian issues 2013-09-04 00:27:27 -04:00
icplus icplus: Use netif_running to determine device state 2013-09-05 14:27:32 -04:00
intel DMA-API: net: intel/igbvf: fix 32-bit DMA mask handling 2013-09-21 21:01:14 +01:00
marvell Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
mellanox mlx5: remove unused MLX5_DEBUG param in Kconfig 2013-09-06 14:43:49 -04:00
micrel net: ks8851-ml: use dev_get_platdata() 2013-08-30 17:43:36 -04:00
microchip
moxa ethernet: moxa: remove unnecessary platform_set_drvdata() 2013-08-22 15:12:21 -07:00
myricom drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
natsemi
neterion
nuvoton drivers:net: delete premature free_irq 2013-09-04 13:18:19 -04:00
nvidia
nxp
octeon
oki-semi drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
packetengines
pasemi drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
qlogic qlcnic: Fix warning reported by kbuild test robot. 2013-09-11 15:59:59 -04:00
rdc
realtek Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-26 16:37:08 -04:00
renesas Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
seeq net: seeq: use dev_get_platdata() 2013-08-30 17:43:37 -04:00
sfc sfc: check for allocation failure 2013-09-04 13:07:47 -04:00
sgi drivers:net: Convert dma_alloc_coherent(...__GFP_ZERO) to dma_zalloc_coherent 2013-08-29 21:55:23 -04:00
silan
sis Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 2013-09-06 09:36:28 -07:00
smsc net: smsc911x: use dev_get_platdata() 2013-08-30 17:43:37 -04:00
stmicro net: stmmac: fix bad merge conflict resolution 2013-09-05 18:07:00 -07:00
sun Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next 2013-09-05 14:54:29 -07:00
tehuti
ti net: davinci_mdio: use dev_get_platdata() 2013-08-30 17:43:38 -04:00
tile net: tilegx driver: avoid compiler warning 2013-09-11 16:57:45 -04:00
toshiba ps3_gelic: lower NAPI weight 2013-08-27 14:59:27 -04:00
tundra net: tsi108: use dev_get_platdata() 2013-08-30 17:43:38 -04:00
via Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-08-16 15:37:26 -07:00
wiznet net: w5100: use dev_get_platdata() 2013-08-30 17:43:38 -04:00
xilinx Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-09-05 14:58:52 -04:00
xircom
xscale net: ixp4xx_eth: use dev_get_platdata() 2013-08-30 17:43:39 -04:00
dnet.c
dnet.h
ethoc.c net: ethoc: use dev_get_platdata() 2013-08-30 17:43:35 -04:00
fealnx.c
jme.c jme: lower NAPI weight 2013-08-27 14:59:27 -04:00
jme.h
Kconfig
korina.c net: korina: remove deprecated IRQF_DISABLED 2013-09-11 16:09:58 -04:00
lantiq_etop.c
Makefile
netx-eth.c net: netx-eth: remove unnecessary casting 2013-09-04 00:27:27 -04:00
s6gmac.c