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>

1 files changed, 8 insertions, 5 deletions

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 91c2bc61c8eb..424b456c5c82 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -702,7 +702,10 @@ netxen_load_firmware(struct netxen_adapter *adapter)
 
                 for (i = 0; i < size; i++) {
                         data = cpu_to_le64(ptr64[i]);
-                        adapter->pci_mem_write(adapter, flashaddr, &data, 8);
+                        if (adapter->pci_mem_write(adapter,
+                                                flashaddr, data))
+                                return -EIO;
+
                         flashaddr += 8;
                 }
 
@@ -716,7 +719,7 @@ netxen_load_firmware(struct netxen_adapter *adapter)
                         data = cpu_to_le64(ptr64[i]);
 
                         if (adapter->pci_mem_write(adapter,
-                                                flashaddr, &data, 8))
+                                                flashaddr, data))
                                 return -EIO;
 
                         flashaddr += 8;
@@ -730,17 +733,17 @@ netxen_load_firmware(struct netxen_adapter *adapter)
 
                 for (i = 0; i < size; i++) {
                         if (netxen_rom_fast_read(adapter,
-                                        flashaddr, &lo) != 0)
+                                        flashaddr, (int *)&lo) != 0)
                                 return -EIO;
                         if (netxen_rom_fast_read(adapter,
-                                        flashaddr + 4, &hi) != 0)
+                                        flashaddr + 4, (int *)&hi) != 0)
                                 return -EIO;
 
                         /* hi, lo are already in host endian byteorder */
                         data = (((u64)hi << 32) | lo);
 
                         if (adapter->pci_mem_write(adapter,
-                                                flashaddr, &data, 8))
+                                                flashaddr, data))
                                 return -EIO;
 
                         flashaddr += 8;