Commit 72860ff3 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Revert "iommu/amd: Enable PCI/IMS" 

This reverts commit fa5745ac.

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-5-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 b966b110

drivers/iommu/amd/iommu.c

+2 −15
Original line number Diff line number Diff line
@@ -3701,20 +3701,11 @@ static struct irq_chip amd_ir_chip = { 
};



static const struct msi_parent_ops amdvi_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_amdvi_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,

};



int amd_iommu_create_irq_domain(struct amd_iommu *iommu)

{

	struct fwnode_handle *fn;
@@ -3732,10 +3723,6 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu) 
	irq_domain_update_bus_token(iommu->ir_domain,  DOMAIN_BUS_AMDVI);

	iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |

				   IRQ_DOMAIN_FLAG_ISOLATED_MSI;



	if (amd_iommu_np_cache)

		iommu->ir_domain->msi_parent_ops = &virt_amdvi_msi_parent_ops;

	else

	iommu->ir_domain->msi_parent_ops = &amdvi_msi_parent_ops;



	return 0;