| Message ID | 1398169382-12097-3-git-send-email-mathias.nyman@linux.intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On Tue, Apr 22, 2014 at 03:22:59PM +0300, Mathias Nyman wrote: > From: Alexander Gordeev <agordeev@redhat.com> > > 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 <agordeev@redhat.com> > Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> > Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Cc: linux-usb@vger.kernel.org > Cc: linux-pci@vger.kernel.org > Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> > --- > drivers/usb/host/xhci.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c > index 988ed5f..b0b8399 100644 > --- a/drivers/usb/host/xhci.c > +++ b/drivers/usb/host/xhci.c > @@ -291,7 +291,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); Why is this change needed for 3.15-final? -- 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 04/24/2014 10:49 PM, Greg KH wrote: > On Tue, Apr 22, 2014 at 03:22:59PM +0300, Mathias Nyman wrote: >> From: Alexander Gordeev <agordeev@redhat.com> >> >> 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 <agordeev@redhat.com> >> Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> >> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> Cc: linux-usb@vger.kernel.org >> Cc: linux-pci@vger.kernel.org >> Signed-off-by: Mathias Nyman <mathias.nyman@linux.intel.com> >> --- >> drivers/usb/host/xhci.c | 2 +- >> 1 file changed, 1 insertion(+), 1 deletion(-) >> >> diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c >> index 988ed5f..b0b8399 100644 >> --- a/drivers/usb/host/xhci.c >> +++ b/drivers/usb/host/xhci.c >> @@ -291,7 +291,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); > > Why is this change needed for 3.15-final? > Can't remember why I thought this was needed for 3.15 Looks like other subsystems (like PCI) just queued similar MSI changes for 3.16. I'll move it to the patchseries for usb-next -Mathias -- 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
diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c index 988ed5f..b0b8399 100644 --- a/drivers/usb/host/xhci.c +++ b/drivers/usb/host/xhci.c @@ -291,7 +291,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");