hyplnk: Update with cleanup and ECC error handlingDEV.MPM-TRANSPORT-01.00.08.02A

Signed-off-by: Sam Nelson <sam.nelson@ti.com>

1 files changed, 65 insertions, 17 deletions

diff --git a/src/transport/hyplnk/mpm_transport_hyplnk_interface.c b/src/transport/hyplnk/mpm_transport_hyplnk_interface.c
index 918be33..a8f20fd 100644
--- a/src/transport/hyplnk/mpm_transport_hyplnk_interface.c
+++ b/src/transport/hyplnk/mpm_transport_hyplnk_interface.c
@@ -41,6 +41,7 @@ extern hyplnk_peripheral hyplnkActiveIF[NUM_INTERFACES];
 
 #define SERDES_DIRECTION_TX 0x1
 #define SERDES_DIRECTION_RX 0x2
+#define SERDES_DIRECTION_RX_RESET 0x4
 
 void * internal_hyplnk_mmap(uint32_t addr, uint32_t size, int device_fd)
 {
@@ -322,7 +323,7 @@ int hyplnkSerdesSetup(mpm_transport_hyplnk_t *hypCfg, uint32_t direction_bitmap,
                         CSL_SERDES_MAX_LANES, serdes_init_params.lane_mask,
                         serdes_init_params.phy_type);
 
-                if(csl_retval) {
+                if(csl_retval && !(direction_bitmap & SERDES_DIRECTION_RX_RESET)) {
                         /* exit with success */
                         return 0;
                 }
@@ -345,7 +346,8 @@ int hyplnkSerdesSetup(mpm_transport_hyplnk_t *hypCfg, uint32_t direction_bitmap,
                 } while ((lane_retval != CSL_SERDES_LANE_ENABLE_NO_ERR));
                 if (lane_retval != CSL_SERDES_LANE_ENABLE_NO_ERR)
                 {
-                        mpm_printf (1, "Invalid Serdes Lane Enable Init\n");
+                        mpm_printf (1, "Invalid Serdes Lane Enable Init. lane_retval=%d\n",
+                          lane_retval);
                         goto error_return;
                 }
         }
@@ -394,7 +396,6 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
         int ecc_error_occurred = 0;
 
         sem_init(&hyperlink_sem[index], 0, 1);
-        bool rxSerdesInit=FALSE;
 
         /* To prove the APIs work -- expose uninitialized variables */
         memset (&rev,            0xff, sizeof(rev));
@@ -442,7 +443,7 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                 return retVal;
         }
 
