[PATCH net] atl1e: drop pci-msi support because of packet corruption

[PATCH net] atl1e: drop pci-msi support because of packet corruption

[Hannes Frederic Sowa]

Usage of pci-msi results in corrupted dma packet transfers to the host.

Reported-by: rebelyouth <rebelyouth.hacklab@gmail.com>
Cc: Huang, Xiong <xiong@qca.qualcomm.com>
Tested-by: Christian Sünkenberg <christian.suenkenberg@student.kit.edu>
Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
---
I think this is material for -stable.

 drivers/net/ethernet/atheros/atl1e/atl1e.h      |  1 -
 drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 19 ++-----------------
 2 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e.h b/drivers/net/ethernet/atheros/atl1e/atl1e.h
index 829b5ad..edfdf6b 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e.h
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e.h
@@ -438,7 +438,6 @@ struct atl1e_adapter {
 	struct atl1e_hw        hw;
 	struct atl1e_hw_stats  hw_stats;
 
-	bool have_msi;
 	u32 wol;
 	u16 link_speed;
 	u16 link_duplex;
diff --git a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
index e1f1b2a..7e0a822 100644
--- a/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
+++ b/drivers/net/ethernet/atheros/atl1e/atl1e_main.c
@@ -1847,34 +1847,19 @@ static void atl1e_free_irq(struct atl1e_adapter *adapter)
 	struct net_device *netdev = adapter->netdev;
 
 	free_irq(adapter->pdev->irq, netdev);
-
-	if (adapter->have_msi)
-		pci_disable_msi(adapter->pdev);
 }
 
 static int atl1e_request_irq(struct atl1e_adapter *adapter)
 {
 	struct pci_dev    *pdev   = adapter->pdev;
 	struct net_device *netdev = adapter->netdev;
-	int flags = 0;
 	int err = 0;
 
-	adapter->have_msi = true;
-	err = pci_enable_msi(pdev);
-	if (err) {
-		netdev_dbg(netdev,
-			   "Unable to allocate MSI interrupt Error: %d\n", err);
-		adapter->have_msi = false;
-	}
-
-	if (!adapter->have_msi)
-		flags |= IRQF_SHARED;
-	err = request_irq(pdev->irq, atl1e_intr, flags, netdev->name, netdev);
+	err = request_irq(pdev->irq, atl1e_intr, IRQF_SHARED, netdev->name,
+			  netdev);
 	if (err) {
 		netdev_dbg(adapter->netdev,
 			   "Unable to allocate interrupt Error: %d\n", err);
-		if (adapter->have_msi)
-			pci_disable_msi(pdev);
 		return err;
 	}
 	netdev_dbg(netdev, "atl1e_request_irq OK\n");
-- 
1.8.1.4

RE: [PATCH net] atl1e: drop pci-msi support because of packet corruption

[Huang, Xiong]

> -----Original Message-----
> From: Hannes Frederic Sowa [mailto:hannes@stressinduktion.org]
> Sent: Friday, March 29, 2013 12:11 PM
> To: netdev@vger.kernel.org
> Cc: rebelyouth.hacklab@gmail.com; Huang, Xiong;
> christian.suenkenberg@student.kit.edu; sven@svenhartge.de
> Subject: [PATCH net] atl1e: drop pci-msi support because of packet
> corruption
> 
> Usage of pci-msi results in corrupted dma packet transfers to the host.
> 
> Reported-by: rebelyouth <rebelyouth.hacklab@gmail.com>
> Cc: Huang, Xiong <xiong@qca.qualcomm.com>
> Tested-by: Christian Sünkenberg <christian.suenkenberg@student.kit.edu>
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>
> ---
> I think this is material for -stable.
> 
Hi  Hannes, 

you can try to enable rx-checksum offload if DMA issue disappear, as windows driver enable this feature.


Thanks
-Xiong

Re: [PATCH net] atl1e: drop pci-msi support because of packet corruption

[Hannes Frederic Sowa]

On Fri, Mar 29, 2013 at 05:03:43AM +0000, Huang, Xiong wrote:
> you can try to enable rx-checksum offload if DMA issue disappear, as windows driver enable this feature.

We tested each change separately. So we had rx-checksum offload enabled
the whole time while testing this patch and it had not caused any
problems.

Greetings,

  Hannes

Re: [PATCH net] atl1e: drop pci-msi support because of packet corruption

[David Miller]

From: Hannes Frederic Sowa <hannes@stressinduktion.org>
Date: Fri, 29 Mar 2013 05:10:50 +0100

> Usage of pci-msi results in corrupted dma packet transfers to the host.
> 
> Reported-by: rebelyouth <rebelyouth.hacklab@gmail.com>
> Cc: Huang, Xiong <xiong@qca.qualcomm.com>
> Tested-by: Christian Sünkenberg <christian.suenkenberg@student.kit.edu>
> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org>

Applied and queued up for -stable, thanks.