Skip to content

Commit

Permalink
[SCSI] ipr: Add support to flash FPGA and flash back DRAM images
Browse files Browse the repository at this point in the history
The write buffer command is used to download and burn new IOA FW images.
The same interface can now be used to flash FPGA and flash back DRAM images.
To download and flash the new images takes more than 15 minutes, so increase
the write buffer command timeout to 30 minutes.

The FPGA and flash back DRAM images don't have the same card_type as the IOA FW
image. So, remove the sanity checking from the driver.  The adapter has sanity
checking and will only accept a valid image.

Signed-off-by: Wayne Boyer <wayneb@linux.vnet.ibm.com>
Acked-by: Brian King <brking@linux.vnet.ibm.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
  • Loading branch information
Wayne Boyer authored and James Bottomley committed Oct 16, 2011
1 parent 1a34c06 commit 14ed9cc
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
10 changes: 2 additions & 8 deletions drivers/scsi/ipr.c
Original file line number Diff line number Diff line change
Expand Up @@ -3751,14 +3751,6 @@ static ssize_t ipr_store_update_fw(struct device *dev,

image_hdr = (struct ipr_ucode_image_header *)fw_entry->data;

if (be32_to_cpu(image_hdr->header_length) > fw_entry->size ||
(ioa_cfg->vpd_cbs->page3_data.card_type &&
ioa_cfg->vpd_cbs->page3_data.card_type != image_hdr->card_type)) {
dev_err(&ioa_cfg->pdev->dev, "Invalid microcode buffer\n");
release_firmware(fw_entry);
return -EINVAL;
}

src = (u8 *)image_hdr + be32_to_cpu(image_hdr->header_length);
dnld_size = fw_entry->size - be32_to_cpu(image_hdr->header_length);
sglist = ipr_alloc_ucode_buffer(dnld_size);
Expand All @@ -3777,6 +3769,8 @@ static ssize_t ipr_store_update_fw(struct device *dev,
goto out;
}

ipr_info("Updating microcode, please be patient. This may take up to 30 minutes.\n");

result = ipr_update_ioa_ucode(ioa_cfg, sglist);

if (!result)
Expand Down
2 changes: 1 addition & 1 deletion drivers/scsi/ipr.h
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@
#define IPR_CANCEL_ALL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ)
#define IPR_ABORT_TASK_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ)
#define IPR_INTERNAL_TIMEOUT (ipr_fastfail ? 10 * HZ : 30 * HZ)
#define IPR_WRITE_BUFFER_TIMEOUT (10 * 60 * HZ)
#define IPR_WRITE_BUFFER_TIMEOUT (30 * 60 * HZ)
#define IPR_SET_SUP_DEVICE_TIMEOUT (2 * 60 * HZ)
#define IPR_REQUEST_SENSE_TIMEOUT (10 * HZ)
#define IPR_OPERATIONAL_TIMEOUT (5 * 60)
Expand Down

0 comments on commit 14ed9cc

Please sign in to comment.