Commit 4eefa8f0 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: add single vector msi-x testing to interrupt test 



This change adds testing of the first msix vector to the interrupt testing.
This should help with determining the cause of interrupt issues when they are
encountered.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ad93d17e

drivers/net/igb/igb_ethtool.c

+17 −10
Original line number Original line Diff line number Diff line
@@ -1123,28 +1123,32 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) 
	*data = 0;

	*data = 0;





	/* Hook up test interrupt handler just for this test */

	/* Hook up test interrupt handler just for this test */

	if (adapter->msix_entries)

	if (adapter->msix_entries) {

		/* NOTE: we don't test MSI-X interrupts here, yet */

		if (request_irq(adapter->msix_entries[0].vector,

		return 0;

		                &igb_test_intr, 0, netdev->name, adapter)) {

			*data = 1;

			return -1;

		}





	if (adapter->flags & IGB_FLAG_HAS_MSI) {

	} else if (adapter->flags & IGB_FLAG_HAS_MSI) {

		shared_int = false;

		shared_int = false;

		if (request_irq(irq, &igb_test_intr, 0, netdev->name, netdev)) {

		if (request_irq(irq,

		                &igb_test_intr, 0, netdev->name, adapter)) {

			*data = 1;

			*data = 1;

			return -1;

			return -1;

		}

		}

	} else if (!request_irq(irq, &igb_test_intr, IRQF_PROBE_SHARED,

	} else if (!request_irq(irq, &igb_test_intr, IRQF_PROBE_SHARED,

				netdev->name, netdev)) {

				netdev->name, adapter)) {

		shared_int = false;

		shared_int = false;

	} else if (request_irq(irq, &igb_test_intr, IRQF_SHARED,

	} else if (request_irq(irq, &igb_test_intr, IRQF_SHARED,

		 netdev->name, netdev)) {

		 netdev->name, adapter)) {

		*data = 1;

		*data = 1;

		return -1;

		return -1;

	}

	}

	dev_info(&adapter->pdev->dev, "testing %s interrupt\n",

	dev_info(&adapter->pdev->dev, "testing %s interrupt\n",

		(shared_int ? "shared" : "unshared"));

		(shared_int ? "shared" : "unshared"));

	/* Disable all the interrupts */

	/* Disable all the interrupts */

	wr32(E1000_IMC, 0xFFFFFFFF);

	wr32(E1000_IMC, ~0);

	msleep(10);

	msleep(10);





	/* Define all writable bits for ICS */

	/* Define all writable bits for ICS */
@@ -1238,7 +1242,10 @@ static int igb_intr_test(struct igb_adapter *adapter, u64 *data) 
	msleep(10);

	msleep(10);





	/* Unhook test interrupt handler */

	/* Unhook test interrupt handler */

	free_irq(irq, netdev);

	if (adapter->msix_entries)

		free_irq(adapter->msix_entries[0].vector, adapter);

	else

		free_irq(irq, adapter);





	return *data;

	return *data;

}

}