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 4/9] amd_iommu: convert amd_iommu_detect to use iommu_init hook
    Date
    This changes amd_iommu_detect() to set amd_iommu_init to
    iommu_init hook if amd_iommu_detect() finds the AMD IOMMU.

    We can kill the code to check if we found the IOMMU in
    amd_iommu_init() since amd_iommu_detect() sets amd_iommu_init() only
    when it found the IOMMU.

    Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
    ---
    arch/x86/include/asm/amd_iommu.h | 2 --
    arch/x86/kernel/amd_iommu_init.c | 17 +++--------------
    arch/x86/kernel/pci-dma.c | 2 --
    3 files changed, 3 insertions(+), 18 deletions(-)

    diff --git a/arch/x86/include/asm/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h
    index 3604669..b8ef2ee 100644
    --- a/arch/x86/include/asm/amd_iommu.h
    +++ b/arch/x86/include/asm/amd_iommu.h
    @@ -23,7 +23,6 @@
    #include <linux/irqreturn.h>

    #ifdef CONFIG_AMD_IOMMU
    -extern int amd_iommu_init(void);
    extern int amd_iommu_init_dma_ops(void);
    extern int amd_iommu_init_passthrough(void);
    extern void amd_iommu_detect(void);
    @@ -32,7 +31,6 @@ extern void amd_iommu_flush_all_domains(void);
    extern void amd_iommu_flush_all_devices(void);
    extern void amd_iommu_apply_erratum_63(u16 devid);
    #else
    -static inline int amd_iommu_init(void) { return -ENODEV; }
    static inline void amd_iommu_detect(void) { }
    #endif

    diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c
    index 6acd43e..c41aabd 100644
    --- a/arch/x86/kernel/amd_iommu_init.c
    +++ b/arch/x86/kernel/amd_iommu_init.c
    @@ -29,6 +29,7 @@
    #include <asm/amd_iommu.h>
    #include <asm/iommu.h>
    #include <asm/gart.h>
    +#include <asm/x86_init.h>

    /*
    * definitions for the ACPI scanning code
    @@ -1176,19 +1177,10 @@ static struct sys_device device_amd_iommu = {
    * functions. Finally it prints some information about AMD IOMMUs and
    * the driver state and enables the hardware.
    */
    -int __init amd_iommu_init(void)
    +static int __init amd_iommu_init(void)
    {
    int i, ret = 0;

    -
    - if (no_iommu) {
    - printk(KERN_INFO "AMD-Vi disabled by kernel command line\n");
    - 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
    @@ -1344,10 +1336,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;
    -#endif
    + x86_init.iommu.iommu_init = amd_iommu_init;
    }
    }

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

    intel_iommu_init();

    - amd_iommu_init();
    -
    no_iommu_init();
    return 0;
    }
    --
    1.5.6.5


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