[PATCH v2 RESEND 0/4] : Use pci_enable_msix_exact() instead of pci_enable_msix()

[PATCH v2 RESEND 0/4] : Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

The series is based on 3.14-rc4.

The patches are unrelated to each other.

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.

Alexander Gordeev (4):
  ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
  portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()
  tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()
  xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

 drivers/dma/ioat/dma.c           |    2 +-
 drivers/pci/pcie/portdrv_core.c  |    4 ++--
 drivers/rapidio/devices/tsi721.c |   11 +++--------
 drivers/usb/host/xhci.c          |    7 ++++---
 4 files changed, 10 insertions(+), 14 deletions(-)

-- 
1.7.7.6

[PATCH v2 RESEND 1/4] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
Cc: linux-pci@vger.kernel.org
---
 drivers/dma/ioat/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 4e3549a..b76c148 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -947,7 +947,7 @@ msix:
 	for (i = 0; i < msixcnt; i++)
 		device->msix_entries[i].entry = i;
 
-	err = pci_enable_msix(pdev, device->msix_entries, msixcnt);
+	err = pci_enable_msix_exact(pdev, device->msix_entries, msixcnt);
 	if (err)
 		goto msi;
 
-- 
1.7.7.6

Re: [PATCH v2 RESEND 1/4] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Dan Williams]

On Thu, Mar 6, 2014 at 12:11 PM, Alexander Gordeev <agordeev@redhat.com> 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()  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: Dan Williams <dan.j.williams@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: dmaengine@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> ---

Can you point me to the background for this change.  From the
changelog I have no idea what this patch does or why I need to apply
it.

Re: [PATCH v2 RESEND 1/4] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Thu, Mar 06, 2014 at 01:09:39PM -0800, Dan Williams wrote:
> Can you point me to the background for this change.  From the
> changelog I have no idea what this patch does or why I need to apply
> it.

Function pci_enable_msix() returns a tri-state value while
pci_enable_msi_exact() is a canonical zero/-errno variant.
The former is being phased out in favor of the latter.
In case of 'ioat' there (should be) no difference.

HTH.

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2 RESEND 1/4] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Dan Williams]

On Thu, Mar 6, 2014 at 1:43 PM, Alexander Gordeev <agordeev@redhat.com> wrote:
> On Thu, Mar 06, 2014 at 01:09:39PM -0800, Dan Williams wrote:
>> Can you point me to the background for this change.  From the
>> changelog I have no idea what this patch does or why I need to apply
>> it.
>
> Function pci_enable_msix() returns a tri-state value while
> pci_enable_msi_exact() is a canonical zero/-errno variant.
> The former is being phased out in favor of the latter.
> In case of 'ioat' there (should be) no difference.

Got it.  If you resend with that in the changelog.

Acked-by: Dan Williams <dan.j.williams@intel.com>

[PATCH v2] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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.

Function pci_enable_msix() returns a tri-state value while
pci_enable_msi_exact() is a canonical zero/-errno variant.
The former is being phased out in favor of the latter.
In case of 'ioat' there (should be) no difference.

Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Vinod Koul <vinod.koul@intel.com>
Cc: dmaengine@vger.kernel.org
Cc: linux-pci@vger.kernel.org
Acked-by: Dan Williams <dan.j.williams@intel.com>
---
 drivers/dma/ioat/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
index 4e3549a..b76c148 100644
--- a/drivers/dma/ioat/dma.c
+++ b/drivers/dma/ioat/dma.c
@@ -947,7 +947,7 @@ msix:
 	for (i = 0; i < msixcnt; i++)
 		device->msix_entries[i].entry = i;
 
-	err = pci_enable_msix(pdev, device->msix_entries, msixcnt);
+	err = pci_enable_msix_exact(pdev, device->msix_entries, msixcnt);
 	if (err)
 		goto msi;
 
-- 
1.7.7.6

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Fri, Mar 07, 2014 at 08:49:32AM +0100, 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()  or pci_enable_msi_exact()
> and pci_enable_msix_range() or pci_enable_msix_exact()
> interfaces.
> 
> Function pci_enable_msix() returns a tri-state value while
> pci_enable_msi_exact() is a canonical zero/-errno variant.
> The former is being phased out in favor of the latter.
> In case of 'ioat' there (should be) no difference.
> 
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: dmaengine@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> Acked-by: Dan Williams <dan.j.williams@intel.com>

Hi Dan,

Would you pick this patch, please?

Thanks!

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Fri, Mar 07, 2014 at 08:49:32AM +0100, 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()  or pci_enable_msi_exact()
> and pci_enable_msix_range() or pci_enable_msix_exact()
> interfaces.

Dan, Vinod,

This patch hangs in -next for quite some time.
Would you release it, please?

Thanks!

> Function pci_enable_msix() returns a tri-state value while
> pci_enable_msi_exact() is a canonical zero/-errno variant.
> The former is being phased out in favor of the latter.
> In case of 'ioat' there (should be) no difference.
> 
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Dan Williams <dan.j.williams@intel.com>
> Cc: Vinod Koul <vinod.koul@intel.com>
> Cc: dmaengine@vger.kernel.org
> Cc: linux-pci@vger.kernel.org
> Acked-by: Dan Williams <dan.j.williams@intel.com>
> ---
>  drivers/dma/ioat/dma.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c
> index 4e3549a..b76c148 100644
> --- a/drivers/dma/ioat/dma.c
> +++ b/drivers/dma/ioat/dma.c
> @@ -947,7 +947,7 @@ msix:
>  	for (i = 0; i < msixcnt; i++)
>  		device->msix_entries[i].entry = i;
>  
> -	err = pci_enable_msix(pdev, device->msix_entries, msixcnt);
> +	err = pci_enable_msix_exact(pdev, device->msix_entries, msixcnt);
>  	if (err)
>  		goto msi;
>  
> -- 
> 1.7.7.6
> 
> -- 
> Regards,
> Alexander Gordeev
> agordeev@redhat.com

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2] ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Dan Williams]

On Mon, Aug 25, 2014 at 9:35 AM, Alexander Gordeev <agordeev@redhat.com> wrote:
> On Fri, Mar 07, 2014 at 08:49:32AM +0100, 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()  or pci_enable_msi_exact()
>> and pci_enable_msix_range() or pci_enable_msix_exact()
>> interfaces.
>
> Dan, Vinod,
>
> This patch hangs in -next for quite some time.
> Would you release it, please?

On its way... apologies for the delay.

[PATCH v2 RESEND 2/4] portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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: Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org
---
 drivers/pci/pcie/portdrv_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 986f8ea..0b1efb2 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -99,7 +99,7 @@ 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);
+	status = pci_enable_msix_exact(dev, msix_entries, nr_entries);
 	if (status)
 		goto Exit;
 
@@ -171,7 +171,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
 		pci_disable_msix(dev);
 
 		/* Now allocate the MSI-X vectors for real */
-		status = pci_enable_msix(dev, msix_entries, nvec);
+		status = pci_enable_msix_exact(dev, msix_entries, nvec);
 		if (status)
 			goto Exit;
 	}
-- 
1.7.7.6

Re: [PATCH v2 RESEND 2/4] portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Bjorn Helgaas]

On Thu, Mar 06, 2014 at 09:11:22PM +0100, 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()  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: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-pci@vger.kernel.org

Applied to pci/msi for v3.15, thanks!

> ---
>  drivers/pci/pcie/portdrv_core.c |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> index 986f8ea..0b1efb2 100644
> --- a/drivers/pci/pcie/portdrv_core.c
> +++ b/drivers/pci/pcie/portdrv_core.c
> @@ -99,7 +99,7 @@ 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);
> +	status = pci_enable_msix_exact(dev, msix_entries, nr_entries);
>  	if (status)
>  		goto Exit;
>  
> @@ -171,7 +171,7 @@ static int pcie_port_enable_msix(struct pci_dev *dev, int *vectors, int mask)
>  		pci_disable_msix(dev);
>  
>  		/* Now allocate the MSI-X vectors for real */
> -		status = pci_enable_msix(dev, msix_entries, nvec);
> +		status = pci_enable_msix_exact(dev, msix_entries, nvec);
>  		if (status)
>  			goto Exit;
>  	}
> -- 
> 1.7.7.6
> 

