]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
megaraid_sas: Indicate online firmware upgrade support for Secure JBOD feature
authorsumit.saxena@avagotech.com <sumit.saxena@avagotech.com>
Thu, 15 Oct 2015 08:10:24 +0000 (13:40 +0530)
committerChuck Anderson <chuck.anderson@oracle.com>
Wed, 16 Mar 2016 13:35:53 +0000 (06:35 -0700)
Orabug: 22620626

Signed-off-by: Sumit Saxena <sumit.saxena@avagotech.com>
Signed-off-by: Kashyap Desai <kashyap.desai@avagotech.com>
Reviewed-by: Tomas Henzl <thenzl@redhat.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
(cherry picked from commit 3222251dbbe9f155e7b8c910b770d6ff922fb47e)
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
drivers/scsi/megaraid/megaraid_sas_base.c

index 47e0c1a5a61ffce03e1b3cbd08927f886045fb4d..163d05908da24618dd592313688755789eb32d2c 100644 (file)
@@ -4199,6 +4199,10 @@ megasas_get_ctrl_info(struct megasas_instance *instance)
                        ctrl_info->properties.OnOffProperties.disableOnlineCtrlReset;
                dev_info(&instance->pdev->dev, "Online Controller Reset(OCR)\t: %s\n",
                        instance->disableOnlineCtrlReset ? "Disabled" : "Enabled");
+               instance->secure_jbod_support =
+                       ctrl_info->adapterOperations3.supportSecurityonJBOD;
+               dev_info(&instance->pdev->dev, "Secure JBOD support\t: %s\n",
+                       instance->secure_jbod_support ? "Yes" : "No");
        }
 
        pci_free_consistent(instance->pdev, sizeof(struct megasas_ctrl_info),
@@ -4852,8 +4856,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
                instance->crash_dump_buf = NULL;
        }
 
-       instance->secure_jbod_support =
-               ctrl_info->adapterOperations3.supportSecurityonJBOD;
 
        dev_info(&instance->pdev->dev,
                "pci id\t\t: (0x%04x)/(0x%04x)/(0x%04x)/(0x%04x)\n",
@@ -4865,8 +4867,6 @@ static int megasas_init_fw(struct megasas_instance *instance)
                instance->UnevenSpanSupport ? "yes" : "no");
        dev_info(&instance->pdev->dev, "firmware crash dump     : %s\n",
                instance->crash_dump_drv_support ? "yes" : "no");
-       dev_info(&instance->pdev->dev, "secure jbod             : %s\n",
-               instance->secure_jbod_support ? "yes" : "no");
        dev_info(&instance->pdev->dev, "jbod sync map           : %s\n",
                instance->use_seqnum_jbod_fp ? "yes" : "no");