x86: Gart: fix breakage due to IOMMU initialization cleanup
authorYinghai Lu <yinghai@kernel.org>
Mon, 14 Dec 2009 02:52:15 +0000 (11:52 +0900)
committerIngo Molnar <mingo@elte.hu>
Mon, 14 Dec 2009 07:57:40 +0000 (08:57 +0100)
commitf3eee54276dfd1117fd94259f2b4a38388264724
treeb51cb4d1dc14be52d6b91f59a6e27800e0c8a9cb
parentf4780ca005404166cc40af77ef0e86132ab98a81
x86: Gart: fix breakage due to IOMMU initialization cleanup

This fixes the following breakage of the commit
75f1cdf1dda92cae037ec848ae63690d91913eac:

- GART systems that don't AGP with broken BIOS and more than 4GB
  memory are forced to use swiotlb. They can allocate aperture by
  hand and use GART.

- GART systems without GAP must disable GART on shutdown.

- swiotlb usage is forced by the boot option,
  gart_iommu_hole_init() is not called, so we disable GART
  early_gart_iommu_check().

Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
LKML-Reference: <1260759135-6450-3-git-send-email-fujita.tomonori@lab.ntt.co.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/aperture_64.c
arch/x86/kernel/pci-gart_64.c