lkml.org 
[lkml]   [2012]   [Jul]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 08/28] iommu/amd: Split enable_iommus() routine
    Date
    Split the enable_iommus() routine so that a part of it can
    run in early code.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    drivers/iommu/amd_iommu_init.c | 26 +++++++++++++++++++++-----
    1 file changed, 21 insertions(+), 5 deletions(-)

    diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
    index 1b23235..2324f9b 100644
    --- a/drivers/iommu/amd_iommu_init.c
    +++ b/drivers/iommu/amd_iommu_init.c
    @@ -1382,7 +1382,7 @@ static void iommu_apply_resume_quirks(struct amd_iommu *iommu)
    * This function finally enables all IOMMUs found in the system after
    * they have been initialized
    */
    -static void enable_iommus(void)
    +static void early_enable_iommus(void)
    {
    struct amd_iommu *iommu;

    @@ -1392,12 +1392,30 @@ static void enable_iommus(void)
    iommu_set_device_table(iommu);
    iommu_enable_command_buffer(iommu);
    iommu_enable_event_buffer(iommu);
    - iommu_enable_ppr_log(iommu);
    - iommu_enable_gt(iommu);
    iommu_set_exclusion_range(iommu);
    iommu_enable(iommu);
    iommu_flush_all_caches(iommu);
    }
    +
    + x86_platform.iommu_shutdown = disable_iommus;
    +
    +}
    +
    +static void enable_iommus_v2(void)
    +{
    + struct amd_iommu *iommu;
    +
    + for_each_iommu(iommu) {
    + iommu_enable_ppr_log(iommu);
    + iommu_enable_gt(iommu);
    + }
    +}
    +
    +static void enable_iommus(void)
    +{
    + early_enable_iommus();
    +
    + enable_iommus_v2();
    }

    static void disable_iommus(void)
    @@ -1696,8 +1714,6 @@ static int __init amd_iommu_init(void)
    else
    printk(KERN_INFO "AMD-Vi: Lazy IO/TLB flushing enabled\n");

    - x86_platform.iommu_shutdown = disable_iommus;
    -
    out:
    return ret;

    --
    1.7.9.5



    \
     
     \ /
      Last update: 2012-07-05 15:21    [W:4.245 / U:0.364 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site