1 files changed, 16 insertions, 0 deletions

diff --git a/drivers/scsi/lpfc/lpfc_attr.c b/drivers/scsi/lpfc/lpfc_attr.c
index 23ce45708335..f681eea57730 100644
--- a/drivers/scsi/lpfc/lpfc_attr.c
+++ b/drivers/scsi/lpfc/lpfc_attr.c
@@ -586,6 +586,11 @@ lpfc_issue_lip(struct Scsi_Host *shost)
                                phba->cfg_link_speed);
                 mbxstatus = lpfc_sli_issue_mbox_wait(phba, pmboxq,
                                                      phba->fc_ratov * 2);
+                if ((mbxstatus == MBX_SUCCESS) &&
+                    (pmboxq->u.mb.mbxStatus == MBXERR_SEC_NO_PERMISSION))
+                        lpfc_printf_log(phba, KERN_ERR, LOG_MBOX | LOG_SLI,
+                                        "2859 SLI authentication is required "
+                                        "for INIT_LINK but has not done yet\n");
         }
 
         lpfc_set_loopback_flag(phba);
@@ -2159,6 +2164,11 @@ lpfc_nodev_tmo_set(struct lpfc_vport *vport, int val)
         if (val >= LPFC_MIN_DEVLOSS_TMO && val <= LPFC_MAX_DEVLOSS_TMO) {
                 vport->cfg_nodev_tmo = val;
                 vport->cfg_devloss_tmo = val;
+                /*
+                 * For compat: set the fc_host dev loss so new rports
+                 * will get the value.
+                 */
+                fc_host_dev_loss_tmo(lpfc_shost_from_vport(vport)) = val;
                 lpfc_update_rport_devloss_tmo(vport);
                 return 0;
         }
@@ -2208,6 +2218,7 @@ lpfc_devloss_tmo_set(struct lpfc_vport *vport, int val)
                 vport->cfg_nodev_tmo = val;
                 vport->cfg_devloss_tmo = val;
                 vport->dev_loss_tmo_changed = 1;
+                fc_host_dev_loss_tmo(lpfc_shost_from_vport(vport)) = val;
                 lpfc_update_rport_devloss_tmo(vport);
                 return 0;
         }
@@ -3776,6 +3787,11 @@ sysfs_mbox_read(struct file *filp, struct kobject *kobj,
                 case MBX_PORT_CAPABILITIES:
                 case MBX_PORT_IOV_CONTROL:
                         break;
+                case MBX_SECURITY_MGMT:
+                case MBX_AUTH_PORT:
+                        if (phba->pci_dev_grp == LPFC_PCI_DEV_OC)
+                                return -EPERM;
+                        break;
                 case MBX_READ_SPARM64:
                 case MBX_READ_LA:
                 case MBX_READ_LA64: