diff options
| author | Andy Gospodarek <andy@greyhouse.net> | 2008-02-15 14:05:25 -0800 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2008-02-23 23:55:01 -0500 |
| commit | 6cb5e57701d355737f0bc9f94c0f80ed69a95b62 (patch) | |
| tree | c4d4e715ba4c87a4518ed2dba7a11ce2186cb2bb /drivers/net/igb | |
| parent | 5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df (diff) | |
| download | op-kernel-dev-6cb5e57701d355737f0bc9f94c0f80ed69a95b62.zip op-kernel-dev-6cb5e57701d355737f0bc9f94c0f80ed69a95b62.tar.gz | |
igb: fix legacy mode irq issue
I booted an igb kernel with the option pci=nomsi and instantly noticed
that interrupts no longer worked on my igb device. I took a look at the
interrupt initialization and quickly discovered a comment stating:
"DO NOT USE EIAME or IAME in legacy mode"
It seemed a bit odd that bits to enable IAM were being set in legacy
interrupt mode, so I dropped out the following parts and interrupts
began working fine again.
[Updated code flow and a nitpick spelling error --Auke]
Signed-off-by: Andy Gospodarek <andy@greyhouse.net>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/net/igb')
| -rw-r--r-- | drivers/net/igb/igb_main.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index bff280e..3480cc7 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c @@ -439,7 +439,7 @@ static int igb_request_irq(struct igb_adapter *adapter) err = igb_request_msix(adapter); if (!err) { /* enable IAM, auto-mask, - * DO NOT USE EIAME or IAME in legacy mode */ + * DO NOT USE EIAM or IAM in legacy mode */ wr32(E1000_IAM, IMS_ENABLE_MASK); goto request_done; } @@ -465,14 +465,9 @@ static int igb_request_irq(struct igb_adapter *adapter) err = request_irq(adapter->pdev->irq, &igb_intr, IRQF_SHARED, netdev->name, netdev); - if (err) { + if (err) dev_err(&adapter->pdev->dev, "Error %d getting interrupt\n", err); - goto request_done; - } - - /* enable IAM, auto-mask */ - wr32(E1000_IAM, IMS_ENABLE_MASK); request_done: return err; |
