1 files changed, 13 insertions, 0 deletions

diff --git a/drivers/scsi/qla2xxx/qla_init.c b/drivers/scsi/qla2xxx/qla_init.c
index 880de6f380e9..2ccdd848bcf6 100644
--- a/drivers/scsi/qla2xxx/qla_init.c
+++ b/drivers/scsi/qla2xxx/qla_init.c
@@ -89,6 +89,17 @@ qla2x00_initialize_adapter(scsi_qla_host_t *ha)
 
         ha->isp_ops.nvram_config(ha);
 
+        if (ha->flags.disable_serdes) {
+                /* Mask HBA via NVRAM settings? */
+                qla_printk(KERN_INFO, ha, "Masking HBA WWPN "
+                    "%02x%02x%02x%02x%02x%02x%02x%02x (via NVRAM).\n",
+                    ha->port_name[0], ha->port_name[1],
+                    ha->port_name[2], ha->port_name[3],
+                    ha->port_name[4], ha->port_name[5],
+                    ha->port_name[6], ha->port_name[7]);
+                return QLA_FUNCTION_FAILED;
+        }
+
         qla_printk(KERN_INFO, ha, "Verifying loaded RISC code...\n");
 
         retry = 10;
@@ -1639,6 +1650,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
         ha->flags.enable_lip_full_login = ((nv->host_p[1] & BIT_2) ? 1 : 0);
         ha->flags.enable_target_reset = ((nv->host_p[1] & BIT_3) ? 1 : 0);
         ha->flags.enable_led_scheme = (nv->special_options[1] & BIT_4) ? 1 : 0;
+        ha->flags.disable_serdes = 0;
 
         ha->operating_mode =
             (icb->add_firmware_options[0] & (BIT_6 | BIT_5 | BIT_4)) >> 4;
@@ -3450,6 +3462,7 @@ qla24xx_nvram_config(scsi_qla_host_t *ha)
         ha->flags.enable_lip_full_login = 1;
         ha->flags.enable_target_reset = 1;
         ha->flags.enable_led_scheme = 0;
+        ha->flags.disable_serdes = le32_to_cpu(nv->host_p) & BIT_5 ? 1: 0;
 
         ha->operating_mode = (le32_to_cpu(icb->firmware_options_2) &
             (BIT_6 | BIT_5 | BIT_4)) >> 4;