igb: igb should not flag lltx
Subsystems (2)
PATCH 1/3 igb: igb should not flag lltx
From: Alexander Duyck <[email protected]>
Igb has flags enabling lltx but this is a holdover from the earlier e1000 driver which the igb driver was based off of.
---
drivers/net/igb/igb_main.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
drivers/net/igb/igb_main.c +0 -1
@@ -1200,7 +1200,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,if (pci_using_dac) netdev->features |=NETIF_F_HIGHDMA ; - netdev->features |=NETIF_F_LLTX ; adapter->en_mng_pt =igb_enable_mng_pass_thru (&adapter->hw);/* before reading the NVM, reset the controller to put the device in a
PATCH 2/3 igb: make certain to power on optics for 82576 fiber nics
From: Alexander Duyck <[email protected]>
It appears that a step was missed in the initialization of 82576 fiber nics that resulted in it not powering on the optics.
---
drivers/net/igb/e1000_82575.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-)
drivers/net/igb/e1000_82575.c +7 -0
@@ -1103,6 +1103,13 @@ static s32 igb_setup_fiber_serdes_link_82575(struct e1000_hw *hw)E1000_CTRL_SWDPIN1 ;wr32 (E1000_CTRL , reg); +/* Power on phy for 82576 fiber adapters */ +if (hw->mac.type == e1000_82576) { + reg =rd32 (E1000_CTRL_EXT ); + reg &= ~E1000_CTRL_EXT_SDP7_DATA ; +wr32 (E1000_CTRL_EXT , reg); + } +/* Set switch control to serdes energy detect */ reg =rd32 (E1000_CONNSW ); reg |=E1000_CONNSW_ENRGSRC ;
Re: [PATCH 2/3] igb: make certain to power on optics for 82576 fiber nics
From: Jeff Kirsher <[email protected]>
Date: Wed, 21 Jan 2009 00:33:48 -0800
Quoted 5 lines
It appears that a step was missed in the initialization of 82576 fiber nics that resulted in it not powering on the optics.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/3 e1000: drop lltx, remove unnecessary lock
In reply to Jeff KirsherLLTX is deprecated, don't use it. This completes the removal of LLTX from the Intel Network drivers.
---
drivers/net/e1000/e1000.h | 2 -- drivers/net/e1000/e1000_main.c | 29 +++-------------------------- 2 files changed, 3 insertions(+), 28 deletions(-)
drivers/net/e1000/e1000.h +0 -2
@@ -182,7 +182,6 @@ struct e1000_tx_ring {/* array of buffer information structs */ struct e1000_buffer *buffer_info; -spinlock_t tx_lock;u16 tdh;u16 tdt;bool last_tx_tso;
@@ -238,7 +237,6 @@ struct e1000_adapter {u16 link_speed;u16 link_duplex;spinlock_t stats_lock; -spinlock_t tx_queue_lock;unsigned int total_tx_bytes;unsigned int total_tx_packets;unsigned int total_rx_bytes;
drivers/net/e1000/e1000_main.c +3 -26
@@ -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.20-k3-NAPI" +#define DRV_VERSION "7.3.21-k2-NAPI"const char e1000_driver_version[] =DRV_VERSION ;static const char e1000_copyright[] ="Copyright (c) 1999-2006 Intel Corporation." ;
@@ -1048,8 +1048,6 @@ static int __devinit e1000_probe(struct pci_dev *pdev,if (pci_using_dac) netdev->features |=NETIF_F_HIGHDMA ; - netdev->features |=NETIF_F_LLTX ; - netdev->vlan_features |=NETIF_F_TSO ; netdev->vlan_features |=NETIF_F_TSO6 ; netdev->vlan_features |=NETIF_F_HW_CSUM ;
@@ -1368,8 +1366,6 @@ static int __devinit e1000_sw_init(struct e1000_adapter *adapter)return -ENOMEM ; } -spin_lock_init (&adapter->tx_queue_lock); -/* Explicitly disable IRQ since the NIC can be in any state. */ e1000_irq_disable (adapter);
@@ -1624,7 +1620,6 @@ setup_tx_desc_die: txdr->next_to_use =0 ; txdr->next_to_clean =0 ; -spin_lock_init (&txdr->tx_lock);return 0 ; }
@@ -3185,7 +3180,6 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)unsigned int max_txd_pwr =E1000_MAX_TXD_PWR ;unsigned int tx_flags =0 ;unsigned int len = skb->len - skb->data_len; -unsigned long flags;unsigned int nr_frags;unsigned int mss;int count =0 ;
@@ -3290,22 +3284,15 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) (hw->mac_type == e1000_82573))e1000_transfer_dhcp_info (adapter, skb); -if (!spin_trylock_irqsave (&tx_ring->tx_lock, flags)) -/* Collision - tell upper layer to requeue */ -return NETDEV_TX_LOCKED ; -/* need: count + 2 desc gap to keep tail from touching * head, otherwise try next time */ -if (unlikely (e1000_maybe_stop_tx (netdev, tx_ring, count +2 ))) { -spin_unlock_irqrestore (&tx_ring->tx_lock, flags); +if (unlikely (e1000_maybe_stop_tx (netdev, tx_ring, count +2 )))return NETDEV_TX_BUSY ; - }if (unlikely (hw->mac_type == e1000_82547)) {if (unlikely (e1000_82547_fifo_workaround (adapter, skb))) {netif_stop_queue (netdev);mod_timer (&adapter->tx_fifo_stall_timer, jiffies +1 ); -spin_unlock_irqrestore (&tx_ring->tx_lock, flags);return NETDEV_TX_BUSY ; } }
@@ -3320,7 +3307,6 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev) tso =e1000_tso (adapter, tx_ring, skb);if (tso <0 ) {dev_kfree_skb_any (skb); -spin_unlock_irqrestore (&tx_ring->tx_lock, flags);return NETDEV_TX_OK ; }
@@ -3345,7 +3331,6 @@ static int e1000_xmit_frame(struct sk_buff *skb, struct net_device *netdev)/* Make sure there is space in the ring for the next send. */ e1000_maybe_stop_tx (netdev, tx_ring,MAX_SKB_FRAGS +2 ); -spin_unlock_irqrestore (&tx_ring->tx_lock, flags);return NETDEV_TX_OK ; }
@@ -3773,15 +3758,7 @@ static int e1000_clean(struct napi_struct *napi, int budget) adapter =netdev_priv (poll_dev); -/* e1000_clean is called per-cpu. This lock protects -* tx_ring[0] from being cleaned by multiple cpus -* simultaneously. A failure obtaining the lock means -* tx_ring[0] is currently being cleaned anyway. */ -if (spin_trylock (&adapter->tx_queue_lock)) { - tx_cleaned =e1000_clean_tx_irq (adapter, - &adapter->tx_ring[0 ]); -spin_unlock (&adapter->tx_queue_lock); - } + tx_cleaned =e1000_clean_tx_irq (adapter, &adapter->tx_ring[0 ]); adapter->clean_rx (adapter, &adapter->rx_ring[0 ], &work_done, budget);
Re: [PATCH 3/3] e1000: drop lltx, remove unnecessary lock
Quoted 4 lines · Jeff Kirsher
LLTX is deprecated, don't use it. This completes the removal of LLTX from the Intel Network drivers.
Signed-off-by Jeff Kirsher <[email protected]>
Awesome work Jeff :)
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtDavid Miller
maintainerRe: [PATCH 3/3] e1000: drop lltx, remove unnecessary lock
From: Herbert Xu <[email protected]>
Date: Thu, 22 Jan 2009 09:34:18 +1100
Quoted 7 lines
Quoted 4 lines · Jeff Kirsher
LLTX is deprecated, don't use it. This completes the removal of LLTX from the Intel Network drivers.
Signed-off-by Jeff Kirsher <[email protected]>Awesome work Jeff :)
Indeed, I'll be applying these anti-LLTX patches for sure :)
Re: [PATCH 3/3] e1000: drop lltx, remove unnecessary lock
In reply to Jeff KirsherFrom: Jeff Kirsher <[email protected]>
Date: Wed, 21 Jan 2009 00:34:07 -0800
Quoted 4 lines
LLTX is deprecated, don't use it. This completes the removal of LLTX from the Intel Network drivers.
Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 21 Jan 2009 00:33:29 -0800
Quoted 5 lines
Igb has flags enabling lltx but this is a holdover from the earlier e1000 driver which the igb driver was based off of.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.