]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
net: hns3: Support "ethtool -d" for HNS3 VF driver
authorJian Shen <shenjian15@huawei.com>
Thu, 29 Nov 2018 16:40:58 +0000 (16:40 +0000)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 14 Jan 2019 09:28:55 +0000 (09:28 +0000)
BugLink: https://bugs.launchpad.net/bugs/1810457
This patch adds "ethtool -d" support for HNS3 VF Driver.

Signed-off-by: Jian Shen <shenjian15@huawei.com>
Signed-off-by: Salil Mehta <salil.mehta@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
(cherry picked from commit 1600c3e5f23e39c0ecdad237838e6366713656b7)
Signed-off-by: dann frazier <dann.frazier@canonical.com>
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c
drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.h

index 355b1e50ce9e5048514b5ad7a07eda2b47315f13..40543440cc4ef38335d9cff1a0b952f6f1ad8d6a 100644 (file)
@@ -23,6 +23,58 @@ static const struct pci_device_id ae_algovf_pci_tbl[] = {
 
 MODULE_DEVICE_TABLE(pci, ae_algovf_pci_tbl);
 
+static const u32 cmdq_reg_addr_list[] = {HCLGEVF_CMDQ_TX_ADDR_L_REG,
+                                        HCLGEVF_CMDQ_TX_ADDR_H_REG,
+                                        HCLGEVF_CMDQ_TX_DEPTH_REG,
+                                        HCLGEVF_CMDQ_TX_TAIL_REG,
+                                        HCLGEVF_CMDQ_TX_HEAD_REG,
+                                        HCLGEVF_CMDQ_RX_ADDR_L_REG,
+                                        HCLGEVF_CMDQ_RX_ADDR_H_REG,
+                                        HCLGEVF_CMDQ_RX_DEPTH_REG,
+                                        HCLGEVF_CMDQ_RX_TAIL_REG,
+                                        HCLGEVF_CMDQ_RX_HEAD_REG,
+                                        HCLGEVF_VECTOR0_CMDQ_SRC_REG,
+                                        HCLGEVF_CMDQ_INTR_STS_REG,
+                                        HCLGEVF_CMDQ_INTR_EN_REG,
+                                        HCLGEVF_CMDQ_INTR_GEN_REG};
+
+static const u32 common_reg_addr_list[] = {HCLGEVF_MISC_VECTOR_REG_BASE,
+                                          HCLGEVF_RST_ING,
+                                          HCLGEVF_GRO_EN_REG};
+
+static const u32 ring_reg_addr_list[] = {HCLGEVF_RING_RX_ADDR_L_REG,
+                                        HCLGEVF_RING_RX_ADDR_H_REG,
+                                        HCLGEVF_RING_RX_BD_NUM_REG,
+                                        HCLGEVF_RING_RX_BD_LENGTH_REG,
+                                        HCLGEVF_RING_RX_MERGE_EN_REG,
+                                        HCLGEVF_RING_RX_TAIL_REG,
+                                        HCLGEVF_RING_RX_HEAD_REG,
+                                        HCLGEVF_RING_RX_FBD_NUM_REG,
+                                        HCLGEVF_RING_RX_OFFSET_REG,
+                                        HCLGEVF_RING_RX_FBD_OFFSET_REG,
+                                        HCLGEVF_RING_RX_STASH_REG,
+                                        HCLGEVF_RING_RX_BD_ERR_REG,
+                                        HCLGEVF_RING_TX_ADDR_L_REG,
+                                        HCLGEVF_RING_TX_ADDR_H_REG,
+                                        HCLGEVF_RING_TX_BD_NUM_REG,
+                                        HCLGEVF_RING_TX_PRIORITY_REG,
+                                        HCLGEVF_RING_TX_TC_REG,
+                                        HCLGEVF_RING_TX_MERGE_EN_REG,
+                                        HCLGEVF_RING_TX_TAIL_REG,
+                                        HCLGEVF_RING_TX_HEAD_REG,
+                                        HCLGEVF_RING_TX_FBD_NUM_REG,
+                                        HCLGEVF_RING_TX_OFFSET_REG,
+                                        HCLGEVF_RING_TX_EBD_NUM_REG,
+                                        HCLGEVF_RING_TX_EBD_OFFSET_REG,
+                                        HCLGEVF_RING_TX_BD_ERR_REG,
+                                        HCLGEVF_RING_EN_REG};
+
+static const u32 tqp_intr_reg_addr_list[] = {HCLGEVF_TQP_INTR_CTRL_REG,
+                                            HCLGEVF_TQP_INTR_GL0_REG,
+                                            HCLGEVF_TQP_INTR_GL1_REG,
+                                            HCLGEVF_TQP_INTR_GL2_REG,
+                                            HCLGEVF_TQP_INTR_RL_REG};
+
 static inline struct hclgevf_dev *hclgevf_ae_get_hdev(
        struct hnae3_handle *handle)
 {
@@ -2466,6 +2518,72 @@ static unsigned long hclgevf_ae_dev_reset_cnt(struct hnae3_handle *handle)
        return hdev->reset_count;
 }
 
+#define MAX_SEPARATE_NUM       4
+#define SEPARATOR_VALUE                0xFFFFFFFF
+#define REG_NUM_PER_LINE       4
+#define REG_LEN_PER_LINE       (REG_NUM_PER_LINE * sizeof(u32))
+
+static int hclgevf_get_regs_len(struct hnae3_handle *handle)
+{
+       int cmdq_lines, common_lines, ring_lines, tqp_intr_lines;
+       struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
+
+       cmdq_lines = sizeof(cmdq_reg_addr_list) / REG_LEN_PER_LINE + 1;
+       common_lines = sizeof(common_reg_addr_list) / REG_LEN_PER_LINE + 1;
+       ring_lines = sizeof(ring_reg_addr_list) / REG_LEN_PER_LINE + 1;
+       tqp_intr_lines = sizeof(tqp_intr_reg_addr_list) / REG_LEN_PER_LINE + 1;
+
+       return (cmdq_lines + common_lines + ring_lines * hdev->num_tqps +
+               tqp_intr_lines * (hdev->num_msi_used - 1)) * REG_LEN_PER_LINE;
+}
+
+static void hclgevf_get_regs(struct hnae3_handle *handle, u32 *version,
+                            void *data)
+{
+       struct hclgevf_dev *hdev = hclgevf_ae_get_hdev(handle);
+       int i, j, reg_um, separator_num;
+       u32 *reg = data;
+
+       *version = hdev->fw_version;
+
+       /* fetching per-VF registers values from VF PCIe register space */
+       reg_um = sizeof(cmdq_reg_addr_list) / sizeof(u32);
+       separator_num = MAX_SEPARATE_NUM - reg_um % REG_NUM_PER_LINE;
+       for (i = 0; i < reg_um; i++)
+               *reg++ = hclgevf_read_dev(&hdev->hw, cmdq_reg_addr_list[i]);
+       for (i = 0; i < separator_num; i++)
+               *reg++ = SEPARATOR_VALUE;
+
+       reg_um = sizeof(common_reg_addr_list) / sizeof(u32);
+       separator_num = MAX_SEPARATE_NUM - reg_um % REG_NUM_PER_LINE;
+       for (i = 0; i < reg_um; i++)
+               *reg++ = hclgevf_read_dev(&hdev->hw, common_reg_addr_list[i]);
+       for (i = 0; i < separator_num; i++)
+               *reg++ = SEPARATOR_VALUE;
+
+       reg_um = sizeof(ring_reg_addr_list) / sizeof(u32);
+       separator_num = MAX_SEPARATE_NUM - reg_um % REG_NUM_PER_LINE;
+       for (j = 0; j < hdev->num_tqps; j++) {
+               for (i = 0; i < reg_um; i++)
+                       *reg++ = hclgevf_read_dev(&hdev->hw,
+                                                 ring_reg_addr_list[i] +
+                                                 0x200 * j);
+               for (i = 0; i < separator_num; i++)
+                       *reg++ = SEPARATOR_VALUE;
+       }
+
+       reg_um = sizeof(tqp_intr_reg_addr_list) / sizeof(u32);
+       separator_num = MAX_SEPARATE_NUM - reg_um % REG_NUM_PER_LINE;
+       for (j = 0; j < hdev->num_msi_used - 1; j++) {
+               for (i = 0; i < reg_um; i++)
+                       *reg++ = hclgevf_read_dev(&hdev->hw,
+                                                 tqp_intr_reg_addr_list[i] +
+                                                 4 * j);
+               for (i = 0; i < separator_num; i++)
+                       *reg++ = SEPARATOR_VALUE;
+       }
+}
+
 static const struct hnae3_ae_ops hclgevf_ops = {
        .init_ae_dev = hclgevf_init_ae_dev,
        .uninit_ae_dev = hclgevf_uninit_ae_dev,
@@ -2507,6 +2625,8 @@ static const struct hnae3_ae_ops hclgevf_ops = {
        .set_default_reset_request = hclgevf_set_def_reset_request,
        .get_channels = hclgevf_get_channels,
        .get_tqps_and_rss_info = hclgevf_get_tqps_and_rss_info,
+       .get_regs_len = hclgevf_get_regs_len,
+       .get_regs = hclgevf_get_regs,
        .get_status = hclgevf_get_status,
        .get_ksettings_an_result = hclgevf_get_ksettings_an_result,
        .get_media_type = hclgevf_get_media_type,
index 4517b7ea581713edcd19318b4868fa886ff5eb57..787bc06944e5bf6eff5a53479e1e7bcac71e4503 100644 (file)
 #define HCLGEVF_VECTOR_REG_OFFSET      0x4
 #define HCLGEVF_VECTOR_VF_OFFSET               0x100000
 
+/* bar registers for cmdq */
+#define HCLGEVF_CMDQ_TX_ADDR_L_REG             0x27000
+#define HCLGEVF_CMDQ_TX_ADDR_H_REG             0x27004
+#define HCLGEVF_CMDQ_TX_DEPTH_REG              0x27008
+#define HCLGEVF_CMDQ_TX_TAIL_REG               0x27010
+#define HCLGEVF_CMDQ_TX_HEAD_REG               0x27014
+#define HCLGEVF_CMDQ_RX_ADDR_L_REG             0x27018
+#define HCLGEVF_CMDQ_RX_ADDR_H_REG             0x2701C
+#define HCLGEVF_CMDQ_RX_DEPTH_REG              0x27020
+#define HCLGEVF_CMDQ_RX_TAIL_REG               0x27024
+#define HCLGEVF_CMDQ_RX_HEAD_REG               0x27028
+#define HCLGEVF_CMDQ_INTR_SRC_REG              0x27100
+#define HCLGEVF_CMDQ_INTR_STS_REG              0x27104
+#define HCLGEVF_CMDQ_INTR_EN_REG               0x27108
+#define HCLGEVF_CMDQ_INTR_GEN_REG              0x2710C
+
+/* bar registers for common func */
+#define HCLGEVF_GRO_EN_REG                     0x28000
+
+/* bar registers for rcb */
+#define HCLGEVF_RING_RX_ADDR_L_REG             0x80000
+#define HCLGEVF_RING_RX_ADDR_H_REG             0x80004
+#define HCLGEVF_RING_RX_BD_NUM_REG             0x80008
+#define HCLGEVF_RING_RX_BD_LENGTH_REG          0x8000C
+#define HCLGEVF_RING_RX_MERGE_EN_REG           0x80014
+#define HCLGEVF_RING_RX_TAIL_REG               0x80018
+#define HCLGEVF_RING_RX_HEAD_REG               0x8001C
+#define HCLGEVF_RING_RX_FBD_NUM_REG            0x80020
+#define HCLGEVF_RING_RX_OFFSET_REG             0x80024
+#define HCLGEVF_RING_RX_FBD_OFFSET_REG         0x80028
+#define HCLGEVF_RING_RX_STASH_REG              0x80030
+#define HCLGEVF_RING_RX_BD_ERR_REG             0x80034
+#define HCLGEVF_RING_TX_ADDR_L_REG             0x80040
+#define HCLGEVF_RING_TX_ADDR_H_REG             0x80044
+#define HCLGEVF_RING_TX_BD_NUM_REG             0x80048
+#define HCLGEVF_RING_TX_PRIORITY_REG           0x8004C
+#define HCLGEVF_RING_TX_TC_REG                 0x80050
+#define HCLGEVF_RING_TX_MERGE_EN_REG           0x80054
+#define HCLGEVF_RING_TX_TAIL_REG               0x80058
+#define HCLGEVF_RING_TX_HEAD_REG               0x8005C
+#define HCLGEVF_RING_TX_FBD_NUM_REG            0x80060
+#define HCLGEVF_RING_TX_OFFSET_REG             0x80064
+#define HCLGEVF_RING_TX_EBD_NUM_REG            0x80068
+#define HCLGEVF_RING_TX_EBD_OFFSET_REG         0x80070
+#define HCLGEVF_RING_TX_BD_ERR_REG             0x80074
+#define HCLGEVF_RING_EN_REG                    0x80090
+
+/* bar registers for tqp interrupt */
+#define HCLGEVF_TQP_INTR_CTRL_REG              0x20000
+#define HCLGEVF_TQP_INTR_GL0_REG               0x20100
+#define HCLGEVF_TQP_INTR_GL1_REG               0x20200
+#define HCLGEVF_TQP_INTR_GL2_REG               0x20300
+#define HCLGEVF_TQP_INTR_RL_REG                        0x20900
+
 /* Vector0 interrupt CMDQ event source register(RW) */
 #define HCLGEVF_VECTOR0_CMDQ_SRC_REG   0x27100
 /* CMDQ register bits for RX event(=MBX event) */