net: hns3: not allow SSU loopback while execute ethtool -t dev

The current loopback mode is to add 0x1F to the SMAC address
as the DMAC address and enable the promiscuous mode.
However, if the VF address is the same as the DMAC address,
the loopback test fails.

Loopback can be enabled in three places: SSU, MAC, and serdes.
By default, SSU loopback is enabled, so if the SMAC and the DMAC
are the same, the packets are looped back in the SSU. If SSU loopback
is disabled, packets can reach MAC even if SMAC is the same as DMAC.

Therefore, this patch disables the SSU loopback before the loopback
test. In this way, the SMAC and DMAC can be the same, and the
promiscuous mode does not need to be enabled. And this is not
valid in version 0x20.

This patch also uses a macro to replace 0x1F.

Fixes: c39c4d98dc65 ("net: hns3: Add mac loopback selftest support in hns3 driver")
Signed-off-by: Yufeng Mo <moyufeng@huawei.com>
Reviewed-by: Peng Li <lipeng321@huawei.com>
Signed-off-by: Huazhong Tan <tanhuazhong@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
index e219bb1c95b0201cffb4783f166fba4881c8b98d..c52eccc1621d4625a1b143a32cd3edd93b8f1ed4 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c
@@ -97,7 +97,7 @@ static int hns3_lp_setup(struct net_device *ndev, enum hnae3_loop loop, bool en)
                break;
        }
 
