Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa6cae14 authored by zeal's avatar zeal Committed by David S. Miller
Browse files

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: default avatarzeal <zealcook@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3fd434d8

drivers/net/arm/ks8695net.c

+7 −15
Original line number Original line Diff line number Diff line
@@ -433,25 +433,17 @@ 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);



	/*clean rx status bit*/

	writel(status | mask_bit , KS8695_IRQ_VA + KS8695_INTST);



	if (status & mask_bit) {

	if (napi_schedule_prep(&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*/

		/*disable rx interrupt*/

		status &= ~mask_bit;

		status &= ~mask_bit;

		writel(status , KS8695_IRQ_VA + KS8695_INTEN);

		writel(status , KS8695_IRQ_VA + KS8695_INTEN);

		__napi_schedule(&ksp->napi);

		__napi_schedule(&ksp->napi);

	}

	}

	}





	spin_unlock(&ksp->rx_lock);

	spin_unlock(&ksp->rx_lock);

	return IRQ_HANDLED;

	return IRQ_HANDLED;