From: Bjorn Helgaas <bhelgaas@google.com>
To: Alexander Gordeev <agordeev@redhat.com>
Cc: linux-kernel@vger.kernel.org,
Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>,
linux-wireless@vger.kernel.org, wil6210@qca.qualcomm.com,
linux-pci@vger.kernel.org
Subject: Re: [PATCH v2 9/9] wil6210: Use pci_enable_msi_range()
Date: Wed, 29 Jan 2014 14:37:16 -0700 [thread overview]
Message-ID: <20140129213716.GD16825@google.com> (raw)
In-Reply-To: <aedc9b7eb82232204a7d65b4c7d3302ba6ba3892.1389904167.git.agordeev@redhat.com>
On Fri, Jan 17, 2014 at 05:02:23PM +0100, Alexander Gordeev wrote:
> As result deprecation of MSI-X/MSI enablement functions
> pci_enable_msix() and pci_enable_msi_block() all drivers
> using these two interfaces need to be updated to use the
> new pci_enable_msi_range() and pci_enable_msix_range()
> interfaces.
>
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Acked-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com>
Applied to my pci/msi branch, thanks!
> ---
> drivers/net/wireless/ath/wil6210/pcie_bus.c | 36 ++++++++++++++------------
> 1 files changed, 19 insertions(+), 17 deletions(-)
>
> diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c
> index eeceab3..4e1bf54 100644
> --- a/drivers/net/wireless/ath/wil6210/pcie_bus.c
> +++ b/drivers/net/wireless/ath/wil6210/pcie_bus.c
> @@ -41,30 +41,32 @@ static int wil_if_pcie_enable(struct wil6210_priv *wil)
> switch (use_msi) {
> case 3:
> case 1:
> + wil_dbg_misc(wil, "Setup %d MSI interrupts\n", use_msi);
> + break;
> case 0:
> + wil_dbg_misc(wil, "MSI interrupts disabled, use INTx\n");
> break;
> default:
> - wil_err(wil, "Invalid use_msi=%d, default to 1\n",
> - use_msi);
> + wil_err(wil, "Invalid use_msi=%d, default to 1\n", use_msi);
> use_msi = 1;
> }
> - wil->n_msi = use_msi;
> - if (wil->n_msi) {
> - wil_dbg_misc(wil, "Setup %d MSI interrupts\n", use_msi);
> - rc = pci_enable_msi_block(pdev, wil->n_msi);
> - if (rc && (wil->n_msi == 3)) {
> - wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
> - wil->n_msi = 1;
> - rc = pci_enable_msi_block(pdev, wil->n_msi);
> - }
> - if (rc) {
> - wil_err(wil, "pci_enable_msi failed, use INTx\n");
> - wil->n_msi = 0;
> - }
> - } else {
> - wil_dbg_misc(wil, "MSI interrupts disabled, use INTx\n");
> +
> + switch (use_msi) {
> + case 3:
> + if (pci_enable_msi_range(pdev, 3, 3) > 0)
> + break;
> + wil_err(wil, "3 MSI mode failed, try 1 MSI\n");
> + use_msi = 1;
> + /* fallthrough */
> + case 1:
> + if (!pci_enable_msi(pdev))
> + break;
> + wil_err(wil, "pci_enable_msi failed, use INTx\n");
> + use_msi = 0;
> }
>
> + wil->n_msi = use_msi;
> +
> rc = wil6210_init_irq(wil, pdev->irq);
> if (rc)
> goto stop_master;
> --
> 1.7.7.6
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-pci" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
next prev parent reply other threads:[~2014-01-29 21:37 UTC|newest]
Thread overview: 67+ 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 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 19:40 ` Bjorn Helgaas
2014-01-17 22:01 ` Keith Busch
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-02-05 13:07 ` Alexander Gordeev
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 22:48 ` Keith Busch
2014-01-21 10:03 ` Alexander Gordeev
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 19:06 ` Keith Busch
2014-01-20 8:43 ` [PATCH] nvme: Cleanup nvme_dev_start() Alexander Gordeev
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 ` [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-30 13:48 ` [PATCH 1/3] ath10k: Get rid of superfluous call to pci_disable_msi() Alexander Gordeev
2014-02-04 18:32 ` Kalle Valo
2014-02-04 19:09 ` Alexander Gordeev
2014-02-05 8:21 ` Kalle Valo
2014-02-05 8:50 ` Alexander Gordeev
2014-02-05 8:54 ` Kalle Valo
2014-02-12 0:31 ` Bjorn Helgaas
2014-02-12 13:38 ` Alexander Gordeev
2014-02-12 19:28 ` Bjorn Helgaas
2014-02-12 21:30 ` Kalle Valo
2014-02-12 21:40 ` Bjorn Helgaas
2014-02-13 10:29 ` Kalle Valo
2014-02-13 13:18 ` Alexander Gordeev
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:49 ` [PATCH v3 3/3] ath10k: Use pci_enable_msi_range() Alexander Gordeev
2014-02-03 11:02 ` [PATCH v2 8/9] " Alexander Gordeev
2014-01-17 16:02 ` [PATCH v2 9/9] wil6210: " Alexander Gordeev
2014-01-29 21:37 ` Bjorn Helgaas [this message]
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-18 7:15 ` Alexander Gordeev
2014-01-18 14:38 ` Bjorn Helgaas
2014-01-18 14:59 ` Tejun Heo
2014-01-29 21:48 ` Bjorn Helgaas
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=20140129213716.GD16825@google.com \
--to=bhelgaas@google.com \
--cc=agordeev@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=qca_vkondrat@qca.qualcomm.com \
--cc=wil6210@qca.qualcomm.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).