lkml.org 
[lkml]   [2012]   [Jul]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 024/108] iommu/amd: Fix missing iommu_shutdown initialization in passthrough mode
    3.2-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Shuah Khan <shuah.khan@hp.com>

    commit f2f12b6fc032c7b1419fd6db84e2868b5f05a878 upstream.

    The iommu_shutdown callback is not initialized when the AMD
    IOMMU driver runs in passthrough mode. Fix that by moving
    the callback initialization before the check for
    passthrough mode.

    Signed-off-by: Shuah Khan <shuah.khan@hp.com>
    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c
    index 542024b..c04ddca 100644
    --- a/drivers/iommu/amd_iommu_init.c
    +++ b/drivers/iommu/amd_iommu_init.c
    @@ -1641,6 +1641,8 @@ static int __init amd_iommu_init(void)

    register_syscore_ops(&amd_iommu_syscore_ops);

    + x86_platform.iommu_shutdown = disable_iommus;
    +
    if (iommu_pass_through)
    goto out;

    @@ -1649,7 +1651,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;




    \
     
     \ /
      Last update: 2012-07-23 04:42    [W:4.161 / U:0.540 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site