net driver updates for .28
Subsystems (3)
PATCH 1/1 net driver updates for .28
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
to receive the following updates:
drivers/net/8139cp.c | 14 +- drivers/net/8139too.c | 4 +- drivers/net/Makefile | 2 +- drivers/net/bonding/bond_alb.c | 4 +- drivers/net/bonding/bond_main.c | 6 +- drivers/net/e1000e/82571.c | 153 ++++++- drivers/net/e1000e/defines.h | 15 + drivers/net/e1000e/e1000.h | 31 ++- drivers/net/e1000e/es2lan.c | 2 +- drivers/net/e1000e/ethtool.c | 60 ++- drivers/net/e1000e/hw.h | 15 +- drivers/net/e1000e/ich8lan.c | 173 +++++++- drivers/net/e1000e/lib.c | 7 +- drivers/net/e1000e/netdev.c | 435 ++++++++++++++++-- drivers/net/e1000e/param.c | 27 ++ drivers/net/e1000e/phy.c | 194 ++++++++- drivers/net/ibm_newemac/mal.h | 4 +- drivers/net/igb/igb_main.c | 12 +- drivers/net/ixgbe/ixgbe.h | 43 ++- drivers/net/ixgbe/ixgbe_82598.c | 6 +- drivers/net/ixgbe/ixgbe_common.c | 140 ++++++- drivers/net/ixgbe/ixgbe_common.h | 4 +- drivers/net/ixgbe/ixgbe_ethtool.c | 6 +- drivers/net/ixgbe/ixgbe_main.c | 721 +++++++++++++++++------------ drivers/net/ixgbe/ixgbe_type.h | 47 +- drivers/net/myri10ge/myri10ge.c | 1 - drivers/net/netxen/netxen_nic_ethtool.c | 1 - drivers/net/r8169.c | 401 ++++++++++++++--- drivers/net/s2io.c | 4 +- drivers/net/sfc/bitfield.h | 178 +++++--- drivers/net/sfc/boards.c | 12 +- drivers/net/sfc/boards.h | 2 - drivers/net/sfc/efx.c | 471 ++++++++----------- drivers/net/sfc/efx.h | 14 +- drivers/net/sfc/enum.h | 9 +- drivers/net/sfc/ethtool.c | 184 ++++---- drivers/net/sfc/falcon.c | 767 ++++++++++++++++++++++--------- drivers/net/sfc/falcon.h | 16 +- drivers/net/sfc/falcon_hwdefs.h | 79 +++- drivers/net/sfc/falcon_xmac.c | 330 ++++++-------- drivers/net/sfc/mac.h | 4 - drivers/net/sfc/mdio_10g.c | 16 +- drivers/net/sfc/mdio_10g.h | 13 +- drivers/net/sfc/net_driver.h | 136 +++--- drivers/net/sfc/phy.h | 10 +- drivers/net/sfc/rx.c | 78 ++-- drivers/net/sfc/rx.h | 4 +- drivers/net/sfc/selftest.c | 391 +++++++++------- drivers/net/sfc/selftest.h | 13 +- drivers/net/sfc/sfe4001.c | 244 ++++++---- drivers/net/sfc/spi.h | 89 ++-- drivers/net/sfc/tenxpress.c | 90 ++--- drivers/net/sfc/tx.c | 383 ++++++++-------- drivers/net/sfc/tx.h | 2 +- drivers/net/sfc/workarounds.h | 2 - drivers/net/sfc/xfp_phy.c | 11 +- drivers/net/sky2.c | 170 +++++-- drivers/net/tokenring/lanstreamer.c | 1 - drivers/net/via-rhine.c | 8 +- 59 files changed, 4084 insertions(+), 2175 deletions(-)
Alexander Duyck (3):
igb: remove unneeded cleaned variable in clean_tx_irq path
igb: clean up a stray fake netdev code left in rx path
ixgbe: change config srrctl to only program one register per VMDq/RSS id
Ben Hutchings (38):
sfc: Replace net_dev->priv with netdev_priv(net_dev)
sfc: Change first parameter type of {set,clear}_bit_le() to unsigned
sfc: Use separate hardware TX queues to select checksum generation
sfc: Avoid mangling error codes in efx_test_loopback()
sfc: Reduce delays in SFE4001 initialisation
sfc: Remove mistaken hardware workaround
sfc: XMAC statistics fix-ups
sfc: Remove inclusion of workarounds.h from efx.c
sfc: Reverse the XOFF/XON pause frame control fifo thresholds
sfc: Reduce log level for XGXS lane status
sfc: Self-test reporting cleanup
sfc: Speed up loopback self-test
sfc: Don't leak PCI DMA maps in the TSO code when the queue fills up
sfc: Use pci_map_single() to map the skb header when doing TSO
sfc: Reduce the size of struct efx_tx_buffer
sfc: Use explicit bool for boolean variables, parameters and return values
sfc: Set net_device::vlan_features appropriately
sfc: Cleaned up struct tso_state fields
sfc: Removed forced inlining of long functions
sfc: Export boot configuration in EEPROM through ethtool
sfc: Move CPU counting for RSS into a separate function, efx_wanted_rx_queues()
sfc: Remove efx_channel::has_interrupt
sfc: Cleanup RX queue information
sfc: Remove initialisation of RX_FILTER_CTL_REG.NUM_KER
sfc: Make efx_for_each_channel_rx_queue() more efficient
sfc: Remove efx_channel::evqnum field
sfc: Cleanup RX event processing
sfc: Implement get_sset_count, replacing get_stats_count and self_test_count
sfc: Make PHY flash mode a device attribute, not a module parameter
sfc: Enable TSO for 802.1q VLAN devices
sfc: Remove efx_nic_dummy_op_int() as redundant with efx_port_dummy_op_int()
sfc: Remove remnants of multi-port abstraction for MAC registers
sfc: Remove some unreachable error paths
sfc: Cleanup reset code
sfc: Rework the bitfield header so that we can identify fields by bit number
sfc: Extend self-tests
sfc: Remove the STATE_RESETTING flag
sfc: Rework efx_set_multicast_hash()
Brian Haley (1):
bonding: change some __constant_htons() to htons()
Bruce Allan (3):
e1000e: add support for the 82567LM-4 device
e1000e: add support for 82567LM-3 and 82567LF-3 (ICH10D) parts
e1000e: add support for new 82574L partChristopher Leech (1):
ixgbe: Implement HAVE_SET_RX_MODE
Francois Romieu (6):
r8169: get ethtool settings through the generic mii helper
r8169: Tx performance tweak helper
r8169: use pci_find_capability for the PCI-E features
r8169: add 8168/8101 registers description
r8169: add hw start helpers for the 8168 and the 8101
r8169: additional 8101 and 8102 support
Huang Weiyi (1):
[netdrvr] removed unused #include <version.h>
Ilpo Järvinen (1):
s2io: reindented misleading for loop
Jesse Brandeburg (11):
ixgbe: fix rx csum return status misinterpretation
ixgbe: add little endian annotations for sparse
ixgbe: do not update stats twice each receive
ixgbe: Cleanup references to Tx and Rx rings to becommon across the driver
ixgbe: disable flow control by default
ixgbe: Implement Tx Head Writeback
ixgbe: Lock RSS seed, move rx_buf_len to the rx_ring
ixgbe: should not use HW_CSUM, should use IP* flags
ixgbe: update dca to new interface, fix CONFIG_DCA_MODULE
ixgbe: fix bug where lro settings are per ring
ixgbe: fix dca hints going to wrong processor
Kevin Lo (3):
via-rhine: changed to use netdev_alloc_skb() from dev_alloc_skb 8139cp: use netdev_alloc_skb
8139too: use netdev_alloc_skb
PJ Waskiewicz (1):
ixgbe: use different context for tso and offload
Randy Dunlap (1):
hp-plus: fix link objects
Stephen Hemminger (2):
sky2: EEPROM read/write bug fixes
sky2: display product info on boot.
Steve Hodgson (2):
sfc: Remove unused field efx_channel::reset_work
sfc: Do not call netif_{stop,wake}_queue() before register_netdev
roel kluin (1):
ibm_newemac: MAL[12]_IER_EVENTS definition: 2x *_OTE -> *_DE
drivers/net/8139cp.c +7 -7
@@ -127,7 +127,6 @@ MODULE_PARM_DESC (multicast_filter_limit, "8139cp: maximum number of filtered mu (CP)->tx_tail - (CP)->tx_head - 1)#define PKT_BUF_SZ 1536/* Size of each temporary Rx buffer.*/ -#define RX_OFFSET 2#define CP_INTERNAL_PHY 32/* The following settings are log_2(bytes)-4: 0 == 16 bytes .. 6==1024, 7==end of packet. */
@@ -552,14 +551,14 @@ rx_status_loop:printk (KERN_DEBUG "%s: rx slot %d status 0x%x len %d\n" , dev->name, rx_tail, status, len); - buflen = cp->rx_buf_sz +RX_OFFSET ; - new_skb =dev_alloc_skb (buflen); + buflen = cp->rx_buf_sz +NET_IP_ALIGN ; + new_skb =netdev_alloc_skb (dev, buflen);if (!new_skb) { dev->stats.rx_dropped++; goto rx_next; } -skb_reserve (new_skb,RX_OFFSET ); +skb_reserve (new_skb,NET_IP_ALIGN );dma_unmap_single (&cp->pdev->dev, mapping, buflen,PCI_DMA_FROMDEVICE );
@@ -1051,19 +1050,20 @@ static void cp_init_hw (struct cp_private *cp)cpw8_f (Cfg9346, Cfg9346_Lock); } -static int cp_refill_rx (struct cp_private *cp) +static int cp_refill_rx (struct cp_private *cp) { +struct net_device *dev = cp->dev;unsigned i;for (i =0 ; i <CP_RX_RING_SIZE ; i++) {struct sk_buff *skb;dma_addr_t mapping; - skb =dev_alloc_skb (cp->rx_buf_sz +RX_OFFSET ); + skb =netdev_alloc_skb (dev, cp->rx_buf_sz +NET_IP_ALIGN );if (!skb) goto err_out; -skb_reserve (skb,RX_OFFSET ); +skb_reserve (skb,NET_IP_ALIGN ); mapping =dma_map_single (&cp->pdev->dev, skb->data, cp->rx_buf_sz,PCI_DMA_FROMDEVICE );
drivers/net/8139too.c +2 -2
@@ -2009,9 +2009,9 @@ no_early_rx:/* Malloc up new buffer, compatible with net-2e. */ /* Omit the four octet CRC from the length. */ - skb =dev_alloc_skb (pkt_size +2 ); + skb =netdev_alloc_skb (dev, pkt_size +NET_IP_ALIGN );if (likely (skb)) { -skb_reserve (skb,2 );/* 16 byte align the IP fields. */ +skb_reserve (skb,NET_IP_ALIGN );/* 16 byte align the IP fields. */ #if RX_BUF_IDX ==3 wrap_copy (skb, rx_ring, ring_offset+4 , pkt_size);#else
drivers/net/Makefile +1 -1
@@ -111,7 +111,7 @@ obj-$(CONFIG_EL2) += 3c503.o 8390p.o obj-$(CONFIG_NE2000) += ne.o 8390p.o obj-$(CONFIG_NE2_MCA) += ne2.o 8390p.o obj-$(CONFIG_HPLAN) += hp.o 8390p.o -obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390p.o +obj-$(CONFIG_HPLAN_PLUS) += hp-plus.o 8390.o obj-$(CONFIG_ULTRA) += smc-ultra.o 8390.o obj-$(CONFIG_ULTRAMCA) += smc-mca.o 8390.o obj-$(CONFIG_ULTRA32) += smc-ultra32.o 8390.o
drivers/net/bonding/bond_alb.c +2 -2
@@ -710,7 +710,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)struct arp_pkt *arp =arp_pkt (skb);struct slave *tx_slave =NULL ; -if (arp->op_code ==__constant_htons (ARPOP_REPLY )) { +if (arp->op_code ==htons (ARPOP_REPLY )) {/* the arp must be sent on the selected * rx channel */
@@ -719,7 +719,7 @@ static struct slave *rlb_arp_xmit(struct sk_buff *skb, struct bonding *bond)memcpy (arp->mac_src,tx_slave->dev->dev_addr,ETH_ALEN ); }dprintk ("Server sent ARP Reply packet\n" ); - }else if (arp->op_code ==__constant_htons (ARPOP_REQUEST )) { + }else if (arp->op_code ==htons (ARPOP_REQUEST )) {/* Create an entry in the rx_hashtbl for this client as a * place holder. * When the arp reply is received the entry will be updated
drivers/net/bonding/bond_main.c +3 -3
@@ -3702,7 +3702,7 @@ static int bond_xmit_hash_policy_l23(struct sk_buff *skb,struct ethhdr *data = (struct ethhdr *)skb->data;struct iphdr *iph =ip_hdr (skb); -if (skb->protocol ==__constant_htons (ETH_P_IP )) { +if (skb->protocol ==htons (ETH_P_IP )) {return ((ntohl (iph->saddr ^ iph->daddr) &0xffff ) ^ (data->h_dest[5 ] ^ bond_dev->dev_addr[5 ])) % count; }
@@ -3723,8 +3723,8 @@ static int bond_xmit_hash_policy_l34(struct sk_buff *skb,__be16 *layer4hdr = (__be16 *)((u32 *)iph + iph->ihl);int layer4_xor =0 ; -if (skb->protocol ==__constant_htons (ETH_P_IP )) { -if (!(iph->frag_off &__constant_htons (IP_MF |IP_OFFSET )) && +if (skb->protocol ==htons (ETH_P_IP )) { +if (!(iph->frag_off &htons (IP_MF |IP_OFFSET )) && (iph->protocol ==IPPROTO_TCP || iph->protocol ==IPPROTO_UDP )) { layer4_xor =ntohs ((*layer4hdr ^ *(layer4hdr +1 )));
drivers/net/e1000e/82571.c +140 -13
306 lines not on this page · raw message
drivers/net/e1000e/defines.h +15 -0
@@ -71,9 +71,11 @@#define E1000_CTRL_EXT_RO_DIS 0x00020000/* Relaxed Ordering disable */ #define E1000_CTRL_EXT_LINK_MODE_MASK 0x00C00000#define E1000_CTRL_EXT_LINK_MODE_PCIE_SERDES 0x00C00000 +#define E1000_CTRL_EXT_EIAME 0x01000000#define E1000_CTRL_EXT_DRV_LOAD 0x10000000/* Driver loaded bit for FW */ #define E1000_CTRL_EXT_IAME 0x08000000/* Interrupt acknowledge Auto-mask */ #define E1000_CTRL_EXT_INT_TIMER_CLR 0x20000000/* Clear Interrupt timers after IMS clear */ +#define E1000_CTRL_EXT_PBA_CLR 0x80000000/* PBA Clear */ /* Receive Descriptor bit definitions */ #define E1000_RXD_STAT_DD 0x01/* Descriptor Done */
@@ -299,6 +301,7 @@#define E1000_RXCSUM_IPPCSE 0x00001000/* IP payload checksum enable */ /* Header split receive */ +#define E1000_RFCTL_ACK_DIS 0x00001000#define E1000_RFCTL_EXTEN 0x00008000#define E1000_RFCTL_IPV6_EX_DIS 0x00010000#define E1000_RFCTL_NEW_IPV6_EXT_DIS 0x00020000
@@ -363,6 +366,11 @@#define E1000_ICR_RXDMT0 0x00000010/* Rx desc min. threshold (0) */ #define E1000_ICR_RXT0 0x00000080/* Rx timer intr (ring 0) */ #define E1000_ICR_INT_ASSERTED 0x80000000/* If this bit asserted, the driver should claim the interrupt */ +#define E1000_ICR_RXQ0 0x00100000/* Rx Queue 0 Interrupt */ +#define E1000_ICR_RXQ1 0x00200000/* Rx Queue 1 Interrupt */ +#define E1000_ICR_TXQ0 0x00400000/* Tx Queue 0 Interrupt */ +#define E1000_ICR_TXQ1 0x00800000/* Tx Queue 1 Interrupt */ +#define E1000_ICR_OTHER 0x01000000/* Other Interrupts */ /* * This defines the bits that are set in the Interrupt Mask
@@ -386,6 +394,11 @@#define E1000_IMS_RXSEQ E1000_ICR_RXSEQ/* Rx sequence error */ #define E1000_IMS_RXDMT0 E1000_ICR_RXDMT0/* Rx desc min. threshold */ #define E1000_IMS_RXT0 E1000_ICR_RXT0/* Rx timer intr */ +#define E1000_IMS_RXQ0 E1000_ICR_RXQ0/* Rx Queue 0 Interrupt */ +#define E1000_IMS_RXQ1 E1000_ICR_RXQ1/* Rx Queue 1 Interrupt */ +#define E1000_IMS_TXQ0 E1000_ICR_TXQ0/* Tx Queue 0 Interrupt */ +#define E1000_IMS_TXQ1 E1000_ICR_TXQ1/* Tx Queue 1 Interrupt */ +#define E1000_IMS_OTHER E1000_ICR_OTHER/* Other Interrupts */ /* Interrupt Cause Set */ #define E1000_ICS_LSC E1000_ICR_LSC/* Link Status Change */
@@ -505,6 +518,7 @@#define NWAY_LPAR_ASM_DIR 0x0800/* LP Asymmetric Pause Direction bit */ /* Autoneg Expansion Register */ +#define NWAY_ER_LP_NWAY_CAPS 0x0001/* LP has Auto Neg Capability */ /* 1000BASE-T Control Register */ #define CR_1000T_HD_CAPS 0x0100/* Advertise 1000T HD capability */
@@ -540,6 +554,7 @@#define E1000_EECD_DO 0x00000008/* NVM Data Out */ #define E1000_EECD_REQ 0x00000040/* NVM Access Request */ #define E1000_EECD_GNT 0x00000080/* NVM Access Grant */ +#define E1000_EECD_PRES 0x00000100/* NVM Present */ #define E1000_EECD_SIZE 0x00000200/* NVM Size (0=64 word 1=256 word) */ /* NVM Addressing bits based on type (0-small, 1-large) */ #define E1000_EECD_ADDR_BITS 0x00000400
drivers/net/e1000e/e1000.h +30 -1
@@ -62,6 +62,11 @@ struct e1000_info; e_printk(KERN_NOTICE, adapter, format, ## arg) +/* Interrupt modes, as used by the IntMode paramter */ +#define E1000E_INT_MODE_LEGACY 0 +#define E1000E_INT_MODE_MSI 1 +#define E1000E_INT_MODE_MSIX 2 + /* Tx/Rx descriptor defines */ #define E1000_DEFAULT_TXD 256 #define E1000_MAX_TXD 4096
@@ -95,9 +100,11 @@ enum e1000_boards { board_82571, board_82572, board_82573, + board_82574, board_80003es2lan, board_ich8lan, board_ich9lan, + board_ich10lan, }; struct e1000_queue_stats {
@@ -146,6 +153,12 @@ struct e1000_ring {/* array of buffer information structs */ struct e1000_buffer *buffer_info; +char name[IFNAMSIZ +5 ]; +u32 ims_val; +u32 itr_val; +u16 itr_register; +int set_itr; +struct sk_buff *rx_skb_top;struct e1000_queue_stats stats;
@@ -274,6 +287,9 @@ struct e1000_adapter {u32 test_icr;u32 msg_enable; +struct msix_entry *msix_entries; +int int_mode; +u32 eiac_mask;u32 eeprom_wol;u32 wol;
@@ -306,6 +322,7 @@ struct e1000_info {#define FLAG_HAS_SWSM_ON_LOAD (1 << 6)#define FLAG_HAS_JUMBO_FRAMES (1 << 7)#define FLAG_IS_ICH (1 << 9) +#define FLAG_HAS_MSIX (1 << 10)#define FLAG_HAS_SMART_POWER_DOWN (1 << 11)#define FLAG_IS_QUAD_PORT_A (1 << 12)#define FLAG_IS_QUAD_PORT (1 << 13)
@@ -364,6 +381,8 @@ extern int e1000e_setup_tx_resources(struct e1000_adapter *adapter);extern void e1000e_free_rx_resources (struct e1000_adapter *adapter);extern void e1000e_free_tx_resources (struct e1000_adapter *adapter);extern void e1000e_update_stats (struct e1000_adapter *adapter); +extern void e1000e_set_interrupt_capability (struct e1000_adapter *adapter); +extern void e1000e_reset_interrupt_capability (struct e1000_adapter *adapter);extern unsigned int copybreak;
@@ -372,8 +391,10 @@ extern char *e1000e_get_hw_dev_name(struct e1000_hw *hw);extern struct e1000_info e1000_82571_info;extern struct e1000_info e1000_82572_info;extern struct e1000_info e1000_82573_info; +extern struct e1000_info e1000_82574_info;extern struct e1000_info e1000_ich8_info;extern struct e1000_info e1000_ich9_info; +extern struct e1000_info e1000_ich10_info;extern struct e1000_info e1000_es2_info;extern s32 e1000e_read_pba_num (struct e1000_hw *hw,u32 *pba_num);
@@ -446,10 +467,13 @@ extern s32 e1000e_get_cable_length_m88(struct e1000_hw *hw);extern s32 e1000e_get_phy_info_m88 (struct e1000_hw *hw);extern s32 e1000e_read_phy_reg_m88 (struct e1000_hw *hw,u32 offset,u16 *data);extern s32 e1000e_write_phy_reg_m88 (struct e1000_hw *hw,u32 offset,u16 data); +extern s32 e1000e_phy_init_script_igp3 (struct e1000_hw *hw);extern enum e1000_phy_type e1000e_get_phy_type_from_id (u32 phy_id);extern s32 e1000e_determine_phy_address (struct e1000_hw *hw);extern s32 e1000e_write_phy_reg_bm (struct e1000_hw *hw,u32 offset,u16 data);extern s32 e1000e_read_phy_reg_bm (struct e1000_hw *hw,u32 offset,u16 *data); +extern s32 e1000e_read_phy_reg_bm2 (struct e1000_hw *hw,u32 offset,u16 *data); +extern s32 e1000e_write_phy_reg_bm2 (struct e1000_hw *hw,u32 offset,u16 data);extern void e1000e_phy_force_speed_duplex_setup (struct e1000_hw *hw,u16 *phy_ctrl);extern s32 e1000e_write_kmrn_reg (struct e1000_hw *hw,u32 offset,u16 data);extern s32 e1000e_read_kmrn_reg (struct e1000_hw *hw,u32 offset,u16 *data);
@@ -520,7 +544,12 @@ static inline s32 e1000_get_phy_info(struct e1000_hw *hw)return hw->phy.ops.get_phy_info (hw); } -extern bool e1000e_check_mng_mode (struct e1000_hw *hw); +static inline s32 e1000e_check_mng_mode (struct e1000_hw *hw) +{ +return hw->mac.ops.check_mng_mode (hw); +} + +extern bool e1000e_check_mng_mode_generic (struct e1000_hw *hw);extern bool e1000e_enable_tx_pkt_filtering (struct e1000_hw *hw);extern s32 e1000e_mng_write_dhcp_info (struct e1000_hw *hw,u8 *buffer,u16 length);
drivers/net/e1000e/es2lan.c +1 -1
@@ -1247,7 +1247,7 @@ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) }static struct e1000_mac_operations es2_mac_ops = { - .mng_mode_enab =E1000_MNG_IAMT_MODE <<E1000_FWSM_MODE_SHIFT , + .check_mng_mode = e1000e_check_mng_mode_generic,/* check_for_link dependent on media type */ .cleanup_led = e1000e_cleanup_led_generic, .clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan,
drivers/net/e1000e/ethtool.c +47 -13
131 lines not on this page · raw message
drivers/net/e1000e/hw.h +13 -2
@@ -65,7 +65,11 @@ enum e1e_registers {E1000_ICS =0x000C8 ,/* Interrupt Cause Set - WO */ E1000_IMS =0x000D0 ,/* Interrupt Mask Set - RW */ E1000_IMC =0x000D8 ,/* Interrupt Mask Clear - WO */ +E1000_EIAC_82574 =0x000DC ,/* Ext. Interrupt Auto Clear - RW */ E1000_IAM =0x000E0 ,/* Interrupt Acknowledge Auto Mask */ +E1000_IVAR =0x000E4 ,/* Interrupt Vector Allocation - RW */ +E1000_EITR_82574_BASE =0x000E8 ,/* Interrupt Throttling - RW */ +#define E1000_EITR_82574(_n) (E1000_EITR_82574_BASE + (_n << 2))E1000_RCTL =0x00100 ,/* Rx Control - RW */ E1000_FCTTV =0x00170 ,/* Flow Control Transmit Timer Value - RW */ E1000_TXCW = 0x00178, /* Tx Configuration Word - RW */
@@ -332,6 +336,7 @@ enum e1e_registers {#define E1000_DEV_ID_82573E 0x108B#define E1000_DEV_ID_82573E_IAMT 0x108C#define E1000_DEV_ID_82573L 0x109A +#define E1000_DEV_ID_82574L 0x10D3#define E1000_DEV_ID_80003ES2LAN_COPPER_DPT 0x1096#define E1000_DEV_ID_80003ES2LAN_SERDES_DPT 0x1098
@@ -346,6 +351,7 @@ enum e1e_registers {#define E1000_DEV_ID_ICH8_IFE_G 0x10C5#define E1000_DEV_ID_ICH8_IGP_M 0x104D#define E1000_DEV_ID_ICH9_IGP_AMT 0x10BD +#define E1000_DEV_ID_ICH9_BM 0x10E5#define E1000_DEV_ID_ICH9_IGP_M_AMT 0x10F5#define E1000_DEV_ID_ICH9_IGP_M 0x10BF#define E1000_DEV_ID_ICH9_IGP_M_V 0x10CB
@@ -356,6 +362,10 @@ enum e1e_registers {#define E1000_DEV_ID_ICH10_R_BM_LM 0x10CC#define E1000_DEV_ID_ICH10_R_BM_LF 0x10CD#define E1000_DEV_ID_ICH10_R_BM_V 0x10CE +#define E1000_DEV_ID_ICH10_D_BM_LM 0x10DE +#define E1000_DEV_ID_ICH10_D_BM_LF 0x10DF + +#define E1000_REVISION_4 4#define E1000_FUNC_1 1
@@ -363,9 +373,11 @@ enum e1000_mac_type { e1000_82571, e1000_82572, e1000_82573, + e1000_82574, e1000_80003es2lan, e1000_ich8lan, e1000_ich9lan, + e1000_ich10lan, }; enum e1000_media_type {
@@ -696,8 +708,7 @@ struct e1000_host_mng_command_info {/* Function pointers and static data for the MAC. */ struct e1000_mac_operations { -u32 mng_mode_enab; - +bool (*check_mng_mode)(struct e1000_hw *);s32 (*check_for_link)(struct e1000_hw *);s32 (*cleanup_led)(struct e1000_hw *);void (*clear_hw_cntrs)(struct e1000_hw *);
drivers/net/e1000e/ich8lan.c +162 -11
265 lines not on this page · raw message
drivers/net/e1000e/lib.c +4 -3
@@ -2222,17 +2222,18 @@ static s32 e1000_mng_enable_host_if(struct e1000_hw *hw) }/** -* e1000e_check_mng_mode - check management mode +* e1000e_check_mng_mode_generic - check management mode * @hw: pointer to the HW structure * * Reads the firmware semaphore register and returns true (>0) if * manageability is enabled, else false (0). **/ -bool e1000e_check_mng_mode (struct e1000_hw *hw) +bool e1000e_check_mng_mode_generic (struct e1000_hw *hw) {u32 fwsm =er32 (FWSM ); -return (fwsm &E1000_FWSM_MODE_MASK ) == hw->mac.ops.mng_mode_enab; +return (fwsm &E1000_FWSM_MODE_MASK ) == + (E1000_MNG_IAMT_MODE <<E1000_FWSM_MODE_SHIFT ); }/**
drivers/net/e1000e/netdev.c +389 -46
636 lines not on this page · raw message
drivers/net/e1000e/param.c +27 -0
@@ -114,6 +114,15 @@ E1000_PARAM(InterruptThrottleRate, "Interrupt Throttling Rate");#define DEFAULT_ITR 3#define MAX_ITR 100000#define MIN_ITR 100 +/* IntMode (Interrupt Mode) +* +* Valid Range: 0 - 2 +* +* Default Value: 2 (MSI-X) +*/ +E1000_PARAM (IntMode,"Interrupt Mode" ); +#define MAX_INTMODE 2 +#define MIN_INTMODE 0/* * Enable Smart Power Down of the PHY
@@ -352,6 +361,24 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter) adapter->itr =20000 ; } } + {/* Interrupt Mode */ +struct e1000_option opt = { + .type = range_option, + .name ="Interrupt Mode" , + .err ="defaulting to 2 (MSI-X)" , + .def =E1000E_INT_MODE_MSIX , + .arg = { .r = { .min =MIN_INTMODE , + .max =MAX_INTMODE } } + }; + +if (num_IntMode > bd) { +unsigned int int_mode = IntMode[bd]; +e1000_validate_option (&int_mode, &opt, adapter); + adapter->int_mode = int_mode; + }else { + adapter->int_mode = opt.def; + } + } {/* Smart Power Down */ const struct e1000_option opt = { .type = enable_option,
drivers/net/e1000e/phy.c +193 -1
218 lines not on this page · raw message
drivers/net/ibm_newemac/mal.h +2 -2
@@ -102,7 +102,7 @@/* MAL V1 IER bits */ #define MAL1_IER_NWE 0x00000008#define MAL1_IER_SOC_EVENTS MAL1_IER_NWE -#define MAL1_IER_EVENTS (MAL1_IER_SOC_EVENTS | MAL_IER_OTE | \ +#define MAL1_IER_EVENTS (MAL1_IER_SOC_EVENTS | MAL_IER_DE | \ MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)/* MAL V2 IER bits */
@@ -110,7 +110,7 @@#define MAL2_IER_PRE 0x00000040#define MAL2_IER_PWE 0x00000020#define MAL2_IER_SOC_EVENTS (MAL2_IER_PT | MAL2_IER_PRE | MAL2_IER_PWE) -#define MAL2_IER_EVENTS (MAL2_IER_SOC_EVENTS | MAL_IER_OTE | \ +#define MAL2_IER_EVENTS (MAL2_IER_SOC_EVENTS | MAL_IER_DE | \ MAL_IER_OTE | MAL_IER_OE | MAL_IER_PE)
drivers/net/igb/igb_main.c +2 -10
@@ -3563,10 +3563,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)struct net_device *netdev = adapter->netdev;int work_done =0 ; -/* Keep link state information with original netdev */ -if (!netif_carrier_ok (netdev)) - goto quit_polling; -#ifdef CONFIG_DCA if (adapter->flags &IGB_FLAG_DCA_ENABLED )igb_update_rx_dca (rx_ring);
@@ -3576,7 +3572,6 @@ static int igb_clean_rx_ring_msix(struct napi_struct *napi, int budget)/* If not enough Rx work done, exit the polling mode */ if ((work_done ==0 ) || !netif_running (netdev)) { -quit_polling:netif_rx_complete (netdev, napi);if (adapter->itr_setting &3 ) {
@@ -3617,16 +3612,14 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring)unsigned int i;u32 head, oldhead;unsigned int count =0 ; -bool cleaned = false; -bool retval = true;unsigned int total_bytes =0 , total_packets =0 ; +bool retval = true;rmb (); head =get_head (tx_ring); i = tx_ring->next_to_clean;while (1 ) {while (i != head) { - cleaned = true; tx_desc =E1000_TX_DESC (*tx_ring, i); buffer_info = &tx_ring->buffer_info[i]; skb = buffer_info->skb;
@@ -3643,7 +3636,6 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring) }igb_unmap_and_free_tx_resource (adapter, buffer_info); - tx_desc->upper.data =0 ; i++;if (i == tx_ring->count)
@@ -3665,7 +3657,7 @@ static bool igb_clean_tx_irq(struct igb_ring *tx_ring) done_cleaning: tx_ring->next_to_clean = i; -if (unlikely (cleaned && +if (unlikely (count &&netif_carrier_ok (netdev) &&IGB_DESC_UNUSED (tx_ring) >=IGB_TX_QUEUE_WAKE )) {/* Make sure that anybody stopping the queue after this
drivers/net/ixgbe/ixgbe.h +28 -15
82 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_82598.c +5 -1
@@ -36,6 +36,8 @@#define IXGBE_82598_MAX_TX_QUEUES 32#define IXGBE_82598_MAX_RX_QUEUES 64#define IXGBE_82598_RAR_ENTRIES 16 +#define IXGBE_82598_MC_TBL_SIZE 128 +#define IXGBE_82598_VFT_TBL_SIZE 128static s32 ixgbe_get_invariants_82598 (struct ixgbe_hw *hw); static s32 ixgbe_get_link_settings_82598(struct ixgbe_hw *hw, u32 *speed,
@@ -60,7 +62,9 @@ static s32 ixgbe_get_invariants_82598(struct ixgbe_hw *hw) { hw->mac.num_rx_queues =IXGBE_82598_MAX_RX_QUEUES ; hw->mac.num_tx_queues =IXGBE_82598_MAX_TX_QUEUES ; - hw->mac.num_rx_addrs =IXGBE_82598_RAR_ENTRIES ; + hw->mac.mcft_size =IXGBE_82598_MC_TBL_SIZE ; + hw->mac.vft_size =IXGBE_82598_VFT_TBL_SIZE ; + hw->mac.num_rar_entries =IXGBE_82598_RAR_ENTRIES ;/* PHY ops are filled in by default properly for Fiber only */ if (hw->mac.ops.get_media_type (hw) == ixgbe_media_type_copper) {
drivers/net/ixgbe/ixgbe_common.c +129 -11
210 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_common.h +3 -1
@@ -47,7 +47,9 @@ s32 ixgbe_validate_eeprom_checksum(struct ixgbe_hw *hw, u16 *checksum_val);s32 ixgbe_set_rar (struct ixgbe_hw *hw,u32 index,u8 *addr,u32 vind,u32 enable_addr);s32 ixgbe_update_mc_addr_list (struct ixgbe_hw *hw,u8 *mc_addr_list, -u32 mc_addr_count,u32 pad); +u32 mc_addr_count,ixgbe_mc_addr_itr next); +s32 ixgbe_update_uc_addr_list (struct ixgbe_hw *hw,u8 *uc_addr_list, +u32 mc_addr_count,ixgbe_mc_addr_itr next);s32 ixgbe_set_vfta (struct ixgbe_hw *hw,u32 vlan,u32 vind,bool vlan_on);s32 ixgbe_validate_mac_addr (u8 *mac_addr);
drivers/net/ixgbe/ixgbe_ethtool.c +3 -3
@@ -233,15 +233,15 @@ static int ixgbe_set_rx_csum(struct net_device *netdev, u32 data)static u32 ixgbe_get_tx_csum (struct net_device *netdev) { -return (netdev->features &NETIF_F_HW_CSUM ) !=0 ; +return (netdev->features &NETIF_F_IP_CSUM ) !=0 ; }static int ixgbe_set_tx_csum (struct net_device *netdev,u32 data) {if (data) - netdev->features |=NETIF_F_HW_CSUM ; + netdev->features |= (NETIF_F_IP_CSUM |NETIF_F_IPV6_CSUM );else - netdev->features &= ~NETIF_F_HW_CSUM ; + netdev->features &= ~NETIF_F_IP_CSUM ;return 0 ; }
drivers/net/ixgbe/ixgbe_main.c +414 -307
670 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_type.h +26 -21
47 lines not on this page · raw message
drivers/net/netxen/netxen_nic_ethtool.c +0 -1
Lines of this file are not shown. View the raw message.
drivers/net/r8169.c +335 -66
401 lines not on this page · raw message
drivers/net/sfc/bitfield.h +111 -67
178 lines not on this page · raw message
drivers/net/sfc/efx.c +198 -273
471 lines not on this page · raw message
drivers/net/sfc/ethtool.c +97 -87
184 lines not on this page · raw message
drivers/net/sfc/falcon.c +550 -217
767 lines not on this page · raw message
drivers/net/sfc/falcon_hwdefs.h +53 -26
79 lines not on this page · raw message
drivers/net/sfc/falcon_xmac.c +148 -182
330 lines not on this page · raw message
drivers/net/sfc/net_driver.h +70 -66
136 lines not on this page · raw message
drivers/net/sfc/rx.c +34 -44
78 lines not on this page · raw message
drivers/net/sfc/selftest.c +213 -178
391 lines not on this page · raw message
drivers/net/sfc/sfe4001.c +154 -90
244 lines not on this page · raw message
drivers/net/sfc/spi.h +42 -47
89 lines not on this page · raw message
drivers/net/sfc/tenxpress.c +33 -57
90 lines not on this page · raw message
drivers/net/sfc/tx.c +203 -180
383 lines not on this page · raw message
drivers/net/sky2.c +124 -46
170 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Part of the diff is not shown here. View the raw message.
David Miller
maintainerFrom: Jeff Garzik <[email protected]>
Date: Wed, 3 Sep 2008 10:37:45 -0400
Quoted 2 lines
Please pull from 'davem-next' branch of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git davem-next
Pulled, thanks Jeff.