Re: [PATCH v2 RESEND 2/4] portdrv: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Wed, Mar 12, 2014 at 09:56:34PM -0600, Bjorn Helgaas wrote:
> On Thu, Mar 06, 2014 at 09:11:22PM +0100, 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()  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: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: linux-pci@vger.kernel.org
> 
> Applied to pci/msi for v3.15, thanks!

Hi Bjorn,

If this one indeed applied?

Thanks!

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

[PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alexandre.bounine@idt.com>
Cc: linux-pci@vger.kernel.org
---
 drivers/rapidio/devices/tsi721.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/drivers/rapidio/devices/tsi721.c b/drivers/rapidio/devices/tsi721.c
index ff7cbf2..ce08e8d 100644
--- a/drivers/rapidio/devices/tsi721.c
+++ b/drivers/rapidio/devices/tsi721.c
@@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct tsi721_device *priv)
 	}
 #endif /* CONFIG_RAPIDIO_DMA_ENGINE */
 
-	err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries));
+	err = pci_enable_msix_exact(priv->pdev, entries, ARRAY_SIZE(entries));
 	if (err) {
-		if (err > 0)
-			dev_info(&priv->pdev->dev,
-				 "Only %d MSI-X vectors available, "
-				 "not using MSI-X\n", err);
-		else
-			dev_err(&priv->pdev->dev,
-				"Failed to enable MSI-X (err=%d)\n", err);
+		dev_err(&priv->pdev->dev,
+			"Failed to enable MSI-X (err=%d)\n", err);
 		return err;
 	}
 
-- 
1.7.7.6

RE: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Bounine, Alexandre]

> From: Alexander Gordeev [mailto:agordeev@redhat.com]
> Sent: Thursday, March 06, 2014 3:11 PM
> To: linux-kernel@vger.kernel.org
> Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux-
> pci@vger.kernel.org
> Subject: [PATCH v2 RESEND 3/4] tsi721: 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.


Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>

Andrew, please pick up this patch for the -next tree.

> 
> Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> Cc: Matt Porter <mporter@kernel.crashing.org>
> Cc: Alexandre Bounine <alexandre.bounine@idt.com>
> Cc: linux-pci@vger.kernel.org
> ---
>  drivers/rapidio/devices/tsi721.c |   11 +++--------
>  1 files changed, 3 insertions(+), 8 deletions(-)
> 
> diff --git a/drivers/rapidio/devices/tsi721.c
> b/drivers/rapidio/devices/tsi721.c
> index ff7cbf2..ce08e8d 100644
> --- a/drivers/rapidio/devices/tsi721.c
> +++ b/drivers/rapidio/devices/tsi721.c
> @@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct
> tsi721_device *priv)
>  	}
>  #endif /* CONFIG_RAPIDIO_DMA_ENGINE */
> 
> -	err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries));
> +	err = pci_enable_msix_exact(priv->pdev, entries,
> ARRAY_SIZE(entries));
>  	if (err) {
> -		if (err > 0)
> -			dev_info(&priv->pdev->dev,
> -				 "Only %d MSI-X vectors available, "
> -				 "not using MSI-X\n", err);
> -		else
> -			dev_err(&priv->pdev->dev,
> -				"Failed to enable MSI-X (err=%d)\n", err);
> +		dev_err(&priv->pdev->dev,
> +			"Failed to enable MSI-X (err=%d)\n", err);
>  		return err;
>  	}
> 
> --
> 1.7.7.6

Re: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Fri, Mar 07, 2014 at 01:35:34PM +0000, Bounine, Alexandre wrote:
> > From: Alexander Gordeev [mailto:agordeev@redhat.com]
> > Sent: Thursday, March 06, 2014 3:11 PM
> > To: linux-kernel@vger.kernel.org
> > Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux-
> > pci@vger.kernel.org
> > Subject: [PATCH v2 RESEND 3/4] tsi721: 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.
> 
> 
> Acked-by: Alexandre Bounine <alexandre.bounine@idt.com>
> 
> Andrew, please pick up this patch for the -next tree.

