KS8695: fix ks8695_rx_irq() bug.
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>
This commit is contained in:
parent
3fd434d846
commit
fa6cae143d
|
@ -433,24 +433,16 @@ ks8695_rx_irq(int irq, void *dev_id)
|
||||||
{
|
{
|
||||||
struct net_device *ndev = (struct net_device *)dev_id;
|
struct net_device *ndev = (struct net_device *)dev_id;
|
||||||
struct ks8695_priv *ksp = netdev_priv(ndev);
|
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);
|
spin_lock(&ksp->rx_lock);
|
||||||
|
|
||||||
status = readl(KS8695_IRQ_VA + KS8695_INTST);
|
if (napi_schedule_prep(&ksp->napi)) {
|
||||||
|
unsigned long status = readl(KS8695_IRQ_VA + KS8695_INTEN);
|
||||||
/*clean rx status bit*/
|
unsigned long mask_bit = 1 << ks8695_get_rx_enable_bit(ksp);
|
||||||
writel(status | mask_bit , KS8695_IRQ_VA + KS8695_INTST);
|
/*disable rx interrupt*/
|
||||||
|
status &= ~mask_bit;
|
||||||
if (status & mask_bit) {
|
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
|
||||||
if (napi_schedule_prep(&ksp->napi)) {
|
__napi_schedule(&ksp->napi);
|
||||||
/*disable rx interrupt*/
|
|
||||||
status &= ~mask_bit;
|
|
||||||
writel(status , KS8695_IRQ_VA + KS8695_INTEN);
|
|
||||||
__napi_schedule(&ksp->napi);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
spin_unlock(&ksp->rx_lock);
|
spin_unlock(&ksp->rx_lock);
|
||||||
|
|
Loading…
Reference in New Issue