igb: misc whitespace/formatting cleanups
Subsystems (2)
PATCH 1/6 igb: misc whitespace/formatting cleanups
From: Alexander Duyck <[email protected]>
This patch is intended to hold several whitespace, formatting, and comment cleanups that have been found while cleaning up the igb driver.
---
drivers/net/igb/igb_main.c | 58 +++++++++++++++----------------------------- 1 files changed, 20 insertions(+), 38 deletions(-)
drivers/net/igb/igb_main.c +20 -38
@@ -1566,7 +1566,6 @@ static int igb_close(struct net_device *netdev)* * Return 0 on success, negative on failure **/ -int igb_setup_tx_resources (struct igb_adapter *adapter,struct igb_ring *tx_ring) {
@@ -1646,13 +1645,13 @@ static void igb_configure_tx(struct igb_adapter *adapter)int i, j;for (i =0 ; i < adapter->num_tx_queues; i++) { -struct igb_ring *ring = &(adapter->tx_ring[i]); +struct igb_ring *ring = &adapter->tx_ring[i]; j = ring->reg_idx;wr32 (E1000_TDLEN (j), - ring->count *sizeof (struct e1000_tx_desc )); + ring->count *sizeof (struct e1000_tx_desc )); tdba = ring->dma;wr32 (E1000_TDBAL (j), - tdba &0x00000000ffffffffULL ); + tdba &0x00000000ffffffffULL );wr32 (E1000_TDBAH (j), tdba >>32 ); ring->head =E1000_TDH (j);
@@ -1672,8 +1671,6 @@ static void igb_configure_tx(struct igb_adapter *adapter)wr32 (E1000_DCA_TXCTRL (j), txctrl); } - -/* Use the default values for the Tx Inter Packet Gap (IPG) timer */ /* Program the Transmit Control Register */
@@ -1701,7 +1698,6 @@ static void igb_configure_tx(struct igb_adapter *adapter)* * Returns 0 on success, negative on failure **/ -int igb_setup_rx_resources (struct igb_adapter *adapter,struct igb_ring *rx_ring) {
@@ -1788,7 +1784,7 @@ static void igb_setup_rctl(struct igb_adapter *adapter)* enable stripping of CRC. It's unlikely this will break BMC * redirection as it did with e1000. Newer features require * that the HW strips the CRC. -*/ +*/ rctl |=E1000_RCTL_SECRC ;/*
@@ -1866,14 +1862,14 @@ static void igb_configure_rx(struct igb_adapter *adapter)/* Setup the HW Rx Head and Tail Descriptor Pointers and * the Base and Length of the Rx Descriptor Ring */ for (i =0 ; i < adapter->num_rx_queues; i++) { -struct igb_ring *ring = &(adapter->rx_ring[i]); +struct igb_ring *ring = &adapter->rx_ring[i]; j = ring->reg_idx; rdba = ring->dma;wr32 (E1000_RDBAL (j), - rdba &0x00000000ffffffffULL ); + rdba &0x00000000ffffffffULL );wr32 (E1000_RDBAH (j), rdba >>32 );wr32 (E1000_RDLEN (j), - ring->count *sizeof (union e1000_adv_rx_desc )); + ring->count *sizeof (union e1000_adv_rx_desc )); ring->head =E1000_RDH (j); ring->tail =E1000_RDT (j);
@@ -2011,6 +2007,7 @@ static void igb_unmap_and_free_tx_resource(struct igb_adapter *adapter, buffer_info->skb =NULL ; } buffer_info->time_stamp =0 ; + buffer_info->next_to_watch =0 ;/* buffer_info must be completely set up in the transmit path */ }
@@ -2576,15 +2573,13 @@ static void igb_set_itr(struct igb_adapter *adapter) adapter->tx_itr, adapter->tx_ring->total_packets, adapter->tx_ring->total_bytes); - current_itr =max (adapter->rx_itr, adapter->tx_itr); }else { current_itr = adapter->rx_itr; }/* conservative mode (itr 3) eliminates the lowest_latency setting */ -if (adapter->itr_setting ==3 && - current_itr == lowest_latency) +if (adapter->itr_setting ==3 && current_itr == lowest_latency) current_itr = low_latency;switch (current_itr) {
@@ -2701,7 +2696,7 @@ static inline int igb_tso_adv(struct igb_adapter *adapter, mss_l4len_idx = (skb_shinfo (skb)->gso_size <<E1000_ADVTXD_MSS_SHIFT ); mss_l4len_idx |= (l4len <<E1000_ADVTXD_L4LEN_SHIFT ); -/* Context index must be unique per ring. */ +/* For 82575, context index must be unique per ring. */ if (adapter->flags &IGB_FLAG_NEED_CTX_IDX ) mss_l4len_idx |= tx_ring->queue_index <<4 ;
@@ -2785,8 +2780,6 @@ static inline bool igb_tx_csum_adv(struct igb_adapter *adapter,return true; } - -return false; }
@@ -2984,7 +2977,6 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb, tx_flags |=IGB_TX_FLAGS_IPV4 ; first = tx_ring->next_to_use; - tso =skb_is_gso (skb) ?igb_tso_adv (adapter, tx_ring, skb, tx_flags, &hdr_len) :0 ;
@@ -3058,8 +3050,7 @@ static void igb_reset_task(struct work_struct *work)* Returns the address of the device statistics structure. * The statistics are actually updated from the timer callback. **/ -static struct net_device_stats * -igb_get_stats (struct net_device *netdev) +static struct net_device_stats *igb_get_stats (struct net_device *netdev) {struct igb_adapter *adapter =netdev_priv (netdev);
@@ -3093,6 +3084,7 @@ static int igb_change_mtu(struct net_device *netdev, int new_mtu)while (test_and_set_bit (__IGB_RESETTING, &adapter->state))msleep (1 ); +/* igb_down has a dependency on max_frame_size */ adapter->max_frame_size = max_frame;if (netif_running (netdev))
@@ -3262,8 +3254,7 @@ void igb_update_stats(struct igb_adapter *adapter)/* Phy Stats */ if (hw->phy.media_type == e1000_media_type_copper) {if ((adapter->link_speed ==SPEED_1000 ) && - (!igb_read_phy_reg (hw,PHY_1000T_STATUS , - &phy_tmp))) { + (!igb_read_phy_reg (hw,PHY_1000T_STATUS , &phy_tmp))) { phy_tmp &=PHY_IDLE_ERROR_COUNT_MASK ; adapter->phy_stats.idle_errors += phy_tmp; }
@@ -3275,7 +3266,6 @@ void igb_update_stats(struct igb_adapter *adapter) adapter->stats.mgpdc +=rd32 (E1000_MGTPDC ); } -static irqreturn_t igb_msix_other (int irq,void *data) {struct net_device *netdev = data;
@@ -3313,6 +3303,7 @@ static irqreturn_t igb_msix_tx(int irq, void *data)if (adapter->flags &IGB_FLAG_DCA_ENABLED )igb_update_tx_dca (tx_ring);#endif + tx_ring->total_bytes =0 ; tx_ring->total_packets =0 ;
@@ -3333,13 +3324,11 @@ static void igb_write_itr(struct igb_ring *ring)if ((ring->adapter->itr_setting &3 ) && ring->set_itr) {switch (hw->mac.type) {case e1000_82576: -wr32 (ring->itr_register, - ring->itr_val | +wr32 (ring->itr_register, ring->itr_val |0x80000000 );break ;default : -wr32 (ring->itr_register, - ring->itr_val | +wr32 (ring->itr_register, ring->itr_val | (ring->itr_val <<16 ));break ; }
@@ -3610,7 +3599,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)#endif igb_clean_rx_irq_adv (rx_ring, &work_done, budget); -/* If not enough Rx work done, exit the polling mode */ if ((work_done ==0 ) || !netif_running (netdev)) {napi_complete (napi);
@@ -3621,7 +3609,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)else igb_update_ring_itr (rx_ring); } -if (!test_bit (__IGB_DOWN, &adapter->state))wr32 (E1000_EIMS , rx_ring->eims_value);
@@ -3678,7 +3665,6 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)if (i == tx_ring->count) i =0 ; } - eop = tx_ring->buffer_info[i].next_to_watch; eop_desc =E1000_TX_DESC_ADV (*tx_ring, eop); }
@@ -3747,7 +3733,7 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)* igb_receive_skb - helper function to handle rx indications * @ring: pointer to receive ring receving this packet * @status: descriptor status field as written by hardware -* @vlan: descriptor vlan field as written by hardware (no le/be conversion) +* @rx_desc: receive descriptor containing vlan and type information. * @skb: pointer to sk_buff to be indicated to stack **/ static void igb_receive_skb(struct igb_ring *ring, u8 status,
@@ -3774,7 +3760,6 @@ static void igb_receive_skb(struct igb_ring *ring, u8 status, } } -static inline void igb_rx_checksum_adv (struct igb_adapter *adapter,u32 status_err,struct sk_buff *skb) {
@@ -3806,11 +3791,11 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring,union e1000_adv_rx_desc *rx_desc , *next_rxd;struct igb_buffer *buffer_info , *next_buffer;struct sk_buff *skb; -unsigned int i; -u32 length, hlen, staterr;bool cleaned = false;int cleaned_count =0 ;unsigned int total_bytes =0 , total_packets =0 ; +unsigned int i; +u32 length, hlen, staterr; i = rx_ring->next_to_clean; buffer_info = &rx_ring->buffer_info[i];
@@ -3858,8 +3843,7 @@ static bool igb_clean_rx_irq_adv(struct igb_ring *rx_ring,if (!skb_shinfo (skb)->nr_frags) {pci_unmap_single (pdev, buffer_info->dma, - adapter->rx_ps_hdr_size + -NET_IP_ALIGN , + adapter->rx_ps_hdr_size +NET_IP_ALIGN ,PCI_DMA_FROMDEVICE );skb_put (skb, hlen); }
@@ -3938,7 +3922,6 @@ next_desc:return cleaned; } -/** * igb_alloc_rx_buffers_adv - Replace used receive buffers; packet split * @adapter: address of board private structure
@@ -4227,7 +4210,6 @@ int igb_set_spd_dplx(struct igb_adapter *adapter, u16 spddplx)return 0 ; } -static int igb_suspend (struct pci_dev *pdev,pm_message_t state) {struct net_device *netdev =pci_get_drvdata (pdev);
PATCH 2/6 igb: reduce size required to trigger low latency
From: Alexander Duyck <[email protected]>
Update the Adaptive Interrupt Moderation algorithm so that the low latency state is triggered less easily to prevent high interrupt loads.
---
drivers/net/igb/igb_main.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/net/igb/igb_main.c +1 -1
@@ -2541,7 +2541,7 @@ static unsigned int igb_update_itr(struct igb_adapter *adapter, u16 itr_setting,if (bytes >25000 ) {if (packets >35 ) retval = low_latency; - }else if (bytes <6000 ) { + }else if (bytes <1500 ) { retval = low_latency; }break ;
Re: [net-next PATCH 2/6] igb: reduce size required to trigger low latency
From: Jeff Kirsher <[email protected]>
Date: Thu, 12 Feb 2009 20:17:21 -0800
Quoted 5 lines
Update the Adaptive Interrupt Moderation algorithm so that the low latency state is triggered less easily to prevent high interrupt loads.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 3/6 igb: cleanup incorrect comment and set IP Checksum Enable
In reply to Jeff KirsherFrom: Alexander Duyck <[email protected]>
IP Checksum enable doesn't need packet split in order to function. It only requires the use of advanced descriptors which the current igb driver does. So we can enable it always without any issues.
---
drivers/net/igb/igb_main.c | 14 ++++---------- 1 files changed, 4 insertions(+), 10 deletions(-)
drivers/net/igb/igb_main.c +4 -10
@@ -1934,17 +1934,11 @@ static void igb_configure_rx(struct igb_adapter *adapter) }else {/* Enable Receive Checksum Offload for TCP and UDP */ rxcsum =rd32 (E1000_RXCSUM ); -if (adapter->rx_csum) { - rxcsum |=E1000_RXCSUM_TUOFL ; +if (adapter->rx_csum) + rxcsum |=E1000_RXCSUM_TUOFL |E1000_RXCSUM_IPPCSE ; +else + rxcsum &= ~(E1000_RXCSUM_TUOFL |E1000_RXCSUM_IPPCSE ); -/* Enable IPv4 payload checksum for UDP fragments -* Must be used in conjunction with packet-split. */ -if (adapter->rx_ps_hdr_size) - rxcsum |=E1000_RXCSUM_IPPCSE ; - }else { - rxcsum &= ~E1000_RXCSUM_TUOFL ; -/* don't need to clear IPPCSE as it defaults to 0 */ - }wr32 (E1000_RXCSUM , rxcsum); }
Re: [net-next PATCH 3/6] igb: cleanup incorrect comment and set IP Checksum Enable
From: Jeff Kirsher <[email protected]>
Date: Thu, 12 Feb 2009 20:17:42 -0800
Quoted 7 lines
IP Checksum enable doesn't need packet split in order to function. It only requires the use of advanced descriptors which the current igb driver does. So we can enable it always without any issues.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 4/6 igb: misc cleanup to combine one if statement and set last_rx
In reply to Jeff KirsherFrom: Alexander Duyck <[email protected]>
This patch combines a pair of if statements into one and adds a line to update netdev->last_rx.
---
drivers/net/igb/igb_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/net/igb/igb_main.c +4 -3
@@ -2981,9 +2981,9 @@ static int igb_xmit_frame_ring_adv(struct sk_buff *skb,if (tso) tx_flags |=IGB_TX_FLAGS_TSO ; -else if (igb_tx_csum_adv (adapter, tx_ring, skb, tx_flags)) -if (skb->ip_summed ==CHECKSUM_PARTIAL ) - tx_flags |=IGB_TX_FLAGS_CSUM ; +else if (igb_tx_csum_adv (adapter, tx_ring, skb, tx_flags) && + (skb->ip_summed ==CHECKSUM_PARTIAL )) + tx_flags |=IGB_TX_FLAGS_CSUM ; igb_tx_queue_adv(adapter, tx_ring, tx_flags, igb_tx_map_adv(adapter, tx_ring, skb, first),
@@ -3886,6 +3886,7 @@ send_up:igb_receive_skb (rx_ring, staterr, rx_desc, skb); + netdev->last_rx = jiffies; next_desc: rx_desc->wb.upper.status_error =0 ;
Re: [net-next PATCH 4/6] igb: misc cleanup to combine one if statement and set last_rx
Quoted 4 lines · Jeff Kirsher
From: Alexander Duyck <[email protected]>
This patch combines a pair of if statements into one and adds a line to update
netdev->last_rx.
[...]
You shouldn't need to update last_rx any more:
commit 6cf3f41e6c08bca6641a695449791c38a25f35ff
Author: Jay Vosburgh <[email protected]> Date: Mon Nov 3 18:16:50 2008 -0800
bonding, net: Move last_rx update into bonding recv logic
The only user of the net_device->last_rx field is bonding.
This patch adds a conditional update of last_rx to the bonding special logic in skb_bond_should_drop, causing last_rx to only be updated when the ARP monitor is running.
This frees network device drivers from the necessity of
updating last_rx, which can have cache line thrash issues.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
David Miller
maintainerRe: [net-next PATCH 4/6] igb: misc cleanup to combine one if statement and set last_rx
From: Ben Hutchings <[email protected]>
Date: Fri, 13 Feb 2009 13:23:23 +0000
Quoted 7 lines · Jeff Kirsher
Quoted 4 lines
From: Alexander Duyck <[email protected]>
This patch combines a pair of if statements into one and adds a line to update
netdev->last_rx.[...]
Quoted 7 lines
You shouldn't need to update
last_rxany more:commit
6cf3f41e6c08bca6641a695449791c38a25f35ffAuthor: Jay Vosburgh <[email protected]> Date: Mon Nov 3 18:16:50 2008 -0800bonding, net: Move
last_rxupdate into bonding recv logic
Right.
PATCH 5/6 igb: remove unused defines
In reply to Jeff KirsherFrom: Alexander Duyck <[email protected]>
This patch removes all of the unused defines from the .h files contained in igb. For some defines there was a use and so I plugged them into the correct locations.
---
drivers/net/igb/e1000_82575.h | 16 +----- drivers/net/igb/e1000_defines.h | 113 --------------------------------------- drivers/net/igb/e1000_mac.h | 5 -- drivers/net/igb/e1000_phy.c | 3 - drivers/net/igb/e1000_regs.h | 14 ----- drivers/net/igb/igb.h | 17 +----- drivers/net/igb/igb_ethtool.c | 6 -- drivers/net/igb/igb_main.c | 12 ++-- 8 files changed, 11 insertions(+), 175 deletions(-)
drivers/net/igb/e1000_82575.h +2 -14
@@ -58,9 +58,6 @@ extern void igb_rx_fifo_flush_82575(struct e1000_hw *hw);E1000_EICR_RX_QUEUE2 | \ E1000_EICR_RX_QUEUE3) -#define E1000_EIMS_RX_QUEUE E1000_EICR_RX_QUEUE -#define E1000_EIMS_TX_QUEUE E1000_EICR_TX_QUEUE -/* Immediate Interrupt Rx (A.K.A. Low Latency Interrupt) */ /* Receive Descriptor - Advanced */
@@ -95,12 +92,6 @@ union e1000_adv_rx_desc {#define E1000_RXDADV_HDRBUFLEN_MASK 0x7FE0#define E1000_RXDADV_HDRBUFLEN_SHIFT 5 -/* RSS Hash results */ - -/* RSS Packet Types as indicated in the receive descriptor */ -#define E1000_RXDADV_PKTTYPE_IPV4 0x00000010/* IPV4 hdr present */ -#define E1000_RXDADV_PKTTYPE_TCP 0x00000100/* TCP hdr present */ -/* Transmit Descriptor - Advanced */ union e1000_adv_tx_desc { struct {
@@ -149,11 +140,8 @@ struct e1000_adv_tx_context_desc {#define E1000_RXDCTL_QUEUE_ENABLE 0x02000000/* Enable specific Rx Queue */ /* Direct Cache Access (DCA) definitions */ -#define E1000_DCA_CTRL_DCA_ENABLE 0x00000000/* DCA Enable */ -#define E1000_DCA_CTRL_DCA_DISABLE 0x00000001/* DCA Disable */ - -#define E1000_DCA_CTRL_DCA_MODE_CB1 0x00/* DCA Mode CB1 */ -#define E1000_DCA_CTRL_DCA_MODE_CB2 0x02/* DCA Mode CB2 */ +#define E1000_DCA_CTRL_DCA_MODE_DISABLE 0x01/* DCA Disable */ +#define E1000_DCA_CTRL_DCA_MODE_CB2 0x02/* DCA Mode CB2 */ #define E1000_DCA_RXCTRL_CPUID_MASK 0x0000001F/* Rx CPUID Mask */ #define E1000_DCA_RXCTRL_DESC_DCA_EN (1 << 5)/* DCA Rx Desc enable */
drivers/net/igb/e1000_defines.h +0 -113
230 lines not on this page · raw message
drivers/net/igb/e1000_mac.h +0 -5
@@ -82,13 +82,8 @@ enum e1000_mng_mode {#define E1000_FWSM_MODE_MASK 0xE#define E1000_FWSM_MODE_SHIFT 1 -#define E1000_MNG_DHCP_COMMAND_TIMEOUT 10#define E1000_MNG_DHCP_COOKIE_STATUS_VLAN 0x2 -#define E1000_HICR_EN 0x01/* Enable bit - RO */ -/* Driver sets this bit when done to put command in RAM */ -#define E1000_HICR_C 0x02 -extern void e1000_init_function_pointers_82575 (struct e1000_hw *hw);extern u32 igb_hash_mc_addr (struct e1000_hw *hw,u8 *mc_addr);
drivers/net/igb/e1000_phy.c +0 -3
@@ -39,9 +39,6 @@ static s32 igb_wait_autoneg(struct e1000_hw *hw);/* Cable length tables */ static const u16 e1000_m88_cable_length_table[] = {0 ,50 ,80 ,110 ,140 ,140 ,E1000_CABLE_LENGTH_UNDEFINED }; -#define M88E1000_CABLE_LENGTH_TABLE_SIZE \ - (sizeof(e1000_m88_cable_length_table) / \ - sizeof(e1000_m88_cable_length_table[0]))static const u16 e1000_igp_2_cable_length_table[] = {0 ,0 ,0 ,0 ,0 ,0 ,0 ,0 ,3 ,5 ,8 ,11 ,13 ,16 ,18 ,21 ,
drivers/net/igb/e1000_regs.h +0 -14
@@ -73,7 +73,6 @@#define E1000_TCPTIMER 0x0104C/* TCP Timer - RW */ #define E1000_FCRTL 0x02160/* Flow Control Receive Threshold Low - RW */ #define E1000_FCRTH 0x02168/* Flow Control Receive Threshold High - RW */ -#define E1000_RDFPCQ (_n) (0x02430 + (0x4 * (_n)))#define E1000_FCRTV 0x02460/* Flow Control Refresh Timer Value - RW */ /* Split and Replication RX Control - RW */ /*
@@ -110,7 +109,6 @@ : (0x0E018 + ((_n) * 0x40)))#define E1000_TXDCTL (_n) ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) \ : (0x0E028 + ((_n) * 0x40))) -#define E1000_TARC (_n) (0x03840 + (_n << 8))#define E1000_DCA_TXCTRL (_n) (0x03814 + (_n << 8))#define E1000_DCA_RXCTRL (_n) (0x02814 + (_n << 8))#define E1000_TDWBAL (_n) ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) \
@@ -233,9 +231,7 @@#define E1000_MANC 0x05820/* Management Control - RW */ #define E1000_IPAV 0x05838/* IP Address Valid - RW */ #define E1000_WUPL 0x05900/* Wakeup Packet Length - RW */ -#define E1000_HOST_IF 0x08800/* Host Interface */ -#define E1000_MANC2H 0x05860/* Management Control To Host - RW */ #define E1000_SW_FW_SYNC 0x05B5C/* Software-Firmware Synchronization - RW */ #define E1000_CCMCTL 0x05B48/* CCM Control Register */ #define E1000_GIOCTL 0x05B44/* GIO Analog Control Register */
@@ -243,9 +239,7 @@#define E1000_FACTPS 0x05B30/* Function Active and Power State to MNG */ #define E1000_SWSM 0x05B50/* SW Semaphore */ #define E1000_FWSM 0x05B54/* FW Semaphore */ -#define E1000_DCA_ID 0x05B70/* DCA Requester ID Information - RO */ #define E1000_DCA_CTRL 0x05B74/* DCA Control - RW */ -#define E1000_HICR 0x08F00/* Host Inteface Control */ /* RSS registers */ #define E1000_MRQC 0x05818/* Multiple Receive Control - RW */
@@ -254,14 +248,6 @@#define E1000_IMIRVP 0x05AC0/* Immediate Interrupt RX VLAN Priority - RW */ /* MSI-X Allocation Register (_i) - RW */ #define E1000_MSIXBM (_i) (0x01600 + ((_i) * 4)) -/* MSI-X Table entry addr low reg 0 - RW */ -#define E1000_MSIXTADD (_i) (0x0C000 + ((_i) * 0x10)) -/* MSI-X Table entry addr upper reg 0 - RW */ -#define E1000_MSIXTUADD (_i) (0x0C004 + ((_i) * 0x10)) -/* MSI-X Table entry message reg 0 - RW */ -#define E1000_MSIXTMSG (_i) (0x0C008 + ((_i) * 0x10)) -/* MSI-X Table entry vector ctrl reg 0 - RW */ -#define E1000_MSIXVCTRL (_i) (0x0C00C + ((_i) * 0x10))/* Redirection Table - RW Array */ #define E1000_RETA (_i) (0x05C00 + ((_i) * 4))#define E1000_RSSRK (_i) (0x05C80 + ((_i) * 4))/* RSS Random Key - RW Array */
drivers/net/igb/igb.h +3 -14
@@ -36,17 +36,9 @@struct igb_adapter ; -/* Interrupt defines */ -#define IGB_MIN_DYN_ITR 3000 -#define IGB_MAX_DYN_ITR 96000 -/* ((1000000000ns / (6000ints/s * 1024ns)) << 2 = 648 */ #define IGB_START_ITR 648 -#define IGB_DYN_ITR_PACKET_THRESHOLD 2 -#define IGB_DYN_ITR_LENGTH_LOW 200 -#define IGB_DYN_ITR_LENGTH_HIGH 1000 -/* TX/RX descriptor defines */ #define IGB_DEFAULT_TXD 256#define IGB_MIN_TXD 80
@@ -88,8 +80,6 @@ struct igb_adapter;#define IGB_RXBUFFER_512 512#define IGB_RXBUFFER_1024 1024#define IGB_RXBUFFER_2048 2048 -#define IGB_RXBUFFER_4096 4096 -#define IGB_RXBUFFER_8192 8192#define IGB_RXBUFFER_16384 16384/* Packet Buffer allocations */
@@ -278,10 +268,9 @@ struct igb_adapter { };#define IGB_FLAG_HAS_MSI (1 << 0) -#define IGB_FLAG_MSI_ENABLE (1 << 1) -#define IGB_FLAG_DCA_ENABLED (1 << 2) -#define IGB_FLAG_QUAD_PORT_A (1 << 3) -#define IGB_FLAG_NEED_CTX_IDX (1 << 4) +#define IGB_FLAG_DCA_ENABLED (1 << 1) +#define IGB_FLAG_QUAD_PORT_A (1 << 2) +#define IGB_FLAG_NEED_CTX_IDX (1 << 3)enum e1000_state_t { __IGB_TESTING,
drivers/net/igb/igb_ethtool.c +1 -5
@@ -1366,8 +1366,7 @@ static int igb_setup_desc_rings(struct igb_adapter *adapter)wr32 (E1000_RDH (0 ),0 );wr32 (E1000_RDT (0 ),0 ); rctl &= ~(E1000_RCTL_LBM_TCVR |E1000_RCTL_LBM_MAC ); - rctl =E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_SZ_2048 | -E1000_RCTL_RDMTS_HALF | + rctl =E1000_RCTL_EN |E1000_RCTL_BAM |E1000_RCTL_RDMTS_HALF | (adapter->hw.mac.mc_filter_type <<E1000_RCTL_MO_SHIFT );wr32 (E1000_RCTL , rctl);wr32 (E1000_SRRCTL (0 ),0 );
@@ -1855,9 +1854,6 @@ static int igb_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)return 0 ; } -/* toggle LED 4 times per second = 2 "blinks" per second */ -#define IGB_ID_INTERVAL (HZ/4) -/* bit defines for adapter->led_status */ #define IGB_LED_ON 0
drivers/net/igb/igb_main.c +5 -7
@@ -1232,7 +1232,7 @@ static int __devinit igb_probe(struct pci_dev *pdev, hw->fc.original_type = e1000_fc_default; hw->fc.type = e1000_fc_default; - adapter->itr_setting =3 ; + adapter->itr_setting =IGB_DEFAULT_ITR ; adapter->itr =IGB_START_ITR ;igb_validate_mdi_setting (hw);
@@ -1293,7 +1293,7 @@ static int __devinit igb_probe(struct pci_dev *pdev,dev_info (&pdev->dev,"DCA enabled\n" );/* Always use CB2 mode, difference is masked * in the CB driver. */ -wr32 (E1000_DCA_CTRL ,2 ); +wr32 (E1000_DCA_CTRL ,E1000_DCA_CTRL_DCA_MODE_CB2 ); igb_setup_dca(adapter); }#endif
@@ -1373,7 +1373,7 @@ static void __devexit igb_remove(struct pci_dev *pdev)dev_info (&pdev->dev,"DCA disabled\n" );dca_remove_requester (&pdev->dev); adapter->flags &= ~IGB_FLAG_DCA_ENABLED ; - wr32(E1000_DCA_CTRL, 1); + wr32(E1000_DCA_CTRL, E1000_DCA_CTRL_DCA_MODE_DISABLE); }#endif
@@ -2929,8 +2929,6 @@ static int igb_maybe_stop_tx(struct net_device *netdev,return __igb_maybe_stop_tx (netdev, tx_ring, size); } -#define TXD_USE_COUNT (S ) (((S) >> (IGB_MAX_TXD_PWR)) + 1) -static int igb_xmit_frame_ring_adv (struct sk_buff *skb,struct net_device *netdev,struct igb_ring *tx_ring)
@@ -3434,7 +3432,7 @@ static int __igb_notify_dca(struct device *dev, void *data)break ;/* Always use CB2 mode, difference is masked * in the CB driver. */ -wr32 (E1000_DCA_CTRL ,2 ); +wr32 (E1000_DCA_CTRL ,E1000_DCA_CTRL_DCA_MODE_CB2 );if (dca_add_requester (dev) ==0 ) { adapter->flags |=IGB_FLAG_DCA_ENABLED ;dev_info (&adapter->pdev->dev,"DCA enabled\n" );
@@ -3449,7 +3447,7 @@ static int __igb_notify_dca(struct device *dev, void *data)dca_remove_requester (dev);dev_info (&adapter->pdev->dev,"DCA disabled\n" ); adapter->flags &= ~IGB_FLAG_DCA_ENABLED ; -wr32 (E1000_DCA_CTRL ,1 ); +wr32 (E1000_DCA_CTRL ,E1000_DCA_CTRL_DCA_MODE_DISABLE ); }break ; }
Re: [net-next PATCH 5/6] igb: remove unused defines
From: Jeff Kirsher <[email protected]>
Date: Thu, 12 Feb 2009 20:18:26 -0800
Quoted 6 lines
This patch removes all of the unused defines from the .h files contained in igb. For some defines there was a use and so I plugged them into the correct locations.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
PATCH 6/6 igb: transition driver to only using advanced descriptors
In reply to Jeff KirsherFrom: Alexander Duyck <[email protected]>
Currently the driver uses advanced descriptors for its main functionality, but then uses legacy when testing. This patch changes this so that advanced descriptors are used throughout and all mentions of legacy descriptors are removed.
---
drivers/net/igb/e1000_hw.h | 138 ----------------------------------------- drivers/net/igb/igb.h | 3 - drivers/net/igb/igb_ethtool.c | 51 +++++++++------ drivers/net/igb/igb_main.c | 6 +- 4 files changed, 32 insertions(+), 166 deletions(-)
drivers/net/igb/e1000_hw.h +0 -138
@@ -144,144 +144,6 @@ enum e1000_fc_type { e1000_fc_default =0xFF }; - -/* Receive Descriptor */ -struct e1000_rx_desc { -__le64 buffer_addr;/* Address of the descriptor's data buffer */ -__le16 length;/* Length of data DMAed into data buffer */ -__le16 csum;/* Packet checksum */ -u8 status;/* Descriptor status */ -u8 errors;/* Descriptor Errors */ -__le16 special; -}; - -/* Receive Descriptor - Extended */ -union e1000_rx_desc_extended { -struct { -__le64 buffer_addr; -__le64 reserved; - } read; -struct { -struct { -__le32 mrq;/* Multiple Rx Queues */ -union { -__le32 rss;/* RSS Hash */ -struct { -__le16 ip_id;/* IP id */ -__le16 csum;/* Packet Checksum */ - } csum_ip; - } hi_dword; - } lower; -struct { -__le32 status_error;/* ext status/error */ -__le16 length; -__le16 vlan;/* VLAN tag */ - } upper; - } wb;/* writeback */ -}; - -#define MAX_PS_BUFFERS 4 -/* Receive Descriptor - Packet Split */ -union e1000_rx_desc_packet_split { -struct { -/* one buffer for protocol header(s), three data buffers */ -__le64 buffer_addr[MAX_PS_BUFFERS ]; - } read; -struct { -struct { -__le32 mrq;/* Multiple Rx Queues */ -union { -__le32 rss;/* RSS Hash */ -struct { -__le16 ip_id;/* IP id */ -__le16 csum;/* Packet Checksum */ - } csum_ip; - } hi_dword; - } lower; -struct { -__le32 status_error;/* ext status/error */ -__le16 length0;/* length of buffer 0 */ -__le16 vlan;/* VLAN tag */ - } middle; -struct { -__le16 header_status; -__le16 length[3 ];/* length of buffers 1-3 */ - } upper; -__le64 reserved; - } wb;/* writeback */ -}; - -/* Transmit Descriptor */ -struct e1000_tx_desc { -__le64 buffer_addr;/* Address of the descriptor's data buffer */ -union { -__le32 data; -struct { -__le16 length;/* Data buffer length */ -u8 cso;/* Checksum offset */ -u8 cmd;/* Descriptor control */ - } flags; - } lower; -union { -__le32 data; -struct { -u8 status;/* Descriptor status */ -u8 css;/* Checksum start */ -__le16 special; - } fields; - } upper; -}; - -/* Offload Context Descriptor */ -struct e1000_context_desc { -union { -__le32 ip_config; -struct { -u8 ipcss;/* IP checksum start */ -u8 ipcso;/* IP checksum offset */ -__le16 ipcse;/* IP checksum end */ - } ip_fields; - } lower_setup; -union { -__le32 tcp_config; -struct { -u8 tucss;/* TCP checksum start */ -u8 tucso;/* TCP checksum offset */ -__le16 tucse;/* TCP checksum end */ - } tcp_fields; - } upper_setup; -__le32 cmd_and_length; -union { -__le32 data; -struct { -u8 status;/* Descriptor status */ -u8 hdr_len;/* Header length */ -__le16 mss;/* Maximum segment size */ - } fields; - } tcp_seg_setup; -}; - -/* Offload data descriptor */ -struct e1000_data_desc { -__le64 buffer_addr;/* Address of the descriptor's buffer address */ -union { -__le32 data; -struct { -__le16 length;/* Data buffer length */ -u8 typ_len_ext; -u8 cmd; - } flags; - } lower; -union { -__le32 data; -struct { -u8 status;/* Descriptor status */ -u8 popts;/* Packet Options */ -__le16 special; - } fields; - } upper; -}; -/* Statistics counters collected by the MAC */ struct e1000_hw_stats {u64 crcerrs;
drivers/net/igb/igb.h +0 -3
@@ -176,9 +176,6 @@ struct igb_ring { (&(((union e1000_adv_tx_desc *)((R).desc))[i]))#define E1000_TX_CTXTDESC_ADV (R , i) \ (&(((struct e1000_adv_tx_context_desc *)((R).desc))[i])) -#define E1000_GET_DESC (R , i, type) (&(((struct type *)((R).desc))[i])) -#define E1000_TX_DESC (R , i) E1000_GET_DESC(R, i, e1000_tx_desc) -#define E1000_RX_DESC (R , i) E1000_GET_DESC(R, i, e1000_rx_desc)/* board specific private data structure */
drivers/net/igb/igb_ethtool.c +29 -22
106 lines not on this page · raw message
drivers/net/igb/igb_main.c +3 -3
@@ -921,7 +921,7 @@ void igb_reset(struct igb_adapter *adapter)/* the tx fifo also stores 16 bytes of information about the tx * but don't include ethernet FCS because hardware appends it */ min_tx_space = (adapter->max_frame_size + -sizeof (struct e1000_tx_desc ) - +sizeof (union e1000_adv_tx_desc ) -ETH_FCS_LEN ) *2 ; min_tx_space =ALIGN (min_tx_space,1024 ); min_tx_space >>=10 ;
@@ -1579,7 +1579,7 @@ int igb_setup_tx_resources(struct igb_adapter *adapter,memset (tx_ring->buffer_info,0 , size);/* round up to nearest 4K */ - tx_ring->size = tx_ring->count *sizeof (struct e1000_tx_desc ); + tx_ring->size = tx_ring->count *sizeof (union e1000_adv_tx_desc ); tx_ring->size =ALIGN (tx_ring->size,4096 ); tx_ring->desc = pci_alloc_consistent(pdev, tx_ring->size,
@@ -1648,7 +1648,7 @@ static void igb_configure_tx(struct igb_adapter *adapter)struct igb_ring *ring = &adapter->tx_ring[i]; j = ring->reg_idx;wr32 (E1000_TDLEN (j), - ring->count *sizeof (struct e1000_tx_desc )); + ring->count *sizeof (union e1000_adv_tx_desc )); tdba = ring->dma;wr32 (E1000_TDBAL (j), tdba &0x00000000ffffffffULL );
Re: [net-next PATCH 6/6] igb: transition driver to only using advanced descriptors
From: Jeff Kirsher <[email protected]>
Date: Thu, 12 Feb 2009 20:18:48 -0800
Quoted 8 lines
Currently the driver uses advanced descriptors for its main functionality, but then uses legacy when testing. This patch changes this so that advanced descriptors are used throughout and all mentions of legacy descriptors are removed.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Thu, 12 Feb 2009 20:16:59 -0800
Quoted 6 lines
This patch is intended to hold several whitespace, formatting, and comment cleanups that have been found while cleaning up the igb driver.
Signed-off-by Alexander Duyck <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.