diff options
author | andrew.vasquez@qlogic.com <andrew.vasquez@qlogic.com> | 2006-03-09 17:27:13 -0500 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-03-12 10:38:03 -0500 |
commit | 044cc6c8ec311c4ddeebfcc31c53dea282de70b7 (patch) | |
tree | 891078bdbf9c8673d2408215c80551dc4a015f6d /drivers/scsi/qla2xxx/qla_iocb.c | |
parent | ea5b6382fde00e0dbcd0de2e4aa2fd15705e5fc3 (diff) |
[SCSI] qla2xxx: Add ISP54xx support.
Chip is similar in form to our ISP24xx offering.
Signed-off-by: Andrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/scsi/qla2xxx/qla_iocb.c')
-rw-r--r-- | drivers/scsi/qla2xxx/qla_iocb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/qla2xxx/qla_iocb.c b/drivers/scsi/qla2xxx/qla_iocb.c index 6544b6d0891d..8f0f4a298357 100644 --- a/drivers/scsi/qla2xxx/qla_iocb.c +++ b/drivers/scsi/qla2xxx/qla_iocb.c | |||
@@ -466,7 +466,7 @@ __qla2x00_marker(scsi_qla_host_t *ha, uint16_t loop_id, uint16_t lun, | |||
466 | mrk->entry_type = MARKER_TYPE; | 466 | mrk->entry_type = MARKER_TYPE; |
467 | mrk->modifier = type; | 467 | mrk->modifier = type; |
468 | if (type != MK_SYNC_ALL) { | 468 | if (type != MK_SYNC_ALL) { |
469 | if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { | 469 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) { |
470 | mrk24 = (struct mrk_entry_24xx *) mrk; | 470 | mrk24 = (struct mrk_entry_24xx *) mrk; |
471 | mrk24->nport_handle = cpu_to_le16(loop_id); | 471 | mrk24->nport_handle = cpu_to_le16(loop_id); |
472 | mrk24->lun[1] = LSB(lun); | 472 | mrk24->lun[1] = LSB(lun); |
@@ -519,7 +519,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha) | |||
519 | for (timer = HZ; timer; timer--) { | 519 | for (timer = HZ; timer; timer--) { |
520 | if ((req_cnt + 2) >= ha->req_q_cnt) { | 520 | if ((req_cnt + 2) >= ha->req_q_cnt) { |
521 | /* Calculate number of free request entries. */ | 521 | /* Calculate number of free request entries. */ |
522 | if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) | 522 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) |
523 | cnt = (uint16_t)RD_REG_DWORD( | 523 | cnt = (uint16_t)RD_REG_DWORD( |
524 | ®->isp24.req_q_out); | 524 | ®->isp24.req_q_out); |
525 | else | 525 | else |
@@ -593,7 +593,7 @@ qla2x00_isp_cmd(scsi_qla_host_t *ha) | |||
593 | ha->request_ring_ptr++; | 593 | ha->request_ring_ptr++; |
594 | 594 | ||
595 | /* Set chip new ring index. */ | 595 | /* Set chip new ring index. */ |
596 | if (IS_QLA24XX(ha) || IS_QLA25XX(ha)) { | 596 | if (IS_QLA24XX(ha) || IS_QLA54XX(ha)) { |
597 | WRT_REG_DWORD(®->isp24.req_q_in, ha->req_ring_index); | 597 | WRT_REG_DWORD(®->isp24.req_q_in, ha->req_ring_index); |
598 | RD_REG_DWORD_RELAXED(®->isp24.req_q_in); | 598 | RD_REG_DWORD_RELAXED(®->isp24.req_q_in); |
599 | } else { | 599 | } else { |