commit 1e7f0bd8c8f2d0496ad338be5e69ff4395d77da4 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

drivers/net/: Use the DMA_{64,32}BIT_MASK constants

Use the DMA_{64,32}BIT_MASK constants from dma-mapping.h when calling
pci_set_dma_mask() or pci_set_consistent_dma_mask()

This patch includes dma-mapping.h explicitly because it caused errors
on some architectures otherwise.

See http://marc.theaimsgroup.com/?t=108001993000001&r=1&w=2 for details

Signed-off-by: Tobias Klauser <tklauser@nuerscht.ch>
Signed-off-by: Domen Puncer <domen@coderock.org>

authored by Domen Puncer and committed by Jeff Garzik 20 years ago 1e7f0bd8 5ccabb9b

+27 -16

11 changed files

expand all

unified split

drivers

net

acenic.c

e100.c

hp100.c

ns83820.c

s2io.c

sk98lin

skge.c

sungem.c

tlan.c

tokenring

lanstreamer.c

via-rhine.c

wan

wanxl.c

+3 -2

drivers/net/acenic.c

··· 58 #include <linux/errno.h> 59 #include <linux/ioport.h> 60 #include <linux/pci.h> 61 #include <linux/kernel.h> 62 #include <linux/netdevice.h> 63 #include <linux/etherdevice.h> ··· 1168 /* 1169 * Configure DMA attributes. 1170 */ 1171 - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { 1172 ap->pci_using_dac = 1; 1173 - } else if (!pci_set_dma_mask(pdev, 0xffffffffULL)) { 1174 ap->pci_using_dac = 0; 1175 } else { 1176 ecode = -ENODEV;

··· 58 #include <linux/errno.h> 59 #include <linux/ioport.h> 60 #include <linux/pci.h> 61 + #include <linux/dma-mapping.h> 62 #include <linux/kernel.h> 63 #include <linux/netdevice.h> 64 #include <linux/etherdevice.h> ··· 1167 /* 1168 * Configure DMA attributes. 1169 */ 1170 + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { 1171 ap->pci_using_dac = 1; 1172 + } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 1173 ap->pci_using_dac = 0; 1174 } else { 1175 ecode = -ENODEV;

+2 -1

drivers/net/e100.c

··· 143 #include <linux/delay.h> 144 #include <linux/init.h> 145 #include <linux/pci.h> 146 #include <linux/netdevice.h> 147 #include <linux/etherdevice.h> 148 #include <linux/mii.h> ··· 2287 goto err_out_disable_pdev; 2288 } 2289 2290 - if((err = pci_set_dma_mask(pdev, 0xFFFFFFFFULL))) { 2291 DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n"); 2292 goto err_out_free_res; 2293 }

··· 143 #include <linux/delay.h> 144 #include <linux/init.h> 145 #include <linux/pci.h> 146 + #include <linux/dma-mapping.h> 147 #include <linux/netdevice.h> 148 #include <linux/etherdevice.h> 149 #include <linux/mii.h> ··· 2286 goto err_out_disable_pdev; 2287 } 2288 2289 + if((err = pci_set_dma_mask(pdev, DMA_32BIT_MASK))) { 2290 DPRINTK(PROBE, ERR, "No usable DMA configuration, aborting.\n"); 2291 goto err_out_free_res; 2292 }

+2 -1

drivers/net/hp100.c

··· 106 #include <linux/interrupt.h> 107 #include <linux/eisa.h> 108 #include <linux/pci.h> 109 #include <linux/spinlock.h> 110 #include <linux/netdevice.h> 111 #include <linux/etherdevice.h> ··· 558 * Also, we can have EISA Busmaster cards (not tested), 559 * so beware !!! - Jean II */ 560 if((bus == HP100_BUS_PCI) && 561 - (pci_set_dma_mask(pci_dev, 0xffffffff))) { 562 /* Gracefully fallback to shared memory */ 563 goto busmasterfail; 564 }

··· 106 #include <linux/interrupt.h> 107 #include <linux/eisa.h> 108 #include <linux/pci.h> 109 + #include <linux/dma-mapping.h> 110 #include <linux/spinlock.h> 111 #include <linux/netdevice.h> 112 #include <linux/etherdevice.h> ··· 557 * Also, we can have EISA Busmaster cards (not tested), 558 * so beware !!! - Jean II */ 559 if((bus == HP100_BUS_PCI) && 560 + (pci_set_dma_mask(pci_dev, DMA_32BIT_MASK))) { 561 /* Gracefully fallback to shared memory */ 562 goto busmasterfail; 563 }

drivers/net/ns83820.c

··· 101 #include <linux/moduleparam.h> 102 #include <linux/types.h> 103 #include <linux/pci.h> 104 #include <linux/netdevice.h> 105 #include <linux/etherdevice.h> 106 #include <linux/delay.h>

