lkml.org 
[lkml]   [2014]   [Jun]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.4 199/214] rapidio/tsi721: Fix interrupt mask when handling MSI
    Date
    3.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Ben Hutchings <ben@decadent.org.uk>

    commit 94e0104bca7d6927e85119030b8e6e31fde88a7a upstream.

    Commit 1619f441963e 'rapidio/tsi721: fix bug in MSI interrupt
    handling' (commit 1ccc819da6fd upstream) makes the MSI handler disable
    and re-enable interrupts. When re-enabling interrupts, we should set
    the same flags as were originally set, but this changed in Linux 3.5 so
    the flags are now inconsistent in 3.2. In fact, the extra flag isn't
    even defined in 3.2. Remove the extra flag from the MSI handler.

    Reported-by: Steve Conklin <steve.conklin@canonical.com>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    Cc: Qiang Huang <h.huangqiang@huawei.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/rapidio/devices/tsi721.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/rapidio/devices/tsi721.c
    +++ b/drivers/rapidio/devices/tsi721.c
    @@ -555,7 +555,7 @@ static irqreturn_t tsi721_irqhandler(int
    /* For MSI mode re-enable device-level interrupts */
    if (priv->flags & TSI721_USING_MSI) {
    dev_int = TSI721_DEV_INT_SR2PC_CH | TSI721_DEV_INT_SRIO |
    - TSI721_DEV_INT_SMSG_CH | TSI721_DEV_INT_BDMA_CH;
    + TSI721_DEV_INT_SMSG_CH;
    iowrite32(dev_int, priv->regs + TSI721_DEV_INTE);
    }




    \
     
     \ /
      Last update: 2014-06-05 07:01    [W:4.157 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site