svn commit: r363675 - in head/sys: dev/iommu dev/ntb/ntb_hw x86/iommu
Ruslan Bukin
br at FreeBSD.org
Wed Jul 29 22:08:56 UTC 2020
Author: br
Date: Wed Jul 29 22:08:54 2020
New Revision: 363675
URL: https://svnweb.freebsd.org/changeset/base/363675
Log:
o Don't include headers from iommu.h, include them from the header
consumers instead;
o Order includes properly.
Reviewed by: kib
Sponsored by: DARPA/AFRL
Differential Revision: https://reviews.freebsd.org/D25878
Modified:
head/sys/dev/iommu/iommu.h
head/sys/dev/iommu/iommu_gas.c
head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
head/sys/x86/iommu/intel_ctx.c
head/sys/x86/iommu/intel_drv.c
head/sys/x86/iommu/intel_idpgtbl.c
head/sys/x86/iommu/intel_intrmap.c
head/sys/x86/iommu/intel_qi.c
head/sys/x86/iommu/intel_quirks.c
head/sys/x86/iommu/intel_utils.c
Modified: head/sys/dev/iommu/iommu.h
==============================================================================
--- head/sys/dev/iommu/iommu.h Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/dev/iommu/iommu.h Wed Jul 29 22:08:54 2020 (r363675)
@@ -34,14 +34,6 @@
#ifndef _SYS_IOMMU_H_
#define _SYS_IOMMU_H_
-#include <sys/types.h>
-#include <sys/queue.h>
-#include <sys/sysctl.h>
-#include <sys/taskqueue.h>
-#include <sys/tree.h>
-
-#include <dev/pci/pcireg.h>
-
/* Host or physical memory address, after translation. */
typedef uint64_t iommu_haddr_t;
/* Guest or bus address, before translation. */
Modified: head/sys/dev/iommu/iommu_gas.c
==============================================================================
--- head/sys/dev/iommu/iommu_gas.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/dev/iommu/iommu_gas.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -52,7 +52,6 @@ __FBSDID("$FreeBSD$");
#include <sys/tree.h>
#include <sys/uio.h>
#include <sys/vmem.h>
-#include <dev/pci/pcivar.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
@@ -60,6 +59,9 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_map.h>
#include <vm/uma.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <dev/iommu/iommu.h>
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/md_var.h>
@@ -67,11 +69,9 @@ __FBSDID("$FreeBSD$");
#include <machine/specialreg.h>
#include <x86/include/busdma_impl.h>
#include <x86/iommu/intel_reg.h>
-#include <dev/iommu/busdma_iommu.h>
-#include <dev/iommu/iommu.h>
-#include <dev/pci/pcireg.h>
#include <x86/iommu/intel_dmar.h>
#endif
+#include <dev/iommu/busdma_iommu.h>
/*
* Guest Address Space management.
Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_intel.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -50,6 +50,8 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/mutex.h>
#include <sys/pciio.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
#include <sys/queue.h>
#include <sys/rman.h>
#include <sys/sbuf.h>
Modified: head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c
==============================================================================
--- head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/dev/ntb/ntb_hw/ntb_hw_plx.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -42,6 +42,8 @@ __FBSDID("$FreeBSD$");
#include <sys/module.h>
#include <sys/rman.h>
#include <sys/sysctl.h>
+#include <sys/taskqueue.h>
+#include <sys/tree.h>
#include <vm/vm.h>
#include <vm/pmap.h>
#include <machine/bus.h>
Modified: head/sys/x86/iommu/intel_ctx.c
==============================================================================
--- head/sys/x86/iommu/intel_ctx.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_ctx.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -58,18 +58,18 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
#include <vm/vm_map.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
-#include <dev/pci/pcivar.h>
static MALLOC_DEFINE(M_DMAR_CTX, "dmar_ctx", "Intel DMAR Context");
static MALLOC_DEFINE(M_DMAR_DOMAIN, "dmar_dom", "Intel DMAR Domain");
Modified: head/sys/x86/iommu/intel_drv.c
==============================================================================
--- head/sys/x86/iommu/intel_drv.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_drv.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -54,11 +54,6 @@ __FBSDID("$FreeBSD$");
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <sys/vmem.h>
-#include <machine/bus.h>
-#include <machine/pci_cfgreg.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
-#include <dev/acpica/acpivar.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
@@ -66,11 +61,16 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
#include <vm/vm_map.h>
-#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
-#include <dev/iommu/busdma_iommu.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.h>
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
+#include <machine/bus.h>
+#include <machine/pci_cfgreg.h>
+#include <x86/include/busdma_impl.h>
+#include <dev/iommu/busdma_iommu.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
#ifdef DEV_APIC
Modified: head/sys/x86/iommu/intel_idpgtbl.c
==============================================================================
--- head/sys/x86/iommu/intel_idpgtbl.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_idpgtbl.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -58,15 +58,15 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
#include <vm/vm_map.h>
+#include <dev/pci/pcireg.h>
#include <machine/atomic.h>
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/md_var.h>
#include <machine/specialreg.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
static int domain_unmap_buf_locked(struct dmar_domain *domain,
Modified: head/sys/x86/iommu/intel_intrmap.c
==============================================================================
--- head/sys/x86/iommu/intel_intrmap.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_intrmap.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -40,24 +40,25 @@ __FBSDID("$FreeBSD$");
#include <sys/mutex.h>
#include <sys/rman.h>
#include <sys/rwlock.h>
+#include <sys/sysctl.h>
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <sys/vmem.h>
-#include <machine/bus.h>
-#include <machine/intr_machdep.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_object.h>
#include <vm/vm_page.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <machine/bus.h>
+#include <machine/intr_machdep.h>
#include <x86/include/apicreg.h>
#include <x86/include/apicvar.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
-#include <dev/pci/pcivar.h>
#include <x86/iommu/iommu_intrmap.h>
static struct dmar_unit *dmar_ir_find(device_t src, uint16_t *rid,
Modified: head/sys/x86/iommu/intel_qi.c
==============================================================================
--- head/sys/x86/iommu/intel_qi.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_qi.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -45,20 +45,20 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/tree.h>
#include <sys/vmem.h>
-#include <machine/bus.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
-#include <dev/acpica/acpivar.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
#include <vm/vm_page.h>
#include <vm/vm_map.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/pci/pcireg.h>
+#include <machine/bus.h>
#include <machine/cpu.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
static bool
Modified: head/sys/x86/iommu/intel_quirks.c
==============================================================================
--- head/sys/x86/iommu/intel_quirks.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_quirks.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$");
#include <sys/taskqueue.h>
#include <sys/tree.h>
#include <sys/vmem.h>
-#include <machine/bus.h>
-#include <contrib/dev/acpica/include/acpi.h>
-#include <contrib/dev/acpica/include/accommon.h>
-#include <dev/acpica/acpivar.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
@@ -57,12 +53,16 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_pager.h>
#include <vm/vm_map.h>
+#include <contrib/dev/acpica/include/acpi.h>
+#include <contrib/dev/acpica/include/accommon.h>
+#include <dev/acpica/acpivar.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
+#include <machine/bus.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
-#include <dev/pci/pcivar.h>
typedef void (*dmar_quirk_cpu_fun)(struct dmar_unit *);
Modified: head/sys/x86/iommu/intel_utils.c
==============================================================================
--- head/sys/x86/iommu/intel_utils.c Wed Jul 29 21:15:06 2020 (r363674)
+++ head/sys/x86/iommu/intel_utils.c Wed Jul 29 22:08:54 2020 (r363675)
@@ -51,7 +51,6 @@ __FBSDID("$FreeBSD$");
#include <sys/time.h>
#include <sys/tree.h>
#include <sys/vmem.h>
-#include <dev/pci/pcivar.h>
#include <vm/vm.h>
#include <vm/vm_extern.h>
#include <vm/vm_kern.h>
@@ -59,14 +58,15 @@ __FBSDID("$FreeBSD$");
#include <vm/vm_page.h>
#include <vm/vm_map.h>
#include <vm/vm_pageout.h>
+#include <dev/pci/pcireg.h>
+#include <dev/pci/pcivar.h>
#include <machine/bus.h>
#include <machine/cpu.h>
#include <machine/intr_machdep.h>
#include <x86/include/apicvar.h>
#include <x86/include/busdma_impl.h>
-#include <x86/iommu/intel_reg.h>
#include <dev/iommu/busdma_iommu.h>
-#include <dev/pci/pcireg.h>
+#include <x86/iommu/intel_reg.h>
#include <x86/iommu/intel_dmar.h>
u_int
More information about the svn-src-head
mailing list