[PATCH] powerpc: Fix initialization and usage of dma_mask
From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Date: 2007-08-06 22:05:46
Also in:
lkml
powerpc has a couple of bugs in the usage of dma_masks that tend to break when drivers explicitely try to set a 32 bits mask for example. First the code that generates the pci devices from the OF device-tree doesn't initialize the mask properly, then our implementation of set_dma_mask() was trying to validate the -previous- mask value, not the one passed in as an argument. This patch should fix these. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> --- Does this fix the problem you've noticed ? (I do still think that sbp2 isn't the right place for that call btw :-) Index: linux-work/include/asm-powerpc/dma-mapping.h ===================================================================
--- linux-work.orig/include/asm-powerpc/dma-mapping.h 2007-08-07 07:59:05.000000000 +1000
+++ linux-work/include/asm-powerpc/dma-mapping.h 2007-08-07 07:59:09.000000000 +1000@@ -96,7 +96,7 @@ return -EIO; if (dma_ops->set_dma_mask != NULL) return dma_ops->set_dma_mask(dev, dma_mask); - if (!dev->dma_mask || !dma_supported(dev, *dev->dma_mask)) + if (!dev->dma_mask || !dma_supported(dev, dma_mask)) return -EIO; *dev->dma_mask = dma_mask; return 0;
Index: linux-work/arch/powerpc/kernel/pci_64.c ===================================================================
--- linux-work.orig/arch/powerpc/kernel/pci_64.c 2007-08-07 08:00:20.000000000 +1000
+++ linux-work/arch/powerpc/kernel/pci_64.c 2007-08-07 08:00:47.000000000 +1000@@ -372,6 +372,7 @@ dev->current_state = 4; /* unknown power state */ dev->error_state = pci_channel_io_normal; + dev->dma_mask = 0xffffffff; if (!strcmp(type, "pci") || !strcmp(type, "pciex")) { /* a PCI-PCI bridge */