| Message ID | a5774459cb8eebfc95156b8cd3b249d896e04400.1389103215.git.agordeev@redhat.com |
|---|---|
| State | Superseded |
| Headers | show |
On Tuesday, January 07, 2014 07:05:42 PM Alexander Gordeev wrote: > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > --- > drivers/net/wireless/ath/wil6210/pcie_bus.c | 36 ++++++++++++++------------ > 1 files changed, 19 insertions(+), 17 deletions(-) > Patch looks fine, but I can't validate it as I can't find patch introducing pci_enable_msi_range(). Where this patch landed on? I am working with: git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git I also checked git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git and, of course git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git Thanks, Vladimir -- 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
On Wed, Jan 08, 2014 at 01:30:45PM +0200, Vladimir Kondratiev wrote: > On Tuesday, January 07, 2014 07:05:42 PM Alexander Gordeev wrote: > > Signed-off-by: Alexander Gordeev <agordeev@redhat.com> > > --- > > drivers/net/wireless/ath/wil6210/pcie_bus.c | 36 ++++++++++++++------------ > > 1 files changed, 19 insertions(+), 17 deletions(-) > > > > Patch looks fine, but I can't validate it as I can't find patch introducing > pci_enable_msi_range(). Where this patch landed on? Vladimir, This series is against pci/msi branch in Bjorn Helgaas's repo: git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git Commit 302a252 "PCI/MSI: Add pci_enable_msi_range() and pci_enable_msix_range()" > I am working with: > git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git > > I also checked > git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git > and, of course > git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git > > Thanks, Vladimir
On Wednesday, January 08, 2014 12:54:01 PM Alexander Gordeev wrote: > Vladimir, > > This series is against pci/msi branch in Bjorn Helgaas's repo: > git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git > > Commit 302a252 "PCI/MSI: Add pci_enable_msi_range() and pci_enable_msix_range()" > Thanks, see it. New code don't distinguish between negative and positive error values, same as old code. I'll fix it. Meanwhile, below my Acked-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> -- 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
On Wed, Jan 08, 2014 at 02:19:01PM +0200, Vladimir Kondratiev wrote: > Thanks, see it. New code don't distinguish between negative and positive error > values, same as old code. I'll fix it. As the patch seems okay for you, I am not quite getting what else needs to be fixed? :) > Meanwhile, below my > > Acked-by: Vladimir Kondratiev <qca_vkondrat@qca.qualcomm.com> Thanks, Vladimir!
diff --git a/drivers/net/wireless/ath/wil6210/pcie_bus.c b/drivers/net/wireless/ath/wil6210/pcie_bus.c index eeceab3..022dfe4 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_range(pdev, 1, 1) > 0) + break; + wil_err(wil, "pci_enable_msi_range failed, use INTx\n"); + use_msi = 0; } + wil->n_msi = use_msi; + rc = wil6210_init_irq(wil, pdev->irq); if (rc) goto stop_master;
Signed-off-by: Alexander Gordeev <agordeev@redhat.com> --- drivers/net/wireless/ath/wil6210/pcie_bus.c | 36 ++++++++++++++------------ 1 files changed, 19 insertions(+), 17 deletions(-)