[PATCH 1/1] UBUNTU: SAUCE: forcedeth: msi interrupt fix

[Andy Whitcroft]

From: Ayaz Abdulla <aabdulla at nvidia.com>

Bug: #288281
OriginalAuthor:  Ayaz Abdulla
OriginalLocation: http://bugzilla.kernel.org/attachment.cgi?id=20010&action=view

This patch fixes an issue with the suspend/resume cycle with msi
interrupts. See bugzilla number 10487 for more details. The fix is to
re-setup a private msi pci config offset field.

Signed-off-by: Ayaz Abdulla <aabdulla at nvidia.com>
Signed-off-by: David S. Miller <davem at davemloft.net>
Signed-off-by: Andy Whitcroft <apw at canonical.com>
---
 drivers/net/forcedeth.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/net/forcedeth.c b/drivers/net/forcedeth.c
index eeb55ed..f47da17 100644
--- a/drivers/net/forcedeth.c
+++ b/drivers/net/forcedeth.c
@@ -582,6 +582,9 @@ union ring_type {
 #define NV_MSI_X_VECTOR_TX    0x1
 #define NV_MSI_X_VECTOR_OTHER 0x2
 
+#define NV_MSI_PRIV_OFFSET 0x68
+#define NV_MSI_PRIV_VALUE  0xffffffff
+
 #define NV_RESTART_TX         0x1
 #define NV_RESTART_RX         0x2
 
@@ -5967,6 +5970,8 @@ static int nv_resume(struct pci_dev *pdev)
 	for (i = 0;i <= np->register_size/sizeof(u32); i++)
 		writel(np->saved_config_space[i], base+i*sizeof(u32));
 
+	pci_write_config_dword(pdev, NV_MSI_PRIV_OFFSET, NV_MSI_PRIV_VALUE);
+
 	netif_device_attach(dev);
 	if (netif_running(dev)) {
 		rc = nv_open(dev);
-- 
1.6.1.2.419.g0d87e