diff options
| -rw-r--r-- | fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh | 18 | ||||
| -rw-r--r-- | resources/job_specs/vpp_device/vpp-1n-spr.md | 30 | ||||
| -rw-r--r-- | resources/libraries/bash/function/device.sh | 10 |
3 files changed, 35 insertions, 23 deletions
diff --git a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh index b240649b4c..74593b24d4 100644 --- a/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh +++ b/fdio.infra.ansible/roles/vpp_device/files/csit-initialize-vfs-spr.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (c) 2023 Cisco and/or its affiliates. +# Copyright (c) 2024 Cisco and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -15,6 +15,9 @@ # Add Intel Corporation Ethernet Controller 10G X550T to blacklist. PCI_BLACKLIST=($(lspci -Dmmd ':1563:0200' | cut -f1 -d' ')) + +# Add Intel Corporation Ethernet Controller X710 for 10GbE SFP+ to whitelist. +PCI_WHITELIST=($(lspci -Dmmd ':1572:0200' | cut -f1 -d' ')) # Add Intel Corporation Ethernet Controller E810-C for 100GbE QSFP to whitelist. PCI_WHITELIST+=($(lspci -Dmmd ':1592:0200' | cut -f1 -d' ')) @@ -23,6 +26,13 @@ PCI_WHITELIST+=($(lspci -Dmmd ':1592:0200' | cut -f1 -d' ')) declare -A PF_INDICES # Intel NICs PF_INDICES["0000:2a:00.0"]=0 -PF_INDICES["0000:2c:00.0"]=1 -PF_INDICES["0000:3f:00.0"]=0 -PF_INDICES["0000:3d:00.0"]=1 +PF_INDICES["0000:2a:00.1"]=1 +PF_INDICES["0000:2a:00.2"]=2 +PF_INDICES["0000:2a:00.3"]=3 +PF_INDICES["0000:bd:00.0"]=4 +PF_INDICES["0000:3d:00.0"]=0 +PF_INDICES["0000:3d:00.1"]=1 +PF_INDICES["0000:3d:00.2"]=2 +PF_INDICES["0000:3d:00.3"]=3 +PF_INDICES["0000:e1:00.0"]=4 + diff --git a/resources/job_specs/vpp_device/vpp-1n-spr.md b/resources/job_specs/vpp_device/vpp-1n-spr.md index 432d78a7f4..3d692b2c7d 100644 --- a/resources/job_specs/vpp_device/vpp-1n-spr.md +++ b/resources/job_specs/vpp_device/vpp-1n-spr.md @@ -3,9 +3,9 @@ ### intel-e810cq #### dpdk-vfio-pci ##### ethip4-l2xcbase-eth-2memif-1dcr -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-eth-2memif-1dcr ##### ethip4-l2bdbasemaclrn-eth-2memif-1dcr -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2memif-1dcr ##### ethip4-ip4base-eth-2memif-1dcr 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-ip4base-eth-2memif-1dcr ## ./crypto/ethip4 @@ -84,7 +84,7 @@ ##### ethicmp4-ip4base-eth-1tap-namespace 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethicmp4-ip4base-eth-1tap-namespace ##### ethip4-l2bdbasemaclrn-eth-2tap -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-eth-2tap ## ./ip4 ### intel-e810cq #### dpdk-vfio-pci @@ -121,9 +121,9 @@ ##### ethip4--ethip4udpgeneve-1tun-ip4base 0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4--ethip4udpgeneve-1tun-ip4base ##### ethip4vxlan-l2bdbasemaclrn -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2bdbasemaclrn ##### ethip4vxlan-l2xcbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4vxlan-l2xcbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4vxlan-l2xcbase ## ./ip6 ### intel-e810cq #### dpdk-vfio-pci @@ -148,30 +148,30 @@ ### intel-e810cq #### avf ##### ethip4-l2bdbasemaclrn -# 0c AND 64b AND scapy AND e810cq AND drv_avf AND ethip4-l2bdbasemaclrn +0c AND 64b AND scapy AND x710 AND drv_avf AND ethip4-l2bdbasemaclrn #### dpdk-vfio-pci ##### ethip4-l2bdbasemaclrn -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn ##### ethip4-l2bdbasemaclrn-iacl1sf -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sf +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sf ##### ethip4-l2bdbasemaclrn-iacl1sl -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sl +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-iacl1sl ##### ethip4-l2bdbasemaclrn-macip-iacl1sl -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-macip-iacl1sl +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-macip-iacl1sl ##### ethip4-l2bdbasemaclrn-oacl1sf -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sf +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sf ##### ethip4-l2bdbasemaclrn-oacl1sl -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2bdbasemaclrn-oacl1sl ## ./l2patch ### intel-e810cq #### dpdk-vfio-pci ##### ethip4-l2patch -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2patch +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2patch ## ./l2xc ### intel-e810cq #### dpdk-vfio-pci ##### ethip4-l2xcbase -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2xcbase +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase ## ./srv6 ### intel-e810cq #### dpdk-vfio-pci @@ -191,7 +191,7 @@ ### intel-e810cq #### dpdk-vfio-pci ##### ethip4-l2xcbase-stats -0c AND 64b AND scapy AND e810cq AND drv_vfio_pci AND ethip4-l2xcbase-stats +0c AND 64b AND scapy AND x710 AND drv_vfio_pci AND ethip4-l2xcbase-stats ## ./vm/ethip4 ### intel-e810cq #### dpdk-vfio-pci diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index 4d39cd2de6..a0ba5a67a9 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -327,12 +327,14 @@ function get_available_interfaces () { ports_per_nic=2 ;; "1n_spr") + # Add Intel Corporation XL710/X710 Virtual Function to the + # whitelist. # Add Intel Corporation E810 Virtual Function to the # whitelist. - pci_id="0x1889" - tg_netdev=(enp42s0 enp44s0) - dut1_netdev=(enp63s0 enp61s0) - ports_per_nic=1 + pci_id="0x154c\|0x1889" + tg_netdev=(enp42s0 ens5) + dut1_netdev=(enp61s0 ens7) + ports_per_nic=2 ;; "1n_vbox") # Add Intel Corporation 82545EM Gigabit Ethernet Controller to the |