lkml.org 
[lkml]   [2010]   [Jul]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 069/164] x86/amd-iommu: Fall back to GART if initialization fails
    2.6.33-stable review patch.  If anyone has any objections, please let me know.

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

    From: Joerg Roedel <joerg.roedel@amd.com>

    commit d7f0776975334070a93370ae048fda0c31a91c38 upstream.

    This patch implements a fallback to the GART IOMMU if this
    is possible and the AMD IOMMU initialization failed.
    Otherwise the fallback would be nommu which is very
    problematic on machines with more than 4GB of memory or
    swiotlb which hurts io-performance.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    arch/x86/kernel/amd_iommu.c | 4 ----
    arch/x86/kernel/amd_iommu_init.c | 9 +++++++++
    2 files changed, 9 insertions(+), 4 deletions(-)

    --- a/arch/x86/kernel/amd_iommu.c
    +++ b/arch/x86/kernel/amd_iommu.c
    @@ -2256,10 +2256,6 @@ int __init amd_iommu_init_dma_ops(void)

    iommu_detected = 1;
    swiotlb = 0;
    -#ifdef CONFIG_GART_IOMMU
    - gart_iommu_aperture_disabled = 1;
    - gart_iommu_aperture = 0;
    -#endif

    /* Make the driver finally visible to the drivers */
    dma_ops = &amd_iommu_dma_ops;
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/arch/x86/kernel/amd_iommu_init.c
    @@ -1340,6 +1340,15 @@ free:

    free_unity_maps();

    +#ifdef CONFIG_GART_IOMMU
    + /*
    + * We failed to initialize the AMD IOMMU - try fallback to GART
    + * if possible.
    + */
    + gart_iommu_init();
    +
    +#endif
    +
    goto out;
    }




    \
     
     \ /
      Last update: 2010-07-01 22:55    [from the cache]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site