From 8cfec5f89d5c1d846f5be180b6e7367924149f71 Mon Sep 17 00:00:00 2001 From: Wayne Boyer Date: Mon, 3 Oct 2011 20:54:37 -0700 Subject: [PATCH] --- yaml --- r: 271099 b: refs/heads/master c: 14ed9cc7e7b9a95d56c2bf91cab2f010968d6e73 h: refs/heads/master i: 271097: 3b544254f1a5fb5e05939f33b4faa210907edfbf 271095: 74526eff335eef9ddd9f3ed4b5284e8d63755a71 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ipr.c | 10 ++-------- trunk/drivers/scsi/ipr.h | 2 +- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index f02346b1200b..39cf571cbc05 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a34c0640137eed8dabdac3a68a7a84116ac9e0d +refs/heads/master: 14ed9cc7e7b9a95d56c2bf91cab2f010968d6e73 diff --git a/trunk/drivers/scsi/ipr.c b/trunk/drivers/scsi/ipr.c index f03963a972fc..e16a9cf442c1 100644 --- a/trunk/drivers/scsi/ipr.c +++ b/trunk/drivers/scsi/ipr.c @@ -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); @@ -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) diff --git a/trunk/drivers/scsi/ipr.h b/trunk/drivers/scsi/ipr.h index f9766f84d91c..0cbf58f6ae5d 100644 --- a/trunk/drivers/scsi/ipr.h +++ b/trunk/drivers/scsi/ipr.h @@ -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)