igb: remove 82576 quad adapter
Disable support for device 8086:10E8. Currently the result of loading the driver with the device present causes system instability. Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
parent
c22ce6d849
commit
17fc7004a3
|
@ -87,7 +87,6 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw)
|
||||||
case E1000_DEV_ID_82576:
|
case E1000_DEV_ID_82576:
|
||||||
case E1000_DEV_ID_82576_FIBER:
|
case E1000_DEV_ID_82576_FIBER:
|
||||||
case E1000_DEV_ID_82576_SERDES:
|
case E1000_DEV_ID_82576_SERDES:
|
||||||
case E1000_DEV_ID_82576_QUAD_COPPER:
|
|
||||||
mac->type = e1000_82576;
|
mac->type = e1000_82576;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
@ -41,7 +41,6 @@ struct e1000_hw;
|
||||||
#define E1000_DEV_ID_82576 0x10C9
|
#define E1000_DEV_ID_82576 0x10C9
|
||||||
#define E1000_DEV_ID_82576_FIBER 0x10E6
|
#define E1000_DEV_ID_82576_FIBER 0x10E6
|
||||||
#define E1000_DEV_ID_82576_SERDES 0x10E7
|
#define E1000_DEV_ID_82576_SERDES 0x10E7
|
||||||
#define E1000_DEV_ID_82576_QUAD_COPPER 0x10E8
|
|
||||||
#define E1000_DEV_ID_82575EB_COPPER 0x10A7
|
#define E1000_DEV_ID_82575EB_COPPER 0x10A7
|
||||||
#define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9
|
#define E1000_DEV_ID_82575EB_FIBER_SERDES 0x10A9
|
||||||
#define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6
|
#define E1000_DEV_ID_82575GB_QUAD_COPPER 0x10D6
|
||||||
|
|
|
@ -1750,15 +1750,6 @@ static int igb_wol_exclusion(struct igb_adapter *adapter,
|
||||||
/* return success for non excluded adapter ports */
|
/* return success for non excluded adapter ports */
|
||||||
retval = 0;
|
retval = 0;
|
||||||
break;
|
break;
|
||||||
case E1000_DEV_ID_82576_QUAD_COPPER:
|
|
||||||
/* quad port adapters only support WoL on port A */
|
|
||||||
if (!(adapter->flags & IGB_FLAG_QUAD_PORT_A)) {
|
|
||||||
wol->supported = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
/* return success for non excluded adapter ports */
|
|
||||||
retval = 0;
|
|
||||||
break;
|
|
||||||
default:
|
default:
|
||||||
/* dual port cards only support WoL on port A from now on
|
/* dual port cards only support WoL on port A from now on
|
||||||
* unless it was enabled in the eeprom for port B
|
* unless it was enabled in the eeprom for port B
|
||||||
|
|
|
@ -61,7 +61,6 @@ static struct pci_device_id igb_pci_tbl[] = {
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576), board_82575 },
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_FIBER), board_82575 },
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_SERDES), board_82575 },
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_QUAD_COPPER), board_82575 },
|
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_COPPER), board_82575 },
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575EB_FIBER_SERDES), board_82575 },
|
||||||
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
|
{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82575GB_QUAD_COPPER), board_82575 },
|
||||||
|
@ -1217,16 +1216,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
|
||||||
if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
|
if (rd32(E1000_STATUS) & E1000_STATUS_FUNC_1)
|
||||||
adapter->eeprom_wol = 0;
|
adapter->eeprom_wol = 0;
|
||||||
break;
|
break;
|
||||||
case E1000_DEV_ID_82576_QUAD_COPPER:
|
|
||||||
/* if quad port adapter, disable WoL on all but port A */
|
|
||||||
if (global_quad_port_a != 0)
|
|
||||||
adapter->eeprom_wol = 0;
|
|
||||||
else
|
|
||||||
adapter->flags |= IGB_FLAG_QUAD_PORT_A;
|
|
||||||
/* Reset for multiple quad port adapters */
|
|
||||||
if (++global_quad_port_a == 4)
|
|
||||||
global_quad_port_a = 0;
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* initialize the wol settings based on the eeprom settings */
|
/* initialize the wol settings based on the eeprom settings */
|
||||||
|
|
Loading…
Reference in New Issue