Hi Andrew,

Could you please pick up this patch?

Thanks!

> > Signed-off-by: Alexander Gordeev <agordeev@redhat.com>
> > Cc: Matt Porter <mporter@kernel.crashing.org>
> > Cc: Alexandre Bounine <alexandre.bounine@idt.com>
> > Cc: linux-pci@vger.kernel.org
> > ---
> >  drivers/rapidio/devices/tsi721.c |   11 +++--------
> >  1 files changed, 3 insertions(+), 8 deletions(-)
> > 
> > diff --git a/drivers/rapidio/devices/tsi721.c
> > b/drivers/rapidio/devices/tsi721.c
> > index ff7cbf2..ce08e8d 100644
> > --- a/drivers/rapidio/devices/tsi721.c
> > +++ b/drivers/rapidio/devices/tsi721.c
> > @@ -768,15 +768,10 @@ static int tsi721_enable_msix(struct
> > tsi721_device *priv)
> >  	}
> >  #endif /* CONFIG_RAPIDIO_DMA_ENGINE */
> > 
> > -	err = pci_enable_msix(priv->pdev, entries, ARRAY_SIZE(entries));
> > +	err = pci_enable_msix_exact(priv->pdev, entries,
> > ARRAY_SIZE(entries));
> >  	if (err) {
> > -		if (err > 0)
> > -			dev_info(&priv->pdev->dev,
> > -				 "Only %d MSI-X vectors available, "
> > -				 "not using MSI-X\n", err);
> > -		else
> > -			dev_err(&priv->pdev->dev,
> > -				"Failed to enable MSI-X (err=%d)\n", err);
> > +		dev_err(&priv->pdev->dev,
> > +			"Failed to enable MSI-X (err=%d)\n", err);
> >  		return err;
> >  	}
> > 
> > --
> > 1.7.7.6
> 

[PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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 <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
---
 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

Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Sarah Sharp]

On Thu, Mar 06, 2014 at 09:11:24PM +0100, 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()  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.

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.

Sarah Sharp

> 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
> ---
>  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
> 

[PATCH v2 1/2] xhci: Cleanup xhci_setup_msi() and xhci_setup_msix()

[Alexander Gordeev]

Make xhci_setup_msi() and xhci_setup_msix() functions
return error code in a consistent and more clear way.

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
---
 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
agordeev@redhat.com

[PATCH v2 2/2] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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
---
 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
agordeev@redhat.com

Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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
agordeev@redhat.com

Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

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
> agordeev@redhat.com

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com

Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Mathias Nyman]

On 04/02/2014 02:41 PM, Alexander Gordeev wrote:
> 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?
>

Hi

Thanks for the patches,
I'll  queue patch 2/2  for usb-linus once 3.15-rc1 comes out.

But I'm going to omit patch 1/2 because it doesn't really improve
code readability and doesn't change functionality.
At this stage I'd like to avoid extra patches as much as possible.
And besides, it adds one extra line of code

-Mathias

Re: [PATCH v2 RESEND 4/4] xhci: Use pci_enable_msix_exact() instead of pci_enable_msix()

[Alexander Gordeev]

On Wed, Apr 02, 2014 at 05:05:13PM +0300, Mathias Nyman wrote:
> On 04/02/2014 02:41 PM, Alexander Gordeev wrote:
> >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?
> >
> 
> Hi

Thank you for the review, Mathias.

> Thanks for the patches,
> I'll  queue patch 2/2  for usb-linus once 3.15-rc1 comes out.
> 
> But I'm going to omit patch 1/2 because it doesn't really improve
> code readability and doesn't change functionality.

I fail to see how it does not improve the readability. It makes the
way the result returned consistent with the rest of the code and
explicitly returns succeess where it is known 'ret' contains zero.

But it surely up to you :)

> At this stage I'd like to avoid extra patches as much as possible.
> And besides, it adds one extra line of code
> 
> -Mathias

-- 
Regards,
Alexander Gordeev
agordeev@redhat.com