From: Alexander Gordeev <agordeev@redhat.com> To: Keith Busch <keith.busch@intel.com> Cc: Bjorn Helgaas <bhelgaas@google.com>, Matthew Wilcox <willy@linux.intel.com>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, linux-nvme@lists.infradead.org, "linux-pci@vger.kernel.org" <linux-pci@vger.kernel.org> Subject: [PATCH 1/2] Revert "NVMe: Disable admin queue on init failure" Date: Tue, 21 Jan 2014 11:06:12 +0100 [thread overview] Message-ID: <20140121100611.GB8847@dhcp-26-207.brq.redhat.com> (raw) In-Reply-To: <20140121100311.GA8847@dhcp-26-207.brq.redhat.com> This reverts commit c5dc9192d52a4a3a479f701e97386347d454af84. --- drivers/block/nvme-core.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index b59a93a..c790679 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1151,11 +1151,11 @@ static void nvme_free_queue(struct nvme_queue *nvmeq) kfree(nvmeq); } -static void nvme_free_queues(struct nvme_dev *dev, int lowest) +static void nvme_free_queues(struct nvme_dev *dev) { int i; - for (i = dev->queue_count - 1; i >= lowest; i--) { + for (i = dev->queue_count - 1; i >= 0; i--) { nvme_free_queue(dev->queues[i]); dev->queue_count--; dev->queues[i] = NULL; @@ -1989,7 +1989,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) return 0; free_queues: - nvme_free_queues(dev, 1); + nvme_free_queues(dev); return result; } @@ -2409,7 +2409,6 @@ static int nvme_dev_start(struct nvme_dev *dev) return result; disable: - nvme_disable_queue(dev, 0); spin_lock(&dev_list_lock); list_del_init(&dev->node); spin_unlock(&dev_list_lock); @@ -2541,7 +2540,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) shutdown: nvme_dev_shutdown(dev); release_pools: - nvme_free_queues(dev, 0); + nvme_free_queues(dev); nvme_release_prp_pools(dev); release: nvme_release_instance(dev); @@ -2565,7 +2564,7 @@ static void nvme_remove(struct pci_dev *pdev) misc_deregister(&dev->miscdev); nvme_dev_remove(dev); nvme_dev_shutdown(dev); - nvme_free_queues(dev, 0); + nvme_free_queues(dev); nvme_release_instance(dev); nvme_release_prp_pools(dev); kref_put(&dev->kref, nvme_free_dev); -- 1.7.7.6 -- Regards, Alexander Gordeev agordeev@redhat.com
WARNING: multiple messages have this Message-ID (diff)
From: agordeev@redhat.com (Alexander Gordeev) Subject: [PATCH 1/2] Revert "NVMe: Disable admin queue on init failure" Date: Tue, 21 Jan 2014 11:06:12 +0100 [thread overview] Message-ID: <20140121100611.GB8847@dhcp-26-207.brq.redhat.com> (raw) In-Reply-To: <20140121100311.GA8847@dhcp-26-207.brq.redhat.com> This reverts commit c5dc9192d52a4a3a479f701e97386347d454af84. --- drivers/block/nvme-core.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/block/nvme-core.c b/drivers/block/nvme-core.c index b59a93a..c790679 100644 --- a/drivers/block/nvme-core.c +++ b/drivers/block/nvme-core.c @@ -1151,11 +1151,11 @@ static void nvme_free_queue(struct nvme_queue *nvmeq) kfree(nvmeq); } -static void nvme_free_queues(struct nvme_dev *dev, int lowest) +static void nvme_free_queues(struct nvme_dev *dev) { int i; - for (i = dev->queue_count - 1; i >= lowest; i--) { + for (i = dev->queue_count - 1; i >= 0; i--) { nvme_free_queue(dev->queues[i]); dev->queue_count--; dev->queues[i] = NULL; @@ -1989,7 +1989,7 @@ static int nvme_setup_io_queues(struct nvme_dev *dev) return 0; free_queues: - nvme_free_queues(dev, 1); + nvme_free_queues(dev); return result; } @@ -2409,7 +2409,6 @@ static int nvme_dev_start(struct nvme_dev *dev) return result; disable: - nvme_disable_queue(dev, 0); spin_lock(&dev_list_lock); list_del_init(&dev->node); spin_unlock(&dev_list_lock); @@ -2541,7 +2540,7 @@ static int nvme_probe(struct pci_dev *pdev, const struct pci_device_id *id) shutdown: nvme_dev_shutdown(dev); release_pools: - nvme_free_queues(dev, 0); + nvme_free_queues(dev); nvme_release_prp_pools(dev); release: nvme_release_instance(dev); @@ -2565,7 +2564,7 @@ static void nvme_remove(struct pci_dev *pdev) misc_deregister(&dev->miscdev); nvme_dev_remove(dev); nvme_dev_shutdown(dev); - nvme_free_queues(dev, 0); + nvme_free_queues(dev); nvme_release_instance(dev); nvme_release_prp_pools(dev); kref_put(&dev->kref, nvme_free_dev); -- 1.7.7.6 -- Regards, Alexander Gordeev agordeev at redhat.com
next prev parent reply other threads:[~2014-01-21 10:04 UTC|newest] Thread overview: 114+ messages / expand[flat|nested] mbox.gz Atom feed top 2014-01-17 16:02 [PATCH v2 0/9] Phase out pci_enable_msi_block() Alexander Gordeev 2014-01-17 16:02 ` Alexander Gordeev 2014-01-17 16:02 ` Alexander Gordeev 2014-01-17 9:26 ` [PATCH 10/9] PCI/MSI: Undeprecate pci_enable_msi() Alexander Gordeev 2014-01-29 22:10 ` Bjorn Helgaas 2014-01-17 9:27 ` [PATCH 11/9] PCI/MSI: Phase out pci_enable_msi_block() Alexander Gordeev 2014-01-29 22:22 ` Bjorn Helgaas 2014-01-17 16:02 ` [PATCH v2 1/9] ahci: Fix broken fallback to single MSI mode Alexander Gordeev 2014-01-17 16:02 ` [PATCH v2 2/9] ahci: Use pci_enable_msi_range() Alexander Gordeev 2014-01-17 16:02 ` [PATCH v2 3/9] ipr: Get rid of superfluous call to pci_disable_msi/msix() Alexander Gordeev 2014-01-17 16:02 ` [PATCH v2 4/9] ipr: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev 2014-01-28 9:54 ` Alexander Gordeev 2014-01-28 15:28 ` Brian King 2014-01-29 13:26 ` Alexander Gordeev 2014-01-30 14:06 ` Alexander Gordeev 2014-01-30 14:09 ` [PATCH v2 1/2] ipr: Get rid of superfluous call to pci_disable_msi/msix() Alexander Gordeev 2014-02-03 15:20 ` Brian King 2014-01-30 14:10 ` [PATCH v2 2/2] ipr: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev 2014-02-03 15:22 ` Brian King 2014-02-24 8:12 ` [PATCH v2 4/9] " Alexander Gordeev 2014-02-26 15:02 ` Brian King 2014-01-17 16:02 ` [PATCH v2 5/9] nvme: Fix invalid call to irq_set_affinity_hint() Alexander Gordeev 2014-01-17 16:02 ` Alexander Gordeev 2014-01-17 19:40 ` Bjorn Helgaas 2014-01-17 19:40 ` Bjorn Helgaas 2014-01-17 22:01 ` Keith Busch 2014-01-17 22:01 ` Keith Busch 2014-01-20 8:38 ` Alexander Gordeev 2014-01-20 8:38 ` Alexander Gordeev 2014-01-20 8:40 ` [PATCH v3 6/9] nvme: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev 2014-01-20 8:40 ` Alexander Gordeev 2014-02-05 13:07 ` Alexander Gordeev 2014-02-05 13:07 ` Alexander Gordeev 2014-02-18 17:54 ` Keith Busch 2014-02-18 17:54 ` Keith Busch 2014-01-20 8:42 ` [PATCH] nvme: Cleanup nvme_dev_start() and fix IRQ leak Alexander Gordeev 2014-01-20 8:42 ` Alexander Gordeev 2014-01-20 22:48 ` Keith Busch 2014-01-20 22:48 ` Keith Busch 2014-01-21 10:03 ` Alexander Gordeev 2014-01-21 10:03 ` Alexander Gordeev 2014-01-21 10:06 ` Alexander Gordeev [this message] 2014-01-21 10:06 ` [PATCH 1/2] Revert "NVMe: Disable admin queue on init failure" Alexander Gordeev 2014-01-21 10:07 ` [PATCH 2/2] nvme: Cleanup nvme_dev_start() and fix IRQ leak Alexander Gordeev 2014-01-21 10:07 ` Alexander Gordeev 2014-01-21 19:06 ` Keith Busch 2014-01-21 19:06 ` Keith Busch 2014-01-20 8:43 ` [PATCH] nvme: Cleanup nvme_dev_start() Alexander Gordeev 2014-01-20 8:43 ` Alexander Gordeev 2014-01-20 16:41 ` Keith Busch 2014-01-20 16:41 ` Keith Busch 2014-01-17 16:02 ` [PATCH v2 6/9] nvme: Use pci_enable_msi_range() and pci_enable_msix_range() Alexander Gordeev 2014-01-17 16:02 ` Alexander Gordeev 2014-01-17 16:02 ` [PATCH v2 7/9] vfio: " Alexander Gordeev 2014-01-29 21:36 ` Bjorn Helgaas 2014-01-17 16:02 ` [PATCH v2 8/9] ath10k: Use pci_enable_msi_range() Alexander Gordeev 2014-01-17 16:02 ` Alexander Gordeev 2014-01-30 13:48 ` [PATCH 1/3] ath10k: Get rid of superfluous call to pci_disable_msi() Alexander Gordeev 2014-01-30 13:48 ` Alexander Gordeev 2014-02-04 18:32 ` Kalle Valo 2014-02-04 18:32 ` Kalle Valo 2014-02-04 19:09 ` Alexander Gordeev 2014-02-04 19:09 ` Alexander Gordeev 2014-02-05 8:21 ` Kalle Valo 2014-02-05 8:21 ` Kalle Valo 2014-02-05 8:50 ` Alexander Gordeev 2014-02-05 8:50 ` Alexander Gordeev 2014-02-05 8:54 ` Kalle Valo 2014-02-05 8:54 ` Kalle Valo 2014-02-12 0:31 ` Bjorn Helgaas 2014-02-12 0:31 ` Bjorn Helgaas 2014-02-12 13:38 ` Alexander Gordeev 2014-02-12 13:38 ` Alexander Gordeev 2014-02-12 19:28 ` Bjorn Helgaas 2014-02-12 19:28 ` Bjorn Helgaas 2014-02-12 21:30 ` Kalle Valo 2014-02-12 21:30 ` Kalle Valo 2014-02-12 21:40 ` Bjorn Helgaas 2014-02-12 21:40 ` Bjorn Helgaas 2014-02-13 10:29 ` Kalle Valo 2014-02-13 10:29 ` Kalle Valo 2014-02-13 13:18 ` Alexander Gordeev 2014-02-13 16:04 ` Kalle Valo 2014-02-13 16:04 ` Kalle Valo 2014-01-30 13:48 ` [PATCH 2/3] ath10k: Disable MSI in case IRQ configuration is unknown Alexander Gordeev 2014-01-30 13:48 ` Alexander Gordeev 2014-01-30 13:49 ` [PATCH v3 3/3] ath10k: Use pci_enable_msi_range() Alexander Gordeev 2014-01-30 13:49 ` Alexander Gordeev 2014-02-03 11:02 ` [PATCH v2 8/9] " Alexander Gordeev 2014-02-03 11:02 ` Alexander Gordeev 2014-01-17 16:02 ` [PATCH v2 9/9] wil6210: " Alexander Gordeev 2014-01-29 21:37 ` Bjorn Helgaas 2014-02-07 14:46 ` [PATCH] wil6210: Fix switch operator "missing break?" warning Alexander Gordeev 2014-02-10 10:54 ` Vladimir Kondratiev 2014-02-10 12:16 ` Alexander Gordeev 2014-02-11 1:32 ` Fengguang Wu 2014-01-17 21:00 ` [PATCH v2 0/9] Phase out pci_enable_msi_block() Bjorn Helgaas 2014-01-17 21:00 ` Bjorn Helgaas 2014-01-17 21:00 ` Bjorn Helgaas 2014-01-18 7:15 ` Alexander Gordeev 2014-01-18 7:15 ` Alexander Gordeev 2014-01-18 7:15 ` Alexander Gordeev 2014-01-18 14:38 ` Bjorn Helgaas 2014-01-18 14:38 ` Bjorn Helgaas 2014-01-18 14:38 ` Bjorn Helgaas 2014-01-18 14:59 ` Tejun Heo 2014-01-18 14:59 ` Tejun Heo 2014-01-18 14:59 ` Tejun Heo 2014-01-29 21:48 ` Bjorn Helgaas 2014-01-29 21:48 ` Bjorn Helgaas 2014-01-29 21:48 ` Bjorn Helgaas 2014-01-29 13:59 ` Alexander Gordeev 2014-01-29 13:59 ` Alexander Gordeev 2014-01-29 13:59 ` Alexander Gordeev
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20140121100611.GB8847@dhcp-26-207.brq.redhat.com \ --to=agordeev@redhat.com \ --cc=bhelgaas@google.com \ --cc=keith.busch@intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-nvme@lists.infradead.org \ --cc=linux-pci@vger.kernel.org \ --cc=willy@linux.intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.