liquidio: Add support for liquidio 10GBase-T NIC

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 <veerasenareddy.burru@cavium.com>
Signed-off-by: Felix Manlunas <felix.manlunas@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
index a63ddf0..550ac29 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
+++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c
@@ -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);

diff --git a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
index 4f72ed1..ecc1682 100644 (file)
--- a/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
+++ b/drivers/net/ethernet/cavium/liquidio/liquidio_common.h
@@ -676,9 +676,11 @@ union oct_link_status {
                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;
@@ -691,6 +693,12 @@ union oct_link_status {
        } 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 {