summaryrefslogtreecommitdiff
path: root/drivers/net/ivshmem-net.c
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2017-01-01 15:54:55 +0100
committerLeonard Crestez <leonard.crestez@nxp.com>2018-08-24 12:41:33 +0300
commit267d8295ef98ce8346b54b0a57664c71d82c52b6 (patch)
tree83b4294e314e1150b5fa3f55878258be894dccca /drivers/net/ivshmem-net.c
parent828f803c30ca5399c6b4e47f0b865c66b72ba706 (diff)
ivshmem-net: Fix stuck state machine during setup
If the remote side is already in INIT state (or even higher) and has a cached rstate of RESET, we won't make progress when signaling RESET again because the remote side won't send a state update. Fix this by enforcing a local check after probe completion. Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> (cherry picked from commit 7f0fb24dae8f5782c802d1d1664d9f75007b05bb)
Diffstat (limited to 'drivers/net/ivshmem-net.c')
-rw-r--r--drivers/net/ivshmem-net.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ivshmem-net.c b/drivers/net/ivshmem-net.c
index c52727ef40c1..9f307ec4d677 100644
--- a/drivers/net/ivshmem-net.c
+++ b/drivers/net/ivshmem-net.c
@@ -911,6 +911,7 @@ static int ivshm_net_probe(struct pci_dev *pdev,
writel(IVSHMEM_INTX_ENABLE, &in->ivshm_regs->intxctrl);
writel(IVSHM_NET_STATE_RESET, &in->ivshm_regs->lstate);
+ ivshm_net_check_state(ndev);
return 0;