Skip to content

W
White Rabbit Switch - Software
Commit 083be1a6 authored by Jean-Claude BAU's avatar Jean-Claude BAU
Browse files
Options

New state RESTART added in rxSetup fsm 

This state has been added to avoid blocking the fsm too long. This was
the case with a sleep of 100ms. This value can now be increased without
influencing other ports.
parent 1f7f829b
Hide whitespace changes
Inline Side-by-side
Showing with 27 additions and 5 deletions
userspace/libwr/include/libwr/hal_shmem.h
View file @ 083be1a6
...@@ -84,6 +84,7 @@ typedef struct { ...@@ -84,6 +84,7 @@ typedef struct {
timeout_t align_timeout; timeout_t align_timeout;
timeout_t earlyup_timeout; timeout_t earlyup_timeout;
timeout_t align_to_link_timeout; timeout_t align_to_link_timeout;
timeout_t restart_timeout;
int attempts; int attempts;
}halPortLpdcRx_t; }halPortLpdcRx_t;
......
userspace/wrsw_hal/hal_port_fsm_rx.c
View file @ 083be1a6
...@@ -47,6 +47,7 @@ static int _hal_port_rx_setup_state_start(fsm_t *fsm, int eventMsk, int isNewSta ...@@ -47,6 +47,7 @@ static int _hal_port_rx_setup_state_start(fsm_t *fsm, int eventMsk, int isNewSta
static int _hal_port_rx_setup_state_reset_pcs(fsm_t *fsm, int ventMsk, int isNewState); static int _hal_port_rx_setup_state_reset_pcs(fsm_t *fsm, int ventMsk, int isNewState);
static int _hal_port_rx_setup_state_wait_lock(fsm_t *fsm, int ventMsk, int isNewState); static int _hal_port_rx_setup_state_wait_lock(fsm_t *fsm, int ventMsk, int isNewState);
static int _hal_port_rx_setup_state_validate(fsm_t *fsm, int ventMsk, int isNewState); static int _hal_port_rx_setup_state_validate(fsm_t *fsm, int ventMsk, int isNewState);
static int _hal_port_rx_setup_state_restart(fsm_t *fsm, int ventMsk, int isNewState);
static int _hal_port_rx_setup_state_done(fsm_t *fsm, int ventMsk, int isNewState); static int _hal_port_rx_setup_state_done(fsm_t *fsm, int ventMsk, int isNewState);
...@@ -68,6 +69,10 @@ static fsm_state_table_entry_t port_rx_setup_fsm_states[] = ...@@ -68,6 +69,10 @@ static fsm_state_table_entry_t port_rx_setup_fsm_states[] =
.stateName="VALIDATE", .stateName="VALIDATE",
FSM_SET_FCT_NAME(_hal_port_rx_setup_state_validate) FSM_SET_FCT_NAME(_hal_port_rx_setup_state_validate)
}, },
{ .state=HAL_PORT_RX_SETUP_STATE_RESTART,
.stateName="RESTART",
FSM_SET_FCT_NAME(_hal_port_rx_setup_state_restart)
},
{ .state=HAL_PORT_RX_SETUP_STATE_DONE, { .state=HAL_PORT_RX_SETUP_STATE_DONE,
.stateName="DONE", .stateName="DONE",
FSM_SET_FCT_NAME(_hal_port_rx_setup_state_done) FSM_SET_FCT_NAME(_hal_port_rx_setup_state_done)
...@@ -264,6 +269,25 @@ static int _hal_port_rx_setup_state_validate(fsm_t *fsm, int eventMsk, int isNew ...@@ -264,6 +269,25 @@ static int _hal_port_rx_setup_state_validate(fsm_t *fsm, int eventMsk, int isNew
return 0; return 0;
} }
/*
* RESTART state - wait few ms before to mode to START state
*
*
*/
static int _hal_port_rx_setup_state_restart(fsm_t *fsm, int eventMsk, int isNewState) {
struct hal_port_state * ps = (struct hal_port_state*) fsm->priv;
if ( isNewState ) {
// This timer is used to leave enough time to the FSM in the other side to detect a link down
libwr_tmo_init(&ps->lpdc.rxSetup->restart_timeout, 100, 0);
} else {
if( libwr_tmo_expired( &ps->lpdc.rxSetup->restart_timeout ) ) {
fsm_fire_state(fsm, HAL_PORT_RX_SETUP_STATE_START);
}
}
return 0;
}
/* /*
* DONE state - wait for link_up * DONE state - wait for link_up
* *
...@@ -300,11 +324,7 @@ static int _hal_port_rx_setup_state_done(fsm_t *fsm, int eventMsk, int isNewStat ...@@ -300,11 +324,7 @@ static int _hal_port_rx_setup_state_done(fsm_t *fsm, int eventMsk, int isNewStat
pcs_writel(ps, MDIO_LPC_CTRL_DMTD_SOURCE_TXOUTCLK, pcs_writel(ps, MDIO_LPC_CTRL_DMTD_SOURCE_TXOUTCLK,
MDIO_LPC_CTRL); MDIO_LPC_CTRL);
// force the other side of the link to reset its FSMs too! fsm_fire_state(fsm, HAL_PORT_RX_SETUP_STATE_RESTART);
// usleep(100000);
sleep(1);
fsm_fire_state(fsm, HAL_PORT_RX_SETUP_STATE_START);
return 0; return 0;
} }
} }
......
userspace/wrsw_hal/hal_port_fsm_rxP.h
View file @ 083be1a6
...@@ -18,6 +18,7 @@ HAL_PORT_RX_SETUP_STATE_START=0, ...@@ -18,6 +18,7 @@ HAL_PORT_RX_SETUP_STATE_START=0,
HAL_PORT_RX_SETUP_STATE_RESET_PCS, HAL_PORT_RX_SETUP_STATE_RESET_PCS,
HAL_PORT_RX_SETUP_STATE_WAIT_LOCK, HAL_PORT_RX_SETUP_STATE_WAIT_LOCK,
HAL_PORT_RX_SETUP_STATE_VALIDATE, HAL_PORT_RX_SETUP_STATE_VALIDATE,
HAL_PORT_RX_SETUP_STATE_RESTART,
HAL_PORT_RX_SETUP_STATE_DONE HAL_PORT_RX_SETUP_STATE_DONE
} hapPortRxSetupState_t; } hapPortRxSetupState_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment