UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

IB/hfi1: PCIe bus width retry 

Retry the PCIe link training up to 'pcie_retry' times
if the PCIe link width is narrower than the previous width.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: Mitko Haralanov <mitko.haralanov@intel.com>
Signed-off-by: Kamenee Arumugam <kamenee.arumugam@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
This commit is contained in:
Kamenee Arumugam 2018-08-15 23:04:13 -07:00 committed by Doug Ledford
parent 6eb4eb10fb
commit e63bb50d19
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/infiniband/hw/hfi1/pcie.c
View File

@ -1005,6 +1005,7 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
const u8 (*ctle_tunings)[4]; const u8 (*ctle_tunings)[4];
uint static_ctle_mode; uint static_ctle_mode;
int return_error = 0; int return_error = 0;
u32 target_width;
/* PCIe Gen3 is for the ASIC only */ /* PCIe Gen3 is for the ASIC only */
if (dd->icode != ICODE_RTL_SILICON) if (dd->icode != ICODE_RTL_SILICON)
@ -1044,6 +1045,9 @@ int do_pcie_gen3_transition(struct hfi1_devdata *dd)
return 0; return 0;
} }
/* Previous Gen1/Gen2 bus width */
target_width = dd->lbus_width;
/* /*
* Do the Gen3 transition. Steps are those of the PCIe Gen3 * Do the Gen3 transition. Steps are those of the PCIe Gen3
* recipe. * recipe.
@ -1412,11 +1416,12 @@ retry:
dd_dev_info(dd, "%s: new speed and width: %s\n", __func__, dd_dev_info(dd, "%s: new speed and width: %s\n", __func__,
dd->lbus_info); dd->lbus_info);
if (dd->lbus_speed != target_speed) { /* not target */ if (dd->lbus_speed != target_speed ||
dd->lbus_width < target_width) { /* not target */
/* maybe retry */ /* maybe retry */
do_retry = retry_count < pcie_retry; do_retry = retry_count < pcie_retry;
dd_dev_err(dd, "PCIe link speed did not switch to Gen%d%s\n", dd_dev_err(dd, "PCIe link speed or width did not match target%s\n",
pcie_target, do_retry ? ", retrying" : ""); do_retry ? ", retrying" : "");
retry_count++; retry_count++;
if (do_retry) { if (do_retry) {
msleep(100); /* allow time to settle */ msleep(100); /* allow time to settle */