leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging/rdma/hfi1: Reset firmware instead of reloading Sbus

Browse Source 
Reset firmware instead of reloading Sbus firmware if it's already done for this
ASIC.  To work around thermal polling problem in firmware, don't reload Sbus
firmware, instead, reset the firmware on the initialization of the second HFI.

Reviewed-by: Easwar Hariharan <easwar.hariharan@intel.com>
Reviewed-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Reviewed-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Caz Yokoyama <caz.yokoyama@intel.com>
Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Caz Yokoyama 2015-10-26 10:28:34 -04:00 committed by Greg Kroah-Hartman
parent 07839049db
commit c91b4a126a
3 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/staging/rdma/hfi1/chip.h
View File

@ -609,6 +609,7 @@ static inline void write_uctxt_csr(struct hfi1_devdata *dd, int ctxt,
u64 create_pbc(struct hfi1_pportdata *ppd, u64, int, u32, u32);
/* firmware.c */
#define SBUS_MASTER_BROADCAST 0xfd
#define NUM_PCIE_SERDES 16 /* number of PCIe serdes on the SBus */
extern const u8 pcie_serdes_broadcast[];
extern const u8 pcie_pcs_addrs[2][NUM_PCIE_SERDES];

4
drivers/staging/rdma/hfi1/firmware.c
View File

@ -924,9 +924,6 @@ static int load_8051_firmware(struct hfi1_devdata *dd,
return 0;
}
/* SBus Master broadcast address */
#define SBUS_MASTER_BROADCAST 0xfd
/*
* Write the SBus request register
*
@ -1255,6 +1252,7 @@ int load_firmware(struct hfi1_devdata *dd)
ret = load_sbus_firmware(dd, &fw_sbus);
if (ret)
goto clear;
fw_sbus_load = 0;
}
if (fw_fabric_serdes_load) {

13
drivers/staging/rdma/hfi1/pcie.c
View File

@ -946,9 +946,20 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
__func__);
}
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);
dd_dev_info(dd, "%s: toggle SPICO_ENABLE to reset the bus\n",
__func__);
}
/* step 3: download SBus Master firmware */
/* step 4: download PCIe Gen3 SerDes firmware */
retry:
dd_dev_info(dd, "%s: downloading firmware\n", __func__);
ret = load_pcie_firmware(dd);
if (ret)