d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move the Intel DMAR busdma backend to a generic place so

Browse Source 
it can be used on other IOMMU systems.

Reviewed by:	kib
Sponsored by:	DARPA/AFRL
Differential Revision:	https://reviews.freebsd.org/D25720
This commit is contained in:
Ruslan Bukin 2020-07-21 10:38:51 +00:00
parent 2032c532aa
commit f2b2f31707
12 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/conf/files.x86
View File

@ -165,6 +165,7 @@ dev/imcsmb/imcsmb.c optional imcsmb
dev/imcsmb/imcsmb_pci.c optional imcsmb pci
dev/intel/spi.c optional intelspi
dev/io/iodev.c optional io
dev/iommu/busdma_iommu.c optional acpi acpi_dmar pci
dev/ipmi/ipmi.c optional ipmi
dev/ipmi/ipmi_acpi.c optional ipmi acpi
dev/ipmi/ipmi_isa.c optional ipmi isa
@ -300,7 +301,6 @@ x86/cpufreq/hwpstate_amd.c optional cpufreq
x86/cpufreq/hwpstate_intel.c optional cpufreq
x86/cpufreq/p4tcc.c optional cpufreq
x86/cpufreq/powernow.c optional cpufreq
x86/iommu/busdma_dmar.c optional acpi acpi_dmar pci
x86/iommu/intel_ctx.c optional acpi acpi_dmar pci
x86/iommu/intel_drv.c optional acpi acpi_dmar pci
x86/iommu/intel_fault.c optional acpi acpi_dmar pci

6
sys/x86/iommu/busdma_dmar.c → sys/dev/iommu/busdma_iommu.c
View File

@ -67,13 +67,13 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <x86/iommu/intel_dmar.h>
#endif
/*
* busdma_dmar.c, the implementation of the busdma(9) interface using
* DMAR units from Intel VT-d.
* busdma_iommu.c, the implementation of the busdma(9) interface using
* IOMMU units from Intel VT-d.
*/
static bool

0
sys/x86/iommu/busdma_dmar.h → sys/dev/iommu/busdma_iommu.h
View File

2
sys/x86/iommu/intel_ctx.c
View File

@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <contrib/dev/acpica/include/accommon.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>
#include <dev/pci/pcivar.h>

2
sys/x86/iommu/intel_drv.c
View File

@ -68,7 +68,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
#include <x86/iommu/intel_dmar.h>

2
sys/x86/iommu/intel_fault.c
View File

@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <x86/iommu/intel_dmar.h>
/*

2
sys/x86/iommu/intel_gas.c
View File

@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>

2
sys/x86/iommu/intel_idpgtbl.c
View File

@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>

2
sys/x86/iommu/intel_intrmap.c
View File

@ -54,7 +54,7 @@ __FBSDID("$FreeBSD$");
#include <x86/include/apicvar.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>
#include <dev/pci/pcivar.h>

2
sys/x86/iommu/intel_qi.c
View File

@ -57,7 +57,7 @@ __FBSDID("$FreeBSD$");
#include <machine/cpu.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>

2
sys/x86/iommu/intel_quirks.c
View File

@ -59,7 +59,7 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_map.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>
#include <dev/pci/pcivar.h>

2
sys/x86/iommu/intel_utils.c
View File

@ -65,7 +65,7 @@ __FBSDID("$FreeBSD$");
#include <x86/include/apicvar.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
#include <x86/iommu/busdma_dmar.h>
#include <dev/iommu/busdma_iommu.h>
#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>