From: sumit.saxena@avagotech.com Date: Thu, 15 Oct 2015 08:10:24 +0000 (+0530) Subject: megaraid_sas: Indicate online firmware upgrade support for Secure JBOD feature X-Git-Tag: v4.1.12-92~186^2~28 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=2e66aab712291b607cc4e30882cd6caefd96a834;p=users%2Fjedix%2Flinux-maple.git megaraid_sas: Indicate online firmware upgrade support for Secure JBOD feature Orabug: 22620626 Signed-off-by: Sumit Saxena Signed-off-by: Kashyap Desai Reviewed-by: Tomas Henzl Signed-off-by: Martin K. Petersen (cherry picked from commit 3222251dbbe9f155e7b8c910b770d6ff922fb47e) Signed-off-by: Martin K. Petersen --- diff --git a/drivers/scsi/megaraid/megaraid_sas_base.c b/drivers/scsi/megaraid/megaraid_sas_base.c index 47e0c1a5a61ff..163d05908da24 100644 --- a/drivers/scsi/megaraid/megaraid_sas_base.c +++ b/drivers/scsi/megaraid/megaraid_sas_base.c @@ -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");