Index: sys/dev/iommu/busdma_iommu.h =================================================================== --- sys/dev/iommu/busdma_iommu.h +++ sys/dev/iommu/busdma_iommu.h @@ -35,6 +35,7 @@ #define __X86_IOMMU_BUSDMA_DMAR_H #include +#include struct bus_dma_tag_iommu { struct bus_dma_tag_common common; Index: sys/dev/iommu/busdma_iommu.c =================================================================== --- sys/dev/iommu/busdma_iommu.c +++ sys/dev/iommu/busdma_iommu.c @@ -60,6 +60,7 @@ #include #include #include +#include #include #include #include Index: sys/dev/iommu/iommu.h =================================================================== --- sys/dev/iommu/iommu.h +++ sys/dev/iommu/iommu.h @@ -43,31 +43,6 @@ struct iommu_map_entry; TAILQ_HEAD(iommu_map_entries_tailq, iommu_map_entry); -RB_HEAD(iommu_gas_entries_tree, iommu_map_entry); -RB_PROTOTYPE(iommu_gas_entries_tree, iommu_map_entry, rb_entry, - iommu_gas_cmp_entries); - -struct iommu_qi_genseq { - u_int gen; - uint32_t seq; -}; - -struct iommu_map_entry { - iommu_gaddr_t start; - iommu_gaddr_t end; - iommu_gaddr_t first; /* Least start in subtree */ - iommu_gaddr_t last; /* Greatest end in subtree */ - iommu_gaddr_t free_down; /* Max free space below the - current R/B tree node */ - u_int flags; - TAILQ_ENTRY(iommu_map_entry) dmamap_link; /* Link for dmamap entries */ - RB_ENTRY(iommu_map_entry) rb_entry; /* Links for domain entries */ - TAILQ_ENTRY(iommu_map_entry) unroll_link; /* Link for unroll after - dmamap_load failure */ - struct iommu_domain *domain; - struct iommu_qi_genseq gseq; -}; - #define IOMMU_MAP_ENTRY_PLACE 0x0001 /* Fake entry */ #define IOMMU_MAP_ENTRY_RMRR 0x0002 /* Permanent, not linked by dmamap_link */ @@ -80,26 +55,10 @@ #define IOMMU_MAP_ENTRY_SNOOP 0x4000 /* Snoop */ #define IOMMU_MAP_ENTRY_TM 0x8000 /* Transient */ -struct iommu_unit { - struct mtx lock; - int unit; +struct iommu_unit; +struct iommu_domain; +struct iommu_ctx; - int dma_enabled; - - /* Busdma delayed map load */ - struct task dmamap_load_task; - TAILQ_HEAD(, bus_dmamap_iommu) delayed_maps; - struct taskqueue *delayed_taskqueue; - - /* - * Bitmap of buses for which context must ignore slot:func, - * duplicating the page table pointer into all context table - * entries. This is a client-controlled quirk to support some - * NTBs. - */ - uint32_t buswide_ctxs[(PCI_BUSMAX + 1) / NBBY / sizeof(uint32_t)]; -}; - struct iommu_domain_map_ops { int (*map)(struct iommu_domain *domain, iommu_gaddr_t base, iommu_gaddr_t size, vm_page_t *ma, uint64_t pflags, int flags); @@ -107,37 +66,6 @@ iommu_gaddr_t size, int flags); }; -/* - * Locking annotations: - * (u) - Protected by iommu unit lock - * (d) - Protected by domain lock - * (c) - Immutable after initialization - */ - -struct iommu_domain { - struct iommu_unit *iommu; /* (c) */ - const struct iommu_domain_map_ops *ops; - struct mtx lock; /* (c) */ - struct task unload_task; /* (c) */ - u_int entries_cnt; /* (d) */ - struct iommu_map_entries_tailq unload_entries; /* (d) Entries to - unload */ - struct iommu_gas_entries_tree rb_root; /* (d) */ - iommu_gaddr_t end; /* (c) Highest address + 1 in - the guest AS */ - struct iommu_map_entry *first_place, *last_place; /* (d) */ - u_int flags; /* (u) */ -}; - -struct iommu_ctx { - struct iommu_domain *domain; /* (c) */ - struct bus_dma_tag_iommu *tag; /* (c) Root tag */ - u_long loads; /* atomic updates, for stat only */ - u_long unloads; /* same */ - u_int flags; /* (u) */ - uint16_t rid; /* (c) pci RID */ -}; - /* struct iommu_ctx flags */ #define IOMMU_CTX_FAULTED 0x0001 /* Fault was reported, last_fault_rec is valid */ @@ -233,7 +161,5 @@ vm_paddr_t start, vm_size_t length, int flags); bus_dma_tag_t iommu_get_dma_tag(device_t dev, device_t child); - -SYSCTL_DECL(_hw_iommu); #endif /* !_SYS_IOMMU_H_ */ Index: sys/dev/iommu/iommu_gas.c =================================================================== --- sys/dev/iommu/iommu_gas.c +++ sys/dev/iommu/iommu_gas.c @@ -62,6 +62,7 @@ #include #include #include +#include #include #include #include Index: sys/dev/iommu/iommu_var.h =================================================================== --- sys/dev/iommu/iommu_var.h +++ sys/dev/iommu/iommu_var.h @@ -0,0 +1,115 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2013 The FreeBSD Foundation + * All rights reserved. + * + * This software was developed by Konstantin Belousov + * under sponsorship from the FreeBSD Foundation. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * + * $FreeBSD$ + */ + +#ifndef _SYS_IOMMU_VAR_H_ +#define _SYS_IOMMU_VAR_H_ + +RB_HEAD(iommu_gas_entries_tree, iommu_map_entry); +RB_PROTOTYPE(iommu_gas_entries_tree, iommu_map_entry, rb_entry, + iommu_gas_cmp_entries); + +struct iommu_qi_genseq { + u_int gen; + uint32_t seq; +}; + +struct iommu_map_entry { + iommu_gaddr_t start; + iommu_gaddr_t end; + iommu_gaddr_t first; /* Least start in subtree */ + iommu_gaddr_t last; /* Greatest end in subtree */ + iommu_gaddr_t free_down; /* Max free space below the + current R/B tree node */ + u_int flags; + TAILQ_ENTRY(iommu_map_entry) dmamap_link; /* Link for dmamap entries */ + RB_ENTRY(iommu_map_entry) rb_entry; /* Links for domain entries */ + TAILQ_ENTRY(iommu_map_entry) unroll_link; /* Link for unroll after + dmamap_load failure */ + struct iommu_domain *domain; + struct iommu_qi_genseq gseq; +}; + +struct iommu_unit { + struct mtx lock; + int unit; + + int dma_enabled; + + /* Busdma delayed map load */ + struct task dmamap_load_task; + TAILQ_HEAD(, bus_dmamap_iommu) delayed_maps; + struct taskqueue *delayed_taskqueue; + + /* + * Bitmap of buses for which context must ignore slot:func, + * duplicating the page table pointer into all context table + * entries. This is a client-controlled quirk to support some + * NTBs. + */ + uint32_t buswide_ctxs[(PCI_BUSMAX + 1) / NBBY / sizeof(uint32_t)]; +}; + +/* + * Locking annotations: + * (u) - Protected by iommu unit lock + * (d) - Protected by domain lock + * (c) - Immutable after initialization + */ + +struct iommu_domain { + struct iommu_unit *iommu; /* (c) */ + const struct iommu_domain_map_ops *ops; + struct mtx lock; /* (c) */ + struct task unload_task; /* (c) */ + u_int entries_cnt; /* (d) */ + struct iommu_map_entries_tailq unload_entries; /* (d) Entries to + unload */ + struct iommu_gas_entries_tree rb_root; /* (d) */ + iommu_gaddr_t end; /* (c) Highest address + 1 in + the guest AS */ + struct iommu_map_entry *first_place, *last_place; /* (d) */ + u_int flags; /* (u) */ +}; + +struct iommu_ctx { + struct iommu_domain *domain; /* (c) */ + struct bus_dma_tag_iommu *tag; /* (c) Root tag */ + u_long loads; /* atomic updates, for stat only */ + u_long unloads; /* same */ + u_int flags; /* (u) */ + uint16_t rid; /* (c) pci RID */ +}; + +SYSCTL_DECL(_hw_iommu); + +#endif /* !_SYS_IOMMU_VAR_H_ */