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

Commit 0f6422a2 authored by Jens Axboe's avatar Jens Axboe
Browse files

mtip32xx: get rid of 'atomic' argument to mtip_exec_internal_command() 



All callers can safely block. Kill the atomic/block argument, and
remove the argument from all callers.

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 c0332694

drivers/block/mtip32xx/mtip32xx.c

+43 −105
Original line number Diff line number Diff line
@@ -609,11 +609,6 @@ static void mtip_completion(struct mtip_port *port, 
	complete(waiting);

}



static void mtip_null_completion(struct mtip_port *port,

			    int tag, struct mtip_cmd *command, int status)

{

}



static int mtip_read_log_page(struct mtip_port *port, u8 page, u16 *buffer,

				dma_addr_t buffer_dma, unsigned int sectors);

static int mtip_get_smart_attr(struct mtip_port *port, unsigned int id,
@@ -1117,7 +1112,6 @@ static int mtip_exec_internal_command(struct mtip_port *port, 
					dma_addr_t buffer,

					int buf_len,

					u32 opts,

					gfp_t atomic,

					unsigned long timeout)

{

	struct mtip_cmd_sg *command_sg;
@@ -1146,13 +1140,11 @@ static int mtip_exec_internal_command(struct mtip_port *port, 


	clear_bit(MTIP_PF_DM_ACTIVE_BIT, &port->flags);



	if (atomic == GFP_KERNEL) {

	if (fis->command != ATA_CMD_STANDBYNOW1) {

		/* wait for io to complete if non atomic */

		if (mtip_quiesce_io(port,

				MTIP_QUIESCE_IO_TIMEOUT_MS, atomic) < 0) {

				dev_warn(&dd->pdev->dev,

					"Failed to quiesce IO\n");

			MTIP_QUIESCE_IO_TIMEOUT_MS, GFP_KERNEL) < 0) {

			dev_warn(&dd->pdev->dev, "Failed to quiesce IO\n");

			mtip_put_int_command(dd, int_cmd);

			clear_bit(MTIP_PF_IC_ACTIVE_BIT, &port->flags);

			wake_up_interruptible(&port->svc_wait);
@@ -1164,12 +1156,6 @@ static int mtip_exec_internal_command(struct mtip_port *port, 
	int_cmd->comp_data = &wait;

	int_cmd->comp_func = mtip_completion;



	} else {

		/* Clear completion - we're going to poll */

		int_cmd->comp_data = NULL;

		int_cmd->comp_func = mtip_null_completion;

	}



	/* Copy the command to the command table */

	memcpy(int_cmd->command, fis, fis_len*4);
@@ -1198,12 +1184,10 @@ static int mtip_exec_internal_command(struct mtip_port *port, 
	/* Issue the command to the hardware */

	mtip_issue_non_ncq_command(port, MTIP_TAG_INTERNAL);



	if (atomic == GFP_KERNEL) {

	/* Wait for the command to complete or timeout. */

		if ((rv = wait_for_completion_interruptible_timeout(

				&wait,

				msecs_to_jiffies(timeout))) <= 0) {



	rv = wait_for_completion_interruptible_timeout(&wait,

				msecs_to_jiffies(timeout));

	if (rv <= 0) {

		if (rv == -ERESTARTSYS) { /* interrupted */

			dev_err(&dd->pdev->dev,

				"Internal command [%02X] was interrupted after %u ms\n",
@@ -1233,46 +1217,8 @@ static int mtip_exec_internal_command(struct mtip_port *port, 
		rv = -EAGAIN;

		goto exec_ic_exit;

	}

	} else {

		u32 hba_stat, port_stat;



		/* Spin for <timeout> checking if command still outstanding */

		timeout = jiffies + msecs_to_jiffies(timeout);

		while ((readl(port->cmd_issue[MTIP_TAG_INTERNAL])

				& (1 << MTIP_TAG_INTERNAL))

				&& time_before(jiffies, timeout)) {

			if (mtip_check_surprise_removal(dd->pdev)) {

				rv = -ENXIO;

				goto exec_ic_exit;

			}

			if ((fis->command != ATA_CMD_STANDBYNOW1) &&

				test_bit(MTIP_DDF_REMOVE_PENDING_BIT,

						&dd->dd_flag)) {

				rv = -ENXIO;

				goto exec_ic_exit;

			}

			port_stat = readl(port->mmio + PORT_IRQ_STAT);

			if (!port_stat)

				continue;



			if (port_stat & PORT_IRQ_ERR) {

				dev_err(&dd->pdev->dev,

					"Internal command [%02X] failed\n",

					fis->command);

				mtip_device_reset(dd);

				rv = -EIO;

				goto exec_ic_exit;

			} else {

				writel(port_stat, port->mmio + PORT_IRQ_STAT);

				hba_stat = readl(dd->mmio + HOST_IRQ_STAT);

				if (hba_stat)

					writel(hba_stat,

						dd->mmio + HOST_IRQ_STAT);

			}

			break;

		}

	}



	rv = 0;

	if (readl(port->cmd_issue[MTIP_TAG_INTERNAL])

			& (1 << MTIP_TAG_INTERNAL)) {

		rv = -ENXIO;
@@ -1391,7 +1337,6 @@ static int mtip_get_identify(struct mtip_port *port, void __user *user_buffer) 
				port->identify_dma,

				sizeof(u16) * ATA_ID_WORDS,

				0,

				GFP_KERNEL,

				MTIP_INT_CMD_TIMEOUT_MS)

				< 0) {

		rv = -1;
@@ -1477,7 +1422,6 @@ static int mtip_standby_immediate(struct mtip_port *port) 
					0,

					0,

					0,

					GFP_ATOMIC,

					timeout);

	dbg_printk(MTIP_DRV_NAME "Time taken to complete standby cmd: %d ms\n",

			jiffies_to_msecs(jiffies - start));
@@ -1523,7 +1467,6 @@ static int mtip_read_log_page(struct mtip_port *port, u8 page, u16 *buffer, 
					buffer_dma,

					sectors * ATA_SECT_SIZE,

					0,

					GFP_ATOMIC,

					MTIP_INT_CMD_TIMEOUT_MS);

}
@@ -1558,7 +1501,6 @@ static int mtip_get_smart_data(struct mtip_port *port, u8 *buffer, 
					buffer_dma,

					ATA_SECT_SIZE,

					0,

					GFP_ATOMIC,

					15000);

}
@@ -1686,7 +1628,6 @@ static int mtip_send_trim(struct driver_data *dd, unsigned int lba, 
					dma_addr,

					ATA_SECT_SIZE,

					0,

					GFP_KERNEL,

					MTIP_TRIM_TIMEOUT_MS) < 0)

		rv = -EIO;
@@ -1850,7 +1791,6 @@ static int exec_drive_task(struct mtip_port *port, u8 *command) 
				 0,

				 0,

				 0,

				 GFP_KERNEL,

				 to) < 0) {

		return -1;

	}
@@ -1946,7 +1886,6 @@ static int exec_drive_command(struct mtip_port *port, u8 *command, 
				 (xfer_sz ? dma_addr : 0),

				 (xfer_sz ? ATA_SECT_SIZE * xfer_sz : 0),

				 0,

				 GFP_KERNEL,

				 to)

				 < 0) {

		rv = -EFAULT;
@@ -2189,7 +2128,6 @@ static int exec_drive_taskfile(struct driver_data *dd, 
				 dma_buffer,

				 transfer_size,

				 0,

				 GFP_KERNEL,

				 timeout) < 0) {

		err = -EIO;

		goto abort;