igb: remove unecessary q_vector declarations and remove itr_shift
Subsystems (2)
PATCH 1/18 igb: remove unecessary q_vector declarations and remove itr_shift
From: Alexander Duyck <[email protected]>
This change removes the use of itr_shift since a mac type call can be used just as easily to identify the only HW that needs to have the itr shifted.
In addition it removes two unecessary declrations of a q_vector pointer from the initialization path.
---
drivers/net/igb/igb.h | 1 - drivers/net/igb/igb_main.c | 25 +++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-)
drivers/net/igb/igb.h +0 -1
@@ -176,7 +176,6 @@ struct igb_q_vector {u16 itr_val;u8 set_itr; -u8 itr_shift;void __iomem *itr_register;char name[IFNAMSIZ +9 ];
drivers/net/igb/igb_main.c +13 -12
@@ -504,6 +504,12 @@ static void igb_assign_vector(struct igb_q_vector *q_vector, int msix_vector)BUG ();break ; } + +/* add q_vector eims value to global eims_enable_mask */ + adapter->eims_enable_mask |= q_vector->eims_value; + +/* configure q_vector to set itr on first interrupt */ + q_vector->set_itr =1 ; }/**
@@ -561,11 +567,8 @@ static void igb_configure_msix(struct igb_adapter *adapter) adapter->eims_enable_mask |= adapter->eims_other; -for (i =0 ; i < adapter->num_q_vectors; i++) { -struct igb_q_vector *q_vector = adapter->q_vector[i]; -igb_assign_vector (q_vector, vector++); - adapter->eims_enable_mask |= q_vector->eims_value; - } +for (i =0 ; i < adapter->num_q_vectors; i++) +igb_assign_vector (adapter->q_vector[i], vector++);wrfl (); }
@@ -756,10 +759,8 @@ static int igb_alloc_q_vectors(struct igb_adapter *adapter)if (!q_vector) goto err_out; q_vector->adapter = adapter; - q_vector->itr_shift = (hw->mac.type == e1000_82575) ?16 :0 ; q_vector->itr_register = hw->hw_addr +E1000_EITR (0 ); q_vector->itr_val =IGB_START_ITR ; - q_vector->set_itr =1 ;netif_napi_add (adapter->netdev, &q_vector->napi, igb_poll,64 ); adapter->q_vector[v_idx] = q_vector; }
@@ -4142,6 +4143,7 @@ static irqreturn_t igb_msix_other(int irq, void *data)static void igb_write_itr (struct igb_q_vector *q_vector) { +struct igb_adapter *adapter = q_vector->adapter;u32 itr_val = q_vector->itr_val &0x7FFC ;if (!q_vector->set_itr)
@@ -4150,8 +4152,8 @@ static void igb_write_itr(struct igb_q_vector *q_vector)if (!itr_val) itr_val =0x4 ; -if (q_vector->itr_shift) - itr_val |= itr_val << q_vector->itr_shift; +if (adapter->hw.mac.type == e1000_82575) + itr_val |= itr_val <<16 ;else itr_val |=0x8000000 ;
@@ -4228,9 +4230,8 @@ static void igb_setup_dca(struct igb_adapter *adapter)wr32 (E1000_DCA_CTRL ,E1000_DCA_CTRL_DCA_MODE_CB2 );for (i =0 ; i < adapter->num_q_vectors; i++) { -struct igb_q_vector *q_vector = adapter->q_vector[i]; - q_vector->cpu =-1 ; -igb_update_dca (q_vector); + adapter->q_vector[i]->cpu =-1 ; +igb_update_dca (adapter->q_vector[i]); } }
PATCH 2/18 igb: add support for wake-on-link
From: Nick Nunley <[email protected]>
This adds support for wake-on-link/phy activity to the ethtool interface.
---
drivers/net/igb/igb_ethtool.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-)
drivers/net/igb/igb_ethtool.c +7 -4
@@ -1812,7 +1812,8 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)struct igb_adapter *adapter =netdev_priv (netdev); wol->supported =WAKE_UCAST |WAKE_MCAST | -WAKE_BCAST |WAKE_MAGIC ; +WAKE_BCAST |WAKE_MAGIC | +WAKE_PHY ; wol->wolopts =0 ;/* this function will set ->supported = 0 and return 1 if wol is not
@@ -1835,15 +1836,15 @@ static void igb_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) wol->wolopts |=WAKE_BCAST ;if (adapter->wol &E1000_WUFC_MAG ) wol->wolopts |=WAKE_MAGIC ; - -return ; +if (adapter->wol &E1000_WUFC_LNKC ) + wol->wolopts |=WAKE_PHY ; }static int igb_set_wol (struct net_device *netdev,struct ethtool_wolinfo *wol) {struct igb_adapter *adapter =netdev_priv (netdev); -if (wol->wolopts & (WAKE_PHY |WAKE_ARP |WAKE_MAGICSECURE )) +if (wol->wolopts & (WAKE_ARP |WAKE_MAGICSECURE ))return -EOPNOTSUPP ; if (igb_wol_exclusion(adapter, wol) ||
@@ -1861,6 +1862,8 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) adapter->wol |=E1000_WUFC_BC ;if (wol->wolopts &WAKE_MAGIC ) adapter->wol |=E1000_WUFC_MAG ; +if (wol->wolopts &WAKE_PHY ) + adapter->wol |=E1000_WUFC_LNKC ;device_set_wakeup_enable (&adapter->pdev->dev, adapter->wol);return 0 ;
PATCH 3/18 igb: Report link status in ethtool when interface is down
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
With this change ethtool will correctly report link status when the interface is down. Currently ethtool reports the link as not detected when the interface is down.
---
drivers/net/igb/igb.h | 1 + drivers/net/igb/igb_ethtool.c | 20 +++++++++++++++++++- drivers/net/igb/igb_main.c | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-)
drivers/net/igb/igb.h +1 -0
@@ -356,6 +356,7 @@ extern void igb_unmap_and_free_tx_resource(struct igb_ring *, struct igb_buffer *);extern void igb_alloc_rx_buffers_adv (struct igb_ring *,int );extern void igb_update_stats (struct igb_adapter *); +extern bool igb_has_link (struct igb_adapter *adapter);extern void igb_set_ethtool_ops (struct net_device *);static inline s32 igb_reset_phy (struct e1000_hw *hw)
drivers/net/igb/igb_ethtool.c +19 -1
@@ -234,6 +234,24 @@ static int igb_set_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)return 0 ; } +static u32 igb_get_link (struct net_device *netdev) +{ +struct igb_adapter *adapter =netdev_priv (netdev); +struct e1000_mac_info *mac = &adapter->hw.mac; + +/* +* If the link is not reported up to netdev, interrupts are disabled, +* and so the physical link state may have changed since we last +* looked. Set get_link_status to make sure that the true link +* state is interrogated, rather than pulling a cached and possibly +* stale link state from the driver. +*/ +if (!netif_carrier_ok (netdev)) + mac->get_link_status =1 ; + +return igb_has_link (adapter); +} +static void igb_get_pauseparam (struct net_device *netdev,struct ethtool_pauseparam *pause) {
@@ -2077,7 +2095,7 @@ static const struct ethtool_ops igb_ethtool_ops = { .get_msglevel = igb_get_msglevel, .set_msglevel = igb_set_msglevel, .nway_reset = igb_nway_reset, - .get_link = ethtool_op_get_link, + .get_link = igb_get_link, .get_eeprom_len = igb_get_eeprom_len, .get_eeprom = igb_get_eeprom, .set_eeprom = igb_set_eeprom,
drivers/net/igb/igb_main.c +1 -1
@@ -3020,7 +3020,7 @@ static void igb_update_phy_info(unsigned long data)* igb_has_link - check shared code for link and determine up/down * @adapter: pointer to driver private info **/ -static bool igb_has_link (struct igb_adapter *adapter) +bool igb_has_link (struct igb_adapter *adapter) {struct e1000_hw *hw = &adapter->hw;bool link_active = false;
PATCH 4/18 igb: ignore EEPROM APME check when shutting down serdes link
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
Checking the EEPROM APME state unnecessarily prevents the link from shutting down. The standard power down routines should be sufficient to determine whether the serdes link can power down when going into D3.
---
drivers/net/igb/e1000_82575.c | 21 ++------------------- 1 files changed, 2 insertions(+), 19 deletions(-)
drivers/net/igb/e1000_82575.c +2 -19
@@ -791,27 +791,12 @@ static s32 igb_get_pcs_speed_and_duplex_82575(struct e1000_hw *hw, u16 *speed,void igb_shutdown_serdes_link_82575 (struct e1000_hw *hw) {u32 reg; -u16 eeprom_data =0 ; -if (hw->phy.media_type != e1000_media_type_internal_serdes || +if (hw->phy.media_type != e1000_media_type_internal_serdes &&igb_sgmii_active_82575 (hw))return ; -if (hw->bus.func ==E1000_FUNC_0 ) - hw->nvm.ops.read (hw,NVM_INIT_CONTROL3_PORT_A ,1 , &eeprom_data); -else if (hw->mac.type == e1000_82580) - hw->nvm.ops.read (hw,NVM_INIT_CONTROL3_PORT_A + -NVM_82580_LAN_FUNC_OFFSET (hw->bus.func),1 , - &eeprom_data); -else if (hw->bus.func ==E1000_FUNC_1 ) - hw->nvm.ops.read (hw,NVM_INIT_CONTROL3_PORT_B ,1 , &eeprom_data); - -/* -* If APM is not enabled in the EEPROM and management interface is -* not enabled, then power down. -*/ -if (!(eeprom_data &E1000_NVM_APME_82575 ) && - !igb_enable_mng_pass_thru (hw)) { +if (!igb_enable_mng_pass_thru (hw)) {/* Disable PCS to turn off link */ reg =rd32 (E1000_PCS_CFG0 ); reg &= ~E1000_PCS_CFG_PCS_EN ;
@@ -826,8 +811,6 @@ void igb_shutdown_serdes_link_82575(struct e1000_hw *hw)wrfl ();msleep (1 ); } - -return ; }/**
PATCH 5/18 igb: Power down link when interface is down
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This changes the behavior of the driver to power down the link when the associated interface is down, unless management is enabled.
---
drivers/net/igb/e1000_82575.c | 44 +++++++++++++++++++++++++++++++++++++++ drivers/net/igb/e1000_82575.h | 2 ++ drivers/net/igb/e1000_defines.h | 1 + drivers/net/igb/e1000_phy.c | 35 +++++++++++++++++++++++++++++++ drivers/net/igb/e1000_phy.h | 2 ++ drivers/net/igb/igb.h | 1 + drivers/net/igb/igb_ethtool.c | 16 ++++++++++++-- drivers/net/igb/igb_main.c | 39 +++++++++++++++++++++++++++-------- 8 files changed, 129 insertions(+), 11 deletions(-)
drivers/net/igb/e1000_82575.c +44 -0
@@ -727,6 +727,34 @@ static s32 igb_check_for_link_82575(struct e1000_hw *hw) }/** +* igb_power_up_serdes_link_82575 - Power up the serdes link after shutdown +* @hw: pointer to the HW structure +**/ +void igb_power_up_serdes_link_82575 (struct e1000_hw *hw) +{ +u32 reg; + + +if ((hw->phy.media_type != e1000_media_type_internal_serdes) && + !igb_sgmii_active_82575 (hw)) +return ; + +/* Enable PCS to turn on link */ + reg =rd32 (E1000_PCS_CFG0 ); + reg |=E1000_PCS_CFG_PCS_EN ; +wr32 (E1000_PCS_CFG0 , reg); + +/* Power up the laser */ + reg =rd32 (E1000_CTRL_EXT ); + reg &= ~E1000_CTRL_EXT_SDP3_DATA ; +wr32 (E1000_CTRL_EXT , reg); + +/* flush the write to verify completion */ +wrfl (); +msleep (1 ); +} + +/** * igb_get_pcs_speed_and_duplex_82575 - Retrieve current speed/duplex * @hw: pointer to the HW structure * @speed: stores the current speed
@@ -1166,6 +1194,22 @@ out: }/** +* igb_power_down_phy_copper_82575 - Remove link during PHY power down +* @hw: pointer to the HW structure +* +* In the case of a PHY power down to save power, or to turn off link during a +* driver unload, or wake on lan is not enabled, remove the link. +**/ +void igb_power_down_phy_copper_82575 (struct e1000_hw *hw) +{ +/* If the management interface is not enabled, then power down */ +if (!(igb_enable_mng_pass_thru (hw) ||igb_check_reset_block (hw))) +igb_power_down_phy_copper (hw); + +return ; +} + +/** * igb_clear_hw_cntrs_82575 - Clear device specific hardware counters * @hw: pointer to the HW structure *
drivers/net/igb/e1000_82575.h +2 -0
@@ -29,6 +29,8 @@#define _E1000_82575_H_extern void igb_shutdown_serdes_link_82575 (struct e1000_hw *hw); +extern void igb_power_up_serdes_link_82575 (struct e1000_hw *hw); +extern void igb_power_down_phy_copper_82575 (struct e1000_hw *hw);extern void igb_rx_fifo_flush_82575 (struct e1000_hw *hw);#define ID_LED_DEFAULT_82575_SERDES ((ID_LED_DEF1_DEF2 << 12) | \
drivers/net/igb/e1000_defines.h +1 -0
@@ -481,6 +481,7 @@/* PHY Control Register */ #define MII_CR_FULL_DUPLEX 0x0100/* FDX =1, half duplex =0 */ #define MII_CR_RESTART_AUTO_NEG 0x0200/* Restart auto negotiation */ +#define MII_CR_POWER_DOWN 0x0800/* Power down */ #define MII_CR_AUTO_NEG_EN 0x1000/* Auto Neg Enable */ #define MII_CR_LOOPBACK 0x4000/* 0 = normal, 1 = loopback */ #define MII_CR_RESET 0x8000/* 0 = normal, 1 = PHY reset */
drivers/net/igb/e1000_phy.c +35 -0
@@ -1931,6 +1931,41 @@ s32 igb_phy_init_script_igp3(struct e1000_hw *hw) }/** +* igb_power_up_phy_copper - Restore copper link in case of PHY power down +* @hw: pointer to the HW structure +* +* In the case of a PHY power down to save power, or to turn off link during a +* driver unload, restore the link to previous settings. +**/ +void igb_power_up_phy_copper (struct e1000_hw *hw) +{ +u16 mii_reg =0 ; + +/* The PHY will retain its settings across a power down/up cycle */ + hw->phy.ops.read_reg (hw,PHY_CONTROL , &mii_reg); + mii_reg &= ~MII_CR_POWER_DOWN ; + hw->phy.ops.write_reg (hw,PHY_CONTROL , mii_reg); +} + +/** +* igb_power_down_phy_copper - Power down copper PHY +* @hw: pointer to the HW structure +* +* Power down PHY to save power when interface is down and wake on lan +* is not enabled. +**/ +void igb_power_down_phy_copper (struct e1000_hw *hw) +{ +u16 mii_reg =0 ; + +/* The PHY will retain its settings across a power down/up cycle */ + hw->phy.ops.read_reg (hw,PHY_CONTROL , &mii_reg); + mii_reg |=MII_CR_POWER_DOWN ; + hw->phy.ops.write_reg (hw,PHY_CONTROL , mii_reg); +msleep (1 ); +} + +/** * igb_check_polarity_82580 - Checks the polarity. * @hw: pointer to the HW structure *
drivers/net/igb/e1000_phy.h +2 -0
@@ -60,6 +60,8 @@ s32 igb_setup_copper_link(struct e1000_hw *hw);s32 igb_write_phy_reg_igp (struct e1000_hw *hw,u32 offset,u16 data);s32 igb_phy_has_link (struct e1000_hw *hw,u32 iterations,u32 usec_interval,bool *success); +void igb_power_up_phy_copper (struct e1000_hw *hw); +void igb_power_down_phy_copper (struct e1000_hw *hw);s32 igb_phy_init_script_igp3 (struct e1000_hw *hw);s32 igb_read_phy_reg_mdic (struct e1000_hw *hw,u32 offset,u16 *data);s32 igb_write_phy_reg_mdic (struct e1000_hw *hw,u32 offset,u16 data);
drivers/net/igb/igb.h +1 -0
@@ -358,6 +358,7 @@ extern void igb_alloc_rx_buffers_adv(struct igb_ring *, int);extern void igb_update_stats (struct igb_adapter *);extern bool igb_has_link (struct igb_adapter *adapter);extern void igb_set_ethtool_ops (struct net_device *); +extern void igb_power_up_link (struct igb_adapter *);static inline s32 igb_reset_phy (struct e1000_hw *hw) {
drivers/net/igb/igb_ethtool.c +13 -3
@@ -1722,6 +1722,9 @@ static void igb_diag_test(struct net_device *netdev,dev_info (&adapter->pdev->dev,"offline testing starting\n" ); +/* power up link for link test */ +igb_power_up_link (adapter); +/* Link test performed before hardware reset so autoneg doesn't * interfere with test result */ if (igb_link_test (adapter, &data[4 ]))
@@ -1745,6 +1748,8 @@ static void igb_diag_test(struct net_device *netdev, eth_test->flags |=ETH_TEST_FL_FAILED ;igb_reset (adapter); +/* power up link for loopback test */ +igb_power_up_link (adapter);if (igb_loopback_test (adapter, &data[3 ])) eth_test->flags |=ETH_TEST_FL_FAILED ;
@@ -1763,9 +1768,14 @@ static void igb_diag_test(struct net_device *netdev,dev_open (netdev); }else {dev_info (&adapter->pdev->dev,"online testing starting\n" ); -/* Online tests */ -if (igb_link_test (adapter, &data[4 ])) - eth_test->flags |=ETH_TEST_FL_FAILED ; + +/* PHY is powered down when interface is down */ +if (!netif_carrier_ok (netdev)) { + data[4 ] =0 ; + }else { +if (igb_link_test (adapter, &data[4 ])) + eth_test->flags |=ETH_TEST_FL_FAILED ; + }/* Online tests aren't run; pass by default */ data[0 ] =0 ;
drivers/net/igb/igb_main.c +31 -8
@@ -1114,6 +1114,29 @@ static void igb_configure(struct igb_adapter *adapter) adapter->tx_queue_len = netdev->tx_queue_len; } +/** +* igb_power_up_link - Power up the phy/serdes link +* @adapter: address of board private structure +**/ +void igb_power_up_link (struct igb_adapter *adapter) +{ +if (adapter->hw.phy.media_type == e1000_media_type_copper) +igb_power_up_phy_copper (&adapter->hw); +else +igb_power_up_serdes_link_82575 (&adapter->hw); +} + +/** +* igb_power_down_link - Power down the phy/serdes link +* @adapter: address of board private structure +*/ +static void igb_power_down_link (struct igb_adapter *adapter) +{ +if (adapter->hw.phy.media_type == e1000_media_type_copper) +igb_power_down_phy_copper_82575 (&adapter->hw); +else +igb_shutdown_serdes_link_82575 (&adapter->hw); +}/** * igb_up - Open the interface and prepare it to handle traffic
@@ -1335,6 +1358,9 @@ void igb_reset(struct igb_adapter *adapter)wr32 (E1000_PCIEMISC , reg & ~E1000_PCIEMISC_LX_DECISION ); } +if (!netif_running (adapter->netdev)) +igb_power_down_link (adapter); +igb_update_mng_vlan (adapter);/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */
@@ -1717,9 +1743,6 @@ static void __devexit igb_remove(struct pci_dev *pdev)unregister_netdev (netdev); -if (!igb_check_reset_block (hw)) -igb_reset_phy (hw); -igb_clear_interrupt_scheme (adapter);#ifdef CONFIG_PCI_IOV
@@ -1995,7 +2018,7 @@ static int igb_open(struct net_device *netdev)if (err) goto err_setup_rx; -/* e1000_power_up_phy(adapter); */ +igb_power_up_link (adapter);/* before we allocate an interrupt, we must be ready to handle it. * Setting DEBUG_SHIRQ in the kernel makes it fire an interrupt
@@ -2037,7 +2060,7 @@ static int igb_open(struct net_device *netdev) err_req_irq:igb_release_hw_control (adapter); -/* e1000_power_down_phy(adapter); */ +igb_power_down_link (adapter);igb_free_all_rx_resources (adapter); err_setup_rx:igb_free_all_tx_resources (adapter);
@@ -5820,7 +5843,9 @@ static int __igb_shutdown(struct pci_dev *pdev, bool *enable_wake) *enable_wake = wufc || adapter->en_mng_pt;if (!*enable_wake) -igb_shutdown_serdes_link_82575 (hw); +igb_power_down_link (adapter); +else +igb_power_up_link (adapter);/* Release control of h/w to f/w. If f/w is AMT enabled, this * would have already happened in close and is redundant. */
@@ -5877,8 +5902,6 @@ static int igb_resume(struct pci_dev *pdev)return -ENOMEM ; } -/* e1000_power_up_phy(adapter); */ -igb_reset (adapter);/* let the f/w know that the h/w is now under the control of the
PATCH 6/18 igb: call pci_save_state after pci_restore_state
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This patch adds calls to pci_save_state() immediately after calls to pci_restore_state(). Due to a change in the behavior of pci_restore_state() it is necessary to call pci_save_state() to keep the state_saved flag. This patch is based on a similar patch for ixgbe.
---
drivers/net/igb/igb_main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
drivers/net/igb/igb_main.c +2 -0
@@ -5885,6 +5885,7 @@ static int igb_resume(struct pci_dev *pdev)pci_set_power_state (pdev,PCI_D0 );pci_restore_state (pdev); +pci_save_state (pdev); err =pci_enable_device_mem (pdev);if (err) {
@@ -6010,6 +6011,7 @@ static pci_ers_result_t igb_io_slot_reset(struct pci_dev *pdev) }else {pci_set_master (pdev);pci_restore_state (pdev); +pci_save_state (pdev);pci_enable_wake (pdev, PCI_D3hot,0 );pci_enable_wake (pdev, PCI_D3cold,0 );
PATCH 7/18 igb: Allocate rings seperately instead of as a block
In reply to Jeff KirsherFrom: Alexander Duyck <[email protected]>
This change makes it so that the rings are allocated seperately. As a result we can allocate them on seperate nodes at some point in the future if we so desire.
---
drivers/net/igb/igb.h | 5 +- drivers/net/igb/igb_ethtool.c | 46 +++++++++-------- drivers/net/igb/igb_main.c | 113 +++++++++++++++++++++-------------------- 3 files changed, 83 insertions(+), 81 deletions(-)
drivers/net/igb/igb.h +2 -3
@@ -240,7 +240,6 @@ static inline int igb_desc_unused(struct igb_ring *ring) }/* board specific private data structure */ -struct igb_adapter {struct timer_list watchdog_timer;struct timer_list phy_info_timer;
@@ -266,12 +265,12 @@ struct igb_adapter {unsigned long led_status;/* TX */ -struct igb_ring *tx_ring;/* One per active queue */ +struct igb_ring *tx_ring[16 ];unsigned long tx_queue_len;u32 tx_timeout_count;/* RX */ -struct igb_ring *rx_ring;/* One per active queue */ +struct igb_ring *rx_ring[16 ];int num_tx_queues;int num_rx_queues;
drivers/net/igb/igb_ethtool.c +24 -22
102 lines not on this page · raw message
drivers/net/igb/igb_main.c +57 -56
279 lines not on this page · raw message
PATCH 8/18 igb: remove adaptive IFS from driver
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
Adaptive IFS support has been included in the igb driver since its initial release, but it is not a feature on any igb NICs. This patch removes it from the driver.
---
drivers/net/igb/e1000_defines.h | 6 --- drivers/net/igb/e1000_hw.h | 7 ---- drivers/net/igb/e1000_mac.c | 70 --------------------------------------- drivers/net/igb/e1000_mac.h | 2 - drivers/net/igb/igb_main.c | 10 +----- 5 files changed, 2 insertions(+), 93 deletions(-)
drivers/net/igb/e1000_defines.h +0 -6
@@ -313,12 +313,6 @@#define E1000_PBA_34K 0x0022#define E1000_PBA_64K 0x0040/* 64KB */ -#define IFS_MAX 80 -#define IFS_MIN 40 -#define IFS_RATIO 4 -#define IFS_STEP 10 -#define MIN_NUM_XMITS 1000 -/* SW Semaphore Register */ #define E1000_SWSM_SMBI 0x00000001/* Driver Semaphore bit */ #define E1000_SWSM_SWESMBI 0x00000002/* FW Semaphore bit */
drivers/net/igb/e1000_hw.h +0 -7
@@ -339,19 +339,12 @@ struct e1000_mac_info {enum e1000_mac_type type; -u32 collision_delta;u32 ledctl_default;u32 ledctl_mode1;u32 ledctl_mode2;u32 mc_filter_type; -u32 tx_packet_delta;u32 txcw; -u16 current_ifs_val; -u16 ifs_max_val; -u16 ifs_min_val; -u16 ifs_ratio; -u16 ifs_step_size;u16 mta_reg_count;u16 uta_reg_count;
drivers/net/igb/e1000_mac.c +0 -70
76 lines not on this page · raw message
drivers/net/igb/e1000_mac.h +0 -2
@@ -67,8 +67,6 @@ void igb_mta_set(struct e1000_hw *hw, u32 hash_value);void igb_put_hw_semaphore (struct e1000_hw *hw);void igb_rar_set (struct e1000_hw *hw,u8 *addr,u32 index);s32 igb_check_alt_mac_addr (struct e1000_hw *hw); -void igb_reset_adaptive (struct e1000_hw *hw); -void igb_update_adaptive (struct e1000_hw *hw);bool igb_enable_mng_pass_thru (struct e1000_hw *hw);
drivers/net/igb/igb_main.c +2 -8
@@ -1365,7 +1365,6 @@ void igb_reset(struct igb_adapter *adapter)/* Enable h/w to recognize an 802.1Q VLAN Ethernet packet */ wr32 (E1000_VET ,ETHERNET_IEEE_VLAN_TYPE ); -igb_reset_adaptive (hw);igb_get_phy_info (hw); }
@@ -1508,7 +1507,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,igb_get_bus_info_pcie (hw); hw->phy.autoneg_wait_to_complete = false; - hw->mac.adaptive_ifs = true;/* Copper options */ if (hw->phy.media_type == e1000_media_type_copper) {
@@ -3159,7 +3157,6 @@ static void igb_watchdog_task(struct work_struct *work) }igb_update_stats (adapter); -igb_update_adaptive (hw);for (i =0 ; i < adapter->num_tx_queues; i++) {struct igb_ring *tx_ring = adapter->tx_ring[i];
@@ -4064,11 +4061,8 @@ void igb_update_stats(struct igb_adapter *adapter) adapter->stats.mptc +=rd32 (E1000_MPTC ); adapter->stats.bptc +=rd32 (E1000_BPTC ); -/* used for adaptive IFS */ - hw->mac.tx_packet_delta =rd32 (E1000_TPT ); - adapter->stats.tpt += hw->mac.tx_packet_delta; - hw->mac.collision_delta =rd32 (E1000_COLC ); - adapter->stats.colc += hw->mac.collision_delta; + adapter->stats.tpt +=rd32 (E1000_TPT ); + adapter->stats.colc +=rd32 (E1000_COLC ); adapter->stats.algnerrc +=rd32 (E1000_ALGNERRC ); adapter->stats.rxerrc +=rd32 (E1000_RXERRC );
PATCH 9/18 igb: cap interrupts at 20K per queue when in itr mode 3
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
In order to maintain similar performance between MSI-X and legacy/MSI interrupts, this patch reduces the number of interrupts when receiving small packets to 20K when in interrupt throttle rate mode 3.
---
drivers/net/igb/igb_main.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
drivers/net/igb/igb_main.c +4 -0
@@ -3260,6 +3260,10 @@ static void igb_update_ring_itr(struct igb_q_vector *q_vector)else new_val = avg_wire_size /2 ; +/* when in itr mode 3 do not exceed 20K ints/sec */ +if (adapter->rx_itr_setting ==3 && new_val <196 ) + new_val =196 ; + set_itr_val:if (new_val != q_vector->itr_val) { q_vector->itr_val = new_val;
PATCH 10/18 igb: only support SRRCTL_DROP_EN when using multiple queues
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
The SRRCTL.DROP_EN bit should only be set when we are supporting multiple queues. This bit is meant to prevent head of line blocking and is unnecessary in the single queue case.
---
drivers/net/igb/igb_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
drivers/net/igb/igb_main.c +3 -0
@@ -2595,6 +2595,9 @@ void igb_configure_rx_ring(struct igb_adapter *adapter,E1000_SRRCTL_BSIZEPKT_SHIFT ; srrctl |=E1000_SRRCTL_DESCTYPE_ADV_ONEBUF ; } +/* Only set Drop Enable if we are supporting multiple queues */ +if (adapter->vfs_allocated_count || adapter->num_rx_queues >1 ) + srrctl |=E1000_SRRCTL_DROP_EN ;wr32 (E1000_SRRCTL (reg_idx), srrctl);
PATCH 11/18 igb: only read phy specific stats if in internal phy mode
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
There are a couple statistics registers that are not meant to be read when in SGMII/serdes mode. This patch adds a check to verify mode before reading and updating these statistics.
---
drivers/net/igb/igb_main.c | 11 ++++++++--- 1 files changed, 8 insertions(+), 3 deletions(-)
drivers/net/igb/igb_main.c +8 -3
@@ -3975,7 +3975,7 @@ void igb_update_stats(struct igb_adapter *adapter)struct net_device_stats *net_stats =igb_get_stats (adapter->netdev);struct e1000_hw *hw = &adapter->hw;struct pci_dev *pdev = adapter->pdev; -u32 rnbc; +u32 rnbc, reg;u16 phy_tmp;int i;u64 bytes, packets;
@@ -4072,8 +4072,13 @@ void igb_update_stats(struct igb_adapter *adapter) adapter->stats.colc +=rd32 (E1000_COLC ); adapter->stats.algnerrc +=rd32 (E1000_ALGNERRC ); - adapter->stats.rxerrc +=rd32 (E1000_RXERRC ); - adapter->stats.tncrs +=rd32 (E1000_TNCRS ); +/* read internal phy specific stats */ + reg =rd32 (E1000_CTRL_EXT ); +if (!(reg &E1000_CTRL_EXT_LINK_MODE_MASK )) { + adapter->stats.rxerrc +=rd32 (E1000_RXERRC ); + adapter->stats.tncrs +=rd32 (E1000_TNCRS ); + } + adapter->stats.tsctc +=rd32 (E1000_TSCTC ); adapter->stats.tsctfc +=rd32 (E1000_TSCTFC );
PATCH 12/18 igb: inline igb_maybe_stop_tx
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
igb_maybe_stop_tx() is extremely small and appears in several spots in the tx hotpath. This change inlines the function for a possible performance boost.
---
drivers/net/igb/igb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/igb/igb_main.c +1 -1
@@ -3758,7 +3758,7 @@ static int __igb_maybe_stop_tx(struct igb_ring *tx_ring, int size)return 0 ; } -static int igb_maybe_stop_tx (struct igb_ring *tx_ring,int size) +static inline int igb_maybe_stop_tx (struct igb_ring *tx_ring,int size) {if (igb_desc_unused (tx_ring) >= size)return 0 ;
PATCH 13/18 igb: move gso_segs into buffer_info structure
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This change moves gso_segs into the buffer_info structure to avoid a possible cache line miss in clean_tx_irq.
---
drivers/net/igb/igb.h | 1 + drivers/net/igb/igb_main.c | 3 ++- 2 files changed, 3 insertions(+), 1 deletions(-)
drivers/net/igb/igb.h +1 -0
@@ -141,6 +141,7 @@ struct igb_buffer {u16 length;u16 next_to_watch;u16 mapped_as_page; +u16 gso_segs; };/* RX */ struct {
drivers/net/igb/igb_main.c +2 -1
@@ -3641,6 +3641,7 @@ static inline int igb_tx_map_adv(struct igb_ring *tx_ring, struct sk_buff *skb, } tx_ring->buffer_info[i].skb = skb; + tx_ring->buffer_info[i].gso_segs =skb_shinfo (skb)->gso_segs ?:1 ; tx_ring->buffer_info[first].next_to_watch = i;return ++count;
@@ -5032,7 +5033,7 @@ static bool igb_clean_tx_irq(struct igb_q_vector *q_vector)if (skb) {unsigned int segs, bytecount;/* gso_segs is currently only valid for tcp */ - segs =skb_shinfo (skb)->gso_segs ?:1 ; + segs = buffer_info->gso_segs;/* multiply data chunks by size of headers */ bytecount = ((segs -1 ) *skb_headlen (skb)) + skb->len;
PATCH 14/18 igb: minor type cleanups
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This change cleans up some instances where unsigned int and u32 were being used interchangeably, and cleans up hdr_len which was being set to 0 twice.
---
drivers/net/igb/igb_main.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-)
drivers/net/igb/igb_main.c +6 -6
@@ -3434,8 +3434,8 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,int err;struct igb_buffer *buffer_info;u32 info =0 , tu_cmd =0 ; -u32 mss_l4len_idx, l4len; - *hdr_len =0 ; +u32 mss_l4len_idx; +u8 l4len;if (skb_header_cloned (skb)) { err =pskb_expand_head (skb,0 ,0 ,GFP_ATOMIC );
@@ -3671,7 +3671,7 @@ dma_error: }static inline void igb_tx_queue_adv (struct igb_ring *tx_ring, -int tx_flags,int count,u32 paylen, +u32 tx_flags,int count,u32 paylen,u8 hdr_len) {union e1000_adv_tx_desc *tx_desc;
@@ -3770,10 +3770,10 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb, struct igb_ring *tx_ring) {struct igb_adapter *adapter =netdev_priv (tx_ring->netdev); -unsigned int first; -unsigned int tx_flags =0 ; -u8 hdr_len =0 ;int tso =0 , count; +u32 tx_flags =0 ; +u16 first; +u8 hdr_len =0 ;union skb_shared_tx *shtx =skb_tx (skb);/* need: 1 descriptor per page,
PATCH 15/18 igb: remove unused vmolr value
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
In an earlier version of igb_write_mc_addr_list() the vmolr register was modified. This register is no longer accessed, although the variable still exists. This patch removes it from the function.
---
drivers/net/igb/igb_main.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
drivers/net/igb/igb_main.c +0 -4
@@ -2883,7 +2883,6 @@ static int igb_write_mc_addr_list(struct net_device *netdev)struct e1000_hw *hw = &adapter->hw;struct dev_mc_list *mc_ptr = netdev->mc_list;u8 *mta_list; -u32 vmolr =0 ;int i;if (netdev_mc_empty (netdev)) {
@@ -2897,9 +2896,6 @@ static int igb_write_mc_addr_list(struct net_device *netdev)if (!mta_list)return -ENOMEM ; -/* set vmolr receive overflow multicast bit */ - vmolr |=E1000_VMOLR_ROMPE ; -/* The shared function expects a packed array of only addresses. */ mc_ptr = netdev->mc_list;
PATCH 16/18 igb: use igb_free_q_vectors to cleanup failure in igb_alloc_q_vectors
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This change makes it so that igb_free_q_vectors is reused in igb_alloc_q_vectors to handle the cleanup instead of unwinding through the allocations.
---
drivers/net/igb/igb_main.c | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-)
drivers/net/igb/igb_main.c +3 -7
@@ -649,6 +649,8 @@ static void igb_free_q_vectors(struct igb_adapter *adapter)for (v_idx =0 ; v_idx < adapter->num_q_vectors; v_idx++) {struct igb_q_vector *q_vector = adapter->q_vector[v_idx]; adapter->q_vector[v_idx] =NULL ; +if (!q_vector) +continue ;netif_napi_del (&q_vector->napi);kfree (q_vector); }
@@ -768,13 +770,7 @@ static int igb_alloc_q_vectors(struct igb_adapter *adapter)return 0 ; err_out: -while (v_idx) { - v_idx--; - q_vector = adapter->q_vector[v_idx]; -netif_napi_del (&q_vector->napi); -kfree (q_vector); - adapter->q_vector[v_idx] =NULL ; - } +igb_free_q_vectors (adapter);return -ENOMEM ; }
PATCH 17/18 igb: change descriptor control thresholds
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This change simplifies the code by setting RX_PTHRESH to 8 for all devices, as it was unlikely that there was any advantage to set it at 16 for earlier cards. Additionally TX_WTHRESH is set to 1 for the 82576 NIC to improve performance by enabling a minimal amount of write combining when writing back descriptors.
---
drivers/net/igb/igb.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/igb/igb.h +2 -2
@@ -95,13 +95,13 @@ struct vf_data_storage {* descriptors until either it has this many to write back, or the * ITR timer expires. */ -#define IGB_RX_PTHRESH (hw->mac.type <= e1000_82576 ? 16 : 8) +#define IGB_RX_PTHRESH 8#define IGB_RX_HTHRESH 8#define IGB_RX_WTHRESH 1#define IGB_TX_PTHRESH 8#define IGB_TX_HTHRESH 1#define IGB_TX_WTHRESH ((hw->mac.type == e1000_82576 && \ - adapter->msix_entries) ? 0 : 16) + adapter->msix_entries) ? 1 : 16)/* this is the size past which hardware will drop packets when setting LPE=0 */ #define MAXIMUM_ETHERNET_VLAN_SIZE 1522
PATCH 18/18 igb: update tx DMA mapping error handling
In reply to Jeff KirsherFrom: Nick Nunley <[email protected]>
This updates the tx DMA mapping error handling code to resemble e1000e/ixgbe.
---
drivers/net/igb/igb_main.c | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-)
drivers/net/igb/igb_main.c +3 -5
@@ -3647,14 +3647,12 @@ dma_error: buffer_info->length =0 ; buffer_info->next_to_watch =0 ; buffer_info->mapped_as_page = false; - count--;/* clear timestamp and dma mappings for remaining portion of packet */ -while (count >=0 ) { - count--; +while (count--) { +if (i ==0 ) + i = tx_ring->count; i--; -if (i <0 ) - i += tx_ring->count; buffer_info = &tx_ring->buffer_info[i];igb_unmap_and_free_tx_resource (tx_ring, buffer_info); }
David Miller
maintainerAll 18 patches applied to net-next-2.6, thanks!