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

Commit 18e01ee7 authored by Don Skidmore's avatar Don Skidmore Committed by Jeff Kirsher
Browse files

ixgbe: Add X552 XFI backplane support 



This patch add support for X552 XFI backplane interface.  The XFI
backplane requires a custom tuned link.  HW/FW owns the link config
for XF backplane and SW must not interfere with it.

Signed-off-by: default avatarDon Skidmore <donald.c.skidmore@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 18bda0d9

drivers/net/ethernet/intel/ixgbe/ixgbe_ethtool.c

+1 −0
Original line number Diff line number Diff line
@@ -179,6 +179,7 @@ static u32 ixgbe_get_supported_10gtypes(struct ixgbe_hw *hw) 
	case IXGBE_DEV_ID_82598_BX:

	case IXGBE_DEV_ID_82599_KR:

	case IXGBE_DEV_ID_X550EM_X_KR:

	case IXGBE_DEV_ID_X550EM_X_XFI:

		return SUPPORTED_10000baseKR_Full;

	default:

		return SUPPORTED_10000baseKX4_Full |

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+1 −0
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ static const struct pci_device_id ixgbe_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T), board_X550},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550T1), board_X550},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KX4), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_XFI), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_KR), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_10G_T), board_X550EM_x},

	{PCI_VDEVICE(INTEL, IXGBE_DEV_ID_X550EM_X_SFP), board_X550EM_x},

drivers/net/ethernet/intel/ixgbe/ixgbe_type.h

+2 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
#define IXGBE_DEV_ID_X550EM_X_SFP	0x15AC

#define IXGBE_DEV_ID_X550EM_X_10G_T	0x15AD

#define IXGBE_DEV_ID_X550EM_X_1G_T	0x15AE

#define IXGBE_DEV_ID_X550EM_X_XFI	0x15B0

#define IXGBE_DEV_ID_X550EM_A_KR	0x15C2

#define IXGBE_DEV_ID_X550EM_A_KR_L	0x15C3

#define IXGBE_DEV_ID_X550EM_A_SFP_N	0x15C4
@@ -3128,6 +3129,7 @@ enum ixgbe_phy_type { 
	ixgbe_phy_aq,

	ixgbe_phy_x550em_kr,

	ixgbe_phy_x550em_kx4,

	ixgbe_phy_x550em_xfi,

	ixgbe_phy_x550em_ext_t,

	ixgbe_phy_cu_unknown,

	ixgbe_phy_qt,

drivers/net/ethernet/intel/ixgbe/ixgbe_x550.c

+14 −0
Original line number Diff line number Diff line
@@ -320,6 +320,9 @@ static s32 ixgbe_identify_phy_x550em(struct ixgbe_hw *hw) 
	case IXGBE_DEV_ID_X550EM_X_KX4:

		hw->phy.type = ixgbe_phy_x550em_kx4;

		break;

	case IXGBE_DEV_ID_X550EM_X_XFI:

		hw->phy.type = ixgbe_phy_x550em_xfi;

		break;

	case IXGBE_DEV_ID_X550EM_X_KR:

	case IXGBE_DEV_ID_X550EM_A_KR:

	case IXGBE_DEV_ID_X550EM_A_KR_L:
@@ -2231,6 +2234,10 @@ static s32 ixgbe_get_link_capabilities_X550em(struct ixgbe_hw *hw, 
				 IXGBE_LINK_SPEED_2_5GB_FULL |

				 IXGBE_LINK_SPEED_10GB_FULL;

			break;

		case ixgbe_phy_x550em_xfi:

			*speed = IXGBE_LINK_SPEED_1GB_FULL |

				 IXGBE_LINK_SPEED_10GB_FULL;

			break;

		case ixgbe_phy_sgmii:

			*speed = IXGBE_LINK_SPEED_1GB_FULL;

			break;
@@ -3127,6 +3134,12 @@ static s32 ixgbe_init_phy_ops_X550em(struct ixgbe_hw *hw) 
		phy->ops.read_reg = ixgbe_read_phy_reg_x550em;

		phy->ops.write_reg = ixgbe_write_phy_reg_x550em;

		break;

	case ixgbe_phy_x550em_xfi:

		/* link is managed by HW */

		phy->ops.setup_link = NULL;

		phy->ops.read_reg = ixgbe_read_phy_reg_x550em;

		phy->ops.write_reg = ixgbe_write_phy_reg_x550em;

		break;

	case ixgbe_phy_x550em_ext_t:

		/* Save NW management interface connected on board. This is used

		 * to determine internal PHY mode
@@ -3180,6 +3193,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_X550em(struct ixgbe_hw *hw) 
		/* Fallthrough */

	case IXGBE_DEV_ID_X550EM_X_KR:

	case IXGBE_DEV_ID_X550EM_X_KX4:

	case IXGBE_DEV_ID_X550EM_X_XFI:

	case IXGBE_DEV_ID_X550EM_A_KR:

	case IXGBE_DEV_ID_X550EM_A_KR_L:

		media_type = ixgbe_media_type_backplane;