1 files changed, 61 insertions, 44 deletions

diff --git a/drivers/net/netxen/netxen_nic_ethtool.c b/drivers/net/netxen/netxen_nic_ethtool.c
index a677ff895184..a452b2facb77 100644
--- a/drivers/net/netxen/netxen_nic_ethtool.c
+++ b/drivers/net/netxen/netxen_nic_ethtool.c
@@ -30,7 +30,6 @@
 
 #include <linux/types.h>
 #include <linux/delay.h>
-#include <asm/uaccess.h>
 #include <linux/pci.h>
 #include <asm/io.h>
 #include <linux/netdevice.h>
@@ -53,13 +52,9 @@ struct netxen_nic_stats {
 #define NETXEN_NIC_INVALID_DATA 0xDEADBEEF
 
 static const struct netxen_nic_stats netxen_nic_gstrings_stats[] = {
-        {"rcvd_bad_skb", NETXEN_NIC_STAT(stats.rcvdbadskb)},
         {"xmit_called", NETXEN_NIC_STAT(stats.xmitcalled)},
-        {"xmited_frames", NETXEN_NIC_STAT(stats.xmitedframes)},
         {"xmit_finished", NETXEN_NIC_STAT(stats.xmitfinished)},
-        {"bad_skb_len", NETXEN_NIC_STAT(stats.badskblen)},
-        {"no_cmd_desc", NETXEN_NIC_STAT(stats.nocmddescriptor)},
-        {"polled", NETXEN_NIC_STAT(stats.polled)},
+        {"rx_dropped", NETXEN_NIC_STAT(stats.rxdropped)},
         {"tx_dropped", NETXEN_NIC_STAT(stats.txdropped)},
         {"csummed", NETXEN_NIC_STAT(stats.csummed)},
         {"no_rcv", NETXEN_NIC_STAT(stats.no_rcv)},
@@ -97,12 +92,9 @@ netxen_nic_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *drvinfo)
         strncpy(drvinfo->driver, netxen_nic_driver_name, 32);
         strncpy(drvinfo->version, NETXEN_NIC_LINUX_VERSIONID, 32);
         write_lock_irqsave(&adapter->adapter_lock, flags);
-        fw_major = adapter->pci_read_normalize(adapter,
-                                        NETXEN_FW_VERSION_MAJOR);
-        fw_minor = adapter->pci_read_normalize(adapter,
-                                        NETXEN_FW_VERSION_MINOR);
-        fw_build = adapter->pci_read_normalize(adapter,
-                                        NETXEN_FW_VERSION_SUB);
+        fw_major = NXRD32(adapter, NETXEN_FW_VERSION_MAJOR);
+        fw_minor = NXRD32(adapter, NETXEN_FW_VERSION_MINOR);
+        fw_build = NXRD32(adapter, NETXEN_FW_VERSION_SUB);
         write_unlock_irqrestore(&adapter->adapter_lock, flags);
         sprintf(drvinfo->fw_version, "%d.%d.%d", fw_major, fw_minor, fw_build);
 
@@ -115,6 +107,7 @@ static int
 netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
 {
         struct netxen_adapter *adapter = netdev_priv(dev);
+        int check_sfp_module = 0;
 
         /* read which mode */
         if (adapter->ahw.port_type == NETXEN_NIC_GBE) {
@@ -139,7 +132,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
                 u32 val;
 
-                adapter->hw_read_wx(adapter, NETXEN_PORT_MODE_ADDR, &val, 4);
+                val = NXRD32(adapter, NETXEN_PORT_MODE_ADDR);
                 if (val == NETXEN_PORT_MODE_802_3_AP) {
                         ecmd->supported = SUPPORTED_1000baseT_Full;
                         ecmd->advertising = ADVERTISED_1000baseT_Full;
@@ -148,13 +141,19 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         ecmd->advertising = ADVERTISED_10000baseT_Full;
                 }
 
+                if (netif_running(dev) && adapter->has_link_events) {
+                        ecmd->speed = adapter->link_speed;
+                        ecmd->autoneg = adapter->link_autoneg;
+                        ecmd->duplex = adapter->link_duplex;
+                        goto skip;
+                }
+
                 ecmd->port = PORT_TP;
 
                 if (NX_IS_REVISION_P3(adapter->ahw.revision_id)) {
                         u16 pcifn = adapter->ahw.pci_func;
 
-                        adapter->hw_read_wx(adapter,
-                                P3_LINK_SPEED_REG(pcifn), &val, 4);
+                        val = NXRD32(adapter, P3_LINK_SPEED_REG(pcifn));
                         ecmd->speed = P3_LINK_SPEED_MHZ *
                                         P3_LINK_SPEED_VAL(pcifn, val);
                 } else
@@ -165,10 +164,11 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         } else
                 return -EIO;
 
+skip:
         ecmd->phy_address = adapter->physical_port;
         ecmd->transceiver = XCVR_EXTERNAL;
 
-        switch ((netxen_brdtype_t)adapter->ahw.board_type) {
+        switch (adapter->ahw.board_type) {
         case NETXEN_BRDTYPE_P2_SB35_4G:
         case NETXEN_BRDTYPE_P2_SB31_2G:
         case NETXEN_BRDTYPE_P3_REF_QG:
@@ -195,7 +195,7 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         case NETXEN_BRDTYPE_P3_HMEZ:
                 ecmd->supported |= SUPPORTED_MII;
                 ecmd->advertising |= ADVERTISED_MII;
-                ecmd->port = PORT_FIBRE;
+                ecmd->port = PORT_MII;
                 ecmd->autoneg = AUTONEG_DISABLE;
                 break;
         case NETXEN_BRDTYPE_P3_10G_SFP_PLUS:
@@ -203,6 +203,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
         case NETXEN_BRDTYPE_P3_10G_SFP_QT:
                 ecmd->advertising |= ADVERTISED_TP;
                 ecmd->supported |= SUPPORTED_TP;
+                check_sfp_module = netif_running(dev) &&
+                        adapter->has_link_events;
         case NETXEN_BRDTYPE_P2_SB31_10G:
         case NETXEN_BRDTYPE_P3_10G_XFP:
                 ecmd->supported |= SUPPORTED_FIBRE;
@@ -217,6 +219,8 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                         ecmd->advertising |=
                                 (ADVERTISED_FIBRE | ADVERTISED_TP);
                         ecmd->port = PORT_FIBRE;
+                        check_sfp_module = netif_running(dev) &&
+                                adapter->has_link_events;
                 } else {
                         ecmd->autoneg = AUTONEG_ENABLE;
                         ecmd->supported |= (SUPPORTED_TP |SUPPORTED_Autoneg);
@@ -227,10 +231,27 @@ netxen_nic_get_settings(struct net_device *dev, struct ethtool_cmd *ecmd)
                 break;
         default:
                 printk(KERN_ERR "netxen-nic: Unsupported board model %d\n",
-                       (netxen_brdtype_t)adapter->ahw.board_type);
+                                adapter->ahw.board_type);
                 return -EIO;
         }
 
+        if (check_sfp_module) {
+                switch (adapter->module_type) {
+                case LINKEVENT_MODULE_OPTICAL_UNKNOWN:
+                case LINKEVENT_MODULE_OPTICAL_SRLR:
+                case LINKEVENT_MODULE_OPTICAL_LRM:
+                case LINKEVENT_MODULE_OPTICAL_SFP_1G:
+                        ecmd->port = PORT_FIBRE;
+                        break;
+                case LINKEVENT_MODULE_TWINAX_UNSUPPORTED_CABLE:
+                case LINKEVENT_MODULE_TWINAX_UNSUPPORTED_CABLELEN:
+                case LINKEVENT_MODULE_TWINAX:
+                        ecmd->port = PORT_TP;
+                default:
+                        ecmd->port = -1;
+                }
+        }
+
         return 0;
 }
 
@@ -398,12 +419,11 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
         regs->version = (1 << 24) | (adapter->ahw.revision_id << 16) |
             (adapter->pdev)->device;
         /* which mode */
-        adapter->hw_read_wx(adapter, NETXEN_NIU_MODE, &regs_buff[0], 4);
+        regs_buff[0] = NXRD32(adapter, NETXEN_NIU_MODE);
         mode = regs_buff[0];
 
         /* Common registers to all the modes */
-        adapter->hw_read_wx(adapter,
-                        NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER, &regs_buff[2], 4);
+        regs_buff[2] = NXRD32(adapter, NETXEN_NIU_STRAP_VALUE_SAVE_HIGHER);
         /* GB/XGB Mode */
         mode = (mode / 2) - 1;
         window = 0;
@@ -414,9 +434,8 @@ netxen_nic_get_regs(struct net_device *dev, struct ethtool_regs *regs, void *p)
                                 window = adapter->physical_port *
                                         NETXEN_NIC_PORT_WINDOW;
 
-                        adapter->hw_read_wx(adapter,
-                                niu_registers[mode].reg[i - 3] + window,
-                                &regs_buff[i], 4);
+                        regs_buff[i] = NXRD32(adapter,
+                                niu_registers[mode].reg[i - 3] + window);
                 }
 
         }
