]> bbs.cooldavid.org Git - net-next-2.6.git/blobdiff - drivers/net/benet/be_ethtool.c
be2net: Bug fix to return correct values in ethtool get_settings.
[net-next-2.6.git] / drivers / net / benet / be_ethtool.c
index 329560f9e54318bce5f9ea82770715f7bb033772..5d001c4deac1d3b8684c91261cb0c15769c96cfa 100644 (file)
@@ -107,6 +107,19 @@ static const struct be_ethtool_stat et_stats[] = {
 };
 #define ETHTOOL_STATS_NUM ARRAY_SIZE(et_stats)
 
+static const char et_self_tests[][ETH_GSTRING_LEN] = {
+       "MAC Loopback test",
+       "PHY Loopback test",
+       "External Loopback test",
+       "DDR DMA test"
+};
+
+#define ETHTOOL_TESTS_NUM ARRAY_SIZE(et_self_tests)
+#define BE_MAC_LOOPBACK 0x0
+#define BE_PHY_LOOPBACK 0x1
+#define BE_ONE_PORT_EXT_LOOPBACK 0x2
+#define BE_NO_LOOPBACK 0xff
+
 static void
 be_get_drvinfo(struct net_device *netdev, struct ethtool_drvinfo *drvinfo)
 {
@@ -278,12 +291,20 @@ be_get_stat_strings(struct net_device *netdev, uint32_t stringset,
                        data += ETH_GSTRING_LEN;
                }
                break;
+       case ETH_SS_TEST:
+               for (i = 0; i < ETHTOOL_TESTS_NUM; i++) {
+                       memcpy(data, et_self_tests[i], ETH_GSTRING_LEN);
+                       data += ETH_GSTRING_LEN;
+               }
+               break;
        }
 }
 
 static int be_get_sset_count(struct net_device *netdev, int stringset)
 {
        switch (stringset) {
+       case ETH_SS_TEST:
+               return ETHTOOL_TESTS_NUM;
        case ETH_SS_STATS:
                return ETHTOOL_STATS_NUM;
        default:
@@ -319,28 +340,50 @@ static int be_get_settings(struct net_device *netdev, struct ethtool_cmd *ecmd)
 
                status = be_cmd_read_port_type(adapter, adapter->port_num,
                                                &connector);
-               switch (connector) {
-               case 7:
-                       ecmd->port = PORT_FIBRE;
-                       break;
-               default:
-                       ecmd->port = PORT_TP;
-                       break;
+               if (!status) {
+                       switch (connector) {
+                       case 7:
+                               ecmd->port = PORT_FIBRE;
+                               ecmd->transceiver = XCVR_EXTERNAL;
+                               break;
+                       case 0:
+                               ecmd->port = PORT_TP;
+                               ecmd->transceiver = XCVR_EXTERNAL;
+                               break;
+                       default:
+                               ecmd->port = PORT_TP;
+                               ecmd->transceiver = XCVR_INTERNAL;
+                               break;
+                       }
+               } else {
+                       ecmd->port = PORT_AUI;
+                       ecmd->transceiver = XCVR_INTERNAL;
                }
 
                /* Save for future use */
                adapter->link_speed = ecmd->speed;
                adapter->port_type = ecmd->port;
+               adapter->transceiver = ecmd->transceiver;
        } else {
                ecmd->speed = adapter->link_speed;
                ecmd->port = adapter->port_type;
+               ecmd->transceiver = adapter->transceiver;
        }
 
        ecmd->duplex = DUPLEX_FULL;
        ecmd->autoneg = AUTONEG_DISABLE;
-       ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_TP);
        ecmd->phy_address = adapter->port_num;
-       ecmd->transceiver = XCVR_INTERNAL;
+       switch (ecmd->port) {
+       case PORT_FIBRE:
+               ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_FIBRE);
+               break;
+       case PORT_TP:
+               ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_TP);
+               break;
+       case PORT_AUI:
+               ecmd->supported = (SUPPORTED_10000baseT_Full | SUPPORTED_AUI);
+               break;
+       }
 
        return 0;
 }
@@ -411,6 +454,105 @@ be_phys_id(struct net_device *netdev, u32 data)
        return status;
 }
 
