Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=24af8cb86973dde9bf8df51bef923fda8718bdb5
Commit:     24af8cb86973dde9bf8df51bef923fda8718bdb5
Parent:     8af03e782cae1e0a0f530ddd22301cdd12cf9dc0
Author:     Olof Johansson <[EMAIL PROTECTED]>
AuthorDate: Thu Jan 31 00:41:30 2008 -0600
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Jan 31 19:59:44 2008 +1100

    POWERPC: Set dma_data correctly for direct_ops on pasemi
    
    More late-caught fallout from the mainline merge.  Commit
    35e4a6e26d0c6bc7f32087db61f0fb3666531183 ("[POWERPC] Use
    archdata.dma_data in dma_direct_ops and add the offset") claimed
    
      "Now that all platforms using dma_direct_offset setup the
       archdata.dma_data correctly, ..."
    
    ..but nope -- the pasemi iommu setup code that disables translation on
    the DMA pci device didn't set dma_data correctly.
    
    This fixes it.
    
    Signed-off-by: Olof Johansson <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 arch/powerpc/platforms/pasemi/iommu.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/platforms/pasemi/iommu.c 
b/arch/powerpc/platforms/pasemi/iommu.c
index 9916a0f..c5cfd4b 100644
--- a/arch/powerpc/platforms/pasemi/iommu.c
+++ b/arch/powerpc/platforms/pasemi/iommu.c
@@ -182,8 +182,10 @@ static void pci_dma_dev_setup_pasemi(struct pci_dev *dev)
         * CONFIG_PPC_PASEMI_IOMMU_DMA_FORCE at build time.
         */
        if (dev->vendor == 0x1959 && dev->device == 0xa007 &&
-           !firmware_has_feature(FW_FEATURE_LPAR))
+           !firmware_has_feature(FW_FEATURE_LPAR)) {
                dev->dev.archdata.dma_ops = &dma_direct_ops;
+               dev->dev.archdata.dma_data = 0;
+       }
 #endif
 
        dev->dev.archdata.dma_data = &iommu_table_iobmap;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to