On Sat, 2013-06-01 at 20:52 -0500, Steve Conklin wrote:
> Ben,
>
> Thanks for the stable maintenance!
>
>
> I've applied your latest stable updates, and the following patch
> causes a build failure:
>
> 1619f44 rapidio/tsi721: fix bug in MSI interrupt handling
>
> This patch depends on definition of TSI721_DEV_INT_BDMA_CH, which is
> defined in a more extensive patch that hasn't been previously included
> in stable.
Sorry, this must not be included in my test config.
> I have not actually tried to build the 3.2.y branch, but I did grep the
> source for the above #define, and it's not there. The only place it
> appears in in the code added by the above referenced patch.
OK, if I'm reading this rightly we're trying to re-enable the same
interrupt flags as were enabled originally, so that flag should just be
removed here.
I've queued the following fix.
Ben.
---
From: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
Subject: rapidio/tsi721: Fix interrupt mask when handling MSI
Date: Sun, 02 Jun 2013 03:34:36 +0100
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@xxxxxxxxxxxxx>
Signed-off-by: Ben Hutchings <ben@xxxxxxxxxxxxxxx>
---
--- 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);
}
--
Ben Hutchings
You can't have everything. Where would you put it?
Attachment:
signature.asc
Description: This is a digitally signed message part