aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2009-02-27 12:59:44 -0500
committerDavid S. Miller <davem@davemloft.net>2009-03-01 23:39:32 -0500
commit814c01dc7c533033b4e99981a2e24a6195bfb43c (patch)
tree56f8b27147b2a45ac2ae23f5bec736e1cba41a89 /drivers
parenteb352b838d42e66f0267c40249798ffda3c63037 (diff)
jme: Adding {64,40}bits DMA mask back
All JMC250 chips have no problem with higher bits support. Adding it back. Found-by: Ethan Hsiao <ethanhsiao@jmicron.com> Signed-off-by: Guo-Fu Tseng <cooldavid@cooldavid.org> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/jme.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/net/jme.c b/drivers/net/jme.c
index 47dd47fd0ace..4da81a3602dc 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2589,6 +2589,16 @@ static const struct ethtool_ops jme_ethtool_ops = {
2589static int 2589static int
2590jme_pci_dma64(struct pci_dev *pdev) 2590jme_pci_dma64(struct pci_dev *pdev)
2591{ 2591{
2592 if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
2593 !pci_set_dma_mask(pdev, DMA_64BIT_MASK))
2594 if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
2595 return 1;
2596
2597 if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
2598 !pci_set_dma_mask(pdev, DMA_40BIT_MASK))
2599 if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))
2600 return 1;
2601
2592 if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) 2602 if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
2593 if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK)) 2603 if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
2594 return 0; 2604 return 0;