summaryrefslogtreecommitdiffstats
path: root/drivers/net/netxen/netxen_nic.h
diff options
context:
space:
mode:
authorAmit Kumar Salecha <amit@netxen.com>2009-10-13 05:31:41 +0000
committerDavid S. Miller <davem@davemloft.net>2009-10-13 11:48:19 -0700
commit1f5e055db369a5d1c74174571585a4ec2e6c40fb (patch)
treeef35e48957f02d9f1b461bd82bbd36745cf8de63 /drivers/net/netxen/netxen_nic.h
parent89d71a66c40d629e3b1285def543ab1425558cd5 (diff)
downloadblackbird-obmc-linux-1f5e055db369a5d1c74174571585a4ec2e6c40fb.tar.gz
blackbird-obmc-linux-1f5e055db369a5d1c74174571585a4ec2e6c40fb.zip
netxen: remove sub 64-bit mem accesses
Sub 64-bit / unaligned access to oncard memory was only used by old diagnostic tools, causes some intermittent issues when memory controller agent is used. The new access method was added by commit ea6828b8aa3a8ebae8d7740f32f212ba1d2f0742 ("netxen: improve pci memory access"). Firmware init anyway uses 8-byte strides. This also fixes address/offset calculation for NX2031 context memory (SIU). For NX3031, SIU uses same register offsets as packet memory (MIU). 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.h')
-rw-r--r--drivers/net/netxen/netxen_nic.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 5c766b52f1dc..db5c8d27d5d8 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -1180,8 +1180,8 @@ struct netxen_adapter {
u32 (*crb_read)(struct netxen_adapter *, ulong);
int (*crb_write)(struct netxen_adapter *, ulong, u32);
- int (*pci_mem_read)(struct netxen_adapter *, u64, void *, int);
- int (*pci_mem_write)(struct netxen_adapter *, u64, void *, int);
+ int (*pci_mem_read)(struct netxen_adapter *, u64, u64 *);
+ int (*pci_mem_write)(struct netxen_adapter *, u64, u64);
unsigned long (*pci_set_window)(struct netxen_adapter *,
unsigned long long);
OpenPOWER on IntegriCloud