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

Commit 8688cfce authored by Ingo Molnar's avatar Ingo Molnar Committed by Linus Torvalds
Browse files

[PATCH] lockdep: annotate forcedeth.c disable_irq() 



nv_do_nic_poll() is called from timer softirqs, which has interrupts enabled,
but np->lock might also be taken by some other interrupt context.

The driver does disable_irq() to get around this problem, so annotate the
disable_irq()/enable_irq() calls for lockdep.

Has no effect on non-lockdep kernels.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarArjan van de Ven <arjan@linux.intel.com>
Cc: Ayaz Abdulla <aabdulla@nvidia.com>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 479ceddd

drivers/net/forcedeth.c

+10 −10
Original line number Diff line number Diff line
@@ -2735,21 +2735,21 @@ static void nv_do_nic_poll(unsigned long data) 


	if (!using_multi_irqs(dev)) {

		if (np->msi_flags & NV_MSI_X_ENABLED)

			disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);

			disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);

		else

			disable_irq(dev->irq);

			disable_irq_lockdep(dev->irq);

		mask = np->irqmask;

	} else {

		if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {

			disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);

			disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);

			mask |= NVREG_IRQ_RX_ALL;

		}

		if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) {

			disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);

			disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);

			mask |= NVREG_IRQ_TX_ALL;

		}

		if (np->nic_poll_irq & NVREG_IRQ_OTHER) {

			disable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);

			disable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);

			mask |= NVREG_IRQ_OTHER;

		}

	}
@@ -2763,21 +2763,21 @@ static void nv_do_nic_poll(unsigned long data) 
	if (!using_multi_irqs(dev)) {

		nv_nic_irq(0, dev, NULL);

		if (np->msi_flags & NV_MSI_X_ENABLED)

			enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);

			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_ALL].vector);

		else

			enable_irq(dev->irq);

			enable_irq_lockdep(dev->irq);

	} else {

		if (np->nic_poll_irq & NVREG_IRQ_RX_ALL) {

			nv_nic_irq_rx(0, dev, NULL);

			enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);

			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_RX].vector);

		}

		if (np->nic_poll_irq & NVREG_IRQ_TX_ALL) {

			nv_nic_irq_tx(0, dev, NULL);

			enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);

			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_TX].vector);

		}

		if (np->nic_poll_irq & NVREG_IRQ_OTHER) {

			nv_nic_irq_other(0, dev, NULL);

			enable_irq(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);

			enable_irq_lockdep(np->msi_x_entry[NV_MSI_X_VECTOR_OTHER].vector);

		}

	}

}