netxen: fix mac addr setup

[linux-2.6-omap-h63xx.git] / drivers / net / netxen / netxen_nic_hw.c

diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 9aa20f961618aff39195cec203306e285db7bdad..f5db48bcd266bccfc76595880ba8f1ec20ab1876 100644 (file)
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -733,31 +733,56 @@ static int netxen_get_flash_block(struct netxen_adapter *adapter, int base,
        return 0;
 }
 
-int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 mac[])
+int netxen_get_flash_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
 {
-       __le32 *pmac = (__le32 *) & mac[0];
+       __le32 *pmac = (__le32 *) mac;
+       u32 offset;
 
-       if (netxen_get_flash_block(adapter,
-                                  NETXEN_USER_START +
-                                  offsetof(struct netxen_new_user_info,
-                                           mac_addr),
-                                  FLASH_NUM_PORTS * sizeof(u64), pmac) == -1) {
+       offset = NETXEN_USER_START +
+               offsetof(struct netxen_new_user_info, mac_addr) +
+               adapter->portnum * sizeof(u64);
+
+       if (netxen_get_flash_block(adapter, offset, sizeof(u64), pmac) == -1)
                return -1;
-       }
+
        if (*mac == cpu_to_le64(~0ULL)) {
+
+               offset = NETXEN_USER_START_OLD +
+                       offsetof(struct netxen_user_old_info, mac_addr) +
+                       adapter->portnum * sizeof(u64);
+
                if (netxen_get_flash_block(adapter,
-                                          NETXEN_USER_START_OLD +
-                                          offsetof(struct netxen_user_old_info,
-                                                   mac_addr),
-                                          FLASH_NUM_PORTS * sizeof(u64),
-                                          pmac) == -1)
+                                       offset, sizeof(u64), pmac) == -1)
                        return -1;
+
                if (*mac == cpu_to_le64(~0ULL))
                        return -1;
        }
        return 0;
 }
 
+int netxen_p3_get_mac_addr(struct netxen_adapter *adapter, __le64 *mac)
+{
+       uint32_t crbaddr, mac_hi, mac_lo;
+       int pci_func = adapter->ahw.pci_func;
+
+       crbaddr = CRB_MAC_BLOCK_START +
+               (4 * ((pci_func/2) * 3)) + (4 * (pci_func & 1));
+
+       adapter->hw_read_wx(adapter, crbaddr, &mac_lo, 4);
+       adapter->hw_read_wx(adapter, crbaddr+4, &mac_hi, 4);
+
+       mac_hi = cpu_to_le32(mac_hi);
+       mac_lo = cpu_to_le32(mac_lo);
+
+       if (pci_func & 1)
+               *mac = ((mac_lo >> 16) | ((u64)mac_hi << 16));
+       else
+               *mac = ((mac_lo) | ((u64)mac_hi << 32));
+
+       return 0;
+}
+
 #define CRB_WIN_LOCK_TIMEOUT 100000000
 
 static int crb_win_lock(struct netxen_adapter *adapter)