From: "Kok, Auke" <auke-jan.h.kok@intel•com>
To: "Garzik, Jeff" <jgarzik@pobox•com>
Cc: netdev@vger•kernel.org, "Brandeburg,
Jesse" <jesse.brandeburg@intel•com>,
"Kok, Auke" <auke-jan.h.kok@intel•com>,
"Kok, Auke" <auke@foo-projects•org>,
"Ronciak, John" <john.ronciak@intel•com>
Subject: [PATCH 3/8] e1000: Fix MSI only interrupt handler routine
Date: Fri, 12 Jan 2007 16:37:45 -0800 [thread overview]
Message-ID: <20070113003745.16816.56820.stgit@gitlost.site> (raw)
In-Reply-To: <20070113003650.16816.34076.stgit@gitlost.site>
Unfortunately the read-free MSI interrupt handler needs to flush write
the icr register and thus we can't be read-free. Our MSI irq routine
thus becomes a lot more simpler since we don't need to track link state
anymore.
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel•com>
Signed-off-by: Auke Kok <auke-jan.h.kok@intel•com>
---
drivers/net/e1000/e1000.h | 1 -
drivers/net/e1000/e1000_main.c | 60 +++++++++++++---------------------------
2 files changed, 19 insertions(+), 42 deletions(-)
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h
index f091042..8e7acb0 100644
--- a/drivers/net/e1000/e1000.h
+++ b/drivers/net/e1000/e1000.h
@@ -257,7 +257,6 @@ struct e1000_adapter {
spinlock_t tx_queue_lock;
#endif
atomic_t irq_sem;
- unsigned int detect_link;
unsigned int total_tx_bytes;
unsigned int total_tx_packets;
unsigned int total_rx_bytes;
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index c6259c7..d408949 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -3765,8 +3765,8 @@ e1000_update_stats(struct e1000_adapter *adapter)
* @data: pointer to a network interface device structure
**/
-static
-irqreturn_t e1000_intr_msi(int irq, void *data)
+static irqreturn_t
+e1000_intr_msi(int irq, void *data)
{
struct net_device *netdev = data;
struct e1000_adapter *adapter = netdev_priv(netdev);
@@ -3774,49 +3774,27 @@ irqreturn_t e1000_intr_msi(int irq, void *data)
#ifndef CONFIG_E1000_NAPI
int i;
#endif
+ uint32_t icr = E1000_READ_REG(hw, ICR);
- /* this code avoids the read of ICR but has to get 1000 interrupts
- * at every link change event before it will notice the change */
- if (++adapter->detect_link >= 1000) {
- uint32_t icr = E1000_READ_REG(hw, ICR);
#ifdef CONFIG_E1000_NAPI
- /* read ICR disables interrupts using IAM, so keep up with our
- * enable/disable accounting */
- atomic_inc(&adapter->irq_sem);
+ /* read ICR disables interrupts using IAM, so keep up with our
+ * enable/disable accounting */
+ atomic_inc(&adapter->irq_sem);
#endif
- adapter->detect_link = 0;
- if ((icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) &&
- (icr & E1000_ICR_INT_ASSERTED)) {
- hw->get_link_status = 1;
- /* 80003ES2LAN workaround--
- * For packet buffer work-around on link down event;
- * disable receives here in the ISR and
- * reset adapter in watchdog
- */
- if (netif_carrier_ok(netdev) &&
- (adapter->hw.mac_type == e1000_80003es2lan)) {
- /* disable receives */
- uint32_t rctl = E1000_READ_REG(hw, RCTL);
- E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
- }
- /* guard against interrupt when we're going down */
- if (!test_bit(__E1000_DOWN, &adapter->flags))
- mod_timer(&adapter->watchdog_timer,
- jiffies + 1);
+ if (icr & (E1000_ICR_RXSEQ | E1000_ICR_LSC)) {
+ hw->get_link_status = 1;
+ /* 80003ES2LAN workaround-- For packet buffer work-around on
+ * link down event; disable receives here in the ISR and reset
+ * adapter in watchdog */
+ if (netif_carrier_ok(netdev) &&
+ (adapter->hw.mac_type == e1000_80003es2lan)) {
+ /* disable receives */
+ uint32_t rctl = E1000_READ_REG(hw, RCTL);
+ E1000_WRITE_REG(hw, RCTL, rctl & ~E1000_RCTL_EN);
}
- } else {
- E1000_WRITE_REG(hw, ICR, (0xffffffff & ~(E1000_ICR_RXSEQ |
- E1000_ICR_LSC)));
- /* bummer we have to flush here, but things break otherwise as
- * some event appears to be lost or delayed and throughput
- * drops. In almost all tests this flush is un-necessary */
- E1000_WRITE_FLUSH(hw);
-#ifdef CONFIG_E1000_NAPI
- /* Interrupt Auto-Mask (IAM)...upon writing ICR, interrupts are
- * masked. No need for the IMC write, but it does mean we
- * should account for it ASAP. */
- atomic_inc(&adapter->irq_sem);
-#endif
+ /* guard against interrupt when we're going down */
+ if (!test_bit(__E1000_DOWN, &adapter->flags))
+ mod_timer(&adapter->watchdog_timer, jiffies + 1);
}
#ifdef CONFIG_E1000_NAPI
---
Auke Kok <auke-jan.h.kok@intel•com>
next prev parent reply other threads:[~2007-01-13 0:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-13 0:36 [PATCH 0/8] partial resend: e1000 fixes and updates Kok, Auke
2007-01-13 0:37 ` [PATCH 1/8] e1000: simplify case handling gigabit at half duplex Kok, Auke
2007-01-13 0:37 ` [PATCH 2/8] e1000: clean up debug output defines Kok, Auke
2007-01-13 0:37 ` Kok, Auke [this message]
2007-01-13 0:37 ` [PATCH 4/8] e1000: fix NAPI performance on 4-port adapters Kok, Auke
2007-01-13 0:37 ` [PATCH 5/8] e1000: display flow control of link status at link up Kok, Auke
2007-01-13 0:37 ` [PATCH 6/8] e1000: clear ip csum info from context descriptor Kok, Auke
2007-01-13 0:37 ` [PATCH 7/8] e1000: tune our dynamic itr transmit packet accounting Kok, Auke
2007-01-13 0:37 ` [PATCH 8/8] e1000: update version to 7.3.20-k2 Kok, Auke
2007-01-18 16:56 ` [PATCH 0/8] partial resend: e1000 fixes and updates Jeff Garzik
2007-01-18 17:16 ` Auke Kok
2007-01-23 21:31 ` Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070113003745.16816.56820.stgit@gitlost.site \
--to=auke-jan.h.kok@intel$(echo .)com \
--cc=auke@foo-projects$(echo .)org \
--cc=jesse.brandeburg@intel$(echo .)com \
--cc=jgarzik@pobox$(echo .)com \
--cc=john.ronciak@intel$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox