diff options
| author | Stephen M. Cameron <scameron@beardog.cce.hp.com> | 2014-02-18 13:57:37 -0600 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-15 10:19:08 -0700 |
| commit | 23100dd96a870470c19dcd84a50b6c43c684d912 (patch) | |
| tree | 6c7be05a2126f9f342551c480a47fe92879512d4 /drivers/scsi/hpsa.c | |
| parent | dd0e19f3ceb87a768d09ea4726ee33961665bfbb (diff) | |
| download | linux-23100dd96a870470c19dcd84a50b6c43c684d912.tar.gz linux-23100dd96a870470c19dcd84a50b6c43c684d912.tar.bz2 linux-23100dd96a870470c19dcd84a50b6c43c684d912.zip | |
[SCSI] hpsa: when switching out of accel mode await only accel command completions
Don't wait for *all* commands to complete, only for accelerated mode
commands.
Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/hpsa.c')
| -rw-r--r-- | drivers/scsi/hpsa.c | 22 |
1 files changed, 16 insertions, 6 deletions
diff --git a/drivers/scsi/hpsa.c b/drivers/scsi/hpsa.c index 442fef90ffb0..cb8760f33ea2 100644 --- a/drivers/scsi/hpsa.c +++ b/drivers/scsi/hpsa.c @@ -221,7 +221,7 @@ static inline void finish_cmd(struct CommandList *c); static void hpsa_wait_for_mode_change_ack(struct ctlr_info *h); #define BOARD_NOT_READY 0 #define BOARD_READY 1 -static void hpsa_drain_commands(struct ctlr_info *h); +static void hpsa_drain_accel_commands(struct ctlr_info *h); static void hpsa_flush_cache(struct ctlr_info *h); static int hpsa_scsi_ioaccel_queue_command(struct ctlr_info *h, struct CommandList *c, u32 ioaccel_handle, u8 *cdb, int cdb_len, @@ -6374,7 +6374,7 @@ static int hpsa_kickoff_rescan(struct ctlr_info *h) scsi_block_requests(h->scsi_host); for (i = 0; i < h->ndevices; i++) h->dev[i]->offload_enabled = 0; - hpsa_drain_commands(h); + hpsa_drain_accel_commands(h); /* Set 'accelerator path config change' bit */ dev_warn(&h->pdev->dev, "Acknowledging event: 0x%08x (HP SSD Smart Path %s)\n", @@ -7078,16 +7078,26 @@ clean_up: kfree(h->blockFetchTable); } -static void hpsa_drain_commands(struct ctlr_info *h) +static int is_accelerated_cmd(struct CommandList *c) { - int cmds_out; + return c->cmd_type == CMD_IOACCEL1 || c->cmd_type == CMD_IOACCEL2; +} + +static void hpsa_drain_accel_commands(struct ctlr_info *h) +{ + struct CommandList *c = NULL; unsigned long flags; + int accel_cmds_out; do { /* wait for all outstanding commands to drain out */ + accel_cmds_out = 0; spin_lock_irqsave(&h->lock, flags); - cmds_out = h->commands_outstanding; + list_for_each_entry(c, &h->cmpQ, list) + accel_cmds_out += is_accelerated_cmd(c); + list_for_each_entry(c, &h->reqQ, list) + accel_cmds_out += is_accelerated_cmd(c); spin_unlock_irqrestore(&h->lock, flags); - if (cmds_out <= 0) + if (accel_cmds_out <= 0) break; msleep(100); } while (1); |