: Use pci_enable_msix_exact() instead of pci_enable_msix()

PATCH RESEND Applied Alexander Gordeev 6 participants 23 messages Mar 6, 2014 – Aug 25, 2014

Subsystems (5)

USB PCI dmaengine USB xHCI driver +1 more subsystems

lore

Share & tools

lore

Alexander Gordeev

author

2014-03-06 20:09 UTC #0 lore raw

v2 cover : Use pci_enable_msix_exact() instead of pci_enable_msix()

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

Signature · 1 line

1.7.7.6

Alexander Gordeev

author

2014-03-06 20:09 UTC #1 lore raw

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

Signed-off-by Alexander Gordeev <[email protected]>

Cc Dan Williams <[email protected]>

Cc Vinod Koul <[email protected]>

Cc [email protected]

---
 drivers/dma/ioat/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/dma/ioat/dma.c +1 -1

index 4e3549a..b76c148 100644
@@ -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;

Signature · 1 line

1.7.7.6

Dan Williams

2014-03-06 21:09 UTC #2 lore raw

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

Quoted 7 lines · 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.

Quoted 6 lines

Signed-off-by Alexander Gordeev <[email protected]>
Cc Dan Williams <[email protected]>
Cc Vinod Koul <[email protected]>
Cc [email protected]
Cc [email protected]
---

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.

Alexander Gordeev

author

2014-03-06 21:42 UTC #3 lore raw

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

Quoted 3 lines · Dan Williams

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.

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Dan Williams

Acked-by

2014-03-06 21:50 UTC #4 lore raw

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

Quoted 9 lines · Alexander Gordeev

Quoted 3 lines · Dan Williams
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 <[email protected]>

Alexander Gordeev

author

2014-03-07 07:47 UTC #5 lore raw

PATCH v2 1/1 ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()

Signed-off-by Alexander Gordeev <[email protected]>

Cc Dan Williams <[email protected]>

Cc Vinod Koul <[email protected]>

Cc [email protected]

Acked-by Dan Williams <[email protected]>

---
 drivers/dma/ioat/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/dma/ioat/dma.c +1 -1

index 4e3549a..b76c148 100644
@@ -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;

Signature · 6 lines

1.7.7.6

-- 
Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-04-21 13:46 UTC #6 lore raw

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

Quoted 12 lines · 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.

Quoted 6 lines

Signed-off-by Alexander Gordeev <[email protected]>
Cc Dan Williams <[email protected]>
Cc Vinod Koul <[email protected]>
Cc [email protected]
Cc [email protected]
Acked-by Dan Williams <[email protected]>

Hi Dan,

Would you pick this patch, please?

Thanks!

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-08-25 16:27 UTC #7 lore raw

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

In reply to Alexander Gordeev

Quoted 6 lines · 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.

Dan, Vinod,

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

Thanks!

Quoted 35 lines

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 <[email protected]>
Cc Dan Williams <[email protected]>
Cc Vinod Koul <[email protected]>
Cc [email protected]
Cc [email protected]
Acked-by Dan Williams <[email protected]>
---
 drivers/dma/ioat/dma.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/dma/ioat/dma.c +1 -1
index 4e3549a..b76c148 100644
@@ -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;
 
Signature · 6 lines
1.7.7.6

-- 
Regards,
Alexander Gordeev
[email protected]

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Dan Williams

2014-08-25 16:31 UTC #8 lore raw

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

Quoted 8 lines · Alexander Gordeev

Quoted 6 lines · 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.

Quoted 4 lines

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

On its way... apologies for the delay.

Alexander Gordeev

author

2014-03-06 20:09 UTC #9 lore raw

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

In reply to Alexander Gordeev

Signed-off-by Alexander Gordeev <[email protected]>

Cc Bjorn Helgaas <[email protected]>

Cc [email protected]

---
 drivers/pci/pcie/portdrv_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/pci/pcie/portdrv_core.c +2 -2

index 986f8ea..0b1efb2 100644
@@ -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;
 	}

Signature · 1 line

1.7.7.6

Bjorn Helgaas

maintainer Applied

2014-03-13 03:56 UTC #10 lore raw

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

Quoted 10 lines · 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 <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc [email protected]

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

Quoted 29 lines

---
 drivers/pci/pcie/portdrv_core.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

drivers/pci/pcie/portdrv_core.c +2 -2

index 986f8ea..0b1efb2 100644
@@ -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;
 	}

Signature · 1 line

1.7.7.6

Alexander Gordeev

author

2014-04-14 16:16 UTC #11 lore raw

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

Quoted 8 lines · Bjorn Helgaas

Quoted 7 lines · 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.

Quoted 5 lines

Quoted 3 lines
Signed-off-by Alexander Gordeev <[email protected]>
Cc Bjorn Helgaas <[email protected]>
Cc [email protected]
Applied to pci/msi for v3.15, thanks!

Hi Bjorn,

If this one indeed applied?

Thanks!

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-03-06 20:09 UTC #12 lore raw

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

In reply to Alexander Gordeev

Signed-off-by Alexander Gordeev <[email protected]>

Cc Matt Porter <[email protected]>

Cc Alexandre Bounine <[email protected]>

Cc [email protected]

---
 drivers/rapidio/devices/tsi721.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

drivers/rapidio/devices/tsi721.c +3 -8

index ff7cbf2..ce08e8d 100644
@@ -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;
 	}

