]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
nvme/pci: Remove last_cq_head
authorKeith Busch <kbusch@kernel.org>
Mon, 2 Dec 2019 20:53:30 +0000 (05:53 +0900)
committerKeith Busch <kbusch@kernel.org>
Tue, 3 Dec 2019 15:38:06 +0000 (00:38 +0900)
We had been saving the last_cq_head seen from an interrupt so that a
polled queue wouldn't mistakenly trigger spruious interrupt detection. We
don't poll interrupt driven queues any more, so saving this value is
pointless.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Keith Busch <kbusch@kernel.org>
drivers/nvme/host/pci.c

index 9d307593b94f8927a8ead231df315eced947b4d7..0590640ba62ca16ad061d713f38ba153008f9751 100644 (file)
@@ -176,7 +176,6 @@ struct nvme_queue {
        u16 sq_tail;
        u16 last_sq_tail;
        u16 cq_head;
-       u16 last_cq_head;
        u16 qid;
        u8 cq_phase;
        u8 sqes;
@@ -1026,10 +1025,7 @@ static irqreturn_t nvme_irq(int irq, void *data)
         * the irq handler, even if that was on another CPU.
         */
        rmb();
-       if (nvmeq->cq_head != nvmeq->last_cq_head)
-               ret = IRQ_HANDLED;
        nvme_process_cq(nvmeq, &start, &end, -1);
-       nvmeq->last_cq_head = nvmeq->cq_head;
        wmb();
 
        if (start != end) {