Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce57a02c authored by Auke Kok's avatar Auke Kok Committed by Jeff Garzik
Browse files

e1000: Add device IDs of new 82571 board variants 



This patch adds support for 2 new board variants:
- A Quad port fiber 82571 board
- A blade version of the 82571 quad copper board

Signed-off-by: default avatarAuke Kok <auke-jan.h.kok@intel.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 10a273a6

drivers/net/e1000/e1000_ethtool.c

+2 −0
Original line number Diff line number Diff line
@@ -1706,6 +1706,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
	case E1000_DEV_ID_82545EM_COPPER:

	case E1000_DEV_ID_82546GB_QUAD_COPPER:

	case E1000_DEV_ID_82546GB_PCIE:

	case E1000_DEV_ID_82571EB_SERDES_QUAD:

		/* these don't support WoL at all */

		wol->supported = 0;

		break;
@@ -1723,6 +1724,7 @@ static int e1000_wol_exclusion(struct e1000_adapter *adapter, struct ethtool_wol 
		retval = 0;

		break;

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:

		/* quad port adapters only support WoL on port A */

drivers/net/e1000/e1000_hw.c

+5 −0
Original line number Diff line number Diff line
@@ -384,7 +384,10 @@ e1000_set_mac_type(struct e1000_hw *hw) 
	case E1000_DEV_ID_82571EB_COPPER:

	case E1000_DEV_ID_82571EB_FIBER:

	case E1000_DEV_ID_82571EB_SERDES:

	case E1000_DEV_ID_82571EB_SERDES_DUAL:

	case E1000_DEV_ID_82571EB_SERDES_QUAD:

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

		hw->mac_type = e1000_82571;

		break;
@@ -485,6 +488,8 @@ e1000_set_media_type(struct e1000_hw *hw) 
    case E1000_DEV_ID_82545GM_SERDES:

    case E1000_DEV_ID_82546GB_SERDES:

    case E1000_DEV_ID_82571EB_SERDES:

    case E1000_DEV_ID_82571EB_SERDES_DUAL:

    case E1000_DEV_ID_82571EB_SERDES_QUAD:

    case E1000_DEV_ID_82572EI_SERDES:

    case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:

        hw->media_type = e1000_media_type_internal_serdes;

drivers/net/e1000/e1000_hw.h

+3 −0
Original line number Diff line number Diff line
@@ -475,7 +475,10 @@ int32_t e1000_check_phy_reset_block(struct e1000_hw *hw); 
#define E1000_DEV_ID_82571EB_FIBER       0x105F

#define E1000_DEV_ID_82571EB_SERDES      0x1060

#define E1000_DEV_ID_82571EB_QUAD_COPPER 0x10A4

#define E1000_DEV_ID_82571EB_QUAD_FIBER  0x10A5

#define E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE  0x10BC

#define E1000_DEV_ID_82571EB_SERDES_DUAL 0x10D9

#define E1000_DEV_ID_82571EB_SERDES_QUAD 0x10DA

#define E1000_DEV_ID_82572EI_COPPER      0x107D

#define E1000_DEV_ID_82572EI_FIBER       0x107E

#define E1000_DEV_ID_82572EI_SERDES      0x107F

drivers/net/e1000/e1000_main.c

+4 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ static struct pci_device_id e1000_pci_tbl[] = { 
	INTEL_E1000_ETHERNET_DEVICE(0x1099),

	INTEL_E1000_ETHERNET_DEVICE(0x109A),

	INTEL_E1000_ETHERNET_DEVICE(0x10A4),

	INTEL_E1000_ETHERNET_DEVICE(0x10A5),

	INTEL_E1000_ETHERNET_DEVICE(0x10B5),

	INTEL_E1000_ETHERNET_DEVICE(0x10B9),

	INTEL_E1000_ETHERNET_DEVICE(0x10BA),
@@ -107,6 +108,8 @@ static struct pci_device_id e1000_pci_tbl[] = { 
	INTEL_E1000_ETHERNET_DEVICE(0x10BC),

	INTEL_E1000_ETHERNET_DEVICE(0x10C4),

	INTEL_E1000_ETHERNET_DEVICE(0x10C5),

	INTEL_E1000_ETHERNET_DEVICE(0x10D9),

	INTEL_E1000_ETHERNET_DEVICE(0x10DA),

	/* required last entry */

	{0,}

};
@@ -1096,6 +1099,7 @@ e1000_probe(struct pci_dev *pdev, 
		break;

	case E1000_DEV_ID_82546GB_QUAD_COPPER_KSP3:

	case E1000_DEV_ID_82571EB_QUAD_COPPER:

	case E1000_DEV_ID_82571EB_QUAD_FIBER:

	case E1000_DEV_ID_82571EB_QUAD_COPPER_LOWPROFILE:

		/* if quad port adapter, disable WoL on all but port A */

		if (global_quad_port_a != 0)