Signature · 1 line

1.7.7.6

Bounine, Alexandre

Acked-by on v2 3/4

2014-03-07 13:49 UTC #13 lore raw

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

Quoted 8 lines

From: Alexander Gordeev [mailto:[email protected]]
Sent: Thursday, March 06, 2014 3:11 PM
To: [email protected]
Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux- [email protected]
Subject: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()

Quoted 6 lines

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 <[email protected]>

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

Quoted 37 lines

Signed-off-by Alexander Gordeev <[email protected]>

Cc Matt Porter <[email protected]>

Cc Alexandre Bounine <[email protected]>

Cc [email protected]

---
 drivers/rapidio/devices/tsi721.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

drivers/rapidio/devices/tsi721.c +3 -8

index ff7cbf2..ce08e8d 100644
@@ -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

Alexander Gordeev

author

2014-04-21 13:23 UTC #14 lore raw

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

Quoted 16 lines · Alexandre

Quoted 8 lines
From: Alexander Gordeev [mailto:[email protected]]
Sent: Thursday, March 06, 2014 3:11 PM
To: [email protected]
Cc: Alexander Gordeev; Matt Porter; Bounine, Alexandre; linux- [email protected]
Subject: [PATCH v2 RESEND 3/4] tsi721: Use pci_enable_msix_exact() instead of pci_enable_msix()
Quoted 6 lines
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.

Quoted 3 lines

Acked-by Alexandre Bounine <[email protected]>
Andrew, please pick up this patch for the -next tree.

Hi Andrew,

Could you please pick up this patch?

Thanks!

Quoted 37 lines

Quoted 36 lines

Signed-off-by Alexander Gordeev <[email protected]>

Cc Matt Porter <[email protected]>

Cc Alexandre Bounine <[email protected]>

Cc [email protected]

---
 drivers/rapidio/devices/tsi721.c |   11 +++--------
 1 files changed, 3 insertions(+), 8 deletions(-)

drivers/rapidio/devices/tsi721.c +3 -8

index ff7cbf2..ce08e8d 100644
@@ -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

Alexander Gordeev

author

2014-03-06 20:09 UTC #15 lore raw

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

In reply to Alexander Gordeev

This update also cleans up a bit xhci_setup_msi() and xhci_setup_msix() returning of success.

Signed-off-by Alexander Gordeev <[email protected]>

Cc Sarah Sharp <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc [email protected]

---
 drivers/usb/host/xhci.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

drivers/usb/host/xhci.c +4 -3

index 6fe577d..dc7cfb5 100644
@@ -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");

Signature · 1 line

1.7.7.6

Sarah Sharp

2014-03-06 21:57 UTC #16 lore raw

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

Quoted 9 lines · 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.

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

Quoted 46 lines

Signed-off-by Alexander Gordeev <[email protected]>

Cc Sarah Sharp <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc [email protected]

---
 drivers/usb/host/xhci.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

drivers/usb/host/xhci.c +4 -3

index 6fe577d..dc7cfb5 100644
@@ -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");

Signature · 1 line

1.7.7.6

Alexander Gordeev

author

2014-03-07 07:44 UTC #17 lore raw

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 <[email protected]>

Cc Sarah Sharp <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc [email protected]

---
 drivers/usb/host/xhci.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

drivers/usb/host/xhci.c +3 -2

index 6fe577d..6fbba7a 100644
@@ -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");

Signature · 6 lines

1.7.7.6

-- 
Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-03-07 07:46 UTC #18 lore raw

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

In reply to Sarah Sharp

Signed-off-by Alexander Gordeev <[email protected]>

Cc Sarah Sharp <[email protected]>

Cc Greg Kroah-Hartman <[email protected]>

Cc [email protected]

---
 drivers/usb/host/xhci.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

drivers/usb/host/xhci.c +1 -1

index 6fbba7a..dc7cfb5 100644
@@ -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");

Signature · 6 lines

1.7.7.6

-- 
Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-03-25 20:13 UTC #19 lore raw

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

In reply to Sarah Sharp

Quoted 3 lines · Sarah Sharp

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!

Quoted 1 line

Sarah Sharp

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Alexander Gordeev

author

2014-04-02 11:39 UTC #20 lore raw

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

Quoted 8 lines · Alexander Gordeev

Quoted 3 lines · Sarah Sharp
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?

Quoted 8 lines

Thanks!
Quoted 1 line
Sarah Sharp
Signature · 3 lines
Regards,
Alexander Gordeev
[email protected]

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]

Mathias Nyman

maintainer

2014-04-02 13:54 UTC #21 lore raw

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

Quoted 9 lines · Alexander Gordeev

Quoted 7 lines · Alexander Gordeev
Quoted 3 lines · Sarah Sharp
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 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

Alexander Gordeev

author

2014-04-02 15:18 UTC #22 lore raw

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

Quoted 6 lines · Mathias Nyman

Quoted 5 lines · Alexander Gordeev
Quoted 4 lines · Alexander Gordeev
Quoted 3 lines · Sarah Sharp
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.

Quoted 6 lines

Quoted 4 lines
Quoted 3 lines
Hi Sarah,
Any feedback on v2?
Hi

Thank you for the review, Mathias.

Quoted 5 lines

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

Quoted 4 lines

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

Signature · 3 lines

Regards,
Alexander Gordeev
[email protected]