hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hpsa: Rearrange start_io to avoid one unlock/lock sequence in main io path 

Signed-off-by: Stephen M. Cameron <scameron@beardog.cce.hp.com>
Reviewed-by: Joe Handzik <joseph.t.handzik@hp.com>
Signed-off-by: Christoph Hellwig <hch@lst.de>
This commit is contained in:
Stephen M. Cameron 2014-05-29 10:53:28 -05:00 committed by Christoph Hellwig
parent b3a52e791e
commit 0b57075deb
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/scsi/hpsa.c
View File

@ -194,7 +194,8 @@ static int number_of_controllers;
static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id); static irqreturn_t do_hpsa_intr_intx(int irq, void *dev_id);
static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id); static irqreturn_t do_hpsa_intr_msi(int irq, void *dev_id);
static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg); static int hpsa_ioctl(struct scsi_device *dev, int cmd, void *arg);
static void start_io(struct ctlr_info *h); static void lock_and_start_io(struct ctlr_info *h);
static void start_io(struct ctlr_info *h, unsigned long *flags);
#ifdef CONFIG_COMPAT #ifdef CONFIG_COMPAT
static int hpsa_compat_ioctl(struct scsi_device *dev, int cmd, void *arg); static int hpsa_compat_ioctl(struct scsi_device *dev, int cmd, void *arg);
@ -845,8 +846,8 @@ static void enqueue_cmd_and_start_io(struct ctlr_info *h,
spin_lock_irqsave(&h->lock, flags); spin_lock_irqsave(&h->lock, flags);
addQ(&h->reqQ, c); addQ(&h->reqQ, c);
h->Qdepth++; h->Qdepth++;
start_io(h, &flags);
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, flags);
start_io(h);
} }
static inline void removeQ(struct CommandList *c) static inline void removeQ(struct CommandList *c)
@ -5459,13 +5460,12 @@ static void __iomem *remap_pci_mem(ulong base, ulong size)
/* Takes cmds off the submission queue and sends them to the hardware, /* Takes cmds off the submission queue and sends them to the hardware,
* then puts them on the queue of cmds waiting for completion. * then puts them on the queue of cmds waiting for completion.
* Assumes h->lock is held
*/ */
static void start_io(struct ctlr_info *h) static void start_io(struct ctlr_info *h, unsigned long *flags)
{ {
struct CommandList *c; struct CommandList *c;
unsigned long flags;
spin_lock_irqsave(&h->lock, flags);
while (!list_empty(&h->reqQ)) { while (!list_empty(&h->reqQ)) {
c = list_entry(h->reqQ.next, struct CommandList, list); c = list_entry(h->reqQ.next, struct CommandList, list);
/* can't do anything if fifo is full */ /* can't do anything if fifo is full */
@ -5490,10 +5490,18 @@ static void start_io(struct ctlr_info *h)
h->commands_outstanding++; h->commands_outstanding++;
/* Tell the controller execute command */ /* Tell the controller execute command */
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, *flags);
h->access.submit_command(h, c); h->access.submit_command(h, c);
spin_lock_irqsave(&h->lock, flags); spin_lock_irqsave(&h->lock, *flags);
} }
}
static void lock_and_start_io(struct ctlr_info *h)
{
unsigned long flags;
spin_lock_irqsave(&h->lock, flags);
start_io(h, &flags);
spin_unlock_irqrestore(&h->lock, flags); spin_unlock_irqrestore(&h->lock, flags);
} }
@ -5561,7 +5569,7 @@ static inline void finish_cmd(struct CommandList *c)
else if (c->cmd_type == CMD_IOCTL_PEND) else if (c->cmd_type == CMD_IOCTL_PEND)
complete(c->waiting); complete(c->waiting);
if (unlikely(io_may_be_stalled)) if (unlikely(io_may_be_stalled))
start_io(h); lock_and_start_io(h);
} }
static inline u32 hpsa_tag_contains_index(u32 tag) static inline u32 hpsa_tag_contains_index(u32 tag)