net/ionic: register and initialize adapter

[dpdk.git] / drivers / net / axgbe / axgbe_phy_impl.c

diff --git a/drivers/net/axgbe/axgbe_phy_impl.c b/drivers/net/axgbe/axgbe_phy_impl.c
index dfa908d..a324a2b 100644 (file)
--- a/drivers/net/axgbe/axgbe_phy_impl.c
+++ b/drivers/net/axgbe/axgbe_phy_impl.c
@@ -412,15 +412,15 @@ static int axgbe_phy_get_comm_ownership(struct axgbe_port *pdata)
        uint64_t timeout;
        unsigned int mutex_id;
 
-       if (phy_data->comm_owned)
-               return 0;
-
        /* The I2C and MDIO/GPIO bus is multiplexed between multiple devices,
         * the driver needs to take the software mutex and then the hardware
         * mutexes before being able to use the busses.
         */
        pthread_mutex_lock(&pdata->phy_mutex);
 
+       if (phy_data->comm_owned)
+               return 0;
+
        /* Clear the mutexes */
        XP_IOWRITE(pdata, XP_I2C_MUTEX, AXGBE_MUTEX_RELEASE);
        XP_IOWRITE(pdata, XP_MDIO_MUTEX, AXGBE_MUTEX_RELEASE);
@@ -574,11 +574,11 @@ static bool axgbe_phy_belfuse_parse_quirks(struct axgbe_port *pdata)
        struct axgbe_sfp_eeprom *sfp_eeprom = &phy_data->sfp_eeprom;
 
        if (memcmp(&sfp_eeprom->base[AXGBE_SFP_BASE_VENDOR_NAME],
-                  AXGBE_BEL_FUSE_VENDOR, AXGBE_SFP_BASE_VENDOR_NAME_LEN))
+                  AXGBE_BEL_FUSE_VENDOR, strlen(AXGBE_BEL_FUSE_VENDOR)))
                return false;
 
        if (!memcmp(&sfp_eeprom->base[AXGBE_SFP_BASE_VENDOR_PN],
-                   AXGBE_BEL_FUSE_PARTNO, AXGBE_SFP_BASE_VENDOR_PN_LEN)) {
+                   AXGBE_BEL_FUSE_PARTNO, strlen(AXGBE_BEL_FUSE_PARTNO))) {
                phy_data->sfp_base = AXGBE_SFP_BASE_1000_SX;
                phy_data->sfp_cable = AXGBE_SFP_CABLE_ACTIVE;
                phy_data->sfp_speed = AXGBE_SFP_SPEED_1000;
@@ -610,8 +610,7 @@ static void axgbe_phy_sfp_parse_eeprom(struct axgbe_port *pdata)
        if (sfp_base[AXGBE_SFP_BASE_EXT_ID] != AXGBE_SFP_EXT_ID_SFP)
                return;
 
-       if (axgbe_phy_sfp_parse_quirks(pdata))
-               return;
+       axgbe_phy_sfp_parse_quirks(pdata);
 
        /* Assume ACTIVE cable unless told it is PASSIVE */
        if (sfp_base[AXGBE_SFP_BASE_CABLE] & AXGBE_SFP_BASE_CABLE_PASSIVE) {
@@ -958,6 +957,41 @@ static enum axgbe_mode axgbe_phy_an73_outcome(struct axgbe_port *pdata)
        return mode;
 }
 
+static enum axgbe_mode axgbe_phy_an37_sgmii_outcome(struct axgbe_port *pdata)
+{
+       enum axgbe_mode mode;
+
+       pdata->phy.lp_advertising |= ADVERTISED_Autoneg;
+       pdata->phy.lp_advertising |= ADVERTISED_1000baseT_Full;
+
+       if (pdata->phy.pause_autoneg)
+               axgbe_phy_phydev_flowctrl(pdata);
+
+       switch (pdata->an_status & AXGBE_SGMII_AN_LINK_SPEED) {
+       case AXGBE_SGMII_AN_LINK_SPEED_100:
+               if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) {
+                       pdata->phy.lp_advertising |= ADVERTISED_100baseT_Full;
+                       mode = AXGBE_MODE_SGMII_100;
+               } else {
+                       mode = AXGBE_MODE_UNKNOWN;
+               }
+               break;
+       case AXGBE_SGMII_AN_LINK_SPEED_1000:
+               if (pdata->an_status & AXGBE_SGMII_AN_LINK_DUPLEX) {
+                       pdata->phy.lp_advertising |= ADVERTISED_1000baseT_Full;
+                       mode = AXGBE_MODE_SGMII_1000;
+               } else {
+                       /* Half-duplex not supported */
+                       mode = AXGBE_MODE_UNKNOWN;
+               }
+               break;
+       default:
+               mode = AXGBE_MODE_UNKNOWN;
+               break;
+       }
+       return mode;
+}
+
 static enum axgbe_mode axgbe_phy_an_outcome(struct axgbe_port *pdata)
 {
        switch (pdata->an_mode) {
@@ -967,6 +1001,7 @@ static enum axgbe_mode axgbe_phy_an_outcome(struct axgbe_port *pdata)
                return axgbe_phy_an73_redrv_outcome(pdata);
        case AXGBE_AN_MODE_CL37:
        case AXGBE_AN_MODE_CL37_SGMII:
+               return axgbe_phy_an37_sgmii_outcome(pdata);
        default:
                return AXGBE_MODE_UNKNOWN;
        }
@@ -1238,6 +1273,47 @@ static void axgbe_phy_kr_mode(struct axgbe_port *pdata)
        phy_data->cur_mode = AXGBE_MODE_KR;
 }
 
