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

Commit c8ea5ea9 authored by Alexander Duyck's avatar Alexander Duyck Committed by David S. Miller
Browse files

igb: add support for 82576 quad copper adapter 



Add support for 82576 copper adapter and necessary code to restrict wol for
quad port adapter to first port.

Signed-off-by: default avatarAlexander Duyck <alexander.h.duyck@intel.com>
Acked-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9eb2341d

drivers/net/igb/e1000_82575.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -83,6 +83,7 @@ static s32 igb_get_invariants_82575(struct e1000_hw *hw) 
	case E1000_DEV_ID_82576_NS:

	case E1000_DEV_ID_82576_NS:

	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:

drivers/net/igb/e1000_hw.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -40,6 +40,7 @@ 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_82576_NS                 0x150A

#define E1000_DEV_ID_82576_NS                 0x150A

#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

drivers/net/igb/igb_ethtool.c

+9 −0
Original line number Original line Diff line number Diff line
@@ -1779,6 +1779,15 @@ 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

drivers/net/igb/igb_main.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,7 @@ static struct pci_device_id igb_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), board_82575 },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_82576_NS), 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 },
@@ -1375,6 +1376,16 @@ 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 */