17a941d854
AK: I hacked Muli's original patch a lot and there were a lot
of changes - all bugs are probably to blame on me now.
There were also some changes in the fall back behaviour
for swiotlb - in particular it doesn't try to use GFP_DMA
now anymore. Also all DMA mapping operations use the
same core dma_alloc_coherent code with proper fallbacks now.
And various other changes and cleanups.
Known problems: iommu=force swiotlb=force together breaks
needs more testing.
This patch cleans up x86_64's DMA mapping dispatching code. Right now
we have three possible IOMMU types: AGP GART, swiotlb and nommu, and
in the future we will also have Xen's x86_64 swiotlb and other HW
IOMMUs for x86_64. In order to support all of them cleanly, this
patch:
- introduces a struct dma_mapping_ops with function pointers for each
of the DMA mapping operations of gart (AMD HW IOMMU), swiotlb
(software IOMMU) and nommu (no IOMMU).
- gets rid of:
if (swiotlb)
return swiotlb_xxx();
- PCI_DMA_BUS_IS_PHYS is now checked against the dma_ops being set
This makes swiotlb faster by avoiding double copying in some cases.
Signed-Off-By: Muli Ben-Yehuda <mulix@mulix.org>
Signed-Off-By: Jon D. Mason <jdmason@us.ibm.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
53 lines
1.9 KiB
Makefile
53 lines
1.9 KiB
Makefile
#
|
|
# Makefile for the linux kernel.
|
|
#
|
|
|
|
extra-y := head.o head64.o init_task.o vmlinux.lds
|
|
EXTRA_AFLAGS := -traditional
|
|
obj-y := process.o signal.o entry.o traps.o irq.o \
|
|
ptrace.o time.o ioport.o ldt.o setup.o i8259.o sys_x86_64.o \
|
|
x8664_ksyms.o i387.o syscall.o vsyscall.o \
|
|
setup64.o bootflag.o e820.o reboot.o quirks.o i8237.o \
|
|
dmi_scan.o pci-dma.o pci-nommu.o
|
|
|
|
obj-$(CONFIG_X86_MCE) += mce.o
|
|
obj-$(CONFIG_X86_MCE_INTEL) += mce_intel.o
|
|
obj-$(CONFIG_X86_MCE_AMD) += mce_amd.o
|
|
obj-$(CONFIG_MTRR) += ../../i386/kernel/cpu/mtrr/
|
|
obj-$(CONFIG_ACPI) += acpi/
|
|
obj-$(CONFIG_X86_MSR) += msr.o
|
|
obj-$(CONFIG_MICROCODE) += microcode.o
|
|
obj-$(CONFIG_X86_CPUID) += cpuid.o
|
|
obj-$(CONFIG_SMP) += smp.o smpboot.o trampoline.o
|
|
obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o
|
|
obj-$(CONFIG_X86_IO_APIC) += io_apic.o mpparse.o \
|
|
genapic.o genapic_cluster.o genapic_flat.o
|
|
obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o crash.o
|
|
obj-$(CONFIG_CRASH_DUMP) += crash_dump.o
|
|
obj-$(CONFIG_PM) += suspend.o
|
|
obj-$(CONFIG_SOFTWARE_SUSPEND) += suspend_asm.o
|
|
obj-$(CONFIG_CPU_FREQ) += cpufreq/
|
|
obj-$(CONFIG_EARLY_PRINTK) += early_printk.o
|
|
obj-$(CONFIG_GART_IOMMU) += pci-gart.o aperture.o
|
|
obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
|
|
obj-$(CONFIG_KPROBES) += kprobes.o
|
|
obj-$(CONFIG_X86_PM_TIMER) += pmtimer.o
|
|
|
|
obj-$(CONFIG_MODULES) += module.o
|
|
|
|
obj-y += topology.o
|
|
obj-y += intel_cacheinfo.o
|
|
|
|
CFLAGS_vsyscall.o := $(PROFILING) -g0
|
|
|
|
bootflag-y += ../../i386/kernel/bootflag.o
|
|
cpuid-$(subst m,y,$(CONFIG_X86_CPUID)) += ../../i386/kernel/cpuid.o
|
|
topology-y += ../../i386/mach-default/topology.o
|
|
microcode-$(subst m,y,$(CONFIG_MICROCODE)) += ../../i386/kernel/microcode.o
|
|
intel_cacheinfo-y += ../../i386/kernel/cpu/intel_cacheinfo.o
|
|
quirks-y += ../../i386/kernel/quirks.o
|
|
i8237-y += ../../i386/kernel/i8237.o
|
|
msr-$(subst m,y,$(CONFIG_X86_MSR)) += ../../i386/kernel/msr.o
|
|
dmi_scan-y += ../../i386/kernel/dmi_scan.o
|
|
|