diff options
author | Dean Luick <dean.luick@intel.com> | 2015-11-06 20:06:59 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-11-15 20:02:47 -0800 |
commit | 65fcf5576441eb23cd1f2c9f271cbf27e3455581 (patch) | |
tree | 029370ae92af39ea8d9a61a5b5a3e1a6fdacabc8 /drivers/staging/rdma/hfi1 | |
parent | staging/rdma/hfi1: Enable WFR PCIe extended tags from the driver (diff) | |
download | linux-dev-65fcf5576441eb23cd1f2c9f271cbf27e3455581.tar.xz linux-dev-65fcf5576441eb23cd1f2c9f271cbf27e3455581.zip |
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>
Diffstat (limited to 'drivers/staging/rdma/hfi1')
-rw-r--r-- | drivers/staging/rdma/hfi1/firmware.c | 2 | ||||
-rw-r--r-- | drivers/staging/rdma/hfi1/pcie.c | 12 |
2 files changed, 2 insertions, 12 deletions
diff --git a/drivers/staging/rdma/hfi1/firmware.c b/drivers/staging/rdma/hfi1/firmware.c index b4bdcf341aac..f3112821cf47 100644 --- 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 7fcf0896b65a..0b7eafb0fc70 100644 --- 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 */ |