aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic_main.c
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit@netxen.com>2009-10-16 11:50:09 -0400
committerDavid S. Miller <davem@davemloft.net>2009-10-18 02:44:42 -0400
commit6abb4b83eac25d91f6de834e97b2ea38e979575b (patch)
treed06065cc9c37f3bbc9a2a15a6c9e09535e3adb79 /drivers/net/netxen/netxen_nic_main.c
parent0be367bd5d10634c0836f57a684432fee935d929 (diff)
netxen: onchip memory access change
Add support for different windowing scheme for on chip memory in future chip revisions. This is required by diagnostic tools. Signed-off-by: Amit Kumar Salecha <amit@netxen.com> Signed-off-by: Dhananjay Phadke <dhananjay@netxen.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
-rw-r--r--drivers/net/netxen/netxen_nic_main.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index 2d772dd381f..30d9afe7366 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -649,7 +649,11 @@ netxen_setup_pci_map(struct netxen_adapter *adapter)
649 adapter->ahw.pci_base1 = mem_ptr1; 649 adapter->ahw.pci_base1 = mem_ptr1;
650 adapter->ahw.pci_base2 = mem_ptr2; 650 adapter->ahw.pci_base2 = mem_ptr2;
651 651
652 if (!NX_IS_REVISION_P2(adapter->ahw.revision_id)) { 652 if (NX_IS_REVISION_P3P(adapter->ahw.revision_id)) {
653 adapter->ahw.ocm_win_crb = netxen_get_ioaddr(adapter,
654 NETXEN_PCIX_PS_REG(PCIX_OCM_WINDOW_REG(pci_func)));
655
656 } else if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
653 adapter->ahw.ocm_win_crb = netxen_get_ioaddr(adapter, 657 adapter->ahw.ocm_win_crb = netxen_get_ioaddr(adapter,
654 NETXEN_PCIX_PS_REG(PCIE_MN_WINDOW_REG(pci_func))); 658 NETXEN_PCIX_PS_REG(PCIE_MN_WINDOW_REG(pci_func)));
655 } 659 }