|
@@ -10489,6 +10489,14 @@ void set_link_down_reason(struct hfi1_pportdata *ppd, u8 lcl_reason,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/*
|
|
|
|
+ * Verify if BCT for data VLs is non-zero.
|
|
|
|
+ */
|
|
|
|
+static inline bool data_vls_operational(struct hfi1_pportdata *ppd)
|
|
|
|
+{
|
|
|
|
+ return !!ppd->actual_vls_operational;
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Change the physical and/or logical link state.
|
|
* Change the physical and/or logical link state.
|
|
*
|
|
*
|
|
@@ -10587,6 +10595,13 @@ int set_link_state(struct hfi1_pportdata *ppd, u32 state)
|
|
if (ppd->host_link_state != HLS_UP_INIT)
|
|
if (ppd->host_link_state != HLS_UP_INIT)
|
|
goto unexpected;
|
|
goto unexpected;
|
|
|
|
|
|
|
|
+ if (!data_vls_operational(ppd)) {
|
|
|
|
+ dd_dev_err(dd,
|
|
|
|
+ "%s: data VLs not operational\n", __func__);
|
|
|
|
+ ret = -EINVAL;
|
|
|
|
+ break;
|
|
|
|
+ }
|
|
|
|
+
|
|
ppd->host_link_state = HLS_UP_ARMED;
|
|
ppd->host_link_state = HLS_UP_ARMED;
|
|
set_logical_state(dd, LSTATE_ARMED);
|
|
set_logical_state(dd, LSTATE_ARMED);
|
|
ret = wait_logical_linkstate(ppd, IB_PORT_ARMED, 1000);
|
|
ret = wait_logical_linkstate(ppd, IB_PORT_ARMED, 1000);
|
|
@@ -14832,7 +14847,6 @@ struct hfi1_devdata *hfi1_init_dd(struct pci_dev *pdev,
|
|
}
|
|
}
|
|
ppd->vls_supported = num_vls;
|
|
ppd->vls_supported = num_vls;
|
|
ppd->vls_operational = ppd->vls_supported;
|
|
ppd->vls_operational = ppd->vls_supported;
|
|
- ppd->actual_vls_operational = ppd->vls_supported;
|
|
|
|
/* Set the default MTU. */
|
|
/* Set the default MTU. */
|
|
for (vl = 0; vl < num_vls; vl++)
|
|
for (vl = 0; vl < num_vls; vl++)
|
|
dd->vld[vl].mtu = hfi1_max_mtu;
|
|
dd->vld[vl].mtu = hfi1_max_mtu;
|