From f58d415afaacc7565f08817903b0d21f16579eb8 Mon Sep 17 00:00:00 2001
From: Yulong Pei <yulong.pei@intel.com>
Date: Tue, 14 Jul 2020 12:44:44 -0700
Subject: Add Intel E810CQ 100G NIC configuration

for Intel E810CQ 100G NIC, kernel driver of PF is ice, kernel driver of VF
is iavf, its VF hardware support VPP native avf driver.

Signed-off-by: Yulong Pei <yulong.pei@intel.com>
Change-Id: Ic8d86e5ee00057bbbcd09df619a38bd1371c8fd7
---
 resources/libraries/python/Constants.py     | 5 +++++
 resources/libraries/python/InterfaceUtil.py | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'resources/libraries')

diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py
index 73d8b63a0b..97bd63b965 100644
--- a/resources/libraries/python/Constants.py
+++ b/resources/libraries/python/Constants.py
@@ -266,6 +266,7 @@ class Constants:
         u"Intel-X710": 10000000000,
         u"Intel-XL710": 24500000000,
         u"Intel-XXV710": 24500000000,
+        u"Intel-E810CQ": 100000000000,
         u"Mellanox-CX556A": 100000000000,
         u"Amazon-Nitro-50G": 10000000000,
         u"virtual": 100000000,
@@ -280,6 +281,7 @@ class Constants:
         u"Intel-X710": 14880952,
         u"Intel-XL710": 18750000,
         u"Intel-XXV710": 18750000,
+        u"Intel-E810CQ": 58500000,
         u"Mellanox-CX556A": 60000000, # 148809523,
         u"Amazon-Nitro-50G": 1500000,
         u"virtual": 14880952,
@@ -294,6 +296,7 @@ class Constants:
         u"Intel-X710": u"10ge2p1x710",
         u"Intel-XL710": u"40ge2p1xl710",
         u"Intel-XXV710": u"25ge2p1xxv710",
+        u"Intel-E810CQ": u"100ge2p1e810cq",
         u"Amazon-Nitro-50G": u"50ge1p1ENA",
         u"Mellanox-CX556A": u"100ge2p1cx556a",
     }
@@ -307,6 +310,7 @@ class Constants:
         u"Intel-X710": [u"vfio-pci", u"avf"],
         u"Intel-XL710": [u"vfio-pci", u"avf"],
         u"Intel-XXV710": [u"vfio-pci", u"avf"],
+        u"Intel-E810CQ": [u"vfio-pci", u"avf"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"rdma-core"],
     }
@@ -348,6 +352,7 @@ class Constants:
         u"Intel-X710": [u"vfio-pci"],
         u"Intel-XL710": [u"vfio-pci"],
         u"Intel-XXV710": [u"vfio-pci"],
+        u"Intel-E810CQ": [u"vfio-pci"],
         u"Amazon-Nitro-50G": [u"vfio-pci"],
         u"Mellanox-CX556A": [u"mlx5_core"],
     }
diff --git a/resources/libraries/python/InterfaceUtil.py b/resources/libraries/python/InterfaceUtil.py
index bfc0ba7a08..e751160077 100644
--- a/resources/libraries/python/InterfaceUtil.py
+++ b/resources/libraries/python/InterfaceUtil.py
@@ -1569,9 +1569,9 @@ class InterfaceUtil:
         pf_mac_addr = Topology.get_interface_mac(node, ifc_key).split(":")
         uio_driver = Topology.get_uio_driver(node)
         kernel_driver = Topology.get_interface_driver(node, ifc_key)
-        if kernel_driver not in (u"i40e", u"i40evf"):
+        if kernel_driver not in (u"ice", u"iavf", u"i40e", u"i40evf"):
             raise RuntimeError(
-                f"AVF needs i40e-compatible driver, not {kernel_driver} "
+                f"AVF needs ice or i40e compatible driver, not {kernel_driver}"
                 f"at node {node[u'host']} ifc {ifc_key}"
             )
         current_driver = DUTSetup.get_pci_dev_driver(
-- 
cgit 1.2.3-korg