p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mtip32xx: abstract out "are any commands active" helper 

This is a prep patch for backoff in ->queue_rq() for non-ncq commands.

Reviewed-by: Bart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Tested-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
This commit is contained in:
Jens Axboe 2017-04-28 07:54:06 -06:00
parent 8afdd94c74
commit baed548a98
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
drivers/block/mtip32xx/mtip32xx.c
View File

@ -1030,6 +1030,22 @@ static bool mtip_pause_ncq(struct mtip_port *port,
return false; return false;
} }
static bool mtip_commands_active(struct mtip_port *port)
{
unsigned int active;
unsigned int n;
/*
* Ignore s_active bit 0 of array element 0.
* This bit will always be set
*/
active = readl(port->s_active[0]) & 0xFFFFFFFE;
for (n = 1; n < port->dd->slot_groups; n++)
active |= readl(port->s_active[n]);
return active != 0;
}
/* /*
* Wait for port to quiesce * Wait for port to quiesce
* *
@ -1043,8 +1059,7 @@ static bool mtip_pause_ncq(struct mtip_port *port,
static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout) static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)
{ {
unsigned long to; unsigned long to;
unsigned int n; bool active = true;
unsigned int active = 1;
blk_mq_stop_hw_queues(port->dd->queue); blk_mq_stop_hw_queues(port->dd->queue);
@ -1061,14 +1076,7 @@ static int mtip_quiesce_io(struct mtip_port *port, unsigned long timeout)
if (mtip_check_surprise_removal(port->dd->pdev)) if (mtip_check_surprise_removal(port->dd->pdev))
goto err_fault; goto err_fault;
/* active = mtip_commands_active(port);
* Ignore s_active bit 0 of array element 0.
* This bit will always be set
*/
active = readl(port->s_active[0]) & 0xFFFFFFFE;
for (n = 1; n < port->dd->slot_groups; n++)
active |= readl(port->s_active[n]);
if (!active) if (!active)
break; break;
} while (time_before(jiffies, to)); } while (time_before(jiffies, to));