Commit 1eae349d authored by Jens Axboe's avatar Jens Axboe Committed by Keith Busch
Browse files

nvme-pci: drop IRQ disabling on submission queue lock 



Since we aren't sharing the lock for completions now, we don't
have to make it IRQ safe.

Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 1ab0cd69

drivers/nvme/host/pci.c

+4 −4
Original line number Diff line number Diff line
@@ -895,9 +895,9 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx, 


	blk_mq_start_request(req);



	spin_lock_irq(&nvmeq->sq_lock);

	spin_lock(&nvmeq->sq_lock);

	__nvme_submit_cmd(nvmeq, &cmnd);

	spin_unlock_irq(&nvmeq->sq_lock);

	spin_unlock(&nvmeq->sq_lock);

	return BLK_STS_OK;

out_cleanup_iod:

	nvme_free_iod(dev, req);
@@ -1052,9 +1052,9 @@ static void nvme_pci_submit_async_event(struct nvme_ctrl *ctrl) 
	c.common.opcode = nvme_admin_async_event;

	c.common.command_id = NVME_AQ_BLK_MQ_DEPTH;



	spin_lock_irq(&nvmeq->sq_lock);

	spin_lock(&nvmeq->sq_lock);

	__nvme_submit_cmd(nvmeq, &c);

	spin_unlock_irq(&nvmeq->sq_lock);

	spin_unlock(&nvmeq->sq_lock);

}



static int adapter_delete_queue(struct nvme_dev *dev, u8 opcode, u16 id)