Commit 79f99aac authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Revert "iommu/vt-d: Enable PCI/IMS" 

This reverts commit 810531a1.

IMS (Interrupt Message Store) support appeared in v6.2, but there are no
users yet.

Remove it for now.  We can add it back when a user comes along.

Link: https://lore.kernel.org/r/20240410221307.2162676-6-helgaas@kernel.org


Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarKevin Tian <kevin.tian@intel.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 72860ff3

drivers/iommu/intel/irq_remapping.c

+3 −16
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static const struct irq_domain_ops intel_ir_domain_ops; 


static void iommu_disable_irq_remapping(struct intel_iommu *iommu);

static int __init parse_ioapics_under_ir(void);

static const struct msi_parent_ops dmar_msi_parent_ops, virt_dmar_msi_parent_ops;

static const struct msi_parent_ops dmar_msi_parent_ops;



static bool ir_pre_enabled(struct intel_iommu *iommu)

{
@@ -567,10 +567,6 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) 
	irq_domain_update_bus_token(iommu->ir_domain,  DOMAIN_BUS_DMAR);

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |

				   IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	if (cap_caching_mode(iommu->cap))

		iommu->ir_domain->msi_parent_ops = &virt_dmar_msi_parent_ops;

	else

	iommu->ir_domain->msi_parent_ops = &dmar_msi_parent_ops;



	ir_table->base = page_address(pages);
@@ -1421,20 +1417,11 @@ static const struct irq_domain_ops intel_ir_domain_ops = { 
};



static const struct msi_parent_ops dmar_msi_parent_ops = {

	.supported_flags	= X86_VECTOR_MSI_FLAGS_SUPPORTED |

				  MSI_FLAG_MULTI_PCI_MSI |

				  MSI_FLAG_PCI_IMS,

	.supported_flags	= X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_MSI,

	.prefix			= "IR-",

	.init_dev_msi_info	= msi_parent_init_dev_msi_info,

};



static const struct msi_parent_ops virt_dmar_msi_parent_ops = {

	.supported_flags	= X86_VECTOR_MSI_FLAGS_SUPPORTED |

				  MSI_FLAG_MULTI_PCI_MSI,

	.prefix			= "vIR-",

	.init_dev_msi_info	= msi_parent_init_dev_msi_info,

};



/*

 * Support of Interrupt Remapping Unit Hotplug

 */