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

Commit 2f21bdd3 authored by Don Skidmore's avatar Don Skidmore Committed by David S. Miller
Browse files

ixgbe: Add 82598 support for BX mezzanine devices 



Add the device ID for BX devices using the 82598 MAC.

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 1224736d

drivers/net/ixgbe/ixgbe_82598.c

+3 −1
Original line number Diff line number Diff line
@@ -214,7 +214,7 @@ 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 */

	case IXGBE_DEV_ID_82598_BX:

		media_type = ixgbe_media_type_backplane;

		break;

	case IXGBE_DEV_ID_82598AF_DUAL_PORT:
@@ -1011,6 +1011,8 @@ static s32 ixgbe_get_supported_physical_layer_82598(struct ixgbe_hw *hw) 
		physical_layer = (IXGBE_PHYSICAL_LAYER_10GBASE_KX4 |

				  IXGBE_PHYSICAL_LAYER_1000BASE_KX);

		break;

	case IXGBE_DEV_ID_82598_BX:

		physical_layer = IXGBE_PHYSICAL_LAYER_1000BASE_BX;

	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

+8 −0
Original line number Diff line number Diff line
@@ -141,6 +141,14 @@ static int ixgbe_get_settings(struct net_device *netdev, 
				ADVERTISED_FIBRE);

			ecmd->port = PORT_FIBRE;

			break;

		case IXGBE_DEV_ID_82598_BX:

			ecmd->supported = (SUPPORTED_1000baseT_Full |

					   SUPPORTED_FIBRE);

			ecmd->advertising = (ADVERTISED_1000baseT_Full |

					     ADVERTISED_FIBRE);

			ecmd->port = PORT_FIBRE;

			ecmd->autoneg = AUTONEG_DISABLE;

			break;

		}

	} else {

		ecmd->supported |= SUPPORTED_FIBRE;

drivers/net/ixgbe/ixgbe_main.c

+2 −0
Original line number Diff line number Diff line
@@ -84,6 +84,8 @@ static struct pci_device_id ixgbe_pci_tbl[] = { 
	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598EB_SFP_LOM),

	 board_82598 },

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_82598_BX),

	 board_82598 },



	/* required last entry */

	{0, }

drivers/net/ixgbe/ixgbe_type.h

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 


/* Device IDs */

#define IXGBE_DEV_ID_82598               0x10B6

#define IXGBE_DEV_ID_82598_BX            0x1508

#define IXGBE_DEV_ID_82598AF_DUAL_PORT   0x10C6

#define IXGBE_DEV_ID_82598AF_SINGLE_PORT 0x10C7

#define IXGBE_DEV_ID_82598EB_SFP_LOM     0x10DB