lkml.org 
[lkml]   [2008]   [Jul]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5/6] AMD IOMMU: don't try to init IOMMU if early detect code did not detect one
    Date
    This patch adds a check if the early detect code has found AMD IOMMU hardware
    descriptions and does not try to initialize hardware if the check failed.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/amd_iommu_init.c | 6 ++++++
    1 files changed, 6 insertions(+), 0 deletions(-)

    diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
    index c54c823..c970fac 100644
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/arch/x86/kernel/amd_iommu_init.c
    @@ -101,6 +101,8 @@ struct ivmd_header {
    u64 range_length;
    } __attribute__((packed));

    +static int __initdata amd_iommu_detected;
    +
    u16 amd_iommu_last_bdf;
    struct list_head amd_iommu_unity_map;
    unsigned amd_iommu_aperture_order = 26;
    @@ -689,6 +691,9 @@ int __init amd_iommu_init(void)
    return 0;
    }

    + if (!amd_iommu_detected)
    + return -ENODEV;
    +
    /*
    * First parse ACPI tables to find the largest Bus/Dev/Func
    * we need to handle. Upon this information the shared data
    @@ -831,6 +836,7 @@ void __init amd_iommu_detect(void)

    if (acpi_table_parse("IVRS", early_amd_iommu_detect) == 0) {
    iommu_detected = 1;
    + amd_iommu_detected = 1;
    #ifdef CONFIG_GART_IOMMU
    gart_iommu_aperture_disabled = 1;
    gart_iommu_aperture = 0;
    --
    1.5.3.7



    \
     
     \ /
      Last update: 2008-07-03 19:41    [W:0.022 / U:33.628 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site