-        /* Read rev and control */
+        /* Read all regs  */
         if ((retVal = Hyplnk_readRegs (handle, hyplnk_LOCATION_LOCAL, &getRegs)) != hyplnk_RET_OK) {
                 mpm_printf(1, "Read revision register failed!\n");
                 return retVal;
@@ -450,6 +451,9 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
 
         if (reset)
         {
+                memset (&setRegs, 0, sizeof(setRegs));
+                setRegs.control        = &control;
+
                 /* if we need to stop serial traffic */
                 /* Stop traffic before reset */
                 control.serialStop  = 1;
@@ -458,6 +462,9 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                         return retVal;
                 }
 
+                memset (&getRegs, 0, sizeof(getRegs));
+                getRegs.status         = &status;
+
                 /* Wait for traffic to stop */
                 for (i = 0; i < timeout; i++) {
                         if ((retVal = Hyplnk_readRegs (handle, hyplnk_LOCATION_LOCAL, &getRegs)) != hyplnk_RET_OK) {
@@ -470,6 +477,13 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                         usleep(1000);
                 }
 
+                memset (&setRegs, 0, sizeof(setRegs));
+                setRegs.control        = &control;
+                setRegs.status         = &status;
+                setRegs.ECCErrors      = &ECCErrors;
+                setRegs.lanePwrMgmt    = &lanePwrMgmt;
+                setRegs.serdesControl1 = &serdesControl1;
+
                 /* Reset the peripheral */
                 control.reset       = 1;
                 status.lError       = 1; /* Clear any error */
@@ -496,11 +510,10 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
         if (hyplnkActiveIF[index].slavesActive == 1) {
                 if (hypCfg->serdesInit) {
 
-                        /* Don't need to clear any more status bits */
-                        setRegs.status         = NULL;
-                        setRegs.ECCErrors      = NULL;
-                        setRegs.lanePwrMgmt    = NULL;
-                        setRegs.serdesControl1 = NULL;
+                        memset (&setRegs, 0, sizeof(setRegs));
+
+                        setRegs.control        = &control;
+                        setRegs.TXAddrOvly     = &TXAddrOvly;
 
                         TXAddrOvly.txSecOvl    = 0;
                         TXAddrOvly.txPrivIDOvl = hypCfg->hyplnkTxPrivID;
@@ -537,9 +550,17 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                         return retVal;
                 }
 
+                memset (&getRegs, 0, sizeof(getRegs));
+
+                getRegs.status         = &status;
+                getRegs.linkStatus     = &linkStatus;
+                getRegs.ECCErrors      = &ECCErrors;
+
                 /* Prepare structure for setErrorRegs */
                 memset (&setErrorRegs, 0, sizeof(setErrorRegs));
                 setErrorRegs.ECCErrors = &ECCErrors;
+                setErrorRegs.status    = &status;
+                setErrorRegs.control   = &control;
 
                 i=0;
                 do
@@ -554,9 +575,39 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                                         ecc_error_occurred++;
 
                                         /* If error found reset error and try again */
+                                
+                                        control.reset       = 1;
+                                        control.serialStop  = 1;
+                                        status.lError       = 1; /* Clear any error */
+                                        status.rError       = 1; /* Clear any error */
                                         ECCErrors.sglErrCor = 0;
                                         ECCErrors.dblErrDet = 0;
-                                        if ((retVal = Hyplnk_writeRegs (handle, hyplnk_LOCATION_LOCAL, 
+
+                                        /* Set Reset, serial stop hyplnk and reset errors */
+                                        if ((retVal = Hyplnk_writeRegs (handle, hyplnk_LOCATION_LOCAL,
+                                          &setErrorRegs)) != hyplnk_RET_OK) {
+                                                mpm_printf(1, "Error register write failed!\n");
+                                                return retVal;
+                                        }
+
+                                        /* Bring hyperlink out of reset */
+                                        control.reset       = 0;
+                                        if ((retVal = Hyplnk_writeRegs (handle, hyplnk_LOCATION_LOCAL,
+                                          &setErrorRegs)) != hyplnk_RET_OK) {
+                                                mpm_printf(1, "Error register write failed!\n");
+                                                return retVal;
+                                        }
+
+                                        /* Reinitialize serdes Rx */
+                                        if (hyplnkSerdesSetup(hypCfg,
+                                          SERDES_DIRECTION_RX | SERDES_DIRECTION_RX_RESET,
+                                          timeout) == -1) {
+                                                mpm_printf(1, "Failed to setup serdes for hyperlink 0\n");
+                                                return -1;
+                                        }
+
+                                        control.serialStop  = 0;
+                                        if ((retVal = Hyplnk_writeRegs (handle, hyplnk_LOCATION_LOCAL,
                                           &setErrorRegs)) != hyplnk_RET_OK) {
                                                 mpm_printf(1, "Error register write failed!\n");
                                                 return retVal;
@@ -578,15 +629,13 @@ hyplnkRet_e hyplnkPeripheralSetup (mpm_transport_hyplnk_t *hypCfg, int index,
                 return retVal;
         }
 
-        if (ecc_error_occurred) {
-                mpm_printf(1, "Ecc error occurred...%d\n", ecc_error_occurred);
-                /* TODO: returning error to see if ECC occurring */
-                return hyplnk_RET_INV_INITCFG;
-        }
-
         if (!(interface_mode) && (i >= timeout) && (timeout != 0))
         {
                 mpm_printf(1, "Timeout exceeded for connection, exiting...\n");
+                mpm_printf(1,
+                           "Timeout: (status.link=%d) (status.serialHalt=%d) (status.pllUnlock=%d) (linkStatus.txRSync=%d) (linkStatus.txPlsOK=%d) (ecc_error_occurred=%d)...\n",
+                           status.link, status.serialHalt, status.pllUnlock, linkStatus.txRSync, 
+                           linkStatus.txPlsOK, ecc_error_occurred);
                 return hyplnk_RET_INV_INITCFG;
         }
 
@@ -738,7 +787,6 @@ int mpm_transport_hyplnk_reset(mpm_transport_hyplnk_t *hypCfg, int index)
                                 }
                 } while(setRegs.status->rPend);
 
-                control.serialStop = 0;
                 control.reset = 1;
                 if ((retVal = Hyplnk_writeRegs (handle, hyplnk_LOCATION_LOCAL, &setRegs)) != hyplnk_RET_OK) {
                         mpm_printf(1, "Control register write failed!\n");