Skip to content

Commit 1eae349

Browse files
axboeKeith Busch
authored andcommitted
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: Christoph Hellwig <[email protected]> Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Christoph Hellwig <[email protected]>
1 parent 1ab0cd6 commit 1eae349

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/nvme/host/pci.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -895,9 +895,9 @@ static blk_status_t nvme_queue_rq(struct blk_mq_hw_ctx *hctx,
895895

896896
blk_mq_start_request(req);
897897

898-
spin_lock_irq(&nvmeq->sq_lock);
898+
spin_lock(&nvmeq->sq_lock);
899899
__nvme_submit_cmd(nvmeq, &cmnd);
900-
spin_unlock_irq(&nvmeq->sq_lock);
900+
spin_unlock(&nvmeq->sq_lock);
901901
return BLK_STS_OK;
902902
out_cleanup_iod:
903903
nvme_free_iod(dev, req);
@@ -1052,9 +1052,9 @@ static void nvme_pci_submit_async_event(struct nvme_ctrl *ctrl)
10521052
c.common.opcode = nvme_admin_async_event;
10531053
c.common.command_id = NVME_AQ_BLK_MQ_DEPTH;
10541054

1055-
spin_lock_irq(&nvmeq->sq_lock);
1055+
spin_lock(&nvmeq->sq_lock);
10561056
__nvme_submit_cmd(nvmeq, &c);
1057-
spin_unlock_irq(&nvmeq->sq_lock);
1057+
spin_unlock(&nvmeq->sq_lock);
10581058
}
10591059

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

0 commit comments

Comments
 (0)