Commit 76558b25 authored by James Smart's avatar James Smart Committed by Martin K. Petersen

scsi: lpfc: Correct topology type reporting on G7 adapters

Driver missed classifying the chip type for G7 when reporting supported
topologies. This resulted in loop being shown as supported on FC links that
are not supported per the standard.

Add the chip classifications to the topology checks in the driver.
Signed-off-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
Signed-off-by: default avatarJames Smart <jsmart2021@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 1c36833d
...@@ -3937,8 +3937,9 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr, ...@@ -3937,8 +3937,9 @@ lpfc_topology_store(struct device *dev, struct device_attribute *attr,
val); val);
return -EINVAL; return -EINVAL;
} }
if (phba->pcidev->device == PCI_DEVICE_ID_LANCER_G6_FC && if ((phba->pcidev->device == PCI_DEVICE_ID_LANCER_G6_FC ||
val == 4) { phba->pcidev->device == PCI_DEVICE_ID_LANCER_G7_FC) &&
val == 4) {
lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT, lpfc_printf_vlog(vport, KERN_ERR, LOG_INIT,
"3114 Loop mode not supported\n"); "3114 Loop mode not supported\n");
return -EINVAL; return -EINVAL;
......
...@@ -513,9 +513,9 @@ lpfc_init_link(struct lpfc_hba * phba, ...@@ -513,9 +513,9 @@ lpfc_init_link(struct lpfc_hba * phba,
break; break;
} }
if (phba->pcidev->device == PCI_DEVICE_ID_LANCER_G6_FC && if ((phba->pcidev->device == PCI_DEVICE_ID_LANCER_G6_FC ||
mb->un.varInitLnk.link_flags & FLAGS_TOPOLOGY_MODE_LOOP) { phba->pcidev->device == PCI_DEVICE_ID_LANCER_G7_FC) &&
/* Failover is not tried for Lancer G6 */ mb->un.varInitLnk.link_flags & FLAGS_TOPOLOGY_MODE_LOOP) {
mb->un.varInitLnk.link_flags = FLAGS_TOPOLOGY_MODE_PT_PT; mb->un.varInitLnk.link_flags = FLAGS_TOPOLOGY_MODE_PT_PT;
phba->cfg_topology = FLAGS_TOPOLOGY_MODE_PT_PT; phba->cfg_topology = FLAGS_TOPOLOGY_MODE_PT_PT;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment