qla2xxx: Let DPORT be enabled purely by nvram.

Orabug: 23755773

Signed-off-by: Joe Carnuccio <joe.carnuccio@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: Ethan Zhao <ethan.zhao@oracle.com>

diff --git a/drivers/scsi/qla2xxx/qla_dbg.c b/drivers/scsi/qla2xxx/qla_dbg.c
index ca105139f5ee8018f886ddaaf4df3590172c1c11..b8c43ad8e620029de8043f61be00ac9d823a9c92 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_dbg.c
+++ b/drivers/scsi/qla2xxx/qla_dbg.c
@@ -11,7 +11,7 @@
  * ----------------------------------------------------------------------
  * |             Level            |   Last Value Used  |     Holes     |
  * ----------------------------------------------------------------------
- * | Module Init and Probe        |       0x018f       | 0x0146         |
+ * | Module Init and Probe        |       0x0191       | 0x0146         |
  * |                              |                    | 0x015b-0x0160 |
  * |                              |                    | 0x016e-0x0170  |
  * | Mailbox commands             |       0x1196       | 0x111a-0x111b |

diff --git a/drivers/scsi/qla2xxx/qla_def.h b/drivers/scsi/qla2xxx/qla_def.h
index 9ed0009e354a4d8fa717f016f7acdb2d1cf862c3..f8647aa12f320fae43d230340ecb175a06c94f67 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_def.h
+++ b/drivers/scsi/qla2xxx/qla_def.h
@@ -2998,6 +2998,7 @@ struct qla_hw_data {
 
                uint32_t        mr_reset_hdlr_active:1;
                uint32_t        mr_intr_valid:1;
+               uint32_t        dport_enabled:1;
                uint32_t        fawwpn_enabled:1;
                /* 35 bits */
        } flags;

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 8b86f0b92fad54a1aa7e7ba9678c0b817397c1b5..3190f4f71ee318556fdc0b38c2ba16b2828ee0bc 100644 (file)
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -2272,13 +2272,13 @@ qla2x00_init_rings(scsi_qla_host_t *vha)
                mid_init_cb->options = cpu_to_le16(BIT_1);
                mid_init_cb->init_cb.execution_throttle =
                    cpu_to_le16(ha->fw_xcb_count);
-               /* D-Port Status */
-               if (IS_DPORT_CAPABLE(ha))
-                       mid_init_cb->init_cb.firmware_options_1 |=
-                           cpu_to_le16(BIT_7);
+                ha->flags.dport_enabled =
+                    (mid_init_cb->init_cb.firmware_options_1 & BIT_7) != 0;
+                ql_dbg(ql_dbg_init, vha, 0x0191, "DPORT Support: %s.\n",
+                    (ha->flags.dport_enabled) ? "enabled" : "disabled");
                /* Enable FA-WWPN */
                ha->flags.fawwpn_enabled =
-                   (mid_init_cb->init_cb.firmware_options_1 & BIT_6) ? 1 : 0;
+                   (mid_init_cb->init_cb.firmware_options_1 & BIT_6) != 0;
                ql_dbg(ql_dbg_init, vha, 0x0141, "FA-WWPN Support: %s.\n",
                    (ha->flags.fawwpn_enabled) ? "enabled" : "disabled");
        }