liquidio: Add support for liquidio 10GBase-T NIC
Subsystems (3)
PATCH 1/1 liquidio: Add support for liquidio 10GBase-T NIC
From: Veerasenareddy Burru <[email protected]>
Added ethtool changes to show port type as TP (Twisted Pair) for 10GBASE-T ports. Same driver and firmware works for liquidio NIC with SFP+ ports or TP ports.
Signed-off-by Veerasenareddy Burru <[email protected]>
Signed-off-by Felix Manlunas <[email protected]>
--- drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 24 ++++++++++++++++------ .../net/ethernet/cavium/liquidio/liquidio_common.h | 12 +++++++++-- 2 files changed, 28 insertions(+), 8 deletions(-)
drivers/net/ethernet/cavium/liquidio/lio_ethtool.c +18 -6
@@ -232,10 +232,16 @@ static int lio_get_link_ksettings(struct net_device *netdev, linfo = &lio->linfo; -if (linfo->link.s.if_mode ==INTERFACE_MODE_XAUI || - linfo->link.s.if_mode ==INTERFACE_MODE_RXAUI || - linfo->link.s.if_mode ==INTERFACE_MODE_XLAUI || - linfo->link.s.if_mode ==INTERFACE_MODE_XFI ) { +switch (linfo->link.s.phy_type) { +case LIO_PHY_PORT_TP : + ecmd->base.port =PORT_TP ; + supported = (SUPPORTED_10000baseT_Full | +SUPPORTED_TP | SUPPORTED_Pause); + advertising = (ADVERTISED_10000baseT_Full | ADVERTISED_Pause); + ecmd->base.autoneg =AUTONEG_DISABLE ; +break ; + +case LIO_PHY_PORT_FIBRE : ecmd->base.port =PORT_FIBRE ;if (linfo->link.s.speed ==SPEED_10000 ) {
@@ -245,12 +251,18 @@ static int lio_get_link_ksettings(struct net_device *netdev, supported |=SUPPORTED_FIBRE | SUPPORTED_Pause; advertising |= ADVERTISED_Pause; + ecmd->base.autoneg =AUTONEG_DISABLE ; +break ; + } + +if (linfo->link.s.if_mode ==INTERFACE_MODE_XAUI || + linfo->link.s.if_mode ==INTERFACE_MODE_RXAUI || + linfo->link.s.if_mode ==INTERFACE_MODE_XLAUI || + linfo->link.s.if_mode ==INTERFACE_MODE_XFI ) {ethtool_convert_legacy_u32_to_link_mode ( ecmd->link_modes.supported, supported);ethtool_convert_legacy_u32_to_link_mode ( ecmd->link_modes.advertising, advertising); - ecmd->base.autoneg =AUTONEG_DISABLE ; - }else {dev_err (&oct->pci_dev->dev,"Unknown link interface reported %d\n" , linfo->link.s.if_mode);
drivers/net/ethernet/cavium/liquidio/liquidio_common.h +10 -2
@@ -675,9 +675,11 @@ struct octeon_instr_rdp { u64 if_mode:5; u64 pause:1; u64 flashing:1; - u64 reserved:15; + u64 phy_type:5; + u64 reserved:10;#else - u64 reserved:15; + u64 reserved:10; + u64 phy_type:5; u64 flashing:1; u64 pause:1; u64 if_mode:5;
@@ -690,6 +692,12 @@ struct octeon_instr_rdp { } s; }; +enum lio_phy_type { +LIO_PHY_PORT_TP =0x0 , +LIO_PHY_PORT_FIBRE =0x1 , +LIO_PHY_PORT_UNKNOWN , +}; +/** The txpciq info passed to host from the firmware */ union oct_txpciq {
Signature · 1 line
1.8.3.1
From: Felix Manlunas <[email protected]>
Date: Tue, 13 Mar 2018 22:04:45 -0700
Quoted 8 lines
From: Veerasenareddy Burru <[email protected]>
Added ethtool changes to show port type as TP (Twisted Pair) for 10GBASE-T ports. Same driver and firmware works for liquidio NIC with SFP+ ports or TP ports.
Signed-off-by Veerasenareddy Burru <[email protected]>Signed-off-by Felix Manlunas <[email protected]>
Applied, thank you.