@@ -82,7 +82,7 @@ static const struct irq_domain_ops intel_ir_domain_ops;
82
82
83
83
static void iommu_disable_irq_remapping (struct intel_iommu * iommu );
84
84
static 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 ;
86
86
87
87
static bool ir_pre_enabled (struct intel_iommu * iommu )
88
88
{
@@ -567,11 +567,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu)
567
567
irq_domain_update_bus_token (iommu -> ir_domain , DOMAIN_BUS_DMAR );
568
568
iommu -> ir_domain -> flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |
569
569
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 ;
575
571
576
572
ir_table -> base = page_address (pages );
577
573
ir_table -> bitmap = bitmap ;
@@ -1421,20 +1417,11 @@ static const struct irq_domain_ops intel_ir_domain_ops = {
1421
1417
};
1422
1418
1423
1419
static 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 ,
1427
1421
.prefix = "IR-" ,
1428
1422
.init_dev_msi_info = msi_parent_init_dev_msi_info ,
1429
1423
};
1430
1424
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
-
1438
1425
/*
1439
1426
* Support of Interrupt Remapping Unit Hotplug
1440
1427
*/
0 commit comments