Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8bee0a91 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller
Browse files

netxen: fix i2c init 



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

Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 845de8af

drivers/net/netxen/netxen_nic_hdr.h

+1 −0
Original line number Diff line number Diff line
@@ -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)

drivers/net/netxen/netxen_nic_init.c

+2 −6
Original line number Diff line number Diff line
@@ -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) */