summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuo-Fu Tseng <cooldavid@cooldavid.org>2009-02-27 17:59:44 +0000
committerDavid S. Miller <davem@davemloft.net>2009-03-01 20:39:32 -0800
commit814c01dc7c533033b4e99981a2e24a6195bfb43c (patch)
tree56f8b27147b2a45ac2ae23f5bec736e1cba41a89
parenteb352b838d42e66f0267c40249798ffda3c63037 (diff)
downloadop-kernel-dev-814c01dc7c533033b4e99981a2e24a6195bfb43c.zip
op-kernel-dev-814c01dc7c533033b4e99981a2e24a6195bfb43c.tar.gz
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>
-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 47dd47f..4da81a3 100644
--- a/drivers/net/jme.c
+++ b/drivers/net/jme.c
@@ -2589,6 +2589,16 @@ static const struct ethtool_ops jme_ethtool_ops = {
static int
jme_pci_dma64(struct pci_dev *pdev)
{
+ if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
+ !pci_set_dma_mask(pdev, DMA_64BIT_MASK))
+ if (!pci_set_consistent_dma_mask(pdev, DMA_64BIT_MASK))
+ return 1;
+
+ if (pdev->device == PCI_DEVICE_ID_JMICRON_JMC250 &&
+ !pci_set_dma_mask(pdev, DMA_40BIT_MASK))
+ if (!pci_set_consistent_dma_mask(pdev, DMA_40BIT_MASK))
+ return 1;
+
if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK))
if (!pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK))
return 0;
OpenPOWER on IntegriCloud