staging/rdma/hfi1: Always download SBus firmware

B0 dual port parts require the SBus firmware to always be
downloaded.

Remove reset of the SBus Master spico.  It is not necessary
since the SBus firmware download already does that.

Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Jubin John <jubin.john@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/rdma/hfi1/firmware.c b/drivers/staging/rdma/hfi1/firmware.c
index b4bdcf341aacfe77ea38fae2ebe61968d489b2ab..f3112821cf4759f5199f04e85107e120bee98bb9 100644 (file)
--- a/drivers/staging/rdma/hfi1/firmware.c
+++ b/drivers/staging/rdma/hfi1/firmware.c
@@ -1568,7 +1568,7 @@ int load_pcie_firmware(struct hfi1_devdata *dd)
        /* both firmware loads below use the SBus */
        set_sbus_fast_mode(dd);
 
-       if (fw_sbus_load && (dd->flags & HFI1_DO_INIT_ASIC)) {
+       if (fw_sbus_load) {
                turn_off_spicos(dd, SPICO_SBUS);
                ret = load_sbus_firmware(dd, &fw_sbus);
                if (ret)

diff --git a/drivers/staging/rdma/hfi1/pcie.c b/drivers/staging/rdma/hfi1/pcie.c
index 7fcf0896b65abefd9b879c120bb3171ef076234b..0b7eafb0fc705045a4b888c2485c2e80bd72a8f4 100644 (file)
--- a/drivers/staging/rdma/hfi1/pcie.c
+++ b/drivers/staging/rdma/hfi1/pcie.c
@@ -949,17 +949,7 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
        }
 
 retry:
-
-       if (therm) {
-               /*
-                * toggle SPICO_ENABLE to get back to the state
-                * just after the firmware load
-                */
-               sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01,
-                       WRITE_SBUS_RECEIVER, 0x00000040);
-               sbus_request(dd, SBUS_MASTER_BROADCAST, 0x01,
-                       WRITE_SBUS_RECEIVER, 0x00000140);
-       }
+       /* the SBus download will reset the spico for thermal */
 
        /* step 3: download SBus Master firmware */
        /* step 4: download PCIe Gen3 SerDes firmware */