Skip to content

Commit 4709272

Browse files
Quinn Tranmartinkpetersen
authored andcommitted
scsi: qla2xxx: Indicate correct supported speeds for Mezz card
Correct the supported speeds for 16G Mezz card. Link: https://lore.kernel.org/r/[email protected] Reviewed-by: Himanshu Madhani <[email protected]> Signed-off-by: Quinn Tran <[email protected]> Signed-off-by: Nilesh Javali <[email protected]> Signed-off-by: Martin K. Petersen <[email protected]>
1 parent a117579 commit 4709272

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

drivers/scsi/qla2xxx/qla_gs.c

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1505,11 +1505,11 @@ qla2x00_prep_ct_fdmi_req(struct ct_sns_pkt *p, uint16_t cmd,
15051505
static uint
15061506
qla25xx_fdmi_port_speed_capability(struct qla_hw_data *ha)
15071507
{
1508+
uint speeds = 0;
1509+
15081510
if (IS_CNA_CAPABLE(ha))
15091511
return FDMI_PORT_SPEED_10GB;
15101512
if (IS_QLA28XX(ha) || IS_QLA27XX(ha)) {
1511-
uint speeds = 0;
1512-
15131513
if (ha->max_supported_speed == 2) {
15141514
if (ha->min_supported_speed <= 6)
15151515
speeds |= FDMI_PORT_SPEED_64GB;
@@ -1536,9 +1536,16 @@ qla25xx_fdmi_port_speed_capability(struct qla_hw_data *ha)
15361536
}
15371537
return speeds;
15381538
}
1539-
if (IS_QLA2031(ha))
1540-
return FDMI_PORT_SPEED_16GB|FDMI_PORT_SPEED_8GB|
1541-
FDMI_PORT_SPEED_4GB;
1539+
if (IS_QLA2031(ha)) {
1540+
if ((ha->pdev->subsystem_vendor == 0x103C) &&
1541+
(ha->pdev->subsystem_device == 0x8002)) {
1542+
speeds = FDMI_PORT_SPEED_16GB;
1543+
} else {
1544+
speeds = FDMI_PORT_SPEED_16GB|FDMI_PORT_SPEED_8GB|
1545+
FDMI_PORT_SPEED_4GB;
1546+
}
1547+
return speeds;
1548+
}
15421549
if (IS_QLA25XX(ha))
15431550
return FDMI_PORT_SPEED_8GB|FDMI_PORT_SPEED_4GB|
15441551
FDMI_PORT_SPEED_2GB|FDMI_PORT_SPEED_1GB;

0 commit comments

Comments
 (0)