Commit 83021920 authored by 's avatar Committed by James Bottomley

[PATCH] qla2xxx: cleanup DMA mappings...

  Don't use cmd->request->nr_hw_segments as it may not be initialized
  (SG_IO in particular bypasses anything that initializes this and just
  uses scsi_do_req to insert a scsi_request directly on the head of the
  queue) and a bogus value here can trip up the checks to make sure that
  the number of segments will fit in the queue ring buffer, resulting in
  commands that are never completed.

  Fix up several issues with PCI DMA mapping and failure to check return
  values on the mappings.

  Make the check for space in the ring buffer happen after the DMA mapping
  is done since any checks done before the mapping has taken place are
  bogus.

  Doug Ledford <dledford@redhat.com>.
Signed-off-by: default avatarAndrew Vasquez <andrew.vasquez@qlogic.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent bdf79621
...@@ -216,18 +216,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt, ...@@ -216,18 +216,7 @@ void qla2x00_build_scsi_iocbs_32(srb_t *sp, cmd_entry_t *cmd_pkt,
cur_seg++; cur_seg++;
} }
} else { } else {
dma_addr_t req_dma; *cur_dsd++ = cpu_to_le32(sp->dma_handle);
struct page *page;
unsigned long offset;
page = virt_to_page(cmd->request_buffer);
offset = ((unsigned long)cmd->request_buffer & ~PAGE_MASK);
req_dma = pci_map_page(ha->pdev, page, offset,
cmd->request_bufflen, cmd->sc_data_direction);
sp->dma_handle = req_dma;
*cur_dsd++ = cpu_to_le32(req_dma);
*cur_dsd++ = cpu_to_le32(cmd->request_bufflen); *cur_dsd++ = cpu_to_le32(cmd->request_bufflen);
} }
} }
...@@ -299,19 +288,8 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt, ...@@ -299,19 +288,8 @@ void qla2x00_build_scsi_iocbs_64(srb_t *sp, cmd_entry_t *cmd_pkt,
cur_seg++; cur_seg++;
} }
} else { } else {
dma_addr_t req_dma; *cur_dsd++ = cpu_to_le32(LSD(sp->dma_handle));
struct page *page; *cur_dsd++ = cpu_to_le32(MSD(sp->dma_handle));
unsigned long offset;
page = virt_to_page(cmd->request_buffer);
offset = ((unsigned long)cmd->request_buffer & ~PAGE_MASK);
req_dma = pci_map_page(ha->pdev, page, offset,
cmd->request_bufflen, cmd->sc_data_direction);
sp->dma_handle = req_dma;
*cur_dsd++ = cpu_to_le32(LSD(req_dma));
*cur_dsd++ = cpu_to_le32(MSD(req_dma));
*cur_dsd++ = cpu_to_le32(cmd->request_bufflen); *cur_dsd++ = cpu_to_le32(cmd->request_bufflen);
} }
} }
...@@ -345,6 +323,8 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -345,6 +323,8 @@ qla2x00_start_scsi(srb_t *sp)
ha = sp->ha; ha = sp->ha;
reg = ha->iobase; reg = ha->iobase;
cmd = sp->cmd; cmd = sp->cmd;
/* So we know we haven't pci_map'ed anything yet */
tot_dsds = 0;
/* Send marker if required */ /* Send marker if required */
if (ha->marker_needed != 0) { if (ha->marker_needed != 0) {
...@@ -369,8 +349,27 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -369,8 +349,27 @@ qla2x00_start_scsi(srb_t *sp)
if (index == MAX_OUTSTANDING_COMMANDS) if (index == MAX_OUTSTANDING_COMMANDS)
goto queuing_error; goto queuing_error;
/* Map the sg table so we have an accurate count of sg entries needed */
if (cmd->use_sg) {
sg = (struct scatterlist *) cmd->request_buffer;
tot_dsds = pci_map_sg(ha->pdev, sg, cmd->use_sg,
cmd->sc_data_direction);
if (tot_dsds == 0)
goto queuing_error;
} else if (cmd->request_bufflen) {
dma_addr_t req_dma;
req_dma = pci_map_single(ha->pdev, cmd->request_buffer,
cmd->request_bufflen, cmd->sc_data_direction);
if (dma_mapping_error(req_dma))
goto queuing_error;
sp->dma_handle = req_dma;
tot_dsds = 1;
}
/* Calculate the number of request entries needed. */ /* Calculate the number of request entries needed. */
req_cnt = (ha->calc_request_entries)(cmd->request->nr_hw_segments); req_cnt = (ha->calc_request_entries)(tot_dsds);
if (ha->req_q_cnt < (req_cnt + 2)) { if (ha->req_q_cnt < (req_cnt + 2)) {
cnt = RD_REG_WORD_RELAXED(ISP_REQ_Q_OUT(ha, reg)); cnt = RD_REG_WORD_RELAXED(ISP_REQ_Q_OUT(ha, reg));
if (ha->req_ring_index < cnt) if (ha->req_ring_index < cnt)
...@@ -382,19 +381,6 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -382,19 +381,6 @@ qla2x00_start_scsi(srb_t *sp)
if (ha->req_q_cnt < (req_cnt + 2)) if (ha->req_q_cnt < (req_cnt + 2))
goto queuing_error; goto queuing_error;
/* Finally, we have enough space, now perform mappings. */
tot_dsds = 0;
if (cmd->use_sg) {
sg = (struct scatterlist *) cmd->request_buffer;
tot_dsds = pci_map_sg(ha->pdev, sg, cmd->use_sg,
cmd->sc_data_direction);
if (tot_dsds == 0)
goto queuing_error;
} else if (cmd->request_bufflen) {
tot_dsds++;
}
req_cnt = (ha->calc_request_entries)(tot_dsds);
/* Build command packet */ /* Build command packet */
ha->current_outstanding_cmd = handle; ha->current_outstanding_cmd = handle;
ha->outstanding_cmds[handle] = sp; ha->outstanding_cmds[handle] = sp;
...@@ -461,6 +447,14 @@ qla2x00_start_scsi(srb_t *sp) ...@@ -461,6 +447,14 @@ qla2x00_start_scsi(srb_t *sp)
return (QLA_SUCCESS); return (QLA_SUCCESS);
queuing_error: queuing_error:
if (cmd->use_sg && tot_dsds) {
sg = (struct scatterlist *) cmd->request_buffer;
pci_unmap_sg(ha->pdev, sg, cmd->use_sg,
cmd->sc_data_direction);
} else if (tot_dsds) {
pci_unmap_single(ha->pdev, sp->dma_handle,
cmd->request_bufflen, cmd->sc_data_direction);
}
spin_unlock_irqrestore(&ha->hardware_lock, flags); spin_unlock_irqrestore(&ha->hardware_lock, flags);
return (QLA_FUNCTION_FAILED); return (QLA_FUNCTION_FAILED);
......
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