[PATCH 0/3] netxen bug fixes

[PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Set of 3 patch fixes including a sparse warning cleanup.
Please apply.

Thanks,
Dhananjay

Re: [PATCH 0/3] netxen bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Mon, 16 Feb 2009 01:18:48 -0800

> Set of 3 patch fixes including a sparse warning cleanup.
> Please apply.

These are not bug fixes.  I'm applying them to net-next-2.6

RE: [PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Alright, thanks.
________________________________________
From: David Miller [davem@davemloft.net]
Sent: Tuesday, February 17, 2009 8:25 PM
To: Dhananjay Phadke
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH 0/3] netxen bug fixes

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Mon, 16 Feb 2009 01:18:48 -0800

> Set of 3 patch fixes including a sparse warning cleanup.
> Please apply.

These are not bug fixes.  I'm applying them to net-next-2.6

[PATCH 0/3] netxen bug fixes

[Dhananjay Phadke]

Dave,

Set of 3 critical bug fixes for 2.6.31, including a fix for
intermittant deadlock on dev close.

Please apply.

Thanks,
	Dhananjay

Re: [PATCH 0/3] netxen bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Fri, 17 Jul 2009 18:27:05 -0700

> Set of 3 critical bug fixes for 2.6.31, including a fix for
> intermittant deadlock on dev close.

Applied, thanks.

[PATCH 0/3] netxen: bug fixes

[Dhananjay Phadke]

Dave,

3 bug fixes for 2.6.32. Please apply to net-2.6.

Thanks,
	Dhananjay

[PATCH 1/3] netxen: fix i2c init

[Dhananjay Phadke]

Avoid resetting subsys ID in i2c block. Also remove duplicate
check for address tranlsation error.

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_hdr.h  |    1 +
 drivers/net/netxen/netxen_nic_init.c |    8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_hdr.h b/drivers/net/netxen/netxen_nic_hdr.h
index 7a71774..1c46da6 100644
--- a/drivers/net/netxen/netxen_nic_hdr.h
+++ b/drivers/net/netxen/netxen_nic_hdr.h
@@ -419,6 +419,7 @@ enum {
 #define NETXEN_CRB_ROMUSB	\
 	NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_ROMUSB)
 #define NETXEN_CRB_I2Q		NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_I2Q)
+#define NETXEN_CRB_I2C0		NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_I2C0)
 #define NETXEN_CRB_SMB		NETXEN_PCI_CRB_WINDOW(NETXEN_HW_PX_MAP_CRB_SMB)
 #define NETXEN_CRB_MAX		NETXEN_PCI_CRB_WINDOW(64)
 
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 91c2bc6..e40b914 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -531,6 +531,8 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
 			continue;
 
 		if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+			if (off == (NETXEN_CRB_I2C0 + 0x1c))
+				continue;
 			/* do not reset PCI */
 			if (off == (ROMUSB_GLB + 0xbc))
 				continue;
@@ -553,12 +555,6 @@ int netxen_pinit_from_rom(struct netxen_adapter *adapter, int verbose)
 				continue;
 		}
 
-		if (off == NETXEN_ADDR_ERROR) {
-			printk(KERN_ERR "%s: Err: Unknown addr: 0x%08x\n",
-					netxen_nic_driver_name, buf[i].addr);
-			continue;
-		}
-
 		init_delay = 1;
 		/* After writing this register, HW needs time for CRB */
 		/* to quiet down (else crb_window returns 0xffffffff) */
-- 
1.6.0.2

[PATCH 2/3] netxen: fix tx timeout handling on firmware hang

[Dhananjay Phadke]

From: Amit Kumar Salecha <amit.salecha@qlogic.com>

Clear NX_RESETING bit in netxen_tx_timeout_task() so that
the firmware watchdog task can catch need_reset request
from tx timeout.

Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_main.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 7fc15e9..0b4a56a 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1919,6 +1919,7 @@ static void netxen_tx_timeout_task(struct work_struct *work)
 
 request_reset:
 	adapter->need_fw_reset = 1;
+	clear_bit(__NX_RESETTING, &adapter->state);
 }
 
 struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
-- 
1.6.0.2

[PATCH 3/3] netxen: avoid undue board config check

[Dhananjay Phadke]

Old code assumed board config version in the flash to be 1.
When this will get changed by tools, driver just refuses to
attach. This is unnecessary since driver does not have to
parse board config structure directly (maintained by firmware).

Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com>
---
 drivers/net/netxen/netxen_nic_hw.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 3231400..3185a98 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -1901,22 +1901,16 @@ netxen_setup_hwops(struct netxen_adapter *adapter)
 
 int netxen_nic_get_board_info(struct netxen_adapter *adapter)
 {
-	int offset, board_type, magic, header_version;
+	int offset, board_type, magic;
 	struct pci_dev *pdev = adapter->pdev;
 
 	offset = NX_FW_MAGIC_OFFSET;
 	if (netxen_rom_fast_read(adapter, offset, &magic))
 		return -EIO;
 
-	offset = NX_HDR_VERSION_OFFSET;
-	if (netxen_rom_fast_read(adapter, offset, &header_version))
-		return -EIO;
-
-	if (magic != NETXEN_BDINFO_MAGIC ||
-			header_version != NETXEN_BDINFO_VERSION) {
-		dev_err(&pdev->dev,
-			"invalid board config, magic=%08x, version=%08x\n",
-			magic, header_version);
+	if (magic != NETXEN_BDINFO_MAGIC) {
+		dev_err(&pdev->dev, "invalid board config, magic=%08x\n",
+			magic);
 		return -EIO;
 	}
 
-- 
1.6.0.2

Re: [PATCH 0/3] netxen: bug fixes

[David Miller]

From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Wed, 21 Oct 2009 22:39:00 -0700

> 3 bug fixes for 2.6.32. Please apply to net-2.6.

All applied, thank you.

[PATCH 0/3]netxen: bug fixes

[Amit Kumar Salecha]

Hi
   Sending series of 3 bug fixes. Please apply them on net-2.6.

-Amit

Re: [PATCH 0/3]netxen: bug fixes

[David Miller]

From: Amit Kumar Salecha <amit.salecha@qlogic.com>
Date: Mon, 14 Jun 2010 02:39:02 -0700

>    Sending series of 3 bug fixes. Please apply them on net-2.6.

All applied, thanks.