[SPARC64]: Temporarily remove IOMMU merging code.
authorDavid S. Miller <davem@huronp11.davemloft.net>
Wed, 6 Feb 2008 11:50:26 +0000 (03:50 -0800)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Feb 2008 12:12:25 +0000 (04:12 -0800)
commit38192d52f159bc06b7f523800c10b583cdd661d5
tree4cf695d583c0a657133642c0299cbfa536e25663
parentb3ff81dd8ae29ec431f6cc91aff601a51ef6fb8c
[SPARC64]: Temporarily remove IOMMU merging code.

Changeset fde6a3c82d67f592eb587be4d12222b0ae6d4321 ("iommu sg merging:
sparc64: make iommu respect the segment size limits") broke sparc64
because whilst it added the segment limiting code to the first pass of
SG mapping (in prepare_sg()) it did not add matching code to the
second pass handling (in fill_sg())

As a result the two passes disagree where the segment boundaries
should be, resulting in OOPSes, DMA corruption, and corrupted
superblocks.

Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc64/kernel/Makefile
arch/sparc64/kernel/iommu.c
arch/sparc64/kernel/iommu_common.c [deleted file]
arch/sparc64/kernel/iommu_common.h
arch/sparc64/kernel/pci_sun4v.c
include/asm-sparc64/io.h