Skip to content

Commit 72860ff

Browse files
committed
Revert "iommu/amd: Enable PCI/IMS"
This reverts commit fa5745a. 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/[email protected] Signed-off-by: Bjorn Helgaas <[email protected]> Reviewed-by: Kevin Tian <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]>
1 parent b966b11 commit 72860ff

File tree

1 file changed

+2
-15
lines changed

1 file changed

+2
-15
lines changed

drivers/iommu/amd/iommu.c

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3701,20 +3701,11 @@ static struct irq_chip amd_ir_chip = {
37013701
};
37023702

37033703
static const struct msi_parent_ops amdvi_msi_parent_ops = {
3704-
.supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
3705-
MSI_FLAG_MULTI_PCI_MSI |
3706-
MSI_FLAG_PCI_IMS,
3704+
.supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED | MSI_FLAG_MULTI_PCI_MSI,
37073705
.prefix = "IR-",
37083706
.init_dev_msi_info = msi_parent_init_dev_msi_info,
37093707
};
37103708

3711-
static const struct msi_parent_ops virt_amdvi_msi_parent_ops = {
3712-
.supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
3713-
MSI_FLAG_MULTI_PCI_MSI,
3714-
.prefix = "vIR-",
3715-
.init_dev_msi_info = msi_parent_init_dev_msi_info,
3716-
};
3717-
37183709
int amd_iommu_create_irq_domain(struct amd_iommu *iommu)
37193710
{
37203711
struct fwnode_handle *fn;
@@ -3732,11 +3723,7 @@ int amd_iommu_create_irq_domain(struct amd_iommu *iommu)
37323723
irq_domain_update_bus_token(iommu->ir_domain, DOMAIN_BUS_AMDVI);
37333724
iommu->ir_domain->flags |= IRQ_DOMAIN_FLAG_MSI_PARENT |
37343725
IRQ_DOMAIN_FLAG_ISOLATED_MSI;
3735-
3736-
if (amd_iommu_np_cache)
3737-
iommu->ir_domain->msi_parent_ops = &virt_amdvi_msi_parent_ops;
3738-
else
3739-
iommu->ir_domain->msi_parent_ops = &amdvi_msi_parent_ops;
3726+
iommu->ir_domain->msi_parent_ops = &amdvi_msi_parent_ops;
37403727

37413728
return 0;
37423729
}

0 commit comments

Comments
 (0)