net: hns3: Add mac loopback selftest support in hns3 driver

[mirror_ubuntu-bionic-kernel.git] / drivers / net / ethernet / hisilicon / hns3 / hns3pf / hclge_main.c

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index c322b45341482d0860edff92dcd56a5d71169b1a..8508521c26e8ff7790d2881ef8d47d01c85b5c39 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -2350,11 +2350,11 @@ static int hclge_get_status(struct hnae3_handle *handle)
        return hdev->hw.mac.link;
 }
 
-static void hclge_service_timer(unsigned long data)
+static void hclge_service_timer(struct timer_list *t)
 {
-       struct hclge_dev *hdev = (struct hclge_dev *)data;
-       (void)mod_timer(&hdev->service_timer, jiffies + HZ);
+       struct hclge_dev *hdev = from_timer(hdev, t, service_timer);
 
+       mod_timer(&hdev->service_timer, jiffies + HZ);
        hclge_task_schedule(hdev);
 }
 
@@ -3149,6 +3149,59 @@ static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
                        "mac enable fail, ret =%d.\n", ret);
 }
 
+static int hclge_set_loopback(struct hnae3_handle *handle,
+                             enum hnae3_loop loop_mode, bool en)
+{
+       struct hclge_vport *vport = hclge_get_vport(handle);
+       struct hclge_config_mac_mode_cmd *req;
+       struct hclge_dev *hdev = vport->back;
+       struct hclge_desc desc;
+       u32 loop_en;
+       int ret;
+
+       switch (loop_mode) {
+       case HNAE3_MAC_INTER_LOOP_MAC:
+               req = (struct hclge_config_mac_mode_cmd *)&desc.data[0];
+               /* 1 Read out the MAC mode config at first */
+               hclge_cmd_setup_basic_desc(&desc,
+                                          HCLGE_OPC_CONFIG_MAC_MODE,
+                                          true);
+               ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+               if (ret) {
+                       dev_err(&hdev->pdev->dev,
+                               "mac loopback get fail, ret =%d.\n",
+                               ret);
+                       return ret;
+               }
+
+               /* 2 Then setup the loopback flag */
+               loop_en = le32_to_cpu(req->txrx_pad_fcs_loop_en);
+               if (en)
+                       hnae_set_bit(loop_en, HCLGE_MAC_APP_LP_B, 1);
+               else
+                       hnae_set_bit(loop_en, HCLGE_MAC_APP_LP_B, 0);
+
+               req->txrx_pad_fcs_loop_en = cpu_to_le32(loop_en);
+
+               /* 3 Config mac work mode with loopback flag
+                * and its original configure parameters
+                */
+               hclge_cmd_reuse_desc(&desc, false);
+               ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+               if (ret)
+                       dev_err(&hdev->pdev->dev,
+                               "mac loopback set fail, ret =%d.\n", ret);
+               break;
+       default:
+               ret = -ENOTSUPP;
+               dev_err(&hdev->pdev->dev,
+                       "loop_mode %d is not supported\n", loop_mode);
+               break;
+       }
+
+       return ret;
+}
+
 static int hclge_tqp_enable(struct hclge_dev *hdev, int tqp_id,
                            int stream_id, bool enable)
 {
@@ -3204,7 +3257,7 @@ static int hclge_ae_start(struct hnae3_handle *handle)
        /* mac enable */
        hclge_cfg_mac_mode(hdev, true);
        clear_bit(HCLGE_STATE_DOWN, &hdev->state);
-       (void)mod_timer(&hdev->service_timer, jiffies + HZ);
+       mod_timer(&hdev->service_timer, jiffies + HZ);
 
        ret = hclge_mac_start_phy(hdev);
        if (ret)
@@ -4436,8 +4489,7 @@ static int hclge_init_ae_dev(struct hnae3_ae_dev *ae_dev)
 
        hclge_dcb_ops_set(hdev);
 
-       setup_timer(&hdev->service_timer, hclge_service_timer,
-                   (unsigned long)hdev);
+       timer_setup(&hdev->service_timer, hclge_service_timer, 0);
        INIT_WORK(&hdev->service_task, hclge_service_task);
 
        set_bit(HCLGE_STATE_SERVICE_INITED, &hdev->state);
@@ -4464,7 +4516,7 @@ static void hclge_uninit_ae_dev(struct hnae3_ae_dev *ae_dev)
        if (IS_ENABLED(CONFIG_PCI_IOV))
                hclge_disable_sriov(hdev);
 
-       if (hdev->service_timer.data)
+       if (hdev->service_timer.function)
                del_timer_sync(&hdev->service_timer);
        if (hdev->service_task.func)
                cancel_work_sync(&hdev->service_task);
@@ -4486,6 +4538,7 @@ static const struct hnae3_ae_ops hclge_ops = {
        .unmap_ring_from_vector = hclge_unmap_ring_from_vector,
        .get_vector = hclge_get_vector,
        .set_promisc_mode = hclge_set_promisc_mode,
+       .set_loopback = hclge_set_loopback,
        .start = hclge_ae_start,
        .stop = hclge_ae_stop,
        .get_status = hclge_get_status,