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>
This commit is contained in:
Dean Luick
2015-11-06 20:06:59 -05:00
committed by Greg Kroah-Hartman
parent bf70a77577
commit 65fcf55764
2 changed files with 2 additions and 12 deletions

View File

@@ -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)

View File

@@ -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 */