lkml.org 
[lkml]   [2009]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH -v2 5/9] intel-iommu: convert detect_intel_iommu to use iommu_init hook
    Date
    This changes detect_intel_iommu() to set intel_iommu_init() to
    iommu_init hook if detect_intel_iommu() finds the IOMMU.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    ---
    arch/x86/kernel/pci-dma.c | 2 --
    drivers/pci/dmar.c | 4 ++++
    include/linux/dmar.h | 10 ----------
    3 files changed, 4 insertions(+), 12 deletions(-)

    diff --git a/arch/x86/kernel/pci-dma.c b/arch/x86/kernel/pci-dma.c
    index 5ca44a9..bed05e2 100644
    --- a/arch/x86/kernel/pci-dma.c
    +++ b/arch/x86/kernel/pci-dma.c
    @@ -294,8 +294,6 @@ static int __init pci_iommu_init(void)

    x86_init.iommu.iommu_init();

    - intel_iommu_init();
    -
    no_iommu_init();
    return 0;
    }
    diff --git a/drivers/pci/dmar.c b/drivers/pci/dmar.c
    index 22b02c6..bce9cd7 100644
    --- a/drivers/pci/dmar.c
    +++ b/drivers/pci/dmar.c
    @@ -617,6 +617,10 @@ void __init detect_intel_iommu(void)
    !dmar_disabled)
    iommu_detected = 1;
    #endif
    +#ifdef CONFIG_X86
    + if (ret)
    + x86_init.iommu.iommu_init = intel_iommu_init;
    +#endif
    }
    early_acpi_os_unmap_memory(dmar_tbl, dmar_tbl_size);
    dmar_tbl = NULL;
    diff --git a/include/linux/dmar.h b/include/linux/dmar.h
    index a05cd1c..d814d7d 100644
    --- a/include/linux/dmar.h
    +++ b/include/linux/dmar.h
    @@ -218,16 +218,6 @@ struct dmar_atsr_unit {
    u8 include_all:1; /* include all ports */
    };

    -/* Intel DMAR initialization functions */
    extern int intel_iommu_init(void);
    -#else
    -static inline int intel_iommu_init(void)
    -{
    -#ifdef CONFIG_INTR_REMAP
    - return dmar_dev_scope_init();
    -#else
    - return -ENODEV;
    #endif
    -}
    -#endif /* !CONFIG_DMAR */
    #endif /* __DMAR_H__ */
    --
    1.5.6.5


    \
     
     \ /
      Last update: 2009-11-10 11:55    [W:4.228 / U:0.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site