@@ -82,7 +82,7 @@ static const struct irq_domain_ops intel_ir_domain_ops;
8282
8383static void iommu_disable_irq_remapping (struct intel_iommu * iommu );
8484static int __init parse_ioapics_under_ir (void );
85- static const struct msi_parent_ops dmar_msi_parent_ops , virt_dmar_msi_parent_ops ;
85+ static const struct msi_parent_ops dmar_msi_parent_ops ;
8686
8787static bool ir_pre_enabled (struct intel_iommu * iommu )
8888{
@@ -567,11 +567,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
567567 irq_domain_update_bus_token (iommu -> ir_domain , DOMAIN_BUS_DMAR );
568568 iommu -> ir_domain -> flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |
569569 IRQ_DOMAIN_FLAG_ISOLATED_MSI ;
570-
571- if (cap_caching_mode (iommu -> cap ))
572- iommu -> ir_domain -> msi_parent_ops = & virt_dmar_msi_parent_ops ;
573- else
574- iommu -> ir_domain -> msi_parent_ops = & dmar_msi_parent_ops ;
570+ iommu -> ir_domain -> msi_parent_ops = & dmar_msi_parent_ops ;
575571
576572 ir_table -> base = page_address (pages );
577573 ir_table -> bitmap = bitmap ;
@@ -1421,20 +1417,11 @@ static const struct irq_domain_ops intel_ir_domain_ops = {
14211417};
14221418
14231419static const struct msi_parent_ops dmar_msi_parent_ops = {
1424- .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
1425- MSI_FLAG_MULTI_PCI_MSI |
1426- MSI_FLAG_PCI_IMS ,
1420+ .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_MSI ,
14271421 .prefix = "IR-" ,
14281422 .init_dev_msi_info = msi_parent_init_dev_msi_info ,
14291423};
14301424
1431- static const struct msi_parent_ops virt_dmar_msi_parent_ops = {
1432- .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
1433- MSI_FLAG_MULTI_PCI_MSI ,
1434- .prefix = "vIR-" ,
1435- .init_dev_msi_info = msi_parent_init_dev_msi_info ,
1436- };
1437-
14381425/*
14391426 * Support of Interrupt Remapping Unit Hotplug
14401427 */
0 commit comments