IB/hfi1: Do not enable disabled port on cable insert

Fix issue where a disabled port can be enabled by
inserting a cable. The port should be explicitly
enabled instead.

Reviewed-by: Michael J. Ruhl <michael.j.ruhl@intel.com>
Reviewed-by: Jakub Byczkowski <jakub.byczkowski@intel.com>
Signed-off-by: Jan Sokolowski <jan.sokolowski@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Doug Ledford <dledford@redhat.com>

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index eca31dd49caea1e7bf0d420717e5b28224aba12a..bd594e7b0078f89bd3826dfc0709f990ea2f087d 100644 (file)
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -9306,12 +9306,6 @@ int start_link(struct hfi1_pportdata *ppd)
         */
        tune_serdes(ppd);
 
-       if (!ppd->link_enabled) {
-               dd_dev_info(ppd->dd,
-                           "%s: stopping link start because link is disabled\n",
-                           __func__);
-               return 0;
-       }
        if (!ppd->driver_link_ready) {
                dd_dev_info(ppd->dd,
                            "%s: stopping link start because driver is not ready\n",
@@ -9529,6 +9523,13 @@ void qsfp_event(struct work_struct *work)
        if (!qsfp_mod_present(ppd))
                return;
 
+       if (ppd->host_link_state == HLS_DN_DISABLE) {
+               dd_dev_info(ppd->dd,
+                           "%s: stopping link start because link is disabled\n",
+                           __func__);
+               return;
+       }
+
        /*
         * Turn DC back on after cable has been re-inserted. Up until
         * now, the DC has been in reset to save power.