-       if (ret)
+       if (ret || h->pdev->revision >= 0x21)
                return ret;
 
        if (en) {
@@ -144,7 +144,10 @@ static int hns3_lp_down(struct net_device *ndev, enum hnae3_loop loop_mode)
 
 static void hns3_lp_setup_skb(struct sk_buff *skb)
 {
+#define        HNS3_NIC_LB_DST_MAC_ADDR        0x1f
+
        struct net_device *ndev = skb->dev;
+       struct hnae3_handle *handle;
        unsigned char *packet;
        struct ethhdr *ethh;
        unsigned int i;
@@ -160,7 +163,9 @@ static void hns3_lp_setup_skb(struct sk_buff *skb)
         * before the packet reaches mac or serdes, which will defect
         * the purpose of mac or serdes selftest.
         */
-       ethh->h_dest[5] += 0x1f;
+       handle = hns3_get_handle(ndev);
+       if (handle->pdev->revision == 0x20)
+               ethh->h_dest[5] += HNS3_NIC_LB_DST_MAC_ADDR;
        eth_zero_addr(ethh->h_source);
        ethh->h_proto = htons(ETH_P_ARP);
        skb_reset_mac_header(skb);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
index 29979be9e33ac031a2f7fac8d7e6b80400e386f5..4821fe08b5e4919a3d3f94472f83ede49fed8d7c 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_cmd.h
@@ -223,6 +223,9 @@ enum hclge_opcode_type {
        HCLGE_OPC_MAC_ETHTYPE_ADD           = 0x1010,
        HCLGE_OPC_MAC_ETHTYPE_REMOVE    = 0x1011,
 
+       /* MAC VLAN commands */
+       HCLGE_OPC_MAC_VLAN_SWITCH_PARAM = 0x1033,
+
        /* VLAN commands */
        HCLGE_OPC_VLAN_FILTER_CTRL          = 0x1100,
        HCLGE_OPC_VLAN_FILTER_PF_CFG    = 0x1101,
@@ -771,6 +774,31 @@ struct hclge_vlan_filter_vf_cfg_cmd {
        u8  vf_bitmap[16];
 };
 
+#define HCLGE_SWITCH_ANTI_SPOOF_B      0U
+#define HCLGE_SWITCH_ALW_LPBK_B                1U
+#define HCLGE_SWITCH_ALW_LCL_LPBK_B    2U
+#define HCLGE_SWITCH_ALW_DST_OVRD_B    3U
+#define HCLGE_SWITCH_NO_MASK           0x0
+#define HCLGE_SWITCH_ANTI_SPOOF_MASK   0xFE
+#define HCLGE_SWITCH_ALW_LPBK_MASK     0xFD
+#define HCLGE_SWITCH_ALW_LCL_LPBK_MASK 0xFB
+#define HCLGE_SWITCH_LW_DST_OVRD_MASK  0xF7
+
+struct hclge_mac_vlan_switch_cmd {
+       u8 roce_sel;
+       u8 rsv1[3];
+       __le32 func_id;
+       u8 switch_param;
+       u8 rsv2[3];
+       u8 param_mask;
+       u8 rsv3[11];
+};
+
+enum hclge_mac_vlan_cfg_sel {
+       HCLGE_MAC_VLAN_NIC_SEL = 0,
+       HCLGE_MAC_VLAN_ROCE_SEL,
+};
+
 #define HCLGE_ACCEPT_TAG1_B            0
 #define HCLGE_ACCEPT_UNTAG1_B          1
 #define HCLGE_PORT_INS_TAG1_EN_B       2

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
index dc22b84641a7ed6b464f54803579ae9327dc06af..ce4b2280a8b02aa77d1c462b0ee2c0334cf56dae 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.c
@@ -6211,6 +6211,30 @@ static void hclge_cfg_mac_mode(struct hclge_dev *hdev, bool enable)
                        "mac enable fail, ret =%d.\n", ret);
 }
 
+static int hclge_config_switch_param(struct hclge_dev *hdev, int vfid,
+                                    u8 switch_param, u8 param_mask)
+{
+       struct hclge_mac_vlan_switch_cmd *req;
+       struct hclge_desc desc;
+       u32 func_id;
+       int ret;
+
+       func_id = hclge_get_port_number(HOST_PORT, 0, vfid, 0);
+       req = (struct hclge_mac_vlan_switch_cmd *)desc.data;
+       hclge_cmd_setup_basic_desc(&desc, HCLGE_OPC_MAC_VLAN_SWITCH_PARAM,
+                                  false);
+       req->roce_sel = HCLGE_MAC_VLAN_NIC_SEL;
+       req->func_id = cpu_to_le32(func_id);
+       req->switch_param = switch_param;
+       req->param_mask = param_mask;
+
+       ret = hclge_cmd_send(&hdev->hw, &desc, 1);
+       if (ret)
+               dev_err(&hdev->pdev->dev,
+                       "set mac vlan switch parameter fail, ret = %d\n", ret);
+       return ret;
+}
+
 static void hclge_phy_link_status_wait(struct hclge_dev *hdev,
                                       int link_ret)
 {
@@ -6465,6 +6489,20 @@ static int hclge_set_loopback(struct hnae3_handle *handle,
        struct hclge_dev *hdev = vport->back;
        int i, ret;
 
+       /* Loopback can be enabled in three places: SSU, MAC, and serdes. By
+        * default, SSU loopback is enabled, so if the SMAC and the DMAC are
+        * the same, the packets are looped back in the SSU. If SSU loopback
+        * is disabled, packets can reach MAC even if SMAC is the same as DMAC.
+        */
+       if (hdev->pdev->revision >= 0x21) {
+               u8 switch_param = en ? 0 : BIT(HCLGE_SWITCH_ALW_LPBK_B);
+
+               ret = hclge_config_switch_param(hdev, PF_VPORT_ID, switch_param,
+                                               HCLGE_SWITCH_ALW_LPBK_MASK);
+               if (ret)
+                       return ret;
+       }
+
        switch (loop_mode) {
        case HNAE3_LOOP_APP:
                ret = hclge_set_app_loopback(hdev, en);

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
index 437a9ff8f58807a884cb9f0536a27989b44bbc35..870550fa9ff1ea4d9633fffb11f1cf5a7dd7addd 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_main.h
@@ -148,6 +148,8 @@ enum HLCGE_PORT_TYPE {
        NETWORK_PORT
 };
 
+#define PF_VPORT_ID                    0
+
 #define HCLGE_PF_ID_S                  0
 #define HCLGE_PF_ID_M                  GENMASK(2, 0)
 #define HCLGE_VF_ID_S                  3