K64F, K66F: Update the ENET PHY driver

PHY init and autonegotation is split into own functions.

features/netsocket/emac-drivers/TARGET_Freescale_EMAC/kinetis_emac.cpp

@@ -66,8 +66,6 @@ uint32_t *rx_ptr[ENET_RX_RING_LEN];
 #define ENET_ALIGN(x,align)   ((unsigned int)((x) + ((align)-1)) & (unsigned int)(~(unsigned int)((align)- 1)))
 
 extern "C" void kinetis_init_eth_hardware(void);
-extern "C" uint32_t ENET_GetInstance(ENET_Type *base);
-extern "C" clock_ip_name_t s_enetClock[];
 
 /* \brief Flags for worker thread */
 #define FLAG_TX  1
@@ -232,7 +230,7 @@ bool Kinetis_EMAC::low_level_init_successful()
 
     ENET_GetDefaultConfig(&config);
 
-    if (init_enet_phy(ENET, phyAddr, sysClock) != kStatus_Success) {
+    if (PHY_Init(ENET, phyAddr, sysClock) != kStatus_Success) {
         return false;
     }
 
@@ -263,78 +261,6 @@ bool Kinetis_EMAC::low_level_init_successful()
     return true;
 }
 
-status_t Kinetis_EMAC::init_enet_phy(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
-{
-    status_t result = kStatus_Success;
-    uint32_t instance = ENET_GetInstance(base);
-
-#if TARGET_K66F
-    uint32_t counter = 0xFFFFFU;
-    uint32_t idReg = 0;
-
-#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
-    /* Set SMI first. */
-    CLOCK_EnableClock(s_enetClock[instance]);
-#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
-    ENET_SetSMI(base, srcClock_Hz, false);
-
-    /* Initialization after PHY stars to work. */
-    while ((idReg != PHY_CONTROL_ID1) && (counter != 0)) {
-        PHY_Read(base, phyAddr, PHY_ID1_REG, &idReg);
-        counter --;
-    }
-
-    if (!counter) {
-        return kStatus_Fail;
-    }
-
-    counter = 0xFFFFFU;
-#elif TARGET_K64F
-    /* Set SMI first. */
-    CLOCK_EnableClock(s_enetClock[instance]);
-    ENET_SetSMI(base, srcClock_Hz, false);
-#else
-#error invalid target!
-#endif
-
-    /* Reset PHY. */
-    result = PHY_Write(base, phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
-    return result;
-}
-
-status_t Kinetis_EMAC::auto_negotiation(ENET_Type *base, uint32_t phyAddr)
-{
-    uint32_t bssReg;
-    status_t result;
-    uint32_t counter = 0xFFFFFFU;
-
-    /* Set the negotiation. */
-    result = PHY_Write(base, phyAddr, PHY_AUTONEG_ADVERTISE_REG,
-                       (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
-                        PHY_10BASETX_FULLDUPLEX_MASK | PHY_10BASETX_HALFDUPLEX_MASK | 0x1U));
-    if (result == kStatus_Success) {
-        result = PHY_Write(base, phyAddr, PHY_BASICCONTROL_REG,
-                           (PHY_BCTL_AUTONEG_MASK | PHY_BCTL_RESTART_AUTONEG_MASK));
-        if (result == kStatus_Success) {
-            /* Check auto negotiation complete. */
-            while (counter --) {
-                result = PHY_Read(base, phyAddr, PHY_BASICSTATUS_REG, &bssReg);
-                if (result == kStatus_Success) {
-                    if ((bssReg & PHY_BSTATUS_AUTONEGCOMP_MASK) != 0) {
-                        break;
-                    }
-                }
-
-                if (!counter) {
-                    return kStatus_PHY_AutoNegotiateFail;
-                }
-            }
-        }
-    }
-
-    return result;
-}
-
 /** \brief  Allocates a emac_mem_buf_t and returns the data from the incoming packet.
  *
  *  \param[in] idx   index of packet to be read
@@ -544,7 +470,7 @@ void Kinetis_EMAC::phy_task()
 
     if (crt_state.connected == STATE_LINK_UP) {
         if (prev_state.connected != STATE_LINK_UP) {
-            auto_negotiation(ENET, phyAddr);
+            PHY_AutoNegotiation(ENET, phyAddr);
         }
 
         PHY_GetLinkSpeedDuplex(ENET, phyAddr, &crt_state.speed, &crt_state.duplex);

features/netsocket/emac-drivers/TARGET_Freescale_EMAC/kinetis_emac.h

@@ -138,8 +138,6 @@ public:
 
 private:
     bool low_level_init_successful();
-    status_t init_enet_phy(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz);
-    status_t auto_negotiation(ENET_Type *base, uint32_t phyAddr);
     void rx_isr();
     void tx_isr();
     void packet_rx();

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/fsl_phy.c

@@ -64,7 +64,6 @@ extern clock_ip_name_t s_enetClock[FSL_FEATURE_SOC_ENET_COUNT];
 
 status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
 {
-    uint32_t bssReg;
     uint32_t counter = PHY_TIMEOUT_COUNT;
     uint32_t idReg = 0;
     status_t result = kStatus_Success;
@@ -89,10 +88,17 @@ status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
     }
 
     /* Reset PHY. */
-    counter = PHY_TIMEOUT_COUNT;
     result = PHY_Write(base, phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
-    if (result == kStatus_Success)
+
+    return result;
+}
+
+status_t PHY_AutoNegotiation(ENET_Type *base, uint32_t phyAddr)
 {
+    status_t result = kStatus_Success;
+    uint32_t bssReg;
+    uint32_t counter = PHY_TIMEOUT_COUNT;
+
     /* Set the negotiation. */
     result = PHY_Write(base, phyAddr, PHY_AUTONEG_ADVERTISE_REG,
                        (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
@@ -122,7 +128,6 @@ status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
             }
         }
     }
-    }
 
     return result;
 }

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K66F/TARGET_FRDM/fsl_phy.h

