ixgbe: fix setting of promisc mode when using mac-vlans
Subsystems (2)
PATCH 1/3 ixgbe: fix setting of promisc mode when using mac-vlans
From: Emil Tantilov <[email protected]>
Introduce uc_set_promisc flag to fix enabling of promisc mode when exceeding the number of supported RAR entries.
Issue discovered by Ben Greear when using mac-vlans.
---
drivers/net/ixgbe/ixgbe_common.c | 5 ++++- drivers/net/ixgbe/ixgbe_main.c | 6 +++--- drivers/net/ixgbe/ixgbe_type.h | 1 + 3 files changed, 8 insertions(+), 4 deletions(-)
drivers/net/ixgbe/ixgbe_common.c +4 -1
@@ -1392,14 +1392,17 @@ s32 ixgbe_update_uc_addr_list_generic(struct ixgbe_hw *hw, fctrl =IXGBE_READ_REG (hw,IXGBE_FCTRL ); fctrl |=IXGBE_FCTRL_UPE ;IXGBE_WRITE_REG (hw,IXGBE_FCTRL , fctrl); + hw->addr_ctrl.uc_set_promisc = true; } }else {/* only disable if set by overflow, not by user */ -if (old_promisc_setting && !hw->addr_ctrl.user_set_promisc) { +if ((old_promisc_setting && hw->addr_ctrl.uc_set_promisc) && + !(hw->addr_ctrl.user_set_promisc)) {hw_dbg (hw," Leaving address overflow promisc mode\n" ); fctrl =IXGBE_READ_REG (hw,IXGBE_FCTRL ); fctrl &= ~IXGBE_FCTRL_UPE ;IXGBE_WRITE_REG (hw,IXGBE_FCTRL , fctrl); + hw->addr_ctrl.uc_set_promisc = false; } }
drivers/net/ixgbe/ixgbe_main.c +3 -3
@@ -2952,7 +2952,7 @@ void ixgbe_set_rx_mode(struct net_device *netdev) fctrl =IXGBE_READ_REG (hw,IXGBE_FCTRL );if (netdev->flags &IFF_PROMISC ) { - hw->addr_ctrl.user_set_promisc =1 ; + hw->addr_ctrl.user_set_promisc = true; fctrl |= (IXGBE_FCTRL_UPE |IXGBE_FCTRL_MPE );/* don't hardware filter vlans in promisc mode */ ixgbe_vlan_filter_disable (adapter);
@@ -2960,11 +2960,11 @@ void ixgbe_set_rx_mode(struct net_device *netdev)if (netdev->flags &IFF_ALLMULTI ) { fctrl |=IXGBE_FCTRL_MPE ; fctrl &= ~IXGBE_FCTRL_UPE ; - }else { + }else if (!hw->addr_ctrl.uc_set_promisc) { fctrl &= ~(IXGBE_FCTRL_UPE |IXGBE_FCTRL_MPE ); }ixgbe_vlan_filter_enable (adapter); - hw->addr_ctrl.user_set_promisc =0 ; + hw->addr_ctrl.user_set_promisc = false; }IXGBE_WRITE_REG (hw,IXGBE_FCTRL , fctrl);
drivers/net/ixgbe/ixgbe_type.h +1 -0
@@ -2268,6 +2268,7 @@ struct ixgbe_addr_filter_info {u32 mc_addr_in_rar_count;u32 mta_in_use;u32 overflow_promisc; +bool uc_set_promisc;bool user_set_promisc; };
PATCH 2/3 ixgbe: Use bool flag to see if the packet unmapping is delayed in HWRSC
From: Mallikarjuna R Chilakala <[email protected]>
We can't use zero magic "bad" value to check if IXGBE_RSC_CB(skb)->dma is valid. It is only valid in x86/arm/m68k/alpha architectures and in spark, powerPC and other architectures it should be ~0. As per Benjamin Herrenschmidt feedback use a bool flag to decide if the packet unmapping is delayed in hardware RSC till EOP is reached
---
drivers/net/ixgbe/ixgbe_main.c | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 deletions(-)
drivers/net/ixgbe/ixgbe_main.c +11 -6
@@ -1160,6 +1160,7 @@ static inline struct sk_buff *ixgbe_transform_rsc_queue(struct sk_buff *skb,struct ixgbe_rsc_cb {dma_addr_t dma; +bool delay_unmap; };#define IXGBE_RSC_CB (skb) ((struct ixgbe_rsc_cb *)(skb)->cb)
@@ -1215,7 +1216,7 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,if (rx_buffer_info->dma) {if ((adapter->flags2 &IXGBE_FLAG2_RSC_ENABLED ) && (!(staterr &IXGBE_RXD_STAT_EOP )) && - (!(skb->prev))) + (!(skb->prev))) {/* * When HWRSC is enabled, delay unmapping * of the first packet. It carries the
@@ -1223,12 +1224,14 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,* access the header after the writeback. * Only unmap it when EOP is reached */ +IXGBE_RSC_CB (skb)->delay_unmap = true;IXGBE_RSC_CB (skb)->dma = rx_buffer_info->dma; - else + }else {dma_unmap_single (&pdev->dev, - rx_buffer_info->dma, + rx_buffer_info->dma, rx_ring->rx_buf_len, - DMA_FROM_DEVICE); +DMA_FROM_DEVICE ); + } rx_buffer_info->dma =0 ;skb_put (skb, len); }
@@ -1276,12 +1279,13 @@ static bool ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,if (skb->prev) skb =ixgbe_transform_rsc_queue (skb, &(rx_ring->rsc_count));if (adapter->flags2 &IXGBE_FLAG2_RSC_ENABLED ) { -if (IXGBE_RSC_CB (skb)->dma) { +if (IXGBE_RSC_CB (skb)->delay_unmap) {dma_unmap_single (&pdev->dev,IXGBE_RSC_CB (skb)->dma, rx_ring->rx_buf_len,DMA_FROM_DEVICE );IXGBE_RSC_CB (skb)->dma =0 ; +IXGBE_RSC_CB (skb)->delay_unmap = false; }if (rx_ring->flags &IXGBE_RING_RX_PS_ENABLED ) rx_ring->rsc_count +=skb_shinfo (skb)->nr_frags;
@@ -3505,12 +3509,13 @@ static void ixgbe_clean_rx_ring(struct ixgbe_adapter *adapter, rx_buffer_info->skb =NULL ; do { struct sk_buff *this = skb; - if (IXGBE_RSC_CB(this)->dma) { + if (IXGBE_RSC_CB(this)->delay_unmap) { dma_unmap_single(&pdev->dev, IXGBE_RSC_CB(this)->dma, rx_ring->rx_buf_len, DMA_FROM_DEVICE); IXGBE_RSC_CB(this)->dma = 0; + IXGBE_RSC_CB(skb)->delay_unmap = false; } skb = skb->prev; dev_kfree_skb(this);
PATCH 3/3 ixgbe: Refactor common code between 82598 & 82599 to accommodate new hardware
In reply to Jeff KirsherFrom: Mallikarjuna R Chilakala <[email protected]>
Some of the following MAC functions are moved from 82598 & 82599 specific hardware files to common.[ch] to accommodate new silicon changes. Also fixed some white space issues
* get_san_mac_addr, check_link, set_vmdq, clear_vmdq, clear_vfta,
* set_vfta, fc_enable, init_uta_tables
---
drivers/net/ixgbe/ixgbe_82598.c | 8 - drivers/net/ixgbe/ixgbe_82599.c | 403 +----------------------------- drivers/net/ixgbe/ixgbe_common.c | 518 +++++++++++++++++++++++++++++++++++++- drivers/net/ixgbe/ixgbe_common.h | 17 + drivers/net/ixgbe/ixgbe_type.h | 32 ++ 5 files changed, 557 insertions(+), 421 deletions(-)
drivers/net/ixgbe/ixgbe_82598.c +4 -4
@@ -42,9 +42,9 @@ static s32 ixgbe_get_copper_link_capabilities_82598(struct ixgbe_hw *hw, ixgbe_link_speed *speed, bool *autoneg);static s32 ixgbe_setup_copper_link_82598 (struct ixgbe_hw *hw, -ixgbe_link_speed speed, -bool autoneg, -bool autoneg_wait_to_complete); +ixgbe_link_speed speed, +bool autoneg, +bool autoneg_wait_to_complete);static s32 ixgbe_read_i2c_eeprom_82598 (struct ixgbe_hw *hw,u8 byte_offset,u8 *eeprom_data);
@@ -1221,7 +1221,7 @@ static struct ixgbe_mac_operations mac_ops_82598 = {static struct ixgbe_eeprom_operations eeprom_ops_82598 = { .init_params = &ixgbe_init_eeprom_params_generic, - .read = &ixgbe_read_eeprom_generic, + .read = &ixgbe_read_eerd_generic, .validate_checksum = &ixgbe_validate_eeprom_checksum_generic, .update_checksum = &ixgbe_update_eeprom_checksum_generic, };
drivers/net/ixgbe/ixgbe_82599.c +11 -392
467 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_common.c +505 -13
564 lines not on this page · raw message
drivers/net/ixgbe/ixgbe_common.h +13 -4
@@ -30,6 +30,7 @@#include "ixgbe_type.h" +u32 ixgbe_get_pcie_msix_count_generic (struct ixgbe_hw *hw);s32 ixgbe_init_ops_generic (struct ixgbe_hw *hw);s32 ixgbe_init_hw_generic (struct ixgbe_hw *hw);s32 ixgbe_start_hw_generic (struct ixgbe_hw *hw);
@@ -45,12 +46,13 @@ s32 ixgbe_led_off_generic(struct ixgbe_hw *hw, u32 index);s32 ixgbe_init_eeprom_params_generic (struct ixgbe_hw *hw);s32 ixgbe_write_eeprom_generic (struct ixgbe_hw *hw,u16 offset,u16 data); -s32 ixgbe_read_eeprom_generic (struct ixgbe_hw *hw,u16 offset,u16 *data); +s32 ixgbe_read_eerd_generic (struct ixgbe_hw *hw,u16 offset,u16 *data);s32 ixgbe_read_eeprom_bit_bang_generic (struct ixgbe_hw *hw,u16 offset,u16 *data);s32 ixgbe_validate_eeprom_checksum_generic (struct ixgbe_hw *hw,u16 *checksum_val);s32 ixgbe_update_eeprom_checksum_generic (struct ixgbe_hw *hw); +s32 ixgbe_poll_eerd_eewr_done (struct ixgbe_hw *hw,u32 ee_reg);s32 ixgbe_set_rar_generic (struct ixgbe_hw *hw,u32 index,u8 *addr,u32 vmdq,u32 enable_addr);
@@ -70,9 +72,16 @@ s32 ixgbe_validate_mac_addr(u8 *mac_addr);s32 ixgbe_acquire_swfw_sync (struct ixgbe_hw *hw,u16 mask);void ixgbe_release_swfw_sync (struct ixgbe_hw *hw,u16 mask);s32 ixgbe_disable_pcie_master (struct ixgbe_hw *hw); - -s32 ixgbe_read_analog_reg8_generic (struct ixgbe_hw *hw,u32 reg,u8 *val); -s32 ixgbe_write_analog_reg8_generic (struct ixgbe_hw *hw,u32 reg,u8 val); +s32 ixgbe_get_san_mac_addr_generic (struct ixgbe_hw *hw,u8 *san_mac_addr); +s32 ixgbe_set_vmdq_generic (struct ixgbe_hw *hw,u32 rar,u32 vmdq); +s32 ixgbe_clear_vmdq_generic (struct ixgbe_hw *hw,u32 rar,u32 vmdq); +s32 ixgbe_init_uta_tables_generic (struct ixgbe_hw *hw); +s32 ixgbe_set_vfta_generic (struct ixgbe_hw *hw,u32 vlan, +u32 vind,bool vlan_on); +s32 ixgbe_clear_vfta_generic (struct ixgbe_hw *hw); +s32 ixgbe_check_mac_link_generic (struct ixgbe_hw *hw, +ixgbe_link_speed *speed, +bool *link_up,bool link_up_wait_to_complete);s32 ixgbe_blink_led_start_generic (struct ixgbe_hw *hw,u32 index);s32 ixgbe_blink_led_stop_generic (struct ixgbe_hw *hw,u32 index);
drivers/net/ixgbe/ixgbe_type.h +24 -8
@@ -73,6 +73,7 @@/* NVM Registers */ #define IXGBE_EEC 0x10010#define IXGBE_EERD 0x10014 +#define IXGBE_EEWR 0x10018#define IXGBE_FLA 0x1001C#define IXGBE_EEMNGCTL 0x10110#define IXGBE_EEMNGDATA 0x10114
@@ -699,6 +700,7 @@#define IXGBE_MREVID 0x11064#define IXGBE_DCA_ID 0x11070#define IXGBE_DCA_CTRL 0x11074 +#define IXGBE_SWFW_SYNC IXGBE_GSSR/* PCIe registers 82599-specific */ #define IXGBE_GCR_EXT 0x11050
@@ -1463,8 +1465,9 @@#define IXGBE_SWSM_SMBI 0x00000001/* Driver Semaphore bit */ #define IXGBE_SWSM_SWESMBI 0x00000002/* FW Semaphore bit */ #define IXGBE_SWSM_WMNG 0x00000004/* Wake MNG Clock */ +#define IXGBE_SWFW_REGSMP 0x80000000/* Register Semaphore bit 31 */ -/* GSSR definitions */ +/* SW_FW_SYNC/GSSR definitions */ #define IXGBE_GSSR_EEP_SM 0x0001#define IXGBE_GSSR_PHY0_SM 0x0002#define IXGBE_GSSR_PHY1_SM 0x0004
@@ -1484,6 +1487,8 @@#define IXGBE_EEC_GNT 0x00000080/* EEPROM Access Grant */ #define IXGBE_EEC_PRES 0x00000100/* EEPROM Present */ #define IXGBE_EEC_ARD 0x00000200/* EEPROM Auto Read Done */ +#define IXGBE_EEC_FLUP 0x00800000/* Flash update command */ +#define IXGBE_EEC_FLUDONE 0x04000000/* Flash update done */ /* EEPROM Addressing bits based on type (0-small, 1-large) */ #define IXGBE_EEC_ADDR_SIZE 0x00000400#define IXGBE_EEC_SIZE 0x00007800/* EEPROM Size */
@@ -1539,10 +1544,12 @@#define IXGBE_EEPROM_ERASE256_OPCODE_SPI 0xDB/* EEPROM ERASE 256B */ /* EEPROM Read Register */ -#define IXGBE_EEPROM_READ_REG_DATA 16/* data offset in EEPROM read reg */ -#define IXGBE_EEPROM_READ_REG_DONE 2/* Offset to READ done bit */ -#define IXGBE_EEPROM_READ_REG_START 1/* First bit to start operation */ -#define IXGBE_EEPROM_READ_ADDR_SHIFT 2/* Shift to the address bits */ +#define IXGBE_EEPROM_RW_REG_DATA 16/* data offset in EEPROM read reg */ +#define IXGBE_EEPROM_RW_REG_DONE 2/* Offset to READ done bit */ +#define IXGBE_EEPROM_RW_REG_START 1/* First bit to start operation */ +#define IXGBE_EEPROM_RW_ADDR_SHIFT 2/* Shift to the address bits */ +#define IXGBE_NVM_POLL_WRITE 1/* Flag for polling for write complete */ +#define IXGBE_NVM_POLL_READ 0/* Flag for polling for read complete */ #define IXGBE_ETH_LENGTH_OF_ADDRESS 6
@@ -1550,9 +1557,15 @@#define IXGBE_EEPROM_GRANT_ATTEMPTS 1000/* EEPROM # attempts to gain grant */ #endif -#ifndef IXGBE_EERD_ATTEMPTS -/* Number of 5 microseconds we wait for EERD read to complete */ -#define IXGBE_EERD_ATTEMPTS 100000 +#ifndef IXGBE_EERD_EEWR_ATTEMPTS +/* Number of 5 microseconds we wait for EERD read and +* EERW write to complete */ +#define IXGBE_EERD_EEWR_ATTEMPTS 100000 +#endif + +#ifndef IXGBE_FLUDONE_ATTEMPTS +/* # attempts we wait for flush update to complete */ +#define IXGBE_FLUDONE_ATTEMPTS 20000#endif #define IXGBE_SAN_MAC_ADDR_PORT0_OFFSET 0x0
@@ -2476,6 +2489,7 @@ struct ixgbe_mac_info {u32 mcft_size;u32 vft_size;u32 num_rar_entries; +u32 rar_highwater;u32 max_tx_queues;u32 max_rx_queues;u32 max_msix_vectors;
@@ -2582,8 +2596,10 @@ struct ixgbe_info {#define IXGBE_ERR_SFP_NOT_SUPPORTED -19#define IXGBE_ERR_SFP_NOT_PRESENT -20#define IXGBE_ERR_SFP_NO_INIT_SEQ_PRESENT -21 +#define IXGBE_ERR_NO_SAN_ADDR_PTR -22#define IXGBE_ERR_FDIR_REINIT_FAILED -23#define IXGBE_ERR_EEPROM_VERSION -24 +#define IXGBE_ERR_NO_SPACE -25#define IXGBE_NOT_IMPLEMENTED 0x7FFFFFFF#endif /* _IXGBE_TYPE_H_ */
From: Jeff Kirsher <[email protected]>
Date: Thu, 13 May 2010 20:33:00 -0700
Quoted 10 lines
From: Emil Tantilov <[email protected]>
Introduce
uc_set_promiscflag to fix enabling of promisc mode when exceeding the number of supported RAR entries.Issue discovered by Ben Greear when using mac-vlans.
Reported-by Ben Greear <[email protected]>Signed-off-by Emil Tantilov <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
Re: [net-next-2.6 PATCH 2/3] ixgbe: Use bool flag to see if the packet unmapping is delayed in HWRSC
In reply to Jeff KirsherFrom: Jeff Kirsher <[email protected]>
Date: Thu, 13 May 2010 20:33:21 -0700
Quoted 10 lines
From: Mallikarjuna R Chilakala <[email protected]>
We can't use zero magic "bad" value to check if IXGBE_RSC_CB(skb)->dma is valid. It is only valid in x86/arm/m68k/alpha architectures and in spark, powerPC and other architectures it should be ~0. As per Benjamin Herrenschmidt feedback use a bool flag to decide if the packet unmapping is delayed in hardware RSC till EOP is reached
Signed-off-by Mallikarjuna R Chilakala <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
Re: [net-next-2.6 PATCH 3/3] ixgbe: Refactor common code between 82598 & 82599 to accommodate new hardware
In reply to Jeff KirsherFrom: Jeff Kirsher <[email protected]>
Date: Thu, 13 May 2010 20:33:41 -0700
Quoted 10 lines
From: Mallikarjuna R Chilakala <[email protected]>
Some of the following MAC functions are moved from 82598 & 82599 specific hardware files to common.[ch] to accommodate new silicon changes. Also fixed some white space issues
*get_san_mac_addr,check_link,set_vmdq,clear_vmdq,clear_vfta,
*set_vfta,fc_enable,init_uta_tablesSigned-off-by Mallikarjuna R Chilakala <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.