[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-changelog] [xen staging] x86/IOMMU: initialize iommu_ops in vendor-independent code
commit 19127340a504c030901fc16d8475fc7d8cfdf8a5 Author: Jan Beulich <jbeulich@xxxxxxxx> AuthorDate: Mon Apr 8 13:08:05 2019 +0200 Commit: Jan Beulich <jbeulich@xxxxxxxx> CommitDate: Mon Apr 8 13:08:05 2019 +0200 x86/IOMMU: initialize iommu_ops in vendor-independent code Move this into iommu_hardware_setup() and make that function non- inline. Move its declaration into common code. Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx> Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx> Reviewed-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx> Acked-by: Brian Woods <brian.woods@xxxxxxx> --- xen/drivers/passthrough/amd/pci_amd_iommu.c | 6 ++---- xen/drivers/passthrough/vtd/iommu.c | 2 -- xen/drivers/passthrough/x86/iommu.c | 14 ++++++++++++++ xen/include/asm-arm/iommu.h | 2 -- xen/include/asm-x86/iommu.h | 5 ----- xen/include/xen/iommu.h | 1 + 6 files changed, 17 insertions(+), 13 deletions(-) diff --git a/xen/drivers/passthrough/amd/pci_amd_iommu.c b/xen/drivers/passthrough/amd/pci_amd_iommu.c index 243a37663b..dbc71ca7d5 100644 --- a/xen/drivers/passthrough/amd/pci_amd_iommu.c +++ b/xen/drivers/passthrough/amd/pci_amd_iommu.c @@ -31,7 +31,6 @@ static bool_t __read_mostly init_done; static const struct iommu_init_ops _iommu_init_ops; -static const struct iommu_ops amd_iommu_ops; struct amd_iommu *find_iommu_for_device(int seg, int bdf) { @@ -173,8 +172,6 @@ static int __init iov_detect(void) if ( !iommu_enable && !iommu_intremap ) return 0; - iommu_ops = amd_iommu_ops; - if ( amd_iommu_init() != 0 ) { printk("AMD-Vi: Error initialization\n"); @@ -545,7 +542,7 @@ static void amd_dump_p2m_table(struct domain *d) amd_dump_p2m_table_level(hd->arch.root_table, hd->arch.paging_mode, 0, 0); } -static const struct iommu_ops __initconstrel amd_iommu_ops = { +static const struct iommu_ops __initconstrel _iommu_ops = { .init = amd_iommu_domain_init, .hwdom_init = amd_iommu_hwdom_init, .add_device = amd_iommu_add_device, @@ -572,5 +569,6 @@ static const struct iommu_ops __initconstrel amd_iommu_ops = { }; static const struct iommu_init_ops __initconstrel _iommu_init_ops = { + .ops = &_iommu_ops, .setup = iov_detect, }; diff --git a/xen/drivers/passthrough/vtd/iommu.c b/xen/drivers/passthrough/vtd/iommu.c index 74133101c4..69995c4a9f 100644 --- a/xen/drivers/passthrough/vtd/iommu.c +++ b/xen/drivers/passthrough/vtd/iommu.c @@ -2305,8 +2305,6 @@ static int __init vtd_setup(void) goto error; } - iommu_ops = intel_iommu_ops; - /* We enable the following features only if they are supported by all VT-d * engines: Snoop Control, DMA passthrough, Queued Invalidation, Interrupt * Remapping, and Posted Interrupt diff --git a/xen/drivers/passthrough/x86/iommu.c b/xen/drivers/passthrough/x86/iommu.c index 1c8e1ddb5f..034ac903dd 100644 --- a/xen/drivers/passthrough/x86/iommu.c +++ b/xen/drivers/passthrough/x86/iommu.c @@ -26,6 +26,20 @@ const struct iommu_init_ops *__initdata iommu_init_ops; struct iommu_ops __read_mostly iommu_ops; +int __init iommu_hardware_setup(void) +{ + if ( !iommu_init_ops ) + return -ENODEV; + + if ( !iommu_ops.init ) + iommu_ops = *iommu_init_ops->ops; + else + /* x2apic setup may have previously initialised the struct. */ + ASSERT(iommu_ops.init == iommu_init_ops->ops->init); + + return iommu_init_ops->setup(); +} + int iommu_enable_x2apic(void) { if ( system_state < SYS_STATE_active ) diff --git a/xen/include/asm-arm/iommu.h b/xen/include/asm-arm/iommu.h index 90cd011d35..904c9aec11 100644 --- a/xen/include/asm-arm/iommu.h +++ b/xen/include/asm-arm/iommu.h @@ -26,8 +26,6 @@ struct arch_iommu const struct iommu_ops *iommu_get_ops(void); void iommu_set_ops(const struct iommu_ops *ops); -int iommu_hardware_setup(void); - #endif /* __ARCH_ARM_IOMMU_H__ */ /* diff --git a/xen/include/asm-x86/iommu.h b/xen/include/asm-x86/iommu.h index 19c82e924a..fd24d8fb7b 100644 --- a/xen/include/asm-x86/iommu.h +++ b/xen/include/asm-x86/iommu.h @@ -73,11 +73,6 @@ struct iommu_init_ops { extern const struct iommu_init_ops *iommu_init_ops; -static inline int iommu_hardware_setup(void) -{ - return iommu_init_ops ? iommu_init_ops->setup() : -ENODEV; -} - /* Are we using the domain P2M table as its IOMMU pagetable? */ #define iommu_use_hap_pt(d) \ (hap_enabled(d) && has_iommu_pt(d) && iommu_hap_pt_share) diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h index 8b0750981f..b4afafd972 100644 --- a/xen/include/xen/iommu.h +++ b/xen/include/xen/iommu.h @@ -65,6 +65,7 @@ extern int8_t iommu_hwdom_reserved; extern unsigned int iommu_dev_iotlb_timeout; int iommu_setup(void); +int iommu_hardware_setup(void); int iommu_domain_init(struct domain *d); void iommu_hwdom_init(struct domain *d); -- generated by git-patchbot for /home/xen/git/xen.git#staging _______________________________________________ Xen-changelog mailing list Xen-changelog@xxxxxxxxxxxxxxxxxxxx https://lists.xenproject.org/xen-changelog
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |