lkml.org 
[lkml]   [2022]   [Dec]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: irq/core] iommu/amd: Enable PCI/IMS
    The following commit has been merged into the irq/core branch of tip:

    Commit-ID: fa5745aca1dc819aee6463a2475b5c277f7cf8f6
    Gitweb: https://git.kernel.org/tip/fa5745aca1dc819aee6463a2475b5c277f7cf8f6
    Author: Thomas Gleixner <tglx@linutronix.de>
    AuthorDate: Fri, 25 Nov 2022 00:26:36 +01:00
    Committer: Thomas Gleixner <tglx@linutronix.de>
    CommitterDate: Mon, 05 Dec 2022 22:22:35 +01:00

    iommu/amd: Enable PCI/IMS

    PCI/IMS works like PCI/MSI-X in the remapping. Just add the feature flag,
    but only when on real hardware.

    Virtualized IOMMUs need additional support.

    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Reviewed-by: Kevin Tian <kevin.tian@intel.com>
    Acked-by: Marc Zyngier <maz@kernel.org>
    Link: https://lore.kernel.org/r/20221124232327.140571546@linutronix.de

    ---
    drivers/iommu/amd/iommu.c | 17 +++++++++++++++--
    1 file changed, 15 insertions(+), 2 deletions(-)

    diff --git a/drivers/iommu/amd/iommu.c b/drivers/iommu/amd/iommu.c
    index 7caccd8..4d28967 100644
    --- a/drivers/iommu/amd/iommu.c
    +++ b/drivers/iommu/amd/iommu.c
    @@ -3649,11 +3649,20 @@ 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,
    + .supported_flags = X86_VECTOR_MSI_FLAGS_SUPPORTED |
    + MSI_FLAG_MULTI_PCI_MSI |
    + MSI_FLAG_PCI_IMS,
    .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;
    @@ -3670,7 +3679,11 @@ 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;
    - iommu->ir_domain->msi_parent_ops = &amdvi_msi_parent_ops;
    +
    + 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;
    }
    \
     
     \ /
      Last update: 2022-12-05 22:45    [W:3.253 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site