5 files changed, 88 insertions, 26 deletions

diff --git a/drivers/net/netxen/netxen_nic.h b/drivers/net/netxen/netxen_nic.h
index 77220687b92..f744d291218 100644
--- a/drivers/net/netxen/netxen_nic.h
+++ b/drivers/net/netxen/netxen_nic.h
@@ -53,8 +53,8 @@
 
 #define _NETXEN_NIC_LINUX_MAJOR 4
 #define _NETXEN_NIC_LINUX_MINOR 0
-#define _NETXEN_NIC_LINUX_SUBVERSION 75
-#define NETXEN_NIC_LINUX_VERSIONID  "4.0.75"
+#define _NETXEN_NIC_LINUX_SUBVERSION 76
+#define NETXEN_NIC_LINUX_VERSIONID  "4.0.76"
 
 #define NETXEN_VERSION_CODE(a, b, c)    (((a) << 24) + ((b) << 16) + (c))
 #define _major(v)       (((v) >> 24) & 0xff)
@@ -1302,6 +1302,7 @@ int netxen_nic_wol_supported(struct netxen_adapter *adapter);
 int netxen_init_dummy_dma(struct netxen_adapter *adapter);
 void netxen_free_dummy_dma(struct netxen_adapter *adapter);
 
+int netxen_check_flash_fw_compatibility(struct netxen_adapter *adapter);
 int netxen_phantom_init(struct netxen_adapter *adapter, int pegtune_val);
 int netxen_load_firmware(struct netxen_adapter *adapter);
 int netxen_need_fw_reset(struct netxen_adapter *adapter);
diff --git a/drivers/net/netxen/netxen_nic_ctx.c b/drivers/net/netxen/netxen_nic_ctx.c
index f16966afa64..a925392abd6 100644
--- a/drivers/net/netxen/netxen_nic_ctx.c
+++ b/drivers/net/netxen/netxen_nic_ctx.c
@@ -163,7 +163,7 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
                                 rq_size, &hostrq_phys_addr);
         if (addr == NULL)
                 return -ENOMEM;
-        prq = (nx_hostrq_rx_ctx_t *)addr;
+        prq = addr;
 
         addr = pci_alloc_consistent(adapter->pdev,
                         rsp_size, &cardrsp_phys_addr);
@@ -171,7 +171,7 @@ nx_fw_cmd_create_rx_ctx(struct netxen_adapter *adapter)
                 err = -ENOMEM;
                 goto out_free_rq;
         }
-        prsp = (nx_cardrsp_rx_ctx_t *)addr;
+        prsp = addr;
 
         prq->host_rsp_dma_addr = cpu_to_le64(cardrsp_phys_addr);
 
@@ -318,10 +318,10 @@ nx_fw_cmd_create_tx_ctx(struct netxen_adapter *adapter)
         }
 
         memset(rq_addr, 0, rq_size);
-        prq = (nx_hostrq_tx_ctx_t *)rq_addr;
+        prq = rq_addr;
 
         memset(rsp_addr, 0, rsp_size);
-        prsp = (nx_cardrsp_tx_ctx_t *)rsp_addr;
+        prsp = rsp_addr;
 
         prq->host_rsp_dma_addr = cpu_to_le64(rsp_phys_addr);
 
@@ -629,7 +629,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
         }
 
         memset(addr, 0, sizeof(struct netxen_ring_ctx));
-        recv_ctx->hwctx = (struct netxen_ring_ctx *)addr;
+        recv_ctx->hwctx = addr;
         recv_ctx->hwctx->ctx_id = cpu_to_le32(port);
         recv_ctx->hwctx->cmd_consumer_offset =
                 cpu_to_le64(recv_ctx->phys_addr +
@@ -648,7 +648,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                 goto err_out_free;
         }
 
-        tx_ring->desc_head = (struct cmd_desc_type0 *)addr;
+        tx_ring->desc_head = addr;
 
         for (ring = 0; ring < adapter->max_rds_rings; ring++) {
                 rds_ring = &recv_ctx->rds_rings[ring];
@@ -662,7 +662,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                         err = -ENOMEM;
                         goto err_out_free;
                 }
-                rds_ring->desc_head = (struct rcv_desc *)addr;
+                rds_ring->desc_head = addr;
 
                 if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                         rds_ring->crb_rcv_producer =
@@ -683,7 +683,7 @@ int netxen_alloc_hw_resources(struct netxen_adapter *adapter)
                         err = -ENOMEM;
                         goto err_out_free;
                 }
