net: thunderx: Configure tunnelling protocol parsing

This patch enables parsing of inner layers for tunnelled packets.

Signed-off-by: Zyta Szpak <zr@semihalf.com>
Signed-off-by: Sunil Goutham <sgoutham@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/cavium/thunder/nic_main.c b/drivers/net/ethernet/cavium/thunder/nic_main.c
index 167291bba88aa892c8c9d37bd7a287d89b5f0619..25618d20393136eb5b0133859e661bc10133f861 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_main.c
+++ b/drivers/net/ethernet/cavium/thunder/nic_main.c
@@ -835,6 +835,25 @@ static int nic_reset_stat_counters(struct nicpf *nic,
        return 0;
 }
 
+static void nic_enable_tunnel_parsing(struct nicpf *nic, int vf)
+{
+       u64 prot_def = (IPV6_PROT << 32) | (IPV4_PROT << 16) | ET_PROT;
+       u64 vxlan_prot_def = (IPV6_PROT_DEF << 32) |
+                             (IPV4_PROT_DEF) << 16 | ET_PROT_DEF;
+
+       /* Configure tunnel parsing parameters */
+       nic_reg_write(nic, NIC_PF_RX_GENEVE_DEF,
+                     (1ULL << 63 | UDP_GENEVE_PORT_NUM));
+       nic_reg_write(nic, NIC_PF_RX_GENEVE_PROT_DEF,
+                     ((7ULL << 61) | prot_def));
+       nic_reg_write(nic, NIC_PF_RX_NVGRE_PROT_DEF,
+                     ((7ULL << 61) | prot_def));
+       nic_reg_write(nic, NIC_PF_RX_VXLAN_DEF_0_1,
+                     ((1ULL << 63) | UDP_VXLAN_PORT_NUM));
+       nic_reg_write(nic, NIC_PF_RX_VXLAN_PROT_DEF,
+                     ((0xfULL << 60) | vxlan_prot_def));
+}
+
 static void nic_enable_vf(struct nicpf *nic, int vf, bool enable)
 {
        int bgx, lmac;
@@ -908,6 +927,8 @@ static void nic_handle_mbx_intr(struct nicpf *nic, int vf)
                 */
                if (pass2_silicon(nic->pdev))
                        nic_reg_write(nic, NIC_PF_RX_CFG, 0x01);
+               if (!pass1_silicon(nic->pdev))
+                       nic_enable_tunnel_parsing(nic, vf);
                break;
        case NIC_MBOX_MSG_RQ_BP_CFG:
                reg_addr = NIC_PF_QSET_0_127_RQ_0_7_BP_CFG |

diff --git a/drivers/net/ethernet/cavium/thunder/nic_reg.h b/drivers/net/ethernet/cavium/thunder/nic_reg.h
index b4a79534a06b46369c983dd8fd72f956b78ad09d..db9c632d01579bdc085ef114147acecf84804504 100644 (file)
--- a/drivers/net/ethernet/cavium/thunder/nic_reg.h
+++ b/drivers/net/ethernet/cavium/thunder/nic_reg.h
@@ -36,6 +36,19 @@
 #define   NIC_PF_MAILBOX_ENA_W1C               (0x0450)
 #define   NIC_PF_MAILBOX_ENA_W1S               (0x0470)
 #define   NIC_PF_RX_ETYPE_0_7                  (0x0500)
+#define   NIC_PF_RX_GENEVE_DEF                 (0x0580)
+#define    UDP_GENEVE_PORT_NUM                         0x17C1ULL
+#define   NIC_PF_RX_GENEVE_PROT_DEF            (0x0588)
+#define    IPV6_PROT                                   0x86DDULL
+#define    IPV4_PROT                                   0x800ULL
+#define    ET_PROT                                     0x6558ULL
+#define   NIC_PF_RX_NVGRE_PROT_DEF             (0x0598)
+#define   NIC_PF_RX_VXLAN_DEF_0_1              (0x05A0)
+#define    UDP_VXLAN_PORT_NUM                          0x12B5
+#define   NIC_PF_RX_VXLAN_PROT_DEF             (0x05B0)
+#define    IPV6_PROT_DEF                               0x2ULL
+#define    IPV4_PROT_DEF                               0x1ULL
+#define    ET_PROT_DEF                                 0x3ULL
 #define   NIC_PF_RX_CFG                                (0x05D0)
 #define   NIC_PF_PKIND_0_15_CFG                        (0x0600)
 #define   NIC_PF_ECC0_FLIP0                    (0x1000)