Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754594AbaBSWKF (ORCPT ); Wed, 19 Feb 2014 17:10:05 -0500 Received: from mail-ig0-f174.google.com ([209.85.213.174]:57455 "EHLO mail-ig0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753014AbaBSWKD (ORCPT ); Wed, 19 Feb 2014 17:10:03 -0500 MIME-Version: 1.0 In-Reply-To: <1392804931-30671-6-git-send-email-agordeev@redhat.com> References: <1392804931-30671-6-git-send-email-agordeev@redhat.com> From: Bjorn Helgaas Date: Wed, 19 Feb 2014 15:09:41 -0700 Message-ID: Subject: Re: [PATCH] portdrv: Use pci_enable_msix_range() instead of pci_enable_msix() To: Alexander Gordeev Cc: "linux-kernel@vger.kernel.org" , "linux-pci@vger.kernel.org" Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Feb 19, 2014 at 3:15 AM, Alexander Gordeev wrote: > 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. > > Signed-off-by: Alexander Gordeev > Cc: Bjorn Helgaas > Cc: linux-pci@vger.kernel.org > --- > drivers/pci/pcie/portdrv_core.c | 17 ++++++++++------- > 1 files changed, 10 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c > index 986f8ea..4e46eca 100644 > --- a/drivers/pci/pcie/portdrv_core.c > +++ b/drivers/pci/pcie/portdrv_core.c > @@ -99,8 +99,9 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask) > for (i = 0; i < nr_entries; i++) > msix_entries[i].entry = i; > > - status = pci_enable_msix(dev, msix_entries, nr_entries); > - if (status) > + status = pci_enable_msix_range(dev, > + msix_entries, nr_entries, nr_entries); This is a place we could use pci_enable_msix_exact(), isn't it? (Also below.) > + if (status < 0) > goto Exit; > > for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) > @@ -159,21 +160,23 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask) > idx[PCIE_PORT_SERVICE_AER_SHIFT] = i; > } > > + status = 0; > + > /* > * If nvec is equal to the allocated number of entries, we can just use > * what we have. Otherwise, the port has some extra entries not for the > * services we know and we need to work around that. > */ > - if (nvec == nr_entries) { > - status = 0; > - } else { > + if (nvec != nr_entries) { > /* Drop the temporary MSI-X setup */ > pci_disable_msix(dev); > > /* Now allocate the MSI-X vectors for real */ > - status = pci_enable_msix(dev, msix_entries, nvec); > - if (status) > + nvec = pci_enable_msix_range(dev, msix_entries, nvec, nvec); > + if (nvec < 0) { > + status = nvec; > goto Exit; > + } > } > > for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) > -- > 1.7.7.6 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/