iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc

Browse Source 
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
  powerpc/dma: pci_set_dma_mask() shouldn't fail if mask fits in RAM
This commit is contained in:
Linus Torvalds 2009-08-10 08:59:56 -07:00
commit 2c661a669b
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/kernel/dma.c
View File

@ -7,6 +7,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/lmb.h>
#include <asm/bug.h> #include <asm/bug.h>
#include <asm/abs_addr.h> #include <asm/abs_addr.h>
@ -90,11 +91,10 @@ static void dma_direct_unmap_sg(struct device *dev, struct scatterlist *sg,
static int dma_direct_dma_supported(struct device *dev, u64 mask) static int dma_direct_dma_supported(struct device *dev, u64 mask)
{ {
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
/* Could be improved to check for memory though it better be /* Could be improved so platforms can set the limit in case
* done via some global so platforms can set the limit in case
* they have limited DMA windows * they have limited DMA windows
*/ */
return mask >= DMA_BIT_MASK(32); return mask >= (lmb_end_of_DRAM() - 1);
#else #else
return 1; return 1;
#endif #endif