e1000/e1000e: implement a simple interrupt moderation

Back before e1000-7.3.20, the e1000 driver had a simple algorithm that
managed interrupt moderation.  The driver was updated in 7.3.20 to
have the new "adaptive" interrupt moderation but we have customer
requests to redeploy the old way as an option.  This patch adds the
old functionality back.  The new functionality can be enabled via
module parameter or at runtime via ethtool.
Module parameter: (InterruptThrottleRate=4) to use this new
moderation method.
Ethtool method: ethtool -C ethX rx-usecs 4

Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

3 files changed, 30 insertions, 6 deletions

diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c
index d6931cabe421..2a3b2dccd06d 100644
--- a/drivers/net/e1000/e1000_ethtool.c
+++ b/drivers/net/e1000/e1000_ethtool.c
@@ -1808,7 +1808,7 @@ static int e1000_get_coalesce(struct net_device *netdev,
         if (adapter->hw.mac_type < e1000_82545)
                 return -EOPNOTSUPP;
 
-        if (adapter->itr_setting <= 3)
+        if (adapter->itr_setting <= 4)
                 ec->rx_coalesce_usecs = adapter->itr_setting;
         else
                 ec->rx_coalesce_usecs = 1000000 / adapter->itr_setting;
@@ -1826,12 +1826,14 @@ static int e1000_set_coalesce(struct net_device *netdev,
                 return -EOPNOTSUPP;
 
         if ((ec->rx_coalesce_usecs > E1000_MAX_ITR_USECS) ||
-            ((ec->rx_coalesce_usecs > 3) &&
+            ((ec->rx_coalesce_usecs > 4) &&
              (ec->rx_coalesce_usecs < E1000_MIN_ITR_USECS)) ||
             (ec->rx_coalesce_usecs == 2))
                 return -EINVAL;
 
-        if (ec->rx_coalesce_usecs <= 3) {
+        if (ec->rx_coalesce_usecs == 4) {
+                adapter->itr = adapter->itr_setting = 4;
+        } else if (ec->rx_coalesce_usecs <= 3) {
                 adapter->itr = 20000;
                 adapter->itr_setting = ec->rx_coalesce_usecs;
         } else {
diff --git a/drivers/net/e1000/e1000_main.c b/drivers/net/e1000/e1000_main.c
index e6ebc222459f..4dd2c23775cb 100644
--- a/drivers/net/e1000/e1000_main.c
+++ b/drivers/net/e1000/e1000_main.c
@@ -31,7 +31,7 @@
 
 char e1000_driver_name[] = "e1000";
 static char e1000_driver_string[] = "Intel(R) PRO/1000 Network Driver";
-#define DRV_VERSION "7.3.21-k5-NAPI"
+#define DRV_VERSION "7.3.21-k6-NAPI"
 const char e1000_driver_version[] = DRV_VERSION;
 static const char e1000_copyright[] = "Copyright (c) 1999-2006 Intel Corporation.";
 
@@ -2386,6 +2386,22 @@ link_up:
                 }
         }
 
+        /* Simple mode for Interrupt Throttle Rate (ITR) */
+        if (hw->mac_type >= e1000_82540 && adapter->itr_setting == 4) {
+                /*
+                 * Symmetric Tx/Rx gets a reduced ITR=2000;
+                 * Total asymmetrical Tx or Rx gets ITR=8000;
+                 * everyone else is between 2000-8000.
+                 */
+                u32 goc = (adapter->gotcl + adapter->gorcl) / 10000;
+                u32 dif = (adapter->gotcl > adapter->gorcl ?
+                            adapter->gotcl - adapter->gorcl :
+                            adapter->gorcl - adapter->gotcl) / 10000;
+                u32 itr = goc > 0 ? (dif * 6000 / goc + 2000) : 8000;
+
+                ew32(ITR, 1000000000 / (itr * 256));
+        }
+
         /* Cause software interrupt to ensure rx ring is cleaned */
         ew32(ICS, E1000_ICS_RXDMT0);
 
diff --git a/drivers/net/e1000/e1000_param.c b/drivers/net/e1000/e1000_param.c
index 543c6d1767bc..9fbb562dc964 100644
--- a/drivers/net/e1000/e1000_param.c
+++ b/drivers/net/e1000/e1000_param.c
@@ -484,11 +484,17 @@ void __devinit e1000_check_options(struct e1000_adapter *adapter)
                                 adapter->itr_setting = adapter->itr;
                                 adapter->itr = 20000;
                                 break;
+                        case 4:
+                                e_dev_info("%s set to simplified "
+                                           "(2000-8000) ints mode\n", opt.name);
+                                adapter->itr_setting = adapter->itr;
+                                break;
                         default:
                                 e1000_validate_option(&adapter->itr, &opt,
                                         adapter);
-                                /* save the setting, because the dynamic bits change itr */
-                                /* clear the lower two bits because they are
+                                /* save the setting, because the dynamic bits
+                                 * change itr.
+                                 * clear the lower two bits because they are
                                  * used as control */
                                 adapter->itr_setting = adapter->itr & ~3;
                                 break;