Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

firewire: Handle the last few DMA mapping error cases.

Browse source 
This should be the last missing checks.

Signed-off-by: Kristian Hoegsberg <krh@redhat.com>
Signed-off-by: Stefan Richter <stefanr@s5r6.in-berlin.de>
This commit is contained in:
Kristian Høgsberg 2007-05-09 19:23:08 -04:00 committed by Stefan Richter
parent ad85274fb7
commit 95ffc5e314
1 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/firewire/fw-sbp2.c
View file

@ -892,7 +892,7 @@ complete_command_orb(struct sbp2_orb *base_orb, struct sbp2_status *status)
kfree(orb); kfree(orb);
} }
static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb) static int sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
{ {
struct sbp2_device *sd = struct sbp2_device *sd =
(struct sbp2_device *)orb->cmd->device->host->hostdata; (struct sbp2_device *)orb->cmd->device->host->hostdata;
@ -906,6 +906,8 @@ static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
sg = (struct scatterlist *)orb->cmd->request_buffer; sg = (struct scatterlist *)orb->cmd->request_buffer;
count = dma_map_sg(device->card->device, sg, orb->cmd->use_sg, count = dma_map_sg(device->card->device, sg, orb->cmd->use_sg,
orb->cmd->sc_data_direction); orb->cmd->sc_data_direction);
if (count == 0)
goto fail;
/* /*
* Handle the special case where there is only one element in * Handle the special case where there is only one element in
@ -919,7 +921,7 @@ static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
orb->request.data_descriptor.low = sg_dma_address(sg); orb->request.data_descriptor.low = sg_dma_address(sg);
orb->request.misc |= orb->request.misc |=
COMMAND_ORB_DATA_SIZE(sg_dma_len(sg)); COMMAND_ORB_DATA_SIZE(sg_dma_len(sg));
return; return 0;
} }
/* /*
@ -952,6 +954,8 @@ static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
orb->page_table_bus = orb->page_table_bus =
dma_map_single(device->card->device, orb->page_table, dma_map_single(device->card->device, orb->page_table,
size, DMA_TO_DEVICE); size, DMA_TO_DEVICE);
if (dma_mapping_error(orb->page_table_bus))
goto fail_page_table;
orb->request.data_descriptor.high = sd->address_high; orb->request.data_descriptor.high = sd->address_high;
orb->request.data_descriptor.low = orb->page_table_bus; orb->request.data_descriptor.low = orb->page_table_bus;
orb->request.misc |= orb->request.misc |=
@ -959,9 +963,17 @@ static void sbp2_command_orb_map_scatterlist(struct sbp2_command_orb *orb)
COMMAND_ORB_DATA_SIZE(j); COMMAND_ORB_DATA_SIZE(j);
fw_memcpy_to_be32(orb->page_table, orb->page_table, size); fw_memcpy_to_be32(orb->page_table, orb->page_table, size);
return 0;
fail_page_table:
dma_unmap_sg(device->card->device, sg, orb->cmd->use_sg,
orb->cmd->sc_data_direction);
fail:
return -ENOMEM;
} }
static void sbp2_command_orb_map_buffer(struct sbp2_command_orb *orb) static int sbp2_command_orb_map_buffer(struct sbp2_command_orb *orb)
{ {
struct sbp2_device *sd = struct sbp2_device *sd =
(struct sbp2_device *)orb->cmd->device->host->hostdata; (struct sbp2_device *)orb->cmd->device->host->hostdata;
@ -978,10 +990,15 @@ static void sbp2_command_orb_map_buffer(struct sbp2_command_orb *orb)
orb->cmd->request_buffer, orb->cmd->request_buffer,
orb->cmd->request_bufflen, orb->cmd->request_bufflen,
orb->cmd->sc_data_direction); orb->cmd->sc_data_direction);
if (dma_mapping_error(orb->request_buffer_bus))
return -ENOMEM;
orb->request.data_descriptor.high = sd->address_high; orb->request.data_descriptor.high = sd->address_high;
orb->request.data_descriptor.low = orb->request_buffer_bus; orb->request.data_descriptor.low = orb->request_buffer_bus;
orb->request.misc |= orb->request.misc |=
COMMAND_ORB_DATA_SIZE(orb->cmd->request_bufflen); COMMAND_ORB_DATA_SIZE(orb->cmd->request_bufflen);
return 0;
} }
/* SCSI stack integration */ /* SCSI stack integration */
@ -1042,7 +1059,8 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA); COMMAND_ORB_DIRECTION(SBP2_DIRECTION_TO_MEDIA);
if (cmd->use_sg) { if (cmd->use_sg) {
sbp2_command_orb_map_scatterlist(orb); if (sbp2_command_orb_map_scatterlist(orb) < 0)
goto fail_map_payload;
} else if (cmd->request_bufflen > SBP2_MAX_SG_ELEMENT_LENGTH) { } else if (cmd->request_bufflen > SBP2_MAX_SG_ELEMENT_LENGTH) {
/* /*
* FIXME: Need to split this into a sg list... but * FIXME: Need to split this into a sg list... but
@ -1050,9 +1068,10 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
* reporting our max supported block size? * reporting our max supported block size?
*/ */
fw_error("command > 64k\n"); fw_error("command > 64k\n");
goto fail_bufflen; goto fail_map_payload;
} else if (cmd->request_bufflen > 0) { } else if (cmd->request_bufflen > 0) {
sbp2_command_orb_map_buffer(orb); if (sbp2_command_orb_map_buffer(orb) < 0)
goto fail_map_payload;
} }
fw_memcpy_to_be32(&orb->request, &orb->request, sizeof orb->request); fw_memcpy_to_be32(&orb->request, &orb->request, sizeof orb->request);
@ -1068,7 +1087,7 @@ static int sbp2_scsi_queuecommand(struct scsi_cmnd *cmd, scsi_done_fn_t done)
return 0; return 0;
fail_bufflen: fail_map_payload:
dma_unmap_single(device->card->device, orb->base.request_bus, dma_unmap_single(device->card->device, orb->base.request_bus,
sizeof orb->request, DMA_TO_DEVICE); sizeof orb->request, DMA_TO_DEVICE);
fail_mapping: fail_mapping: