openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

scsi: qla2xxx: Show correct port speed capabilities for RDP command 

This patch correctly displays port speed capability and current speed for
RDP command.

Link: https://lore.kernel.org/r/20200212214436.25532-12-hmadhani@marvell.com
Signed-off-by: Himanshu Madhani <hmadhani@marvell.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
This commit is contained in:
Himanshu Madhani 2020-02-12 13:44:22 -08:00 committed by Martin K. Petersen
parent 75666f4a8c
commit 8b01e4db83
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
drivers/scsi/qla2xxx/qla_os.c
View File

@ -5764,13 +5764,39 @@ qla25xx_rdp_port_speed_capability(struct qla_hw_data *ha)
if (IS_CNA_CAPABLE(ha)) if (IS_CNA_CAPABLE(ha))
return RDP_PORT_SPEED_10GB; return RDP_PORT_SPEED_10GB;
if (IS_QLA27XX(ha)) { if (IS_QLA27XX(ha) || IS_QLA28XX(ha)) {
if (FW_ABILITY_MAX_SPEED(ha) == FW_ABILITY_MAX_SPEED_32G) unsigned int speeds = 0;
return RDP_PORT_SPEED_32GB|RDP_PORT_SPEED_16GB|
RDP_PORT_SPEED_8GB;
return RDP_PORT_SPEED_16GB|RDP_PORT_SPEED_8GB| if (ha->max_supported_speed == 2) {
RDP_PORT_SPEED_4GB; if (ha->min_supported_speed <= 6)
speeds |= RDP_PORT_SPEED_64GB;
}
if (ha->max_supported_speed == 2 ||
ha->max_supported_speed == 1) {
if (ha->min_supported_speed <= 5)
speeds |= RDP_PORT_SPEED_32GB;
}
if (ha->max_supported_speed == 2 ||
ha->max_supported_speed == 1 ||
ha->max_supported_speed == 0) {
if (ha->min_supported_speed <= 4)
speeds |= RDP_PORT_SPEED_16GB;
}
if (ha->max_supported_speed == 1 ||
ha->max_supported_speed == 0) {
if (ha->min_supported_speed <= 3)
speeds |= RDP_PORT_SPEED_8GB;
}
if (ha->max_supported_speed == 0) {
if (ha->min_supported_speed <= 2)
speeds |= RDP_PORT_SPEED_4GB;
}
return speeds;
} }
if (IS_QLA2031(ha)) if (IS_QLA2031(ha))
@ -5816,6 +5842,9 @@ qla25xx_rdp_port_speed_currently(struct qla_hw_data *ha)
case PORT_SPEED_32GB: case PORT_SPEED_32GB:
return RDP_PORT_SPEED_32GB; return RDP_PORT_SPEED_32GB;
case PORT_SPEED_64GB:
return RDP_PORT_SPEED_64GB;
default: default:
return RDP_PORT_SPEED_UNKNOWN; return RDP_PORT_SPEED_UNKNOWN;
} }