igb: clear VF_PROMISC bits instead of setting all other bits
Subsystems (2)
PATCH 1/2 igb: clear VF_PROMISC bits instead of setting all other bits
From: Alexander Duyck <[email protected]>
This change corrects an issue in which we were setting all flag bits except for promisc instead of clearing the promisc bits due to the incorrect use of an |= instead of an &=.
---
drivers/net/igb/igb_main.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
drivers/net/igb/igb_main.c +2 -1
@@ -4659,12 +4659,13 @@ static int igb_set_vf_promisc(struct igb_adapter *adapter, u32 *msgbuf, u32 vf)u32 vmolr =rd32 (E1000_VMOLR (vf));struct vf_data_storage *vf_data = &adapter->vf_data[vf]; - vf_data->flags |= ~(IGB_VF_FLAG_UNI_PROMISC | + vf_data->flags &= ~(IGB_VF_FLAG_UNI_PROMISC |IGB_VF_FLAG_MULTI_PROMISC ); vmolr &= ~(E1000_VMOLR_ROPE |E1000_VMOLR_ROMPE |E1000_VMOLR_MPME );if (*msgbuf &E1000_VF_SET_PROMISC_MULTICAST ) { vmolr |=E1000_VMOLR_MPME ; + vf_data->flags |=IGB_VF_FLAG_MULTI_PROMISC ; *msgbuf &= ~E1000_VF_SET_PROMISC_MULTICAST ; }else {/*
PATCH 2/2 igb: Add support for DH89xxCC
From: Joseph Gasparakis <[email protected]>
This patch adds support for the Intel(r) DH89xxCC series. The new device will be using Intel(r) i347-AT4 and Marvell(r) M88E1322 and M88E1112 PHYs. Support for these devices has also been added here.
---
drivers/net/igb/e1000_82575.c | 18 +++ drivers/net/igb/e1000_defines.h | 31 ++++++ drivers/net/igb/e1000_hw.h | 2 drivers/net/igb/e1000_phy.c | 206 +++++++++++++++++++++++++++++++++++++-- drivers/net/igb/e1000_phy.h | 2 drivers/net/igb/igb_main.c | 2 6 files changed, 247 insertions(+), 14 deletions(-)
drivers/net/igb/e1000_82575.c +16 -2
@@ -132,6 +132,8 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)case E1000_DEV_ID_82580_SERDES :case E1000_DEV_ID_82580_SGMII :case E1000_DEV_ID_82580_COPPER_DUAL : +case E1000_DEV_ID_DH89XXCC_SGMII : +case E1000_DEV_ID_DH89XXCC_SERDES : mac->type = e1000_82580;break ;case E1000_DEV_ID_I350_COPPER :
@@ -282,10 +284,18 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)/* Verify phy id and set remaining function pointers */ switch (phy->id) { +case I347AT4_E_PHY_ID : +case M88E1112_E_PHY_ID :case M88E1111_I_PHY_ID : phy->type = e1000_phy_m88; phy->ops.get_phy_info = igb_get_phy_info_m88; - phy->ops.get_cable_length = igb_get_cable_length_m88; + +if (phy->id ==I347AT4_E_PHY_ID || + phy->id ==M88E1112_E_PHY_ID ) + phy->ops.get_cable_length = igb_get_cable_length_m88_gen2; +else + phy->ops.get_cable_length = igb_get_cable_length_m88; + phy->ops.force_speed_duplex = igb_phy_force_speed_duplex_m88;break ;case IGP03E1000_E_PHY_ID :
@@ -1058,7 +1068,11 @@ static s32 igb_setup_copper_link_82575(struct e1000_hw *hw) }switch (hw->phy.type) {case e1000_phy_m88: - ret_val =igb_copper_link_setup_m88 (hw); +if (hw->phy.id ==I347AT4_E_PHY_ID || + hw->phy.id ==M88E1112_E_PHY_ID ) + ret_val =igb_copper_link_setup_m88_gen2 (hw); +else + ret_val =igb_copper_link_setup_m88 (hw);break ;case e1000_phy_igp_3: ret_val =igb_copper_link_setup_igp (hw);
drivers/net/igb/e1000_defines.h +31 -0
@@ -634,6 +634,8 @@* E = External */ #define M88E1111_I_PHY_ID 0x01410CC0 +#define M88E1112_E_PHY_ID 0x01410C90 +#define I347AT4_E_PHY_ID 0x01410DC0#define IGP03E1000_E_PHY_ID 0x02A80390#define I82580_I_PHY_ID 0x015403A0#define I350_I_PHY_ID 0x015403B0
@@ -702,6 +704,35 @@#define M88E1000_EPSCR_SLAVE_DOWNSHIFT_1X 0x0100#define M88E1000_EPSCR_TX_CLK_25 0x0070/* 25 MHz TX_CLK */ +/* Intel i347-AT4 Registers */ + +#define I347AT4_PCDL 0x10/* PHY Cable Diagnostics Length */ +#define I347AT4_PCDC 0x15/* PHY Cable Diagnostics Control */ +#define I347AT4_PAGE_SELECT 0x16 + +/* i347-AT4 Extended PHY Specific Control Register */ + +/* +* Number of times we will attempt to autonegotiate before downshifting if we +* are the master +*/ +#define I347AT4_PSCR_DOWNSHIFT_ENABLE 0x0800 +#define I347AT4_PSCR_DOWNSHIFT_MASK 0x7000 +#define I347AT4_PSCR_DOWNSHIFT_1X 0x0000 +#define I347AT4_PSCR_DOWNSHIFT_2X 0x1000 +#define I347AT4_PSCR_DOWNSHIFT_3X 0x2000 +#define I347AT4_PSCR_DOWNSHIFT_4X 0x3000 +#define I347AT4_PSCR_DOWNSHIFT_5X 0x4000 +#define I347AT4_PSCR_DOWNSHIFT_6X 0x5000 +#define I347AT4_PSCR_DOWNSHIFT_7X 0x6000 +#define I347AT4_PSCR_DOWNSHIFT_8X 0x7000 + +/* i347-AT4 PHY Cable Diagnostics Control */ +#define I347AT4_PCDC_CABLE_LENGTH_UNIT 0x0400/* 0=cm 1=meters */ + +/* Marvell 1112 only registers */ +#define M88E1112_VCT_DSP_DISTANCE 0x001A +/* M88EC018 Rev 2 specific DownShift settings */ #define M88EC018_EPSCR_DOWNSHIFT_COUNTER_MASK 0x0E00#define M88EC018_EPSCR_DOWNSHIFT_COUNTER_5X 0x0800
drivers/net/igb/e1000_hw.h +2 -0
@@ -54,6 +54,8 @@ struct e1000_hw;#define E1000_DEV_ID_82580_SERDES 0x1510#define E1000_DEV_ID_82580_SGMII 0x1511#define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 +#define E1000_DEV_ID_DH89XXCC_SGMII 0x0436 +#define E1000_DEV_ID_DH89XXCC_SERDES 0x0438#define E1000_DEV_ID_I350_COPPER 0x1521#define E1000_DEV_ID_I350_FIBER 0x1522#define E1000_DEV_ID_I350_SERDES 0x1523
drivers/net/igb/e1000_phy.c +194 -12
230 lines not on this page · raw message
drivers/net/igb/e1000_phy.h +2 -0
@@ -45,9 +45,11 @@ s32 igb_check_downshift(struct e1000_hw *hw);s32 igb_check_reset_block (struct e1000_hw *hw);s32 igb_copper_link_setup_igp (struct e1000_hw *hw);s32 igb_copper_link_setup_m88 (struct e1000_hw *hw); +s32 igb_copper_link_setup_m88_gen2 (struct e1000_hw *hw);s32 igb_phy_force_speed_duplex_igp (struct e1000_hw *hw);s32 igb_phy_force_speed_duplex_m88 (struct e1000_hw *hw);s32 igb_get_cable_length_m88 (struct e1000_hw *hw); +s32 igb_get_cable_length_m88_gen2 (struct e1000_hw *hw);s32 igb_get_cable_length_igp_2 (struct e1000_hw *hw);s32 igb_get_phy_id (struct e1000_hw *hw);s32 igb_get_phy_info_igp (struct e1000_hw *hw);
drivers/net/igb/igb_main.c +2 -0
@@ -71,6 +71,8 @@ static DEFINE_PCI_DEVICE_TABLE(igb_pci_tbl) = { { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SERDES), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_SGMII), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82580_COPPER_DUAL), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SGMII), board_82575 }, + { PCI_VDEVICE(INTEL, E1000_DEV_ID_DH89XXCC_SERDES), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 }, { PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS_SERDES), board_82575 },
Re: [net-next-2.6 PATCH 2/2] igb: Add support for DH89xxCC
From: Jeff Kirsher <[email protected]>
Date: Wed, 22 Sep 2010 20:56:44 -0700
Quoted 9 lines
From: Joseph Gasparakis <[email protected]>
This patch adds support for the Intel(r) DH89xxCC series. The new device will be using Intel(r) i347-AT4 and Marvell(r) M88E1322 and M88E1112 PHYs. Support for these devices has also been added here.
Signed-off-by Joseph Gasparakis <[email protected]>Tested-by Jeff Pieper <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.
From: Jeff Kirsher <[email protected]>
Date: Wed, 22 Sep 2010 20:56:20 -0700
Quoted 9 lines
From: Alexander Duyck <[email protected]>
This change corrects an issue in which we were setting all flag bits except for promisc instead of clearing the promisc bits due to the incorrect use of an |= instead of an &=.
Signed-off-by Alexander Duyck <[email protected]>Tested-by Jeff Pieper <[email protected]>Signed-off-by Jeff Kirsher <[email protected]>
Applied.