+static void
+be_get_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+
+       wol->supported = WAKE_MAGIC;
+       if (adapter->wol)
+               wol->wolopts = WAKE_MAGIC;
+       else
+               wol->wolopts = 0;
+       memset(&wol->sopass, 0, sizeof(wol->sopass));
+       return;
+}
+
+static int
+be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+
+       if (wol->wolopts & ~WAKE_MAGIC)
+               return -EINVAL;
+
+       if (wol->wolopts & WAKE_MAGIC)
+               adapter->wol = true;
+       else
+               adapter->wol = false;
+
+       return 0;
+}
+
+static int
+be_test_ddr_dma(struct be_adapter *adapter)
+{
+       int ret, i;
+       struct be_dma_mem ddrdma_cmd;
+       u64 pattern[2] = {0x5a5a5a5a5a5a5a5a, 0xa5a5a5a5a5a5a5a5};
+
+       ddrdma_cmd.size = sizeof(struct be_cmd_req_ddrdma_test);
+       ddrdma_cmd.va = pci_alloc_consistent(adapter->pdev, ddrdma_cmd.size,
+                                       &ddrdma_cmd.dma);
+       if (!ddrdma_cmd.va) {
+               dev_err(&adapter->pdev->dev, "Memory allocation failure \n");
+               return -ENOMEM;
+       }
+
+       for (i = 0; i < 2; i++) {
+               ret = be_cmd_ddr_dma_test(adapter, pattern[i],
+                                       4096, &ddrdma_cmd);
+               if (ret != 0)
+                       goto err;
+       }
+
+err:
+       pci_free_consistent(adapter->pdev, ddrdma_cmd.size,
+                       ddrdma_cmd.va, ddrdma_cmd.dma);
+       return ret;
+}
+
+static u64 be_loopback_test(struct be_adapter *adapter, u8 loopback_type,
+                               u64 *status)
+{
+       be_cmd_set_loopback(adapter, adapter->port_num,
+                               loopback_type, 1);
+       *status = be_cmd_loopback_test(adapter, adapter->port_num,
+                               loopback_type, 1500,
+                               2, 0xabc);
+       be_cmd_set_loopback(adapter, adapter->port_num,
+                               BE_NO_LOOPBACK, 1);
+       return *status;
+}
+
+static void
+be_self_test(struct net_device *netdev, struct ethtool_test *test, u64 *data)
+{
+       struct be_adapter *adapter = netdev_priv(netdev);
+
+       memset(data, 0, sizeof(u64) * ETHTOOL_TESTS_NUM);
+
+       if (test->flags & ETH_TEST_FL_OFFLINE) {
+               if (be_loopback_test(adapter, BE_MAC_LOOPBACK,
+                                               &data[0]) != 0) {
+                       test->flags |= ETH_TEST_FL_FAILED;
+               }
+               if (be_loopback_test(adapter, BE_PHY_LOOPBACK,
+                                               &data[1]) != 0) {
+                       test->flags |= ETH_TEST_FL_FAILED;
+               }
+               if (be_loopback_test(adapter, BE_ONE_PORT_EXT_LOOPBACK,
+                                               &data[2]) != 0) {
+                       test->flags |= ETH_TEST_FL_FAILED;
+               }
+
+               data[3] = be_test_ddr_dma(adapter);
+               if (data[3] != 0)
+                       test->flags |= ETH_TEST_FL_FAILED;
+       }
+
+}
+
 static int
 be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
 {
@@ -428,6 +570,8 @@ be_do_flash(struct net_device *netdev, struct ethtool_flash *efl)
 const struct ethtool_ops be_ethtool_ops = {
        .get_settings = be_get_settings,
        .get_drvinfo = be_get_drvinfo,
+       .get_wol = be_get_wol,
+       .set_wol = be_set_wol,
        .get_link = ethtool_op_get_link,
        .get_coalesce = be_get_coalesce,
        .set_coalesce = be_set_coalesce,
@@ -447,4 +591,5 @@ const struct ethtool_ops be_ethtool_ops = {
        .get_sset_count = be_get_sset_count,
        .get_ethtool_stats = be_get_ethtool_stats,
        .flash_device = be_do_flash,
+       .self_test = be_self_test,
 };