@@ -440,7 +459,7 @@ static u32 netxen_nic_test_link(struct net_device *dev)
                         return !val;
                 }
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
-                val = adapter->pci_read_normalize(adapter, CRB_XG_STATE);
+                val = NXRD32(adapter, CRB_XG_STATE);
                 return (val == XG_LINK_UP) ? 0 : 1;
         }
         return -EIO;
@@ -504,10 +523,9 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                         return;
                 /* get flow control settings */
-                netxen_nic_read_w0(adapter,NETXEN_NIU_GB_MAC_CONFIG_0(port),
-                                &val);
+                val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
                 pause->rx_pause = netxen_gb_get_rx_flowctl(val);
-                netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);
+                val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL);
                 switch (port) {
                         case 0:
                                 pause->tx_pause = !(netxen_gb_get_gb0_mask(val));
@@ -527,7 +545,7 @@ netxen_nic_get_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                         return;
                 pause->rx_pause = 1;
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);
+                val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
                 if (port == 0)
                         pause->tx_pause = !(netxen_xg_get_xg0_mask(val));
                 else
@@ -550,18 +568,17 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                 if ((port < 0) || (port > NETXEN_NIU_MAX_GBE_PORTS))
                         return -EIO;
                 /* set flow control */
-                netxen_nic_read_w0(adapter,
-                                        NETXEN_NIU_GB_MAC_CONFIG_0(port), &val);
+                val = NXRD32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port));
 
                 if (pause->rx_pause)
                         netxen_gb_rx_flowctl(val);
                 else
                         netxen_gb_unset_rx_flowctl(val);
 
