Skip to content

Commit

Permalink
KS8695: fix ks8695_rx_irq() bug.
Browse files Browse the repository at this point in the history
ks8695 rx irq is edge-level. Before arriving at irq handler, the
corresponding status bit has been clear(irq's ack).
So we should not check it after that.

Signed-off-by: zeal <zealcook@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
zeal authored and David S. Miller committed Nov 17, 2009
1 parent 3fd434d commit fa6cae1
Showing 1 changed file with 7 additions and 15 deletions.
22 changes: 7 additions & 15 deletions drivers/net/arm/ks8695net.c
Original file line number Diff line number Diff line change
Expand Up @@ -433,24 +433,16 @@ ks8695_rx_irq(int irq, void *dev_id)
{
struct net_device *ndev = (struct net_device *)dev_id;
struct ks8695_priv *ksp = netdev_priv(ndev);
unsigned long status;

unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);

spin_lock(&ksp->rx_lock);

status = readl(KS8695_IRQ_VA + KS8695_INTST);

/*clean rx status bit*/
writel(status | mask_bit , KS8695_IRQ_VA + KS8695_INTST);

if (status & mask_bit) {
if (napi_schedule_prep(&ksp->napi)) {
/*disable rx interrupt*/
status &= ~mask_bit;
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
__napi_schedule(&ksp->napi);
}
if (napi_schedule_prep(&ksp->napi)) {
unsigned long status = readl(KS8695_IRQ_VA + KS8695_INTEN);
unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
/*disable rx interrupt*/
status &= ~mask_bit;
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
__napi_schedule(&ksp->napi);
}

spin_unlock(&ksp->rx_lock);
Expand Down

0 comments on commit fa6cae1

Please sign in to comment.