wrsw-hal: tx calibration improvements:

- use new version of mini-rpc (less overhead on RT communication polling) - adjust DMTD averaging interval (shorter for calibration -> speedup) - make sure the PLL works in freemaster mode before starting calibration - release control over ports to HAL only after all ports have finished the TX path calibration

wrsw-hal: tx calibration improvements:
- use new version of mini-rpc (less overhead on RT communication polling) - adjust DMTD averaging interval (shorter for calibration -> speedup) - make sure the PLL works in freemaster mode before starting calibration - release control over ports to HAL only after all ports have finished the TX path calibration
40ac1053 · Tomasz Wlostowski · Jean-Claude BAU · 45bb0a33 · 40ac1053 · 40ac1053
Commit 40ac1053 authored Sep 06, 2019 by Tomasz Wlostowski Committed by Jean-Claude BAU Oct 11, 2019
4 changed files
--- a/userspace/wrsw_hal/hal_port_fsm.c
+++ b/userspace/wrsw_hal/hal_port_fsm.c
@@ -117,6 +117,8 @@ static halPortFsmGen_t _portFsm = {
 		.pe=_fsmEvtTable
 };

+extern int txSetupDoneOnAllPorts(struct hal_port_state * ps);
+
 /* INIT state
 *
 * if  entering in state then
@@ -139,8 +141,12 @@ static int _hal_port_state_init(void *vpfg, int eventMsk, int isNewState) {
 	 /* if final state reached for tx setup state machine
 	  * then we can go to DISABLED state
 	  */
-	if (hal_port_tx_setup_state_fsm(ps)==1 )
+
+	hal_port_tx_setup_state_fsm( ps );
+
+	if ( txSetupDoneOnAllPorts(ps) )
 		_fireState(vpfg,HAL_PORT_STATE_DISABLED);
+	
 	return 0;
 }


--- a/userspace/wrsw_hal/hal_port_fsm.h
+++ b/userspace/wrsw_hal/hal_port_fsm.h
@@ -10,6 +10,8 @@
 #ifndef HAL_PORT_FSM_H
 #define HAL_PORT_FSM_H

+#define HAL_CAL_DMTD_SAMPLES 16
+#define HAL_DEFAULT_DMTD_SAMPLES 512

 /* Prototypes */
 void fsm_state_machine( struct hal_port_state * ps );

--- a/userspace/wrsw_hal/hal_port_fsm_tx.c
+++ b/userspace/wrsw_hal/hal_port_fsm_tx.c
@@ -19,6 +19,7 @@
 #include "hal_main.h"
 #include "hal_ports.h"
 #include "hal_port_fsm_txP.h"
+#include "hal_port_fsm.h"

 /**
 * State machine
@@ -101,8 +102,10 @@ static __inline__ void txSetupDone(struct hal_port_state * ps) {
 	gl->numberOfTxSetupDonePorts++;
 }

-static __inline__ int txSetupDoneOnAllPorts(struct hal_port_state * ps) {
+int txSetupDoneOnAllPorts(struct hal_port_state * ps) {
 	struct halGlobalLPDC * gl = ps->lpdc.globalLpdc;
+	if( !gl )
+		return 0;
 	return gl->numberOfTxSetupDonePorts == gl->numberOfLpdcPorts;
 }

@@ -139,6 +142,7 @@ static int _hal_port_tx_setup_state_start(void *vpfg, int eventMsk, int isNewSta
 		_pll_state.channels[ps->hw_index].flags = 0;

 		rts_enable_ptracker(ps->hw_index, 0);
+		rts_ptracker_set_average_samples(ps->hw_index, HAL_CAL_DMTD_SAMPLES);

 		pcs_writel(ps, MDIO_LPC_CTRL_RESET_RX |
 			      MDIO_LPC_CTRL_DMTD_SOURCE_TXOUTCLK,
@@ -215,7 +219,7 @@ static int _hal_port_tx_setup_state_measure_phase(void *vpfg, int eventMsk, int
 			return 0; // retry
 		}
 		return 0; // keep waiting
-        }
+    }

 	txSetup = ps->lpdc.txSetup;
 	int phase = _pll_state.channels[ps->hw_index].phase_loopback;
@@ -242,10 +246,9 @@ static int _hal_port_tx_setup_state_measure_phase(void *vpfg, int eventMsk, int
 	int phase_max = txSetup->expected_phase + txSetup->tollerance;

 	pr_info("TX Calibration: upd wri%d phase %d after %d "
-			"attempts target %d tollerance %d (temp = %.3f degC)\n",
-			ps->hw_index+1, txSetup->measured_phase, txSetup->attempts,
-			txSetup->expected_phase, txSetup->tollerance,
-			hal_get_fpga_temperature() / 256.0);
+			"attempts target %d tollerance %d\n",
+			ps->hw_index+1, txSetup->measured_phase, txSetup->measured_phase,
+			txSetup->attempts, txSetup->expected_phase, txSetup->tollerance);

 	if(_within_range(phase, phase_min, phase_max, 16000)) {
 		pr_info("FIX port %d phase %d after %d attempts "
@@ -280,6 +283,7 @@ static int _hal_port_tx_setup_state_validate(void *vpfg, int eventMsk, int isNew
 	txSetup->measured_phase = _pll_state.channels[ps->hw_index].phase_loopback;
 	pr_info("Port %d: TX calibration complete\n", ps->hw_index + 1);
 	rts_enable_ptracker(ps->hw_index, 0);
+	rts_ptracker_set_average_samples(ps->hw_index, HAL_DEFAULT_DMTD_SAMPLES);

 	// enable the PCS on the port
 	pcs_writel(ps, MDIO_LPC_CTRL_RESET_RX |

--- a/userspace/wrsw_hal/hal_timing.c
+++ b/userspace/wrsw_hal/hal_timing.c
@@ -22,6 +22,14 @@ int hal_tmg_init(const char * logfilename)
 		      "Failed to establish communication with the RT subsystem.\n");
 		return -1;
 	}
+
+	if( rts_set_mode( RTS_MODE_GM_FREERUNNING ) < 0 )
+	{
+		pr_error(
+		      "Failed to configure PLL in free-running master mode.\n");
+		return -1;
+	}
+
 	return 0;
 }