openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

IXP42x: Use __fls() in QMgr interrupt handlers. 

Signed-off-by: Krzysztof Hałasa <khc@pm.waw.pl>
This commit is contained in:
Krzysztof Hałasa 2009-04-28 19:32:55 +02:00
parent d4c9e9fc97
commit 0771c69394
1 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
arch/arm/mach-ixp4xx/ixp4xx_qmgr.c
View File

@ -52,14 +52,15 @@ void qmgr_set_irq(unsigned int queue, int src,
static irqreturn_t qmgr_irq1_a0(int irq, void *pdev) static irqreturn_t qmgr_irq1_a0(int irq, void *pdev)
{ {
int i, ret = 0; int i, ret = 0;
u32 en_bitmap, src, stat;
/* ACK - it may clear any bits so don't rely on it */ /* ACK - it may clear any bits so don't rely on it */
__raw_writel(0xFFFFFFFF, &qmgr_regs->irqstat[0]); __raw_writel(0xFFFFFFFF, &qmgr_regs->irqstat[0]);
for (i = 0; i < HALF_QUEUES; i++) { en_bitmap = qmgr_regs->irqen[0];
u32 src, stat; while (en_bitmap) {
if (!(qmgr_regs->irqen[0] & BIT(i))) i = __fls(en_bitmap); /* number of the last "low" queue */
continue; en_bitmap &= ~BIT(i);
src = qmgr_regs->irqsrc[i >> 3]; src = qmgr_regs->irqsrc[i >> 3];
stat = qmgr_regs->stat1[i >> 3]; stat = qmgr_regs->stat1[i >> 3];
if (src & 4) /* the IRQ condition is inverted */ if (src & 4) /* the IRQ condition is inverted */
@ -82,9 +83,9 @@ static irqreturn_t qmgr_irq2_a0(int irq, void *pdev)
__raw_writel(0xFFFFFFFF, &qmgr_regs->irqstat[1]); __raw_writel(0xFFFFFFFF, &qmgr_regs->irqstat[1]);
req_bitmap = qmgr_regs->irqen[1] & qmgr_regs->statne_h; req_bitmap = qmgr_regs->irqen[1] & qmgr_regs->statne_h;
for (i = 0; i < HALF_QUEUES; i++) { while (req_bitmap) {
if (!(req_bitmap & BIT(i))) i = __fls(req_bitmap); /* number of the last "high" queue */
continue; req_bitmap &= ~BIT(i);
irq_handlers[HALF_QUEUES + i](irq_pdevs[HALF_QUEUES + i]); irq_handlers[HALF_QUEUES + i](irq_pdevs[HALF_QUEUES + i]);
ret = IRQ_HANDLED; ret = IRQ_HANDLED;
} }
@ -95,15 +96,19 @@ static irqreturn_t qmgr_irq2_a0(int irq, void *pdev)
static irqreturn_t qmgr_irq(int irq, void *pdev) static irqreturn_t qmgr_irq(int irq, void *pdev)
{ {
int i, half = (irq == IRQ_IXP4XX_QM1 ? 0 : 1); int i, half = (irq == IRQ_IXP4XX_QM1 ? 0 : 1);
u32 val = __raw_readl(&qmgr_regs->irqstat[half]); u32 req_bitmap = __raw_readl(&qmgr_regs->irqstat[half]);
__raw_writel(val, &qmgr_regs->irqstat[half]); /* ACK */
for (i = 0; i < HALF_QUEUES; i++) if (!req_bitmap)
if (val & (1 << i)) { return 0;
int irq = half * HALF_QUEUES + i; __raw_writel(req_bitmap, &qmgr_regs->irqstat[half]); /* ACK */
irq_handlers[irq](irq_pdevs[irq]);
while (req_bitmap) {
i = __fls(req_bitmap); /* number of the last queue */
req_bitmap &= ~BIT(i);
i += half * HALF_QUEUES;
irq_handlers[i](irq_pdevs[i]);
} }
return val ? IRQ_HANDLED : 0; return IRQ_HANDLED;
} }