Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit baed548a authored by Jens Axboe's avatar Jens Axboe
Browse files

mtip32xx: abstract out "are any commands active" helper 



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

Reviewed-by: default avatarBart Van Assche <Bart.VanAssche@sandisk.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Tested-by: default avatarMing Lei <ming.lei@redhat.com>
Signed-off-by: default avatarJens Axboe <axboe@fb.com>
parent 8afdd94c

drivers/block/mtip32xx/mtip32xx.c

+18 −10
Original line number Diff line number Diff line
@@ -1030,6 +1030,22 @@ static bool mtip_pause_ncq(struct mtip_port *port, 
	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

 *
@@ -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)

{

	unsigned long to;

	unsigned int n;

	unsigned int active = 1;

	bool active = true;



	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))

			goto err_fault;



		/*

		 * 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]);



		active = mtip_commands_active(port);

		if (!active)

			break;

	} while (time_before(jiffies, to));