Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()
On Tue, Mar 25, 2014 at 03:27:30PM +0100, Alexander Gordeev wrote: On Thu, Mar 06, 2014 at 01:56:46PM -0800, Sarah Sharp wrote: What do you mean by this sentence? Are you fixing some bug in those two functions, or just cleaning up how they look? Either way, this should really be two patches. Hi Sarah, Any feedback on v2? Sarah? Thanks! Sarah Sharp -- Regards, Alexander Gordeev agord...@redhat.com -- Regards, Alexander Gordeev agord...@redhat.com -- To unsubscribe from this list: send the line unsubscribe linux-usb in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()
On Thu, Mar 06, 2014 at 01:56:46PM -0800, Sarah Sharp wrote: What do you mean by this sentence? Are you fixing some bug in those two functions, or just cleaning up how they look? Either way, this should really be two patches. Hi Sarah, Any feedback on v2? Thanks! Sarah Sharp -- Regards, Alexander Gordeev agord...@redhat.com -- To unsubscribe from this list: send the line unsubscribe linux-usb in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()
As result of 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() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.
This update also cleans up a bit xhci_setup_msi() and
xhci_setup_msix() returning of success.
Signed-off-by: Alexander Gordeev agord...@redhat.com
Cc: Sarah Sharp sarah.a.sh...@linux.intel.com
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Cc: linux-usb@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
drivers/usb/host/xhci.c |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6fe577d..dc7cfb5 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -232,9 +232,10 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
disable MSI interrupt);
pci_disable_msi(pdev);
+ return ret;
}
- return ret;
+ return 0;
}
/*
@@ -291,7 +292,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
xhci-msix_entries[i].vector = 0;
}
- ret = pci_enable_msix(pdev, xhci-msix_entries, xhci-msix_count);
+ ret = pci_enable_msix_exact(pdev, xhci-msix_entries, xhci-msix_count);
if (ret) {
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
Failed to enable MSI-X);
@@ -307,7 +308,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
}
hcd-msix_enabled = 1;
- return ret;
+ return 0;
disable_msix:
xhci_dbg_trace(xhci, trace_xhci_dbg_init, disable MSI-X interrupt);
--
1.7.7.6
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 1/2] xhci: Cleanup xhci_setup_msi() and xhci_setup_msix()
Make xhci_setup_msi() and xhci_setup_msix() functions return error code in a consistent and more clear way. Signed-off-by: Alexander Gordeev agord...@redhat.com Cc: Sarah Sharp sarah.a.sh...@linux.intel.com Cc: Greg Kroah-Hartman gre...@linuxfoundation.org Cc: linux-usb@vger.kernel.org Cc: linux-...@vger.kernel.org --- drivers/usb/host/xhci.c |5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 6fe577d..6fbba7a 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -232,9 +232,10 @@ static int xhci_setup_msi(struct xhci_hcd *xhci) xhci_dbg_trace(xhci, trace_xhci_dbg_init, disable MSI interrupt); pci_disable_msi(pdev); + return ret; } - return ret; + return 0; } /* @@ -307,7 +308,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci) } hcd-msix_enabled = 1; - return ret; + return 0; disable_msix: xhci_dbg_trace(xhci, trace_xhci_dbg_init, disable MSI-X interrupt); -- 1.7.7.6 -- Regards, Alexander Gordeev agord...@redhat.com -- To unsubscribe from this list: send the line unsubscribe linux-usb in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH v2 2/2] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()
As result of 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() or pci_enable_msi_exact()
and pci_enable_msix_range() or pci_enable_msix_exact()
interfaces.
Signed-off-by: Alexander Gordeev agord...@redhat.com
Cc: Sarah Sharp sarah.a.sh...@linux.intel.com
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Cc: linux-usb@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
drivers/usb/host/xhci.c |2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6fbba7a..dc7cfb5 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -292,7 +292,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
xhci-msix_entries[i].vector = 0;
}
- ret = pci_enable_msix(pdev, xhci-msix_entries, xhci-msix_count);
+ ret = pci_enable_msix_exact(pdev, xhci-msix_entries, xhci-msix_count);
if (ret) {
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
Failed to enable MSI-X);
--
1.7.7.6
--
Regards,
Alexander Gordeev
agord...@redhat.com
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[PATCH] xhci: Use pci_enable_msix_range() instead of pci_enable_msix()
As result of 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.
This update also cleans up a bit xhci_setup_msi() and
xhci_setup_msix() returning of success.
Signed-off-by: Alexander Gordeev agord...@redhat.com
Cc: Sarah Sharp sarah.a.sh...@linux.intel.com
Cc: Greg Kroah-Hartman gre...@linuxfoundation.org
Cc: linux-usb@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
drivers/usb/host/xhci.c | 10 ++
1 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index 6fe577d..1755d18 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -232,9 +232,10 @@ static int xhci_setup_msi(struct xhci_hcd *xhci)
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
disable MSI interrupt);
pci_disable_msi(pdev);
+ return ret;
}
- return ret;
+ return 0;
}
/*
@@ -291,8 +292,9 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
xhci-msix_entries[i].vector = 0;
}
- ret = pci_enable_msix(pdev, xhci-msix_entries, xhci-msix_count);
- if (ret) {
+ ret = pci_enable_msix_range(pdev, xhci-msix_entries,
+ xhci-msix_count, xhci-msix_count);
+ if (ret 0) {
xhci_dbg_trace(xhci, trace_xhci_dbg_init,
Failed to enable MSI-X);
goto free_entries;
@@ -307,7 +309,7 @@ static int xhci_setup_msix(struct xhci_hcd *xhci)
}
hcd-msix_enabled = 1;
- return ret;
+ return 0;
disable_msix:
xhci_dbg_trace(xhci, trace_xhci_dbg_init, disable MSI-X interrupt);
--
1.7.7.6
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
