[PATCH net-next 3/5] ibmvnic: improve ibmvnic_init and ibmvnic_reset_init

[Lijun Pan]

When H_SEND_CRQ command returns with H_CLOSED, it means the
server's CRQ is not ready yet. Instead of resetting immediately,
we wait for the server to launch passive init.
ibmvnic_init() and ibmvnic_reset_init() should also return the
error code from ibmvnic_send_crq_init() call.

Signed-off-by: Lijun Pan <l...@linux.ibm.com>
---
 drivers/net/ethernet/ibm/ibmvnic.c | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ethernet/ibm/ibmvnic.c 
b/drivers/net/ethernet/ibm/ibmvnic.c
index 50e86e65961e..e366fd42a8c4 100644
--- a/drivers/net/ethernet/ibm/ibmvnic.c
+++ b/drivers/net/ethernet/ibm/ibmvnic.c
@@ -3568,8 +3568,7 @@ static int ibmvnic_send_crq(struct ibmvnic_adapter 
*adapter,
        if (rc) {
                if (rc == H_CLOSED) {
                        dev_warn(dev, "CRQ Queue closed\n");
-                       if (test_bit(0, &adapter->resetting))
-                               ibmvnic_reset(adapter, VNIC_RESET_FATAL);
+                       /* do not reset, report the fail, wait for passive init 
from server */
                }
 
                dev_warn(dev, "Send error (rc=%d)\n", rc);
@@ -4985,7 +4984,12 @@ static int ibmvnic_reset_init(struct ibmvnic_adapter 
*adapter)
 
        reinit_completion(&adapter->init_done);
        adapter->init_done_rc = 0;
-       ibmvnic_send_crq_init(adapter);
+       rc = ibmvnic_send_crq_init(adapter);
+       if (rc) {
+               dev_err(dev, "%s: Send crq init failed with error %d\n", 
__func__, rc);
+               return rc;
+       }
+
        if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {
                dev_err(dev, "Initialization sequence timed out\n");
                return -1;
@@ -5039,7 +5043,12 @@ static int ibmvnic_init(struct ibmvnic_adapter *adapter)
        adapter->from_passive_init = false;
 
        adapter->init_done_rc = 0;
-       ibmvnic_send_crq_init(adapter);
+       rc = ibmvnic_send_crq_init(adapter);
+       if (rc) {
+               dev_err(dev, "%s: Send crq init failed with error %d\n", 
__func__, rc);
+               return rc;
+       }
+
        if (!wait_for_completion_timeout(&adapter->init_done, timeout)) {
                dev_err(dev, "Initialization sequence timed out\n");
                return -1;
-- 
2.23.0