net: hns3: add handling of two bits in MAC tunnel interrupts

LINK_UP and LINK_DOWN are two bits of MAC tunnel interrupts, but previous
HNS3 driver didn't handle them. If they were enabled, value of these two
bits will change during link down and link up, which will cause HNS3
driver keep receiving IRQ but can't handle them.

This patch adds handling of these two bits of interrupts, we will record
and clear them as what we do to other MAC tunnel interrupts.

Signed-off-by: Weihang Li <liweihang@hisilicon.com>
Signed-off-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/hns3pf/hclge_debugfs.c b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
index ed1f533d40820c8984a12e7c00bba28d0636f991..e1007d96925b0b0f2cb3a97efc69be23eb1e32b5 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c
@@ -1053,7 +1053,7 @@ static void hclge_dbg_dump_mac_tnl_status(struct hclge_dev *hdev)
 
        while (kfifo_get(&hdev->mac_tnl_log, &stats)) {
                rem_nsec = do_div(stats.time, HCLGE_BILLION_NANO_SECONDS);
-               dev_info(&hdev->pdev->dev, "[%07lu.%03lu]status = 0x%x\n",
+               dev_info(&hdev->pdev->dev, "[%07lu.%03lu] status = 0x%x\n",
                         (unsigned long)stats.time, rem_nsec / 1000,
                         stats.status);
        }

diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h
index 9645590c92942c4a16ac52b7d9e0b729fa3b3fb3..c56b11e7451db483e1a8222e20c9c090be1f9132 100644 (file)
--- a/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h
+++ b/drivers/net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h
@@ -47,9 +47,9 @@
 #define HCLGE_NCSI_ERR_INT_TYPE        0x9
 #define HCLGE_MAC_COMMON_ERR_INT_EN            0x107FF
 #define HCLGE_MAC_COMMON_ERR_INT_EN_MASK       0x107FF
-#define HCLGE_MAC_TNL_INT_EN                   GENMASK(7, 0)
-#define HCLGE_MAC_TNL_INT_EN_MASK              GENMASK(7, 0)
-#define HCLGE_MAC_TNL_INT_CLR                  GENMASK(7, 0)
+#define HCLGE_MAC_TNL_INT_EN                   GENMASK(9, 0)
+#define HCLGE_MAC_TNL_INT_EN_MASK              GENMASK(9, 0)
+#define HCLGE_MAC_TNL_INT_CLR                  GENMASK(9, 0)
 #define HCLGE_PPU_MPF_ABNORMAL_INT0_EN         GENMASK(31, 0)
 #define HCLGE_PPU_MPF_ABNORMAL_INT0_EN_MASK    GENMASK(31, 0)
 #define HCLGE_PPU_MPF_ABNORMAL_INT1_EN         GENMASK(31, 0)