[openib-general] [PATCH RFC 21/21] ofed_1_2 Backport drivers/net/cxgb3/t3_hw.c to sles9sp3

[Steve Wise]

Backport drivers/net/cxgb3/t3_hw.c to sles9sp3

Signed-off-by: Steve Wise <swise at opengridcomputing.com>
---

 .../2.6.5_sles9_sp3/t3_hw_to_2_6_5-7_244.patch     |   43 +++++++++++++++++++++++
 1 files changed, 43 insertions(+), 0 deletions(-)

diff --git a/kernel_patches/backport/2.6.5_sles9_sp3/t3_hw_to_2_6_5-7_244.patch b/kernel_patches/backport/2.6.5_sles9_sp3/t3_hw_to_2_6_5-7_244.patch
new file mode 100644
index 0000000..a667be0
--- /dev/null
+++ b/kernel_patches/backport/2.6.5_sles9_sp3/t3_hw_to_2_6_5-7_244.patch
@@ -0,0 +1,43 @@
+diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h
+index 463ca32..b931fd2 100755
+--- a/drivers/net/cxgb3/adapter.h
++++ b/drivers/net/cxgb3/adapter.h
+@@ -179,6 +179,7 @@ struct adapter {
+ 	struct list_head adapter_list;
+ 	void __iomem *regs;
+ 	struct pci_dev *pdev;
++	u32 saved_pci_state[16];
+ 	unsigned long registered_device_map;
+ 	unsigned long open_device_map;
+ 	unsigned long flags;
+diff --git a/drivers/net/cxgb3/t3_hw.c b/drivers/net/cxgb3/t3_hw.c
+index 14ea6b9..f13f581 100755
+--- a/drivers/net/cxgb3/t3_hw.c
++++ b/drivers/net/cxgb3/t3_hw.c
+@@ -3250,7 +3250,7 @@ int t3_reset_adapter(struct adapter *ada
+ 	uint16_t devid = 0;
+ 
+ 	if (is_pcie(adapter))
+-		pci_save_state(adapter->pdev);
++		pci_save_state(adapter->pdev, adapter->saved_pci_state);
+ 	t3_write_reg(adapter, A_PL_RST, F_CRSTWRM | F_CRSTWRMMODE);
+ 
+ 	/*
+@@ -3268,7 +3268,7 @@ int t3_reset_adapter(struct adapter *ada
+ 		return -1;
+ 
+ 	if (is_pcie(adapter))
+-		pci_restore_state(adapter->pdev);
++		pci_restore_state(adapter->pdev, adapter->saved_pci_state);
+ 	return 0;
+ }
+ 
+@@ -3357,8 +3357,6 @@ int __devinit t3_prep_adapter(struct ada
+ 
+ 		memcpy(adapter->port[i]->dev_addr, hw_addr,
+ 		       ETH_ALEN);
+-		memcpy(adapter->port[i]->perm_addr, hw_addr,
+-		       ETH_ALEN);
+ 		init_link_config(&p->link_config, p->port_type->caps);
+ 		p->phy.ops->power_down(&p->phy, 1);
+ 		if (!(p->port_type->caps & SUPPORTED_IRQ))