diff options
| author | Michael J. Ruhl <michael.j.ruhl@intel.com> | 2017-02-08 14:28:13 +0100 |
|---|---|---|
| committer | Doug Ledford <dledford@redhat.com> | 2017-02-19 15:18:43 +0100 |
| commit | db069ecb5d4dcd297628d5ebc56dd22bdbab9729 (patch) | |
| tree | 9443e114c9cb552a2d18d3328e79328d345ead39 /drivers/infiniband/hw | |
| parent | IB/hfi1: Modify logging frequency of DCC errors (diff) | |
| download | linux-db069ecb5d4dcd297628d5ebc56dd22bdbab9729.tar.xz linux-db069ecb5d4dcd297628d5ebc56dd22bdbab9729.zip | |
IB/hfi1: Do not set physical link state if DC is in the shutdown state
If the DC is in shutdown state, the set link state function will return
an error. Since this is not a failure in this state, make sure to
only call set link state if the DC is on.
Reviewed-by: Easwar Hariharan <easwar.hariharan@intel.com>
Signed-off-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>
Diffstat (limited to 'drivers/infiniband/hw')
| -rw-r--r-- | drivers/infiniband/hw/hfi1/chip.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c index b9d491c9071a..121a4c920f1b 100644 --- a/drivers/infiniband/hw/hfi1/chip.c +++ b/drivers/infiniband/hw/hfi1/chip.c @@ -10510,16 +10510,18 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state) ppd->remote_link_down_reason = 0; } - ret1 = set_physical_link_state(dd, PLS_DISABLED); - if (ret1 != HCMD_SUCCESS) { - dd_dev_err(dd, - "Failed to transition to Disabled link state, return 0x%x\n", - ret1); - ret = -EINVAL; - break; + if (!dd->dc_shutdown) { + ret1 = set_physical_link_state(dd, PLS_DISABLED); + if (ret1 != HCMD_SUCCESS) { + dd_dev_err(dd, + "Failed to transition to Disabled link state, return 0x%x\n", + ret1); + ret = -EINVAL; + break; + } + dc_shutdown(dd); } ppd->host_link_state = HLS_DN_DISABLE; - dc_shutdown(dd); break; case HLS_DN_OFFLINE: if (ppd->host_link_state == HLS_DN_DISABLE) |