lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] x86_64: pci-dma.c clean-up - trivial

Browse Source 
Replace hard coded DMA masks with #defines from
include/linux/dma-mapping.h

Signed-off-by: Jon Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Jon Mason
2006-06-26 13:56:19 +02:00
committed by Linus Torvalds
parent d167a51877
commit 9f2036f3e2
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
arch/x86_64/kernel/pci-dma.c
View File

@@ -38,7 +38,7 @@ int force_iommu __read_mostly= 0;
to i386. */ to i386. */
struct device fallback_dev = { struct device fallback_dev = {
.bus_id = "fallback device", .bus_id = "fallback device",
.coherent_dma_mask = 0xffffffff, .coherent_dma_mask = DMA_32BIT_MASK,
.dma_mask = &fallback_dev.coherent_dma_mask, .dma_mask = &fallback_dev.coherent_dma_mask,
}; };
@@ -77,7 +77,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
dev = &fallback_dev; dev = &fallback_dev;
dma_mask = dev->coherent_dma_mask; dma_mask = dev->coherent_dma_mask;
if (dma_mask == 0) if (dma_mask == 0)
dma_mask = 0xffffffff; dma_mask = DMA_32BIT_MASK;
/* Don't invoke OOM killer */ /* Don't invoke OOM killer */
gfp |= __GFP_NORETRY; gfp |= __GFP_NORETRY;
@@ -90,7 +90,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
larger than 16MB and in this case we have a chance of larger than 16MB and in this case we have a chance of
finding fitting memory in the next higher zone first. If finding fitting memory in the next higher zone first. If
not retry with true GFP_DMA. -AK */ not retry with true GFP_DMA. -AK */
if (dma_mask <= 0xffffffff) if (dma_mask <= DMA_32BIT_MASK)
gfp |= GFP_DMA32; gfp |= GFP_DMA32;
again: again:
@@ -111,7 +111,7 @@ dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle,
/* Don't use the 16MB ZONE_DMA unless absolutely /* Don't use the 16MB ZONE_DMA unless absolutely
needed. It's better to use remapping first. */ needed. It's better to use remapping first. */
if (dma_mask < 0xffffffff && !(gfp & GFP_DMA)) { if (dma_mask < DMA_32BIT_MASK && !(gfp & GFP_DMA)) {
gfp = (gfp & ~GFP_DMA32) | GFP_DMA; gfp = (gfp & ~GFP_DMA32) | GFP_DMA;
goto again; goto again;
} }
@@ -174,7 +174,7 @@ int dma_supported(struct device *dev, u64 mask)
/* Copied from i386. Doesn't make much sense, because it will /* Copied from i386. Doesn't make much sense, because it will
only work for pci_alloc_coherent. only work for pci_alloc_coherent.
The caller just has to use GFP_DMA in this case. */ The caller just has to use GFP_DMA in this case. */
if (mask < 0x00ffffff) if (mask < DMA_24BIT_MASK)
return 0; return 0;
/* Tell the device to use SAC when IOMMU force is on. This /* Tell the device to use SAC when IOMMU force is on. This
@@ -189,7 +189,7 @@ int dma_supported(struct device *dev, u64 mask)
SAC for these. Assume all masks <= 40 bits are of this SAC for these. Assume all masks <= 40 bits are of this
type. Normally this doesn't make any difference, but gives type. Normally this doesn't make any difference, but gives
more gentle handling of IOMMU overflow. */ more gentle handling of IOMMU overflow. */
if (iommu_sac_force && (mask >= 0xffffffffffULL)) { if (iommu_sac_force && (mask >= DMA_40BIT_MASK)) {
printk(KERN_INFO "%s: Force SAC with mask %Lx\n", dev->bus_id,mask); printk(KERN_INFO "%s: Force SAC with mask %Lx\n", dev->bus_id,mask);
return 0; return 0;
} }