diff options
| author |   Amit Kumar Salecha <amit.salecha@qlogic.com> | 2010-05-11 23:53:02 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-05-12 23:02:29 -0700 |
| commit | f8e21f8fe2253e2ed5b9189b9dd5ff7e51af307c (patch) | |
| tree | 225ff000ad8c99b5c0661f530517b421421c263c /drivers/net/netxen/netxen_nic_init.c | |
| parent | tipc: Reduce footprint by un-inlining tipc_msg_* routines (diff) | |
| download | linux-dev-f8e21f8fe2253e2ed5b9189b9dd5ff7e51af307c.tar.xz linux-dev-f8e21f8fe2253e2ed5b9189b9dd5ff7e51af307c.zip | |
netxen: fix register usage
o For NX3031, MSI_MODE, CAPABILITIES_FW and SCRATCHPAD registers
are obsolete. These register addresses can be used for different
purpose.
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_init.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 388feaf60ee7..4a2bbeb1dceb 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -1361,10 +1361,12 @@ int netxen_init_firmware(struct netxen_adapter *adapter) return err; NXWR32(adapter, CRB_NIC_CAPABILITIES_HOST, INTR_SCHEME_PERPORT); - NXWR32(adapter, CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC); NXWR32(adapter, CRB_MPORT_MODE, MPORT_MULTI_FUNCTION_MODE); NXWR32(adapter, CRB_CMDPEG_STATE, PHAN_INITIALIZE_ACK); + if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) + NXWR32(adapter, CRB_NIC_MSI_MODE_HOST, MSI_MODE_MULTIFUNC); + return err; } |