··· 101 #include <linux/moduleparam.h> 102 #include <linux/types.h> 103 #include <linux/pci.h> 104 + #include <linux/dma-mapping.h> 105 #include <linux/netdevice.h> 106 #include <linux/etherdevice.h> 107 #include <linux/delay.h>

+4 -3

drivers/net/s2io.c

··· 42 #include <linux/errno.h> 43 #include <linux/ioport.h> 44 #include <linux/pci.h> 45 #include <linux/kernel.h> 46 #include <linux/netdevice.h> 47 #include <linux/etherdevice.h> ··· 4594 return ret; 4595 } 4596 4597 - if (!pci_set_dma_mask(pdev, 0xffffffffffffffffULL)) { 4598 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n"); 4599 dma_flag = TRUE; 4600 4601 if (pci_set_consistent_dma_mask 4602 - (pdev, 0xffffffffffffffffULL)) { 4603 DBG_PRINT(ERR_DBG, 4604 "Unable to obtain 64bit DMA for \ 4605 consistent allocations\n"); 4606 pci_disable_device(pdev); 4607 return -ENOMEM; 4608 } 4609 - } else if (!pci_set_dma_mask(pdev, 0xffffffffUL)) { 4610 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n"); 4611 } else { 4612 pci_disable_device(pdev);

··· 42 #include <linux/errno.h> 43 #include <linux/ioport.h> 44 #include <linux/pci.h> 45 + #include <linux/dma-mapping.h> 46 #include <linux/kernel.h> 47 #include <linux/netdevice.h> 48 #include <linux/etherdevice.h> ··· 4593 return ret; 4594 } 4595 4596 + if (!pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { 4597 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 64bit DMA\n"); 4598 dma_flag = TRUE; 4599 4600 if (pci_set_consistent_dma_mask 4601 + (pdev, DMA_64BIT_MASK)) { 4602 DBG_PRINT(ERR_DBG, 4603 "Unable to obtain 64bit DMA for \ 4604 consistent allocations\n"); 4605 pci_disable_device(pdev); 4606 return -ENOMEM; 4607 } 4608 + } else if (!pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 4609 DBG_PRINT(INIT_DBG, "s2io_init_nic: Using 32bit DMA\n"); 4610 } else { 4611 pci_disable_device(pdev);

+3 -2

drivers/net/sk98lin/skge.c

··· 112 #include <linux/moduleparam.h> 113 #include <linux/init.h> 114 #include <linux/proc_fs.h> 115 116 #include "h/skdrv1st.h" 117 #include "h/skdrv2nd.h" ··· 4913 goto out; 4914 4915 /* Configure DMA attributes. */ 4916 - if (pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL) && 4917 - pci_set_dma_mask(pdev, (u64) 0xffffffff)) 4918 goto out_disable_device; 4919 4920

··· 112 #include <linux/moduleparam.h> 113 #include <linux/init.h> 114 #include <linux/proc_fs.h> 115 + #include <linux/dma-mapping.h> 116 117 #include "h/skdrv1st.h" 118 #include "h/skdrv2nd.h" ··· 4912 goto out; 4913 4914 /* Configure DMA attributes. */ 4915 + if (pci_set_dma_mask(pdev, DMA_64BIT_MASK) && 4916 + pci_set_dma_mask(pdev, DMA_32BIT_MASK)) 4917 goto out_disable_device; 4918 4919

+3 -2

drivers/net/sungem.c

··· 44 #include <linux/init.h> 45 #include <linux/errno.h> 46 #include <linux/pci.h> 47 #include <linux/netdevice.h> 48 #include <linux/etherdevice.h> 49 #include <linux/skbuff.h> ··· 2990 */ 2991 if (pdev->vendor == PCI_VENDOR_ID_SUN && 2992 pdev->device == PCI_DEVICE_ID_SUN_GEM && 2993 - !pci_set_dma_mask(pdev, (u64) 0xffffffffffffffffULL)) { 2994 pci_using_dac = 1; 2995 } else { 2996 - err = pci_set_dma_mask(pdev, (u64) 0xffffffff); 2997 if (err) { 2998 printk(KERN_ERR PFX "No usable DMA configuration, " 2999 "aborting.\n");

··· 44 #include <linux/init.h> 45 #include <linux/errno.h> 46 #include <linux/pci.h> 47 + #include <linux/dma-mapping.h> 48 #include <linux/netdevice.h> 49 #include <linux/etherdevice.h> 50 #include <linux/skbuff.h> ··· 2989 */ 2990 if (pdev->vendor == PCI_VENDOR_ID_SUN && 2991 pdev->device == PCI_DEVICE_ID_SUN_GEM && 2992 + !pci_set_dma_mask(pdev, DMA_64BIT_MASK)) { 2993 pci_using_dac = 1; 2994 } else { 2995 + err = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 2996 if (err) { 2997 printk(KERN_ERR PFX "No usable DMA configuration, " 2998 "aborting.\n");

+2 -1

drivers/net/tlan.c

··· 171 #include <linux/ioport.h> 172 #include <linux/eisa.h> 173 #include <linux/pci.h> 174 #include <linux/netdevice.h> 175 #include <linux/etherdevice.h> 176 #include <linux/delay.h> ··· 567 568 priv->adapter = &board_info[ent->driver_data]; 569 570 - rc = pci_set_dma_mask(pdev, 0xFFFFFFFF); 571 if (rc) { 572 printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n"); 573 goto err_out_free_dev;

··· 171 #include <linux/ioport.h> 172 #include <linux/eisa.h> 173 #include <linux/pci.h> 174 + #include <linux/dma-mapping.h> 175 #include <linux/netdevice.h> 176 #include <linux/etherdevice.h> 177 #include <linux/delay.h> ··· 566 567 priv->adapter = &board_info[ent->driver_data]; 568 569 + rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 570 if (rc) { 571 printk(KERN_ERR "TLAN: No suitable PCI mapping available.\n"); 572 goto err_out_free_dev;

+2 -1

drivers/net/tokenring/lanstreamer.c

··· 118 #include <linux/stddef.h> 119 #include <linux/init.h> 120 #include <linux/pci.h> 121 #include <linux/spinlock.h> 122 #include <linux/version.h> 123 #include <linux/bitops.h> ··· 258 #endif 259 #endif 260 261 - rc = pci_set_dma_mask(pdev, 0xFFFFFFFFULL); 262 if (rc) { 263 printk(KERN_ERR "%s: No suitable PCI mapping available.\n", 264 dev->name);

··· 118 #include <linux/stddef.h> 119 #include <linux/init.h> 120 #include <linux/pci.h> 121 + #include <linux/dma-mapping.h> 122 #include <linux/spinlock.h> 123 #include <linux/version.h> 124 #include <linux/bitops.h> ··· 257 #endif 258 #endif 259 260 + rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 261 if (rc) { 262 printk(KERN_ERR "%s: No suitable PCI mapping available.\n", 263 dev->name);

+2 -1

drivers/net/via-rhine.c

··· 186 #include <linux/slab.h> 187 #include <linux/interrupt.h> 188 #include <linux/pci.h> 189 #include <linux/netdevice.h> 190 #include <linux/etherdevice.h> 191 #include <linux/skbuff.h> ··· 741 goto err_out; 742 743 /* this should always be supported */ 744 - rc = pci_set_dma_mask(pdev, 0xffffffff); 745 if (rc) { 746 printk(KERN_ERR "32-bit PCI DMA addresses not supported by " 747 "the card!?\n");

··· 186 #include <linux/slab.h> 187 #include <linux/interrupt.h> 188 #include <linux/pci.h> 189 + #include <linux/dma-mapping.h> 190 #include <linux/netdevice.h> 191 #include <linux/etherdevice.h> 192 #include <linux/skbuff.h> ··· 740 goto err_out; 741 742 /* this should always be supported */ 743 + rc = pci_set_dma_mask(pdev, DMA_32BIT_MASK); 744 if (rc) { 745 printk(KERN_ERR "32-bit PCI DMA addresses not supported by " 746 "the card!?\n");

+3 -2

drivers/net/wan/wanxl.c

··· 26 #include <linux/netdevice.h> 27 #include <linux/hdlc.h> 28 #include <linux/pci.h> 29 #include <asm/io.h> 30 #include <asm/delay.h> 31 ··· 625 /* FIXME when PCI/DMA subsystems are fixed. 626 We set both dma_mask and consistent_dma_mask back to 32 bits 627 to indicate the card can do 32-bit DMA addressing */ 628 - if (pci_set_consistent_dma_mask(pdev, 0xFFFFFFFF) || 629 - pci_set_dma_mask(pdev, 0xFFFFFFFF)) { 630 printk(KERN_ERR "wanXL: No usable DMA configuration\n"); 631 wanxl_pci_remove_one(pdev); 632 return -EIO;

··· 26 #include <linux/netdevice.h> 27 #include <linux/hdlc.h> 28 #include <linux/pci.h> 29 + #include <linux/dma-mapping.h> 30 #include <asm/io.h> 31 #include <asm/delay.h> 32 ··· 624 /* FIXME when PCI/DMA subsystems are fixed. 625 We set both dma_mask and consistent_dma_mask back to 32 bits 626 to indicate the card can do 32-bit DMA addressing */ 627 + if (pci_set_consistent_dma_mask(pdev, DMA_32BIT_MASK) || 628 + pci_set_dma_mask(pdev, DMA_32BIT_MASK)) { 629 printk(KERN_ERR "wanXL: No usable DMA configuration\n"); 630 wanxl_pci_remove_one(pdev); 631 return -EIO;