hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

scsi: lpfc: Fix BlockGuard enablement on FCoE adapters 

The driver is allowing the user to change lpfc_enable_bg while loading the
driver against a FCoE adapter. This is not supported.

No check is made for the adapter type when applying the blockguard
enablement value.

Fix by verifying the adapter type before setting the enablement flag.

Signed-off-by: Dick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: James Smart <jsmart2021@gmail.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
James Smart 2019-08-14 16:57:02 -07:00 committed by Martin K. Petersen
parent 845d0327bf
commit 4945c0f95b
1 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/scsi/lpfc/lpfc_attr.c
View File

@ -7065,6 +7065,21 @@ struct fc_function_template lpfc_vport_transport_functions = {
.set_vport_symbolic_name = lpfc_set_vport_symbolic_name,
};
/**
* lpfc_get_hba_function_mode - Used to determine the HBA function in FCoE
* Mode
* @phba: lpfc_hba pointer.
**/
static void
lpfc_get_hba_function_mode(struct lpfc_hba *phba)
{
/* If it's a SkyHawk FCoE adapter */
if (phba->pcidev->device == PCI_DEVICE_ID_SKYHAWK)
phba->hba_flag |= HBA_FCOE_MODE;
else
phba->hba_flag &= ~HBA_FCOE_MODE;
}
/**
* lpfc_get_cfgparam - Used during probe_one to init the adapter structure
* @phba: lpfc_hba pointer.
@ -7121,8 +7136,18 @@ lpfc_get_cfgparam(struct lpfc_hba *phba)
else
phba->cfg_poll = lpfc_poll;
if (phba->cfg_enable_bg)
/* Get the function mode */
lpfc_get_hba_function_mode(phba);
/* BlockGuard allowed for FC only. */
if (phba->cfg_enable_bg && phba->hba_flag & HBA_FCOE_MODE) {
lpfc_printf_log(phba, KERN_INFO, LOG_INIT,
"0581 BlockGuard feature not supported\n");
/* If set, clear the BlockGuard support param */
phba->cfg_enable_bg = 0;
} else if (phba->cfg_enable_bg) {
phba->sli3_options |= LPFC_SLI3_BG_ENABLED;
}
lpfc_suppress_rsp_init(phba, lpfc_suppress_rsp);