diff options
| author | Jan Kiszka <jan.kiszka@siemens.com> | 2018-03-04 13:50:24 +0100 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | 5809956be0cabfba51f3bdf0019e30ad20df8476 (patch) | |
| tree | ca8d72191789bf3f9fd72f266123a0e4b59206d9 /drivers/net/ivshmem-net.c | |
| parent | 5d4d17b6e3d8cef454ce1756d2634b4c196416e0 (diff) | |
ivshmem-net: Refactor and comment ivshm_net_state_change
This should make the state transitioning logic clearer. Also avoid the
harmless but redundant netif_carrier_on/ivshm_net_run in RUN state.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
(cherry picked from commit d0791721836578640fb8a1980ce61f1afb90aeb2)
Diffstat (limited to 'drivers/net/ivshmem-net.c')
| -rw-r--r-- | drivers/net/ivshmem-net.c | 23 |
1 files changed, 20 insertions, 3 deletions
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c index 0c503194b4ec..aba77c232c48 100644 --- a/drivers/net/ivshmem-net.c +++ b/drivers/net/ivshmem-net.c @@ -575,14 +575,21 @@ static void ivshm_net_state_change(struct work_struct *work) struct net_device *ndev = in->napi.dev; u32 rstate = readl(&in->ivshm_regs->rstate); - switch (in->lstate) { case IVSHM_NET_STATE_RESET: + /* + * Wait for the remote to leave READY/RUN before transitioning + * to INIT. + */ if (rstate < IVSHM_NET_STATE_READY) ivshm_net_set_state(in, IVSHM_NET_STATE_INIT); break; case IVSHM_NET_STATE_INIT: + /* + * Wait for the remote to leave RESET before performing the + * initialization and moving to READY. + */ if (rstate > IVSHM_NET_STATE_RESET) { ivshm_net_init_queues(ndev); ivshm_net_set_state(in, IVSHM_NET_STATE_READY); @@ -594,11 +601,21 @@ static void ivshm_net_state_change(struct work_struct *work) break; case IVSHM_NET_STATE_READY: - case IVSHM_NET_STATE_RUN: + /* + * Link is up and we are running once the remote is in READY or + * RUN. + */ if (rstate >= IVSHM_NET_STATE_READY) { netif_carrier_on(ndev); ivshm_net_run(ndev); - } else if (rstate == IVSHM_NET_STATE_RESET) { + break; + } + /* fall through */ + case IVSHM_NET_STATE_RUN: + /* + * If the remote goes to RESET, we need to follow immediately. + */ + if (rstate == IVSHM_NET_STATE_RESET) { netif_carrier_off(ndev); ivshm_net_do_stop(ndev); } |