@@ -136,10 +136,19 @@ extern "C" {
  * @param srcClock_Hz  The module clock frequency - system clock for MII management interface - SMI.
  * @retval kStatus_Success  PHY initialize success
  * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
- * @retval kStatus_PHY_AutoNegotiateFail  PHY auto negotiate fail
  */
 status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz);
 
+/*!
+ * @brief Initiates auto negotiation.
+ *
+ * @param base       ENET peripheral base address.
+ * @param phyAddr    The PHY address.
+ * @retval kStatus_Success  PHY auto negotiation success
+ * @retval kStatus_PHY_AutoNegotiateFail  PHY auto negotiate fail
+ */
+status_t PHY_AutoNegotiation(ENET_Type *base, uint32_t phyAddr);
+
 /*!
  * @brief PHY Write function. This function write data over the SMI to
  * the specified PHY register. This function is called by all PHY interfaces.

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/fsl_phy.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2015, Freescale Semiconductor, Inc.
-* All rights reserved.
+ * Copyright 2016-2017 NXP
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -12,7 +12,7 @@
  *   list of conditions and the following disclaimer in the documentation and/or
  *   other materials provided with the distribution.
  *
-* o Neither the name of Freescale Semiconductor, Inc. nor the names of its
+ * o Neither the name of the copyright holder nor the names of its
  *   contributors may be used to endorse or promote products derived from this
  *   software without specific prior written permission.
  *
@@ -53,8 +53,10 @@ extern uint32_t ENET_GetInstance(ENET_Type *base);
  * Variables
  ******************************************************************************/
 
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
 /*! @brief Pointers to enet clocks for each instance. */
 extern clock_ip_name_t s_enetClock[FSL_FEATURE_SOC_ENET_COUNT];
+#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
 
 /*******************************************************************************
  * Code
@@ -62,19 +64,41 @@ extern clock_ip_name_t s_enetClock[FSL_FEATURE_SOC_ENET_COUNT];
 
 status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
 {
-    uint32_t bssReg;
     uint32_t counter = PHY_TIMEOUT_COUNT;
+    uint32_t idReg = 0;
     status_t result = kStatus_Success;
     uint32_t instance = ENET_GetInstance(base);
 
+#if !(defined(FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL) && FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL)
     /* Set SMI first. */
     CLOCK_EnableClock(s_enetClock[instance]);
+#endif /* FSL_SDK_DISABLE_DRIVER_CLOCK_CONTROL */
     ENET_SetSMI(base, srcClock_Hz, false);
 
+    /* Initialization after PHY stars to work. */
+    while ((idReg != PHY_CONTROL_ID1) && (counter != 0))
+    {
+        PHY_Read(base, phyAddr, PHY_ID1_REG, &idReg);
+        counter --;       
+    }
+
+    if (!counter)
+    {
+        return kStatus_Fail;
+    }
+
     /* Reset PHY. */
     result = PHY_Write(base, phyAddr, PHY_BASICCONTROL_REG, PHY_BCTL_RESET_MASK);
-    if (result == kStatus_Success)
+
+    return result;
+}
+
+status_t PHY_AutoNegotiation(ENET_Type *base, uint32_t phyAddr)
 {
+    status_t result = kStatus_Success;
+    uint32_t bssReg;
+    uint32_t counter = PHY_TIMEOUT_COUNT;
+
     /* Set the negotiation. */
     result = PHY_Write(base, phyAddr, PHY_AUTONEG_ADVERTISE_REG,
                        (PHY_100BASETX_FULLDUPLEX_MASK | PHY_100BASETX_HALFDUPLEX_MASK |
@@ -104,7 +128,6 @@ status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz)
             }
         }
     }
-    }
 
     return result;
 }

targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_MCU_K64F/TARGET_FRDM/fsl_phy.h

@@ -136,10 +136,19 @@ extern "C" {
  * @param srcClock_Hz  The module clock frequency - system clock for MII management interface - SMI.
  * @retval kStatus_Success  PHY initialize success
  * @retval kStatus_PHY_SMIVisitTimeout  PHY SMI visit time out
- * @retval kStatus_PHY_AutoNegotiateFail  PHY auto negotiate fail
  */
 status_t PHY_Init(ENET_Type *base, uint32_t phyAddr, uint32_t srcClock_Hz);
 
+/*!
+ * @brief Initiates auto negotiation.
+ *
+ * @param base       ENET peripheral base address.
+ * @param phyAddr    The PHY address.
+ * @retval kStatus_Success  PHY auto negotiation success
+ * @retval kStatus_PHY_AutoNegotiateFail  PHY auto negotiate fail
+ */
+status_t PHY_AutoNegotiation(ENET_Type *base, uint32_t phyAddr);
+
 /*!
  * @brief PHY Write function. This function write data over the SMI to
  * the specified PHY register. This function is called by all PHY interfaces.