[PATCH 4/5] NetXen: Fix ping issue

[PATCH 4/5] NetXen: Fix ping issue

[Mithlesh Thukral]

NetXen: Fix initialization and subsequent ping issue
This patch will fix the initialization and ping issues seen on
certain PPC architecture blades.

Signed-off by: Wen Xiong <wenxiong@us.ibm.com>
Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
---

 drivers/net/netxen/netxen_nic_main.c |    7 +++++++
 drivers/net/netxen/netxen_nic_niu.c  |    8 ++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index c61181f..6167b58 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -542,6 +542,13 @@ #endif
 				NETXEN_ROMUSB_GLB_PEGTUNE_DONE));
 		/* Handshake with the card before we register the devices. */
 		netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
+
+	       /* leave the hw in the same state as reboot */
+	       writel(0, NETXEN_CRB_NORMALIZE(adapter, CRB_CMDPEG_STATE));
+	       netxen_pinit_from_rom(adapter, 0);
+	       udelay(500);
+	       netxen_load_firmware(adapter);
+	       netxen_phantom_init(adapter, NETXEN_NIC_PEG_TUNE);
 	}
 
 	/*
diff --git a/drivers/net/netxen/netxen_nic_niu.c b/drivers/net/netxen/netxen_nic_niu.c
index cef90a7..75102d3 100644
--- a/drivers/net/netxen/netxen_nic_niu.c
+++ b/drivers/net/netxen/netxen_nic_niu.c
@@ -454,16 +454,12 @@ int netxen_niu_gbe_init_port(struct netx
 
 int netxen_niu_xg_init_port(struct netxen_adapter *adapter, int port)
 {
-	u32 reg;
 	u32 portnum = physical_port[adapter->portnum];
 
 	netxen_crb_writelit_adapter(adapter,
-		NETXEN_NIU_XGE_CONFIG_0+(0x10000*portnum), 0x5);
-	netxen_nic_hw_read_wx(adapter,
-		NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), &reg, 4);
-	reg = (reg & ~0x2000UL);
+		NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), 0x1447);
 	netxen_crb_writelit_adapter(adapter,
-		NETXEN_NIU_XGE_CONFIG_1+(0x10000*portnum), reg);
+		NETXEN_NIU_XGE_CONFIG_0+(0x10000*portnum), 0x5);
 
 	return 0;
 }

Re: [PATCH 4/5] NetXen: Fix ping issue

[Jeff Garzik]

Mithlesh Thukral wrote:
> NetXen: Fix initialization and subsequent ping issue
> This patch will fix the initialization and ping issues seen on
> certain PPC architecture blades.
> 
> Signed-off by: Wen Xiong <wenxiong@us.ibm.com>
> Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
> ---
> 
>  drivers/net/netxen/netxen_nic_main.c |    7 +++++++
>  drivers/net/netxen/netxen_nic_niu.c  |    8 ++------
>  2 files changed, 9 insertions(+), 6 deletions(-)

Again, your patch description is useless.

You should describe the problem being fixed, and how/why the changes 
seen in the patch actually fix the issue.

Re: [PATCH 4/5] NetXen: Fix ping issue

[wendy xiong]

On Sun, 2007-06-03 at 11:51 -0400, Jeff Garzik wrote:
> Mithlesh Thukral wrote:
> > NetXen: Fix initialization and subsequent ping issue
> > This patch will fix the initialization and ping issues seen on
> > certain PPC architecture blades.
> > 
> > Signed-off by: Wen Xiong <wenxiong@us.ibm.com>
> > Signed-off by: Mithlesh Thukral <mithlesh@netxen.com>
> > ---
> > 
> >  drivers/net/netxen/netxen_nic_main.c |    7 +++++++
> >  drivers/net/netxen/netxen_nic_niu.c  |    8 ++------
> >  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> Again, your patch description is useless.
> 
> You should describe the problem being fixed, and how/why the changes 
> seen in the patch actually fix the issue.
> 
Hi Jeff,

Ping problem description:
After we moved up netxen adapter's firmware to 3.4.19, we saw this ping
problem on x/pBlade.  After configured interface up, ping -c 1
10.10.10.10 failed. Netxen adapter couldn't accept ARP broadcast packet
somehow. If I manually added MAC address in the ARP table, then ping
start working.

netxen adapter should finish initilization after system boot. But on
some platform, looks netxen adapter didn't initilization correctly after
system boot up, so have to re-load the firmware again in probe routine.
Also re-initilization netxen_config_0 and netxen_config_1 registers.

Let me know if you have any question for this patch.

Thanks
Wendy Xiong

Re: [PATCH 4/5] NetXen: Fix ping issue

[Jeff Garzik]

You'll need to resend the patch...