be2net: Bug fix to config NIC appropriately before loopback test

[net-next-2.6.git] / drivers / net / benet / be_ethtool.c

diff --git a/drivers/net/benet/be_ethtool.c b/drivers/net/benet/be_ethtool.c
index 83a2fc703995a76719bc2f00b550f1f3b8ad235c..da66d15e22231f3205d25b4795d02a47f0472efb 100644 (file)
--- a/drivers/net/benet/be_ethtool.c
+++ b/drivers/net/benet/be_ethtool.c
@@ -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:
@@ -441,6 +462,75 @@ be_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol)
        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)
 {
@@ -479,4 +569,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,
 };