Skip to contentSkip to conversation

e1000e: Simplify MSI interrupt testing

PATCH Applied Jean Delvare 3 participants 5 messages Sep 13, 2010 – Sep 14, 2010

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 e1000e: Simplify MSI interrupt testing

The code is quite convoluted, simplify it. This also avoids calling e1000_request_irq() without testing the value it returned, which was bad.

Cc Bruce Allan <[email protected]>
Cc Jeff Kirsher <[email protected]>

---
I understand that we need to request the IRQ again after testing, but why doing it twice?

I sent this patch to the e1000-devel list on August 26th, 2010, but didn't receive any answer:
http://sourceforge.net/mailarchive/forum.php?thread_name=201008261445.44334.jdelvare%40suse.de&forum_name=e1000-devel

 drivers/net/e1000e/netdev.c |   29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)
drivers/net/e1000e/netdev.c +4 -25
@@ -3385,22 +3385,16 @@ static int e1000_test_msi_interrupt(stru
 
 	if (adapter->flags & FLAG_MSI_TEST_FAILED) {
 		adapter->int_mode = E1000E_INT_MODE_LEGACY;
-		err = -EIO;
-		e_info("MSI interrupt test failed!\n");
-	}
+		e_info("MSI interrupt test failed, using legacy interrupt.\n");
+	} else
+		e_dbg("MSI interrupt test succeeded!\n");
 
 	free_irq(adapter->pdev->irq, netdev);
 	pci_disable_msi(adapter->pdev);
 
-	if (err == -EIO)
-		goto msi_test_failed;
-
-	/* okay so the test worked, restore settings */
-	e_dbg("MSI interrupt test succeeded!\n");
 msi_test_failed:
 	e1000e_set_interrupt_capability(adapter);
-	e1000_request_irq(adapter);
-	return err;
+	return e1000_request_irq(adapter);
 }
 
 /**
@@ -3432,21 +3426,6 @@ static int e1000_test_msi(struct e1000_a
 		pci_write_config_word(adapter->pdev, PCI_COMMAND, pci_cmd);
 	}
 
-	/* success ! */
-	if (!err)
-		return 0;
-
-	/* EIO means MSI test failed */
-	if (err != -EIO)
-		return err;
-
-	/* back to INTx mode */
-	e_warn("MSI interrupt test failed, using legacy interrupt.\n");
-
-	e1000_free_irq(adapter);
-
-	err = e1000_request_irq(adapter);
-
 	return err;
 }
 
Signature · 2 lines
Jean Delvare
Suse L3
maintainer
#1 lore raw

From: Jean Delvare <[email protected]>
Date: Mon, 13 Sep 2010 10:45:39 +0200

Quoted 7 lines

The code is quite convoluted, simplify it. This also avoids calling e1000_request_irq() without testing the value it returned, which was bad.

Cc Bruce Allan <[email protected]>
Cc Jeff Kirsher <[email protected]>
Quoted 7 lines

---
I understand that we need to request the IRQ again after testing, but why doing it twice?

I sent this patch to the e1000-devel list on August 26th, 2010, but didn't receive any answer:
http://sourceforge.net/mailarchive/forum.php?thread_name=201008261445.44334.jdelvare%40suse.de&forum_name=e1000-devel

Intel folks, please provide feedback or else I'll just blindly apply Jean's patch to the net-next-2.6 tree as long as it compiles ;-)

#2 lore raw
Quoted 14 lines · David Miller

From: Jean Delvare <[email protected]>
Date: Mon, 13 Sep 2010 10:45:39 +0200

Quoted 11 lines

The code is quite convoluted, simplify it. This also avoids calling e1000_request_irq() without testing the value it returned, which was bad.

Cc Bruce Allan <[email protected]>
Cc Jeff Kirsher <[email protected]>

---
I understand that we need to request the IRQ again after testing, but why doing it twice?

Quoted 7 lines
Quoted 3 lines

I sent this patch to the e1000-devel list on August 26th, 2010, but didn't receive any answer:
http://sourceforge.net/mailarchive/forum.php?thread_name=201008261445.44334.jdelvare%40suse.de&forum_name=e1000-devel

Intel folks, please provide feedback or else I'll just blindly apply Jean's patch to the net-next-2.6 tree as long as it compiles ;-)
--

Sorry, I believe this patch is good to go. I am still trying to catch up on email after being out on vacation.

Let me verify that we tested this patch and get back to you (later tonight) Dave.

Signature · 2 lines
Cheers,
Jeff
maintainer Applied
#4 lore raw

From: Jeff Kirsher <[email protected]>
Date: Mon, 13 Sep 2010 23:34:54 -0700

Quoted 5 lines · Jean Delvare
Quoted 4 lines

The code is quite convoluted, simplify it. This also avoids calling e1000_request_irq() without testing the value it returned, which was bad.

Quoted 7 lines
Quoted 2 lines

FYI - Emil tested this while I was out, and all was good. Sorry for the delayed response Jean.

Applied, thanks a lot.