Skip to content

L
linux
Commit 57b43e98 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley
Browse files
Options

[PATCH] PATCH [3/15] qla2xxx: 2100 request-q contraints 

  Older, notably the ISP2100, chips have some contraints for the request
  queue depth and number of scatter-gather elements allowed for a
  given command.  For this chip, reduce request queue size to 128 and
  maximum number of scatter-gather entries for a command to 32.

 drivers/scsi/qla2xxx/qla_def.h  |   14 +++-----------
 drivers/scsi/qla2xxx/qla_init.c |    9 +++++----
 drivers/scsi/qla2xxx/qla_iocb.c |   14 +++++++-------
 drivers/scsi/qla2xxx/qla_os.c   |   14 +++++++++-----
 drivers/scsi/qla2xxx/qla_rscn.c |    2 +-
 5 files changed, 25 insertions(+), 28 deletions(-)
parent f8999aea
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 28 deletions
drivers/scsi/qla2xxx/qla_def.h
View file @ 57b43e98
...@@ -209,20 +209,11 @@ ...@@ -209,20 +209,11 @@
#define MAX_OUTSTANDING_COMMANDS 1024 #define MAX_OUTSTANDING_COMMANDS 1024
/* ISP request and response entry counts (37-65535) */ /* ISP request and response entry counts (37-65535) */
#define REQUEST_ENTRY_CNT 2048 /* Number of request entries. */ #define REQUEST_ENTRY_CNT_2100 128 /* Number of request entries. */
#define REQUEST_ENTRY_CNT_2200 2048 /* Number of request entries. */
#define RESPONSE_ENTRY_CNT_2100 64 /* Number of response entries.*/ #define RESPONSE_ENTRY_CNT_2100 64 /* Number of response entries.*/
#define RESPONSE_ENTRY_CNT_2300 512 /* Number of response entries.*/ #define RESPONSE_ENTRY_CNT_2300 512 /* Number of response entries.*/
/* Calculations for SG segments */
#define SEGS_PER_REQUEST_32 3
#define SEGS_PER_CONT_32 7
#define SG_SEGMENTS_32 (SEGS_PER_REQUEST_32 + \
(SEGS_PER_CONT_32 * (REQUEST_ENTRY_CNT - 2)))
#define SEGS_PER_REQUEST_64 2
#define SEGS_PER_CONT_64 5
#define SG_SEGMENTS_64 (SEGS_PER_REQUEST_64 + \
(SEGS_PER_CONT_64 * (REQUEST_ENTRY_CNT - 2)))
/* /*
* SCSI Request Block * SCSI Request Block
*/ */
...@@ -2123,6 +2114,7 @@ typedef struct scsi_qla_host { ...@@ -2123,6 +2114,7 @@ typedef struct scsi_qla_host {
request_t *request_ring_ptr; /* Current address. */ request_t *request_ring_ptr; /* Current address. */
uint16_t req_ring_index; /* Current index. */ uint16_t req_ring_index; /* Current index. */
uint16_t req_q_cnt; /* Number of available entries. */ uint16_t req_q_cnt; /* Number of available entries. */
uint16_t request_q_length;
dma_addr_t response_dma; /* Physical address. */ dma_addr_t response_dma; /* Physical address. */
response_t *response_ring; /* Base virtual address */ response_t *response_ring; /* Base virtual address */
......
drivers/scsi/qla2xxx/qla_init.c
View file @ 57b43e98
...@@ -600,10 +600,11 @@ qla2x00_chip_diag(scsi_qla_host_t *ha) ...@@ -600,10 +600,11 @@ qla2x00_chip_diag(scsi_qla_host_t *ha)
ha->product_id[3] = mb[4]; ha->product_id[3] = mb[4];
/* Adjust fw RISC transfer size */ /* Adjust fw RISC transfer size */
if (REQUEST_ENTRY_CNT > 1024) if (ha->request_q_length > 1024)
ha->fw_transfer_size = REQUEST_ENTRY_SIZE * 1024; ha->fw_transfer_size = REQUEST_ENTRY_SIZE * 1024;
else else
ha->fw_transfer_size = REQUEST_ENTRY_SIZE * REQUEST_ENTRY_CNT; ha->fw_transfer_size = REQUEST_ENTRY_SIZE *
ha->request_q_length;
if (IS_QLA2200(ha) && if (IS_QLA2200(ha) &&
RD_MAILBOX_REG(ha, reg, 7) == QLA2200A_RISC_ROM_VER) { RD_MAILBOX_REG(ha, reg, 7) == QLA2200A_RISC_ROM_VER) {
...@@ -802,7 +803,7 @@ qla2x00_init_rings(scsi_qla_host_t *ha) ...@@ -802,7 +803,7 @@ qla2x00_init_rings(scsi_qla_host_t *ha)
/* Initialize firmware. */ /* Initialize firmware. */
ha->request_ring_ptr = ha->request_ring; ha->request_ring_ptr = ha->request_ring;
ha->req_ring_index = 0; ha->req_ring_index = 0;
ha->req_q_cnt = REQUEST_ENTRY_CNT; ha->req_q_cnt = ha->request_q_length;
ha->response_ring_ptr = ha->response_ring; ha->response_ring_ptr = ha->response_ring;
ha->rsp_ring_index = 0; ha->rsp_ring_index = 0;
...@@ -1378,7 +1379,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha) ...@@ -1378,7 +1379,7 @@ qla2x00_nvram_config(scsi_qla_host_t *ha)
*/ */
icb->request_q_outpointer = __constant_cpu_to_le16(0); icb->request_q_outpointer = __constant_cpu_to_le16(0);
icb->response_q_inpointer = __constant_cpu_to_le16(0); icb->response_q_inpointer = __constant_cpu_to_le16(0);
icb->request_q_length = __constant_cpu_to_le16(REQUEST_ENTRY_CNT); icb->request_q_length = cpu_to_le16(ha->request_q_length);
icb->response_q_length = cpu_to_le16(ha->response_q_length); icb->response_q_length = cpu_to_le16(ha->response_q_length);
icb->request_q_address[0] = cpu_to_le32(LSD(ha->request_dma)); icb->request_q_address[0] = cpu_to_le32(LSD(ha->request_dma));
icb->request_q_address[1] = cpu_to_le32(MSD(ha->request_dma)); icb->request_q_address[1] = cpu_to_le32(MSD(ha->request_dma));
......
drivers/scsi/qla2xxx/qla_iocb.c
View file @ 57b43e98
...@@ -124,7 +124,7 @@ qla2x00_prep_cont_type0_iocb(scsi_qla_host_t *ha) ...@@ -124,7 +124,7 @@ qla2x00_prep_cont_type0_iocb(scsi_qla_host_t *ha)
/* Adjust ring index. */ /* Adjust ring index. */
ha->req_ring_index++; ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) { if (ha->req_ring_index == ha->request_q_length) {
ha->req_ring_index = 0; ha->req_ring_index = 0;
ha->request_ring_ptr = ha->request_ring; ha->request_ring_ptr = ha->request_ring;
} else { } else {
...@@ -153,7 +153,7 @@ qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *ha) ...@@ -153,7 +153,7 @@ qla2x00_prep_cont_type1_iocb(scsi_qla_host_t *ha)
/* Adjust ring index. */ /* Adjust ring index. */
ha->req_ring_index++; ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) { if (ha->req_ring_index == ha->request_q_length) {
ha->req_ring_index = 0; ha->req_ring_index = 0;
ha->request_ring_ptr = ha->request_ring; ha->request_ring_ptr = ha->request_ring;
} else { } else {
...@@ -394,7 +394,7 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -394,7 +394,7 @@ qla2x00_start_scsi(srb_t *sp)
if (ha->req_ring_index < cnt) if (ha->req_ring_index < cnt)
ha->req_q_cnt = cnt - ha->req_ring_index; ha->req_q_cnt = cnt - ha->req_ring_index;
else else
ha->req_q_cnt = REQUEST_ENTRY_CNT - ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt); (ha->req_ring_index - cnt);
} }
...@@ -484,7 +484,7 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -484,7 +484,7 @@ qla2x00_start_scsi(srb_t *sp)
/* Adjust ring index. */ /* Adjust ring index. */
ha->req_ring_index++; ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) { if (ha->req_ring_index == ha->request_q_length) {
ha->req_ring_index = 0; ha->req_ring_index = 0;
ha->request_ring_ptr = ha->request_ring; ha->request_ring_ptr = ha->request_ring;
} else } else
...@@ -588,7 +588,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha) ...@@ -588,7 +588,7 @@ qla2x00_req_pkt(scsi_qla_host_t *ha)
if (ha->req_ring_index < cnt) if (ha->req_ring_index < cnt)
ha->req_q_cnt = cnt - ha->req_ring_index; ha->req_q_cnt = cnt - ha->req_ring_index;
else else
ha->req_q_cnt = REQUEST_ENTRY_CNT - ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt); (ha->req_ring_index - cnt);
} }
/* If room for request in request ring. */ /* If room for request in request ring. */
...@@ -658,7 +658,7 @@ qla2x00_ms_req_pkt(scsi_qla_host_t *ha, srb_t *sp) ...@@ -658,7 +658,7 @@ qla2x00_ms_req_pkt(scsi_qla_host_t *ha, srb_t *sp)
if (ha->req_ring_index < cnt) { if (ha->req_ring_index < cnt) {
ha->req_q_cnt = cnt - ha->req_ring_index; ha->req_q_cnt = cnt - ha->req_ring_index;
} else { } else {
ha->req_q_cnt = REQUEST_ENTRY_CNT - ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt); (ha->req_ring_index - cnt);
} }
} }
...@@ -740,7 +740,7 @@ qla2x00_isp_cmd(scsi_qla_host_t *ha) ...@@ -740,7 +740,7 @@ qla2x00_isp_cmd(scsi_qla_host_t *ha)
/* Adjust ring index. */ /* Adjust ring index. */
ha->req_ring_index++; ha->req_ring_index++;
if (ha->req_ring_index == REQUEST_ENTRY_CNT) { if (ha->req_ring_index == ha->request_q_length) {
ha->req_ring_index = 0; ha->req_ring_index = 0;
ha->request_ring_ptr = ha->request_ring; ha->request_ring_ptr = ha->request_ring;
} else } else
......
drivers/scsi/qla2xxx/qla_os.c
View file @ 57b43e98
...@@ -168,7 +168,6 @@ static struct scsi_host_template qla2x00_driver_template = { ...@@ -168,7 +168,6 @@ static struct scsi_host_template qla2x00_driver_template = {
.slave_configure = qla2xxx_slave_configure, .slave_configure = qla2xxx_slave_configure,
.this_id = -1, .this_id = -1,
.can_queue = REQUEST_ENTRY_CNT+128,
.cmd_per_lun = 3, .cmd_per_lun = 3,
.use_clustering = ENABLE_CLUSTERING, .use_clustering = ENABLE_CLUSTERING,
.sg_tablesize = SG_ALL, .sg_tablesize = SG_ALL,
...@@ -1983,19 +1982,24 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info) ...@@ -1983,19 +1982,24 @@ int qla2x00_probe_one(struct pci_dev *pdev, struct qla_board_info *brd_info)
if (IS_QLA2100(ha)) { if (IS_QLA2100(ha)) {
ha->max_targets = MAX_TARGETS_2100; ha->max_targets = MAX_TARGETS_2100;
ha->mbx_count = MAILBOX_REGISTER_COUNT_2100; ha->mbx_count = MAILBOX_REGISTER_COUNT_2100;
ha->request_q_length = REQUEST_ENTRY_CNT_2100;
ha->response_q_length = RESPONSE_ENTRY_CNT_2100; ha->response_q_length = RESPONSE_ENTRY_CNT_2100;
ha->last_loop_id = SNS_LAST_LOOP_ID_2100; ha->last_loop_id = SNS_LAST_LOOP_ID_2100;
host->sg_tablesize = 32;
} else if (IS_QLA2200(ha)) { } else if (IS_QLA2200(ha)) {
ha->max_targets = MAX_TARGETS_2200; ha->max_targets = MAX_TARGETS_2200;
ha->mbx_count = MAILBOX_REGISTER_COUNT; ha->mbx_count = MAILBOX_REGISTER_COUNT;
ha->request_q_length = REQUEST_ENTRY_CNT_2200;
ha->response_q_length = RESPONSE_ENTRY_CNT_2100; ha->response_q_length = RESPONSE_ENTRY_CNT_2100;
ha->last_loop_id = SNS_LAST_LOOP_ID_2100; ha->last_loop_id = SNS_LAST_LOOP_ID_2100;
} else /*if (IS_QLA2300(ha))*/ { } else /*if (IS_QLA2300(ha))*/ {
ha->max_targets = MAX_TARGETS_2200; ha->max_targets = MAX_TARGETS_2200;
ha->mbx_count = MAILBOX_REGISTER_COUNT; ha->mbx_count = MAILBOX_REGISTER_COUNT;
ha->request_q_length = REQUEST_ENTRY_CNT_2200;
ha->response_q_length = RESPONSE_ENTRY_CNT_2300; ha->response_q_length = RESPONSE_ENTRY_CNT_2300;
ha->last_loop_id = SNS_LAST_LOOP_ID_2300; ha->last_loop_id = SNS_LAST_LOOP_ID_2300;
} }
host->can_queue = ha->request_q_length + 128;
/* load the F/W, read paramaters, and init the H/W */ /* load the F/W, read paramaters, and init the H/W */
ha->instance = num_hosts; ha->instance = num_hosts;
...@@ -2390,8 +2394,8 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer, ...@@ -2390,8 +2394,8 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer,
(unsigned long long)ha->response_dma); (unsigned long long)ha->response_dma);
copy_info(&info, copy_info(&info,
"Request Queue count = %ld, Response Queue count = %ld\n", "Request Queue count = %d, Response Queue count = %d\n",
(long)REQUEST_ENTRY_CNT, (long)ha->response_q_length); ha->request_q_length, ha->response_q_length);
copy_info(&info, copy_info(&info,
"Total number of active commands = %ld\n", "Total number of active commands = %ld\n",
...@@ -2861,7 +2865,7 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha) ...@@ -2861,7 +2865,7 @@ qla2x00_mem_alloc(scsi_qla_host_t *ha)
* little delay and a retry. * little delay and a retry.
*/ */
ha->request_ring = pci_alloc_consistent(ha->pdev, ha->request_ring = pci_alloc_consistent(ha->pdev,
((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))), ((ha->request_q_length + 1) * (sizeof(request_t))),
&ha->request_dma); &ha->request_dma);
if (ha->request_ring == NULL) { if (ha->request_ring == NULL) {
qla_printk(KERN_WARNING, ha, qla_printk(KERN_WARNING, ha,
...@@ -3077,7 +3081,7 @@ qla2x00_mem_free(scsi_qla_host_t *ha) ...@@ -3077,7 +3081,7 @@ qla2x00_mem_free(scsi_qla_host_t *ha)
if (ha->request_ring) { if (ha->request_ring) {
pci_free_consistent(ha->pdev, pci_free_consistent(ha->pdev,
((REQUEST_ENTRY_CNT + 1) * (sizeof(request_t))), ((ha->request_q_length + 1) * (sizeof(request_t))),
ha->request_ring, ha->request_dma); ha->request_ring, ha->request_dma);
} }
......
drivers/scsi/qla2xxx/qla_rscn.c
View file @ 57b43e98
...@@ -385,7 +385,7 @@ qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle) ...@@ -385,7 +385,7 @@ qla2x00_get_mbx_iocb_entry(scsi_qla_host_t *ha, uint32_t handle)
if (ha->req_ring_index < cnt) if (ha->req_ring_index < cnt)
ha->req_q_cnt = cnt - ha->req_ring_index; ha->req_q_cnt = cnt - ha->req_ring_index;
else else
ha->req_q_cnt = REQUEST_ENTRY_CNT - ha->req_q_cnt = ha->request_q_length -
(ha->req_ring_index - cnt); (ha->req_ring_index - cnt);
} }
if (ha->req_q_cnt >= 3) { if (ha->req_q_cnt >= 3) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7