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

Commit 1e336d0f authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: add support KX/KX4 device 



And support for the KX/KX4 mezzanine card.  Device id 0x10B6.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Signed-off-by: default avatarPeter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b9c3cdd

drivers/net/ixgbe/ixgbe_82598.c

+9 −0
Original line number Diff line number Diff line
@@ -213,6 +213,10 @@ static enum ixgbe_media_type ixgbe_get_media_type_82598(struct ixgbe_hw *hw) 


	/* Media type for I82598 is based on device ID */

	switch (hw->device_id) {

	case IXGBE_DEV_ID_82598:

		/* Default device ID is mezzanine card KX/KX4 */

		media_type = ixgbe_media_type_backplane;

		break;

	case IXGBE_DEV_ID_82598AF_DUAL_PORT:

	case IXGBE_DEV_ID_82598AF_SINGLE_PORT:

	case IXGBE_DEV_ID_82598EB_CX4:
@@ -1002,6 +1006,11 @@ static s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw) 
	s32 physical_layer = IXGBE_PHYSICAL_LAYER_UNKNOWN;



	switch (hw->device_id) {

	case IXGBE_DEV_ID_82598:

		/* Default device ID is mezzanine card KX/KX4 */

		physical_layer = (IXGBE_PHYSICAL_LAYER_10GBASE_KX4 |

				  IXGBE_PHYSICAL_LAYER_1000BASE_KX);

		break;

	case IXGBE_DEV_ID_82598EB_CX4:

	case IXGBE_DEV_ID_82598_CX4_DUAL_PORT:

		physical_layer = IXGBE_PHYSICAL_LAYER_10GBASE_CX4;

drivers/net/ixgbe/ixgbe_ethtool.c

+12 −0
Original line number Diff line number Diff line
@@ -130,6 +130,18 @@ static int ixgbe_get_settings(struct net_device *netdev, 
			ecmd->advertising |= ADVERTISED_1000baseT_Full;



		ecmd->port = PORT_TP;

	} else if (hw->phy.media_type == ixgbe_media_type_backplane) {

		/* Set as FIBRE until SERDES defined in kernel */

		switch (hw->device_id) {

		case IXGBE_DEV_ID_82598:

			ecmd->supported |= (SUPPORTED_1000baseT_Full |

				SUPPORTED_FIBRE);

			ecmd->advertising = (ADVERTISED_10000baseT_Full |

				ADVERTISED_1000baseT_Full |

				ADVERTISED_FIBRE);

			ecmd->port = PORT_FIBRE;

			break;

		}

	} else {

		ecmd->supported |= SUPPORTED_FIBRE;

		ecmd->advertising = (ADVERTISED_10000baseT_Full |

drivers/net/ixgbe/ixgbe_main.c

+2 −0
Original line number Diff line number Diff line
@@ -64,6 +64,8 @@ static const struct ixgbe_info *ixgbe_info_tbl[] = { 
 *   Class, Class Mask, private data (not used) }

 */

static struct pci_device_id ixgbe_pci_tbl[] = {

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598),

	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_DUAL_PORT),

	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598AF_SINGLE_PORT),

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#define IXGBE_INTEL_VENDOR_ID   0x8086



/* Device IDs */

#define IXGBE_DEV_ID_82598               0x10B6

#define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6

#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7

#define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB