lkml.org 
[lkml]   [2012]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 08/22] x86: hpet: Fix masking of MSI interrupts
    Date
    3.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Jan Beulich <JBeulich@suse.com>

    commit 6acf5a8c931da9d26c8dd77d784daaf07fa2bff0 upstream.

    HPET_TN_FSB is not a proper mask bit; it merely toggles between MSI and
    legacy interrupt delivery. The proper mask bit is HPET_TN_ENABLE, so
    use both bits when (un)masking the interrupt.

    Signed-off-by: Jan Beulich <jbeulich@suse.com>
    Link: http://lkml.kernel.org/r/5093E09002000078000A60E6@nat28.tlf.novell.com
    Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    arch/x86/kernel/hpet.c | 4 ++--
    1 file changed, 2 insertions(+), 2 deletions(-)

    --- a/arch/x86/kernel/hpet.c
    +++ b/arch/x86/kernel/hpet.c
    @@ -427,7 +427,7 @@ void hpet_msi_unmask(struct irq_data *da

    /* unmask it */
    cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
    - cfg |= HPET_TN_FSB;
    + cfg |= HPET_TN_ENABLE | HPET_TN_FSB;
    hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
    }

    @@ -438,7 +438,7 @@ void hpet_msi_mask(struct irq_data *data

    /* mask it */
    cfg = hpet_readl(HPET_Tn_CFG(hdev->num));
    - cfg &= ~HPET_TN_FSB;
    + cfg &= ~(HPET_TN_ENABLE | HPET_TN_FSB);
    hpet_writel(cfg, HPET_Tn_CFG(hdev->num));
    }




    \
     
     \ /
      Last update: 2012-12-15 00:21    [W:6.704 / U:0.172 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site