-                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
+                NXWR32(adapter, NETXEN_NIU_GB_MAC_CONFIG_0(port),
                                 val);
                 /* set autoneg */
-                netxen_nic_read_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, &val);
+                val = NXRD32(adapter, NETXEN_NIU_GB_PAUSE_CTL);
                 switch (port) {
                         case 0:
                                 if (pause->tx_pause)
@@ -589,11 +606,11 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                                         netxen_gb_set_gb3_mask(val);
                                 break;
                 }
-                netxen_nic_write_w0(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
+                NXWR32(adapter, NETXEN_NIU_GB_PAUSE_CTL, val);
         } else if (adapter->ahw.port_type == NETXEN_NIC_XGBE) {
                 if ((port < 0) || (port > NETXEN_NIU_MAX_XG_PORTS))
                         return -EIO;
-                netxen_nic_read_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, &val);
+                val = NXRD32(adapter, NETXEN_NIU_XG_PAUSE_CTL);
                 if (port == 0) {
                         if (pause->tx_pause)
                                 netxen_xg_unset_xg0_mask(val);
@@ -605,7 +622,7 @@ netxen_nic_set_pauseparam(struct net_device *dev,
                         else
                                 netxen_xg_set_xg1_mask(val);
                 }
-                netxen_nic_write_w0(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
+                NXWR32(adapter, NETXEN_NIU_XG_PAUSE_CTL, val);
         } else {
                 printk(KERN_ERR "%s: Unknown board type: %x\n",
                                 netxen_nic_driver_name,
@@ -619,14 +636,14 @@ static int netxen_nic_reg_test(struct net_device *dev)
         struct netxen_adapter *adapter = netdev_priv(dev);
         u32 data_read, data_written;
 
-        netxen_nic_read_w0(adapter, NETXEN_PCIX_PH_REG(0), &data_read);
+        data_read = NXRD32(adapter, NETXEN_PCIX_PH_REG(0));
         if ((data_read & 0xffff) != PHAN_VENDOR_ID)
         return 1;
 
         data_written = (u32)0xa5a5a5a5;
 
-        netxen_nic_reg_write(adapter, CRB_SCRATCHPAD_TEST, data_written);
-        data_read = adapter->pci_read_normalize(adapter, CRB_SCRATCHPAD_TEST);
+        NXWR32(adapter, CRB_SCRATCHPAD_TEST, data_written);
+        data_read = NXRD32(adapter, CRB_SCRATCHPAD_TEST);
         if (data_written != data_read)
                 return 1;
 
@@ -743,11 +760,11 @@ netxen_nic_get_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (NX_IS_REVISION_P2(adapter->ahw.revision_id))
                 return;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG_NV);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG_NV);
         if (wol_cfg & (1UL << adapter->portnum))
                 wol->supported |= WAKE_MAGIC;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
         if (wol_cfg & (1UL << adapter->portnum))
                 wol->wolopts |= WAKE_MAGIC;
 }
@@ -764,16 +781,16 @@ netxen_nic_set_wol(struct net_device *dev, struct ethtool_wolinfo *wol)
         if (wol->wolopts & ~WAKE_MAGIC)
                 return -EOPNOTSUPP;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG_NV);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG_NV);
         if (!(wol_cfg & (1 << adapter->portnum)))
                 return -EOPNOTSUPP;
 
-        wol_cfg = netxen_nic_reg_read(adapter, NETXEN_WOL_CONFIG);
+        wol_cfg = NXRD32(adapter, NETXEN_WOL_CONFIG);
         if (wol->wolopts & WAKE_MAGIC)
                 wol_cfg |= 1UL << adapter->portnum;
         else
                 wol_cfg &= ~(1UL << adapter->portnum);
-        netxen_nic_reg_write(adapter, NETXEN_WOL_CONFIG, wol_cfg);
+        NXWR32(adapter, NETXEN_WOL_CONFIG, wol_cfg);
 
         return 0;
 }