diff options
| author |   Easwar Hariharan <easwar.hariharan@intel.com> | 2016-04-12 11:25:57 -0700 |
|---|---|---|
| committer |   Doug Ledford <dledford@redhat.com> | 2016-04-28 16:32:28 -0400 |
| commit | 623bba2d92a32572e21758a17718eeec65594f7d (patch) | |
| tree | 277c6bc2b654b333792a8c20df980e053c1ec2e1 /drivers/staging/rdma/hfi1/platform.c | |
| parent | IB/hfi1: Always turn on CDRs for low power QSFP modules (diff) | |
| download | linux-dev-623bba2d92a32572e21758a17718eeec65594f7d.tar.xz linux-dev-623bba2d92a32572e21758a17718eeec65594f7d.zip | |
IB/hfi1: Remove module presence check outside pre-LNI checks
The pre-LNI SerDes and channel tuning algorithm already checks for
module presence assertion for the relevant port types. The extraneous
check removed in this patch blocks link up for port types for which
the module presence assertion is not relevant.
Reviewed-by: Dean Luick <dean.luick@intel.com>
Signed-off-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/staging/rdma/hfi1/platform.c')
| -rw-r--r-- | drivers/staging/rdma/hfi1/platform.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/staging/rdma/hfi1/platform.c b/drivers/staging/rdma/hfi1/platform.c index 19d0223eb0cf..b97027d4ddc6 100644 --- a/drivers/staging/rdma/hfi1/platform.c +++ b/drivers/staging/rdma/hfi1/platform.c @@ -838,9 +838,11 @@ void tune_serdes(struct hfi1_pportdata *ppd) total_atten = platform_atten + remote_atten; tuning_method = OPA_PASSIVE_TUNING; - } else + } else { ppd->offline_disabled_reason = HFI1_ODR_MASK(OPA_LINKDOWN_REASON_CHASSIS_CONFIG); + goto bail; + } break; case PORT_TYPE_QSFP: if (qsfp_mod_present(ppd)) { @@ -869,10 +871,12 @@ void tune_serdes(struct hfi1_pportdata *ppd) __func__); goto bail; } - } else + } else { ppd->offline_disabled_reason = HFI1_ODR_MASK( OPA_LINKDOWN_REASON_LOCAL_MEDIA_NOT_INSTALLED); + goto bail; + } break; default: dd_dev_info(ppd->dd, "%s: Unknown port type\n", __func__); |