lkml.org 
[lkml]   [2022]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 277/563] iommu/amd: Remove iommu_init_ga()
    Date
    From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>

    [ Upstream commit eb03f2d2f6a4da25d286613717d10add9ce9f175 ]

    Since the function has been simplified and only call iommu_init_ga_log(),
    remove the function and replace with iommu_init_ga_log() instead.

    Signed-off-by: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
    Link: https://lore.kernel.org/r/20210820202957.187572-4-suravee.suthikulpanit@amd.com
    Fixes: 8bda0cfbdc1a ("iommu/amd: Detect and initialize guest vAPIC log")
    Signed-off-by: Joerg Roedel <jroedel@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/iommu/amd/init.c | 17 ++++-------------
    1 file changed, 4 insertions(+), 13 deletions(-)

    diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
    index 28de889aa5164..c82f8ab4783c0 100644
    --- a/drivers/iommu/amd/init.c
    +++ b/drivers/iommu/amd/init.c
    @@ -830,9 +830,9 @@ static int iommu_ga_log_enable(struct amd_iommu *iommu)
    return 0;
    }

    -#ifdef CONFIG_IRQ_REMAP
    static int iommu_init_ga_log(struct amd_iommu *iommu)
    {
    +#ifdef CONFIG_IRQ_REMAP
    u64 entry;

    if (!AMD_IOMMU_GUEST_IR_VAPIC(amd_iommu_guest_ir))
    @@ -862,18 +862,9 @@ static int iommu_init_ga_log(struct amd_iommu *iommu)
    err_out:
    free_ga_log(iommu);
    return -EINVAL;
    -}
    -#endif /* CONFIG_IRQ_REMAP */
    -
    -static int iommu_init_ga(struct amd_iommu *iommu)
    -{
    - int ret = 0;
    -
    -#ifdef CONFIG_IRQ_REMAP
    - ret = iommu_init_ga_log(iommu);
    +#else
    + return 0;
    #endif /* CONFIG_IRQ_REMAP */
    -
    - return ret;
    }

    static int __init alloc_cwwb_sem(struct amd_iommu *iommu)
    @@ -1860,7 +1851,7 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
    if (iommu_feature(iommu, FEATURE_PPR) && alloc_ppr_log(iommu))
    return -ENOMEM;

    - ret = iommu_init_ga(iommu);
    + ret = iommu_init_ga_log(iommu);
    if (ret)
    return ret;

    --
    2.34.1


    \
     
     \ /
      Last update: 2022-01-24 22:13    [W:2.265 / U:2.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site