]> git.baikalelectronics.ru Git - kernel.git/commit
Revert "pseries/iommu: Remove DDW on kexec"
authorNishanth Aravamudan <nacc@linux.vnet.ibm.com>
Fri, 10 Jan 2014 23:10:41 +0000 (15:10 -0800)
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>
Wed, 15 Jan 2014 02:46:45 +0000 (13:46 +1100)
commitb51896108fcc89733508382844cd6212f2eb5705
tree927bb7eede2a0031a5bb34e88cbe6654e71c85d2
parenta79517a350c397e7a8a00acb643668716f3d702b
Revert "pseries/iommu: Remove DDW on kexec"

After reverting 2a07d813cdd8625c3c7a8f97f300d7f692b1d9b0
("powerpc/pseries/iommu: remove default window before attempting DDW
manipulation"), we no longer remove the base window in enable_ddw.
Therefore, we no longer need to reset the DMA window state in
find_existing_ddw_windows(). We can instead go back to what was done
before, which simply reuses the previous configuration, if any. Further,
this removes the final caller of the reset-pe-dma-windows call, so
remove those functions.

This fixes an EEH on kdump with the ipr driver. The EEH occurs, because
the initcall removes the DDW configuration (64-bit DMA window), but
doesn't ensure the ops are via the IOMMU -- a DMA operation occurs
during probe (still investigating this) and we EEH.

This reverts commit c6d2268d0ce9bd3a1faad071b00966351cf0e16a.

Signed-off-by: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
arch/powerpc/platforms/pseries/iommu.c