staging/rdma/hfi1: No firmware retry for simulation

Simulation has no firmware, so it will never move firmware
acquire to the FINAL state.  Avoid that by skiping the TRY
state and moving directly to FINAL.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/staging/rdma/hfi1/firmware.c b/drivers/staging/rdma/hfi1/firmware.c
index 817cbf9..4ba524b 100644 (file)
--- a/drivers/staging/rdma/hfi1/firmware.c
+++ b/drivers/staging/rdma/hfi1/firmware.c
@@ -631,7 +631,8 @@ done:
                fw_err = -ENOENT;
        } else {
                /* success */
-               if (fw_state == FW_EMPTY)
+               if (fw_state == FW_EMPTY &&
+                   dd->icode != ICODE_FUNCTIONAL_SIMULATOR)
                        fw_state = FW_TRY;      /* may retry later */
                else
                        fw_state = FW_FINAL;    /* cannot try again */