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

qla2xxx: Add adapter checks for FAWWN functionality. 

Signed-off-by: Saurav Kashyap <saurav.kashyap@qlogic.com>
Signed-off-by: Himanshu Madhani <himanshu.madhani@qlogic.com>
Signed-off-by: James Bottomley <JBottomley@Odin.com>
This commit is contained in:
Saurav Kashyap 2015-08-04 13:37:55 -04:00 committed by James Bottomley
parent 8dd7e3a559
commit d6b9b42b49
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/scsi/qla2xxx/qla_def.h
View File

@ -3164,6 +3164,7 @@ struct qla_hw_data {
#define IS_TGT_MODE_CAPABLE(ha) (ha->tgt.atio_q_length) #define IS_TGT_MODE_CAPABLE(ha) (ha->tgt.atio_q_length)
#define IS_SHADOW_REG_CAPABLE(ha) (IS_QLA27XX(ha)) #define IS_SHADOW_REG_CAPABLE(ha) (IS_QLA27XX(ha))
#define IS_DPORT_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha)) #define IS_DPORT_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))
#define IS_FAWWN_CAPABLE(ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha))
/* HBA serial number */ /* HBA serial number */
uint8_t serial0; uint8_t serial0;

30
drivers/scsi/qla2xxx/qla_mbx.c
View File

@ -1135,20 +1135,22 @@ qla2x00_get_adapter_id(scsi_qla_host_t *vha, uint16_t *id, uint8_t *al_pa,
vha->fcoe_vn_port_mac[0] = mcp->mb[13] & 0xff; vha->fcoe_vn_port_mac[0] = mcp->mb[13] & 0xff;
} }
/* If FA-WWN supported */ /* If FA-WWN supported */
if (mcp->mb[7] & BIT_14) { if (IS_FAWWN_CAPABLE(vha->hw)) {
vha->port_name[0] = MSB(mcp->mb[16]); if (mcp->mb[7] & BIT_14) {
vha->port_name[1] = LSB(mcp->mb[16]); vha->port_name[0] = MSB(mcp->mb[16]);
vha->port_name[2] = MSB(mcp->mb[17]); vha->port_name[1] = LSB(mcp->mb[16]);
vha->port_name[3] = LSB(mcp->mb[17]); vha->port_name[2] = MSB(mcp->mb[17]);
vha->port_name[4] = MSB(mcp->mb[18]); vha->port_name[3] = LSB(mcp->mb[17]);
vha->port_name[5] = LSB(mcp->mb[18]); vha->port_name[4] = MSB(mcp->mb[18]);
vha->port_name[6] = MSB(mcp->mb[19]); vha->port_name[5] = LSB(mcp->mb[18]);
vha->port_name[7] = LSB(mcp->mb[19]); vha->port_name[6] = MSB(mcp->mb[19]);
fc_host_port_name(vha->host) = vha->port_name[7] = LSB(mcp->mb[19]);
wwn_to_u64(vha->port_name); fc_host_port_name(vha->host) =
ql_dbg(ql_dbg_mbx, vha, 0x10ca, wwn_to_u64(vha->port_name);
"FA-WWN acquired %016llx\n", ql_dbg(ql_dbg_mbx, vha, 0x10ca,
wwn_to_u64(vha->port_name)); "FA-WWN acquired %016llx\n",
wwn_to_u64(vha->port_name));
}
} }
} }