Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[SCSI] qla2xxx: Add 10Gb iiDMA support.

Browse source 
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
This commit is contained in:
Andrew Vasquez 2009-06-03 09:55:22 -07:00 • committed by James Bottomley
parent f4658b6ccc
commit 9f8fddeef2
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
drivers/scsi/qla2xxx/qla_gs.c
View file

@ -1879,6 +1879,9 @@ qla2x00_gpsc(scsi_qla_host_t *vha, sw_info_t *list)
case BIT_13: case BIT_13:
list[i].fp_speed = PORT_SPEED_4GB; list[i].fp_speed = PORT_SPEED_4GB;
break; break;
case BIT_12:
list[i].fp_speed = PORT_SPEED_10GB;
break;
case BIT_11: case BIT_11:
list[i].fp_speed = PORT_SPEED_8GB; list[i].fp_speed = PORT_SPEED_8GB;
break; break;

10
drivers/scsi/qla2xxx/qla_init.c
View file

@ -2248,7 +2248,8 @@ static void
qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport) qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
{ {
#define LS_UNKNOWN 2 #define LS_UNKNOWN 2
static char *link_speeds[5] = { "1", "2", "?", "4", "8" }; static char *link_speeds[] = { "1", "2", "?", "4", "8", "10" };
char *link_speed;
int rval; int rval;
uint16_t mb[6]; uint16_t mb[6];
struct qla_hw_data *ha = vha->hw; struct qla_hw_data *ha = vha->hw;
@ -2271,10 +2272,15 @@ qla2x00_iidma_fcport(scsi_qla_host_t *vha, fc_port_t *fcport)
fcport->port_name[6], fcport->port_name[7], rval, fcport->port_name[6], fcport->port_name[7], rval,
fcport->fp_speed, mb[0], mb[1])); fcport->fp_speed, mb[0], mb[1]));
} else { } else {
link_speed = link_speeds[LS_UNKNOWN];
if (fcport->fp_speed < 5)
link_speed = link_speeds[fcport->fp_speed];
else if (fcport->fp_speed == 0x13)
link_speed = link_speeds[5];
DEBUG2(qla_printk(KERN_INFO, ha, DEBUG2(qla_printk(KERN_INFO, ha,
"iIDMA adjusted to %s GB/s on " "iIDMA adjusted to %s GB/s on "
"%02x%02x%02x%02x%02x%02x%02x%02x.\n", "%02x%02x%02x%02x%02x%02x%02x%02x.\n",
link_speeds[fcport->fp_speed], fcport->port_name[0], link_speed, fcport->port_name[0],
fcport->port_name[1], fcport->port_name[2], fcport->port_name[1], fcport->port_name[2],
fcport->port_name[3], fcport->port_name[4], fcport->port_name[3], fcport->port_name[4],
fcport->port_name[5], fcport->port_name[6], fcport->port_name[5], fcport->port_name[6],