lkml.org 
[lkml]   [2012]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 01/19] x86, apic: Move irq_remapping_enabled checks into IRQ-remapping code
    Date
    Move the three easy to move checks in the x86' apic.c file
    into the IRQ-remapping code.

    Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
    ---
    arch/x86/kernel/apic/apic.c | 9 +++------
    drivers/iommu/irq_remapping.c | 11 +++++++++--
    2 files changed, 12 insertions(+), 8 deletions(-)

    diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
    index 24deb30..41681b3 100644
    --- a/arch/x86/kernel/apic/apic.c
    +++ b/arch/x86/kernel/apic/apic.c
    @@ -1444,8 +1444,7 @@ void __init bsp_end_local_APIC_setup(void)
    * Now that local APIC setup is completed for BP, configure the fault
    * handling for interrupt remapping.
    */
    - if (irq_remapping_enabled)
    - irq_remap_enable_fault_handling();
    + irq_remap_enable_fault_handling();

    }

    @@ -2218,8 +2217,7 @@ static int lapic_suspend(void)
    local_irq_save(flags);
    disable_local_APIC();

    - if (irq_remapping_enabled)
    - irq_remapping_disable();
    + irq_remapping_disable();

    local_irq_restore(flags);
    return 0;
    @@ -2287,8 +2285,7 @@ static void lapic_resume(void)
    apic_write(APIC_ESR, 0);
    apic_read(APIC_ESR);

    - if (irq_remapping_enabled)
    - irq_remapping_reenable(x2apic_mode);
    + irq_remapping_reenable(x2apic_mode);

    local_irq_restore(flags);
    }
    diff --git a/drivers/iommu/irq_remapping.c b/drivers/iommu/irq_remapping.c
    index 151690d..283a43f 100644
    --- a/drivers/iommu/irq_remapping.c
    +++ b/drivers/iommu/irq_remapping.c
    @@ -82,7 +82,9 @@ int __init irq_remapping_enable(void)

    void irq_remapping_disable(void)
    {
    - if (!remap_ops || !remap_ops->disable)
    + if (!irq_remapping_enabled ||
    + !remap_ops ||
    + !remap_ops->disable)
    return;

    remap_ops->disable();
    @@ -90,7 +92,9 @@ void irq_remapping_disable(void)

    int irq_remapping_reenable(int mode)
    {
    - if (!remap_ops || !remap_ops->reenable)
    + if (!irq_remapping_enabled ||
    + !remap_ops ||
    + !remap_ops->reenable)
    return 0;

    return remap_ops->reenable(mode);
    @@ -98,6 +102,9 @@ int irq_remapping_reenable(int mode)

    int __init irq_remap_enable_fault_handling(void)
    {
    + if (!irq_remapping_enabled)
    + return 0;
    +
    if (!remap_ops || !remap_ops->enable_faulting)
    return -ENODEV;

    --
    1.7.9.5



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