Re: [PATCH net-next] ibmvnic: queue reset when CRQ gets closed during reset

2018-02-08 Thread David Miller
From: Nathan Fontenot 
Date: Wed, 07 Feb 2018 13:00:24 -0600

> While handling a driver reset we get a H_CLOSED return trying
> to send a CRQ event. When this occurs we need to queue up another
> reset attempt. Without doing this we see instances where the driver
> is left in a closed state because the reset failed and there is no
> further attempts to reset the driver.
> 
> Signed-off-by: Nathan Fontenot 

Applied.


[PATCH net-next] ibmvnic: queue reset when CRQ gets closed during reset

2018-02-07 Thread Nathan Fontenot
While handling a driver reset we get a H_CLOSED return trying
to send a CRQ event. When this occurs we need to queue up another
reset attempt. Without doing this we see instances where the driver
is left in a closed state because the reset failed and there is no
further attempts to reset the driver.

Signed-off-by: Nathan Fontenot 
---
 drivers/net/ethernet/ibm/ibmvnic.c |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c 
b/drivers/net/ethernet/ibm/ibmvnic.c
index 5caaa9033841..0f7e1d016207 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -2908,8 +2908,12 @@ static int ibmvnic_send_crq(struct ibmvnic_adapter 
*adapter,
cpu_to_be64(u64_crq[1]));
 
if (rc) {
-   if (rc == H_CLOSED)
+   if (rc == H_CLOSED) {
dev_warn(dev, "CRQ Queue closed\n");
+   if (adapter->resetting)
+   ibmvnic_reset(adapter, VNIC_RESET_FATAL);
+   }
+
dev_warn(dev, "Send error (rc=%d)\n", rc);
}