+static void axgbe_phy_kx_2500_mode(struct axgbe_port *pdata)
+{
+       struct axgbe_phy_data *phy_data = pdata->phy_data;
+       unsigned int s0;
+
+       axgbe_phy_set_redrv_mode(pdata);
+       /* 2.5G/KX */
+       axgbe_phy_start_ratechange(pdata);
+       s0 = 0;
+       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 2);
+       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 0);
+
+       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
+       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
+
+       XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
+
+       phy_data->cur_mode = AXGBE_MODE_KX_2500;
+}
+
+static void axgbe_phy_sgmii_1000_mode(struct axgbe_port *pdata)
+{
+       struct axgbe_phy_data *phy_data = pdata->phy_data;
+       unsigned int s0;
+
+       axgbe_phy_set_redrv_mode(pdata);
+
+       /* 1G/SGMII */
+       axgbe_phy_start_ratechange(pdata);
+       s0 = 0;
+       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, COMMAND, 1);
+       XP_SET_BITS(s0, XP_DRIVER_SCRATCH_0, SUB_COMMAND, 2);
+
+       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_0, s0);
+       XP_IOWRITE(pdata, XP_DRIVER_SCRATCH_1, 0);
+
+       XP_IOWRITE_BITS(pdata, XP_DRIVER_INT_REQ, REQUEST, 1);
+
+       phy_data->cur_mode = AXGBE_MODE_SGMII_1000;
+}
+
 static enum axgbe_mode axgbe_phy_cur_mode(struct axgbe_port *pdata)
 {
        struct axgbe_phy_data *phy_data = pdata->phy_data;
@@ -1408,6 +1484,12 @@ static void axgbe_phy_set_mode(struct axgbe_port *pdata, enum axgbe_mode mode)
        case AXGBE_MODE_SFI:
                axgbe_phy_sfi_mode(pdata);
                break;
+       case AXGBE_MODE_KX_2500:
+               axgbe_phy_kx_2500_mode(pdata);
+               break;
+       case AXGBE_MODE_SGMII_1000:
+               axgbe_phy_sgmii_1000_mode(pdata);
+               break;
        default:
                break;
        }
@@ -1911,6 +1993,7 @@ static int axgbe_phy_start(struct axgbe_port *pdata)
        default:
                break;
        }
+       pdata->phy.advertising &= axgbe_phy_an_advertising(pdata);
 
        return ret;
 }