-                sds_ring->desc_head = (struct status_desc *)addr;
+                sds_ring->desc_head = addr;
 
                 if (NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
                         sds_ring->crb_sts_consumer =
diff --git a/drivers/net/netxen/netxen_nic_hw.c b/drivers/net/netxen/netxen_nic_hw.c
index 5cef718fe35..3f89e57cae5 100644
--- a/drivers/net/netxen/netxen_nic_hw.c
+++ b/drivers/net/netxen/netxen_nic_hw.c
@@ -809,6 +809,9 @@ int netxen_config_hw_lro(struct netxen_adapter *adapter, int enable)
         u64 word;
         int rv = 0;
 
+        if (!test_bit(__NX_FW_ATTACHED, &adapter->state))
+                return 0;
+
         memset(&req, 0, sizeof(nx_nic_req_t));
 
         req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
@@ -959,6 +962,9 @@ int netxen_send_lro_cleanup(struct netxen_adapter *adapter)
         u64 word;
         int rv;
 
+        if (!test_bit(__NX_FW_ATTACHED, &adapter->state))
+                return 0;
+
         memset(&req, 0, sizeof(nx_nic_req_t));
         req.qhdr = cpu_to_le64(NX_HOST_REQUEST << 23);
 
diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 7f999671c7b..e8993a76a08 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -964,6 +964,35 @@ netxen_need_fw_reset(struct netxen_adapter *adapter)
         return 0;
 }
 
+#define NETXEN_MIN_P3_FW_SUPP   NETXEN_VERSION_CODE(4, 0, 505)
+
+int
+netxen_check_flash_fw_compatibility(struct netxen_adapter *adapter)
+{
+        u32 flash_fw_ver, min_fw_ver;
+
+        if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
+                return 0;
+
+        if (netxen_rom_fast_read(adapter,
+                        NX_FW_VERSION_OFFSET, (int *)&flash_fw_ver)) {
+                dev_err(&adapter->pdev->dev, "Unable to read flash fw"
+                        "version\n");
+                return -EIO;
+        }
+
+        flash_fw_ver = NETXEN_DECODE_VERSION(flash_fw_ver);
+        min_fw_ver = NETXEN_MIN_P3_FW_SUPP;
+        if (flash_fw_ver >= min_fw_ver)
+                return 0;
+
+        dev_info(&adapter->pdev->dev, "Flash fw[%d.%d.%d] is < min fw supported"
+                "[4.0.505]. Please update firmware on flash\n",
+                _major(flash_fw_ver), _minor(flash_fw_ver),
+                _build(flash_fw_ver));
+        return -EINVAL;
+}
+
 static char *fw_name[] = {
         NX_P2_MN_ROMIMAGE_NAME,
         NX_P3_CT_ROMIMAGE_NAME,
@@ -1071,10 +1100,12 @@ static int
 netxen_validate_firmware(struct netxen_adapter *adapter)
 {
         __le32 val;
-        u32 ver, min_ver, bios;
+        __le32 flash_fw_ver;
+        u32 file_fw_ver, min_ver, bios;
         struct pci_dev *pdev = adapter->pdev;
         const struct firmware *fw = adapter->fw;
         u8 fw_type = adapter->fw_type;
+        u32 crbinit_fix_fw;
 
         if (fw_type == NX_UNIFIED_ROMIMAGE) {
                 if (netxen_nic_validate_unified_romimage(adapter))
@@ -1091,16 +1122,18 @@ netxen_validate_firmware(struct netxen_adapter *adapter)
         val = nx_get_fw_version(adapter);
 
         if (NX_IS_REVISION_P3(adapter->ahw.revision_id))
-                min_ver = NETXEN_VERSION_CODE(4, 0, 216);
+                min_ver = NETXEN_MIN_P3_FW_SUPP;
         else
                 min_ver = NETXEN_VERSION_CODE(3, 4, 216);
 
-        ver = NETXEN_DECODE_VERSION(val);
+        file_fw_ver = NETXEN_DECODE_VERSION(val);
 
-        if ((_major(ver) > _NETXEN_NIC_LINUX_MAJOR) || (ver < min_ver)) {
+        if ((_major(file_fw_ver) > _NETXEN_NIC_LINUX_MAJOR) ||
+            (file_fw_ver < min_ver)) {
                 dev_err(&pdev->dev,
                                 "%s: firmware version %d.%d.%d unsupported\n",
-                fw_name[fw_type], _major(ver), _minor(ver), _build(ver));
+                fw_name[fw_type], _major(file_fw_ver), _minor(file_fw_ver),
+                 _build(file_fw_ver));
                 return -EINVAL;
         }
 
@@ -1112,17 +1145,34 @@ netxen_validate_firmware(struct netxen_adapter *adapter)
                 return -EINVAL;
         }
 
-        /* check if flashed firmware is newer */
         if (netxen_rom_fast_read(adapter,
-                        NX_FW_VERSION_OFFSET, (int *)&val))
+                        NX_FW_VERSION_OFFSET, (int *)&flash_fw_ver)) {
+                dev_err(&pdev->dev, "Unable to read flash fw version\n");
                 return -EIO;
-        val = NETXEN_DECODE_VERSION(val);
-        if (val > ver) {
-                dev_info(&pdev->dev, "%s: firmware is older than flash\n",
-                                fw_name[fw_type]);
+        }
+        flash_fw_ver = NETXEN_DECODE_VERSION(flash_fw_ver);
+
+        /* New fw from file is not allowed, if fw on flash is < 4.0.554 */
+        crbinit_fix_fw = NETXEN_VERSION_CODE(4, 0, 554);
+        if (file_fw_ver >= crbinit_fix_fw && flash_fw_ver < crbinit_fix_fw &&
+            NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
+                dev_err(&pdev->dev, "Incompatibility detected between driver "
+                        "and firmware version on flash. This configuration "
+                        "is not recommended. Please update the firmware on "
+                        "flash immediately\n");
                 return -EINVAL;
         }
 
+        /* check if flashed firmware is newer only for no-mn and P2 case*/
+        if (!netxen_p3_has_mn(adapter) ||
+            NX_IS_REVISION_P2(adapter->ahw.revision_id)) {
+                if (flash_fw_ver > file_fw_ver) {
+                        dev_info(&pdev->dev, "%s: firmware is older than flash\n",
+                                fw_name[fw_type]);
+                        return -EINVAL;
+                }
+        }
+
         NXWR32(adapter, NETXEN_CAM_RAM(0x1fc), NETXEN_BDINFO_MAGIC);
         return 0;
 }
@@ -1279,7 +1329,7 @@ void netxen_free_dummy_dma(struct netxen_adapter *adapter)
 
                         if (--i == 0)
                                 break;
-                };
+                }
         }
 
         if (i) {
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index c0788a31ff0..f574edff7fc 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -92,7 +92,8 @@ static irqreturn_t netxen_msi_intr(int irq, void *data);
 static irqreturn_t netxen_msix_intr(int irq, void *data);
 
 static void netxen_config_indev_addr(struct net_device *dev, unsigned long);
-static struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev);
+static struct rtnl_link_stats64 *netxen_nic_get_stats(struct net_device *dev,
+                                                      struct rtnl_link_stats64 *stats);
 static int netxen_nic_set_mac(struct net_device *netdev, void *p);
 
 /*  PCI Device ID Table  */
@@ -520,7 +521,7 @@ static const struct net_device_ops netxen_netdev_ops = {
         .ndo_open          = netxen_nic_open,
         .ndo_stop          = netxen_nic_close,
         .ndo_start_xmit    = netxen_nic_xmit_frame,
-        .ndo_get_stats     = netxen_nic_get_stats,
+        .ndo_get_stats64   = netxen_nic_get_stats,
         .ndo_validate_addr = eth_validate_addr,
         .ndo_set_multicast_list = netxen_set_multicast_list,
         .ndo_set_mac_address    = netxen_nic_set_mac,
@@ -1387,6 +1388,10 @@ netxen_nic_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
                 break;
         }
 
+        err = netxen_check_flash_fw_compatibility(adapter);
+        if (err)
+                goto err_out_iounmap;
+
         if (adapter->portnum == 0) {
                 val = NXRD32(adapter, NX_CRB_DEV_REF_COUNT);
                 if (val != 0xffffffff && val != 0) {
@@ -2110,10 +2115,10 @@ request_reset:
         clear_bit(__NX_RESETTING, &adapter->state);
 }
 
-static struct net_device_stats *netxen_nic_get_stats(struct net_device *netdev)
+static struct rtnl_link_stats64 *netxen_nic_get_stats(struct net_device *netdev,
+                                                      struct rtnl_link_stats64 *stats)
 {
         struct netxen_adapter *adapter = netdev_priv(netdev);
-        struct net_device_stats *stats = &netdev->stats;
 
         stats->rx_packets = adapter->stats.rx_pkts + adapter->stats.lro_pkts;
         stats->tx_packets = adapter->stats.xmitfinished;