[SCSI] hpsa: Check for dma_mapping_error for all code paths using fill_cmd
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
This commit is contained in:
parent
eceaae187d
commit
a2dac136c4
|
@ -165,7 +165,7 @@ static void cmd_free(struct ctlr_info *h, struct CommandList *c);
|
||||||
static void cmd_special_free(struct ctlr_info *h, struct CommandList *c);
|
static void cmd_special_free(struct ctlr_info *h, struct CommandList *c);
|
||||||
static struct CommandList *cmd_alloc(struct ctlr_info *h);
|
static struct CommandList *cmd_alloc(struct ctlr_info *h);
|
||||||
static struct CommandList *cmd_special_alloc(struct ctlr_info *h);
|
static struct CommandList *cmd_special_alloc(struct ctlr_info *h);
|
||||||
static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
static int fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
||||||
void *buff, size_t size, u8 page_code, unsigned char *scsi3addr,
|
void *buff, size_t size, u8 page_code, unsigned char *scsi3addr,
|
||||||
int cmd_type);
|
int cmd_type);
|
||||||
|
|
||||||
|
@ -1390,7 +1390,7 @@ static void hpsa_pci_unmap(struct pci_dev *pdev,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static void hpsa_map_one(struct pci_dev *pdev,
|
static int hpsa_map_one(struct pci_dev *pdev,
|
||||||
struct CommandList *cp,
|
struct CommandList *cp,
|
||||||
unsigned char *buf,
|
unsigned char *buf,
|
||||||
size_t buflen,
|
size_t buflen,
|
||||||
|
@ -1401,14 +1401,15 @@ static void hpsa_map_one(struct pci_dev *pdev,
|
||||||
if (buflen == 0 || data_direction == PCI_DMA_NONE) {
|
if (buflen == 0 || data_direction == PCI_DMA_NONE) {
|
||||||
cp->Header.SGList = 0;
|
cp->Header.SGList = 0;
|
||||||
cp->Header.SGTotal = 0;
|
cp->Header.SGTotal = 0;
|
||||||
return;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
addr64 = (u64) pci_map_single(pdev, buf, buflen, data_direction);
|
addr64 = (u64) pci_map_single(pdev, buf, buflen, data_direction);
|
||||||
if (dma_mapping_error(&pdev->dev, addr64)) {
|
if (dma_mapping_error(&pdev->dev, addr64)) {
|
||||||
|
/* Prevent subsequent unmap of something never mapped */
|
||||||
cp->Header.SGList = 0;
|
cp->Header.SGList = 0;
|
||||||
cp->Header.SGTotal = 0;
|
cp->Header.SGTotal = 0;
|
||||||
return;
|
return -1;
|
||||||
}
|
}
|
||||||
cp->SG[0].Addr.lower =
|
cp->SG[0].Addr.lower =
|
||||||
(u32) (addr64 & (u64) 0x00000000FFFFFFFF);
|
(u32) (addr64 & (u64) 0x00000000FFFFFFFF);
|
||||||
|
@ -1417,6 +1418,7 @@ static void hpsa_map_one(struct pci_dev *pdev,
|
||||||
cp->SG[0].Len = buflen;
|
cp->SG[0].Len = buflen;
|
||||||
cp->Header.SGList = (u8) 1; /* no. SGs contig in this cmd */
|
cp->Header.SGList = (u8) 1; /* no. SGs contig in this cmd */
|
||||||
cp->Header.SGTotal = (u16) 1; /* total sgs in this cmd list */
|
cp->Header.SGTotal = (u16) 1; /* total sgs in this cmd list */
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static inline void hpsa_scsi_do_simple_cmd_core(struct ctlr_info *h,
|
static inline void hpsa_scsi_do_simple_cmd_core(struct ctlr_info *h,
|
||||||
|
@ -1545,13 +1547,18 @@ static int hpsa_scsi_do_inquiry(struct ctlr_info *h, unsigned char *scsi3addr,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
fill_cmd(c, HPSA_INQUIRY, h, buf, bufsize, page, scsi3addr, TYPE_CMD);
|
if (fill_cmd(c, HPSA_INQUIRY, h, buf, bufsize,
|
||||||
|
page, scsi3addr, TYPE_CMD)) {
|
||||||
|
rc = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE);
|
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE);
|
||||||
ei = c->err_info;
|
ei = c->err_info;
|
||||||
if (ei->CommandStatus != 0 && ei->CommandStatus != CMD_DATA_UNDERRUN) {
|
if (ei->CommandStatus != 0 && ei->CommandStatus != CMD_DATA_UNDERRUN) {
|
||||||
hpsa_scsi_interpret_error(c);
|
hpsa_scsi_interpret_error(c);
|
||||||
rc = -1;
|
rc = -1;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
cmd_special_free(h, c);
|
cmd_special_free(h, c);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -1569,7 +1576,9 @@ static int hpsa_send_reset(struct ctlr_info *h, unsigned char *scsi3addr)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
fill_cmd(c, HPSA_DEVICE_RESET_MSG, h, NULL, 0, 0, scsi3addr, TYPE_MSG);
|
/* fill_cmd can't fail here, no data buffer to map. */
|
||||||
|
(void) fill_cmd(c, HPSA_DEVICE_RESET_MSG, h,
|
||||||
|
NULL, 0, 0, scsi3addr, TYPE_MSG);
|
||||||
hpsa_scsi_do_simple_cmd_core(h, c);
|
hpsa_scsi_do_simple_cmd_core(h, c);
|
||||||
/* no unmap needed here because no data xfer. */
|
/* no unmap needed here because no data xfer. */
|
||||||
|
|
||||||
|
@ -1636,8 +1645,11 @@ static int hpsa_scsi_do_report_luns(struct ctlr_info *h, int logical,
|
||||||
}
|
}
|
||||||
/* address the controller */
|
/* address the controller */
|
||||||
memset(scsi3addr, 0, sizeof(scsi3addr));
|
memset(scsi3addr, 0, sizeof(scsi3addr));
|
||||||
fill_cmd(c, logical ? HPSA_REPORT_LOG : HPSA_REPORT_PHYS, h,
|
if (fill_cmd(c, logical ? HPSA_REPORT_LOG : HPSA_REPORT_PHYS, h,
|
||||||
buf, bufsize, 0, scsi3addr, TYPE_CMD);
|
buf, bufsize, 0, scsi3addr, TYPE_CMD)) {
|
||||||
|
rc = -1;
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
if (extended_response)
|
if (extended_response)
|
||||||
c->Request.CDB[1] = extended_response;
|
c->Request.CDB[1] = extended_response;
|
||||||
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE);
|
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_FROMDEVICE);
|
||||||
|
@ -1647,6 +1659,7 @@ static int hpsa_scsi_do_report_luns(struct ctlr_info *h, int logical,
|
||||||
hpsa_scsi_interpret_error(c);
|
hpsa_scsi_interpret_error(c);
|
||||||
rc = -1;
|
rc = -1;
|
||||||
}
|
}
|
||||||
|
out:
|
||||||
cmd_special_free(h, c);
|
cmd_special_free(h, c);
|
||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
@ -2358,8 +2371,9 @@ static int wait_for_device_to_become_ready(struct ctlr_info *h,
|
||||||
if (waittime < HPSA_MAX_WAIT_INTERVAL_SECS)
|
if (waittime < HPSA_MAX_WAIT_INTERVAL_SECS)
|
||||||
waittime = waittime * 2;
|
waittime = waittime * 2;
|
||||||
|
|
||||||
/* Send the Test Unit Ready */
|
/* Send the Test Unit Ready, fill_cmd can't fail, no mapping */
|
||||||
fill_cmd(c, TEST_UNIT_READY, h, NULL, 0, 0, lunaddr, TYPE_CMD);
|
(void) fill_cmd(c, TEST_UNIT_READY, h,
|
||||||
|
NULL, 0, 0, lunaddr, TYPE_CMD);
|
||||||
hpsa_scsi_do_simple_cmd_core(h, c);
|
hpsa_scsi_do_simple_cmd_core(h, c);
|
||||||
/* no unmap needed here because no data xfer. */
|
/* no unmap needed here because no data xfer. */
|
||||||
|
|
||||||
|
@ -2444,7 +2458,9 @@ static int hpsa_send_abort(struct ctlr_info *h, unsigned char *scsi3addr,
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
fill_cmd(c, HPSA_ABORT_MSG, h, abort, 0, 0, scsi3addr, TYPE_MSG);
|
/* fill_cmd can't fail here, no buffer to map */
|
||||||
|
(void) fill_cmd(c, HPSA_ABORT_MSG, h, abort,
|
||||||
|
0, 0, scsi3addr, TYPE_MSG);
|
||||||
if (swizzle)
|
if (swizzle)
|
||||||
swizzle_abort_tag(&c->Request.CDB[4]);
|
swizzle_abort_tag(&c->Request.CDB[4]);
|
||||||
hpsa_scsi_do_simple_cmd_core(h, c);
|
hpsa_scsi_do_simple_cmd_core(h, c);
|
||||||
|
@ -3195,7 +3211,8 @@ static int hpsa_send_host_reset(struct ctlr_info *h, unsigned char *scsi3addr,
|
||||||
c = cmd_alloc(h);
|
c = cmd_alloc(h);
|
||||||
if (!c)
|
if (!c)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
fill_cmd(c, HPSA_DEVICE_RESET_MSG, h, NULL, 0, 0,
|
/* fill_cmd can't fail here, no data buffer to map */
|
||||||
|
(void) fill_cmd(c, HPSA_DEVICE_RESET_MSG, h, NULL, 0, 0,
|
||||||
RAID_CTLR_LUNID, TYPE_MSG);
|
RAID_CTLR_LUNID, TYPE_MSG);
|
||||||
c->Request.CDB[1] = reset_type; /* fill_cmd defaults to target reset */
|
c->Request.CDB[1] = reset_type; /* fill_cmd defaults to target reset */
|
||||||
c->waiting = NULL;
|
c->waiting = NULL;
|
||||||
|
@ -3207,7 +3224,7 @@ static int hpsa_send_host_reset(struct ctlr_info *h, unsigned char *scsi3addr,
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
static int fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
||||||
void *buff, size_t size, u8 page_code, unsigned char *scsi3addr,
|
void *buff, size_t size, u8 page_code, unsigned char *scsi3addr,
|
||||||
int cmd_type)
|
int cmd_type)
|
||||||
{
|
{
|
||||||
|
@ -3276,7 +3293,7 @@ static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
||||||
default:
|
default:
|
||||||
dev_warn(&h->pdev->dev, "unknown command 0x%c\n", cmd);
|
dev_warn(&h->pdev->dev, "unknown command 0x%c\n", cmd);
|
||||||
BUG();
|
BUG();
|
||||||
return;
|
return -1;
|
||||||
}
|
}
|
||||||
} else if (cmd_type == TYPE_MSG) {
|
} else if (cmd_type == TYPE_MSG) {
|
||||||
switch (cmd) {
|
switch (cmd) {
|
||||||
|
@ -3348,10 +3365,9 @@ static void fill_cmd(struct CommandList *c, u8 cmd, struct ctlr_info *h,
|
||||||
default:
|
default:
|
||||||
pci_dir = PCI_DMA_BIDIRECTIONAL;
|
pci_dir = PCI_DMA_BIDIRECTIONAL;
|
||||||
}
|
}
|
||||||
|
if (hpsa_map_one(h->pdev, c, buff, size, pci_dir))
|
||||||
hpsa_map_one(h->pdev, c, buff, size, pci_dir);
|
return -1;
|
||||||
|
return 0;
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -4887,10 +4903,13 @@ static void hpsa_flush_cache(struct ctlr_info *h)
|
||||||
dev_warn(&h->pdev->dev, "cmd_special_alloc returned NULL!\n");
|
dev_warn(&h->pdev->dev, "cmd_special_alloc returned NULL!\n");
|
||||||
goto out_of_memory;
|
goto out_of_memory;
|
||||||
}
|
}
|
||||||
fill_cmd(c, HPSA_CACHE_FLUSH, h, flush_buf, 4, 0,
|
if (fill_cmd(c, HPSA_CACHE_FLUSH, h, flush_buf, 4, 0,
|
||||||
RAID_CTLR_LUNID, TYPE_CMD);
|
RAID_CTLR_LUNID, TYPE_CMD)) {
|
||||||
|
goto out;
|
||||||
|
}
|
||||||
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_TODEVICE);
|
hpsa_scsi_do_simple_cmd_with_retry(h, c, PCI_DMA_TODEVICE);
|
||||||
if (c->err_info->CommandStatus != 0)
|
if (c->err_info->CommandStatus != 0)
|
||||||
|
out:
|
||||||
dev_warn(&h->pdev->dev,
|
dev_warn(&h->pdev->dev,
|
||||||
"error flushing cache on controller\n");
|
"error flushing cache on controller\n");
|
||||||
cmd_special_free(h, c);
|
cmd_special_free(h, c);
|
||||||
|
|
Loading…
Reference in a new issue