]> git.baikalelectronics.ru Git - kernel.git/commit
powerpc/iseries: Fix pci breakage due to bad dma_data initialization
authorStephen Rothwell x <sfr@canb.auug.org.au>
Wed, 6 May 2009 14:07:52 +0000 (14:07 +0000)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Fri, 15 May 2009 06:43:41 +0000 (16:43 +1000)
commit8de9ae68c118fc471625827d2453ed63d0ea6247
treec4b02725a662150a9ba7129bd6cbfaa98a4adcd0
parentfbe57be66c96f3b8655ffa80ca5191c6540249cd
powerpc/iseries: Fix pci breakage due to bad dma_data initialization

Commit 2178186f55c5dd4e988509d2fe1679cf4b892e5d "powerpc: Merge 32 and
64-bit dma code" made changes to the PCI initialisation code that added
an assignment to archdata.dma_data but only for 32 bit code.  Commit
7f3125e9f1a59c7f59b72767729bdafb794f484c "powerpc/pci: Cosmetic cleanups
of pci-common.c" removed the conditional compilation.  Unfortunately,
the iSeries code setup the archdata.dma_data before that assignment was
done - effectively overwriting the dma_data with NULL.

Fix this up by moving the iSeries setup of dma_data into a
pci_dma_dev_setup callback.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/include/asm/iseries/iommu.h
arch/powerpc/platforms/iseries/iommu.c
arch/powerpc/platforms/iseries/pci.c