X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fdevice.sh;h=1819c457bba5a5633ee835e828cc9f9d5efb187b;hp=ee0ebdfd16a0978f20fcc51d7d375ea5fead7914;hb=HEAD;hpb=caff461d7ef136f744cc4084fe5be13f49fb27dd diff --git a/resources/libraries/bash/function/device.sh b/resources/libraries/bash/function/device.sh index ee0ebdfd16..4d39cd2de6 100644 --- a/resources/libraries/bash/function/device.sh +++ b/resources/libraries/bash/function/device.sh @@ -173,13 +173,17 @@ function clean_environment () { } # Rebind interfaces back to kernel drivers. + i=0 for ADDR in ${TG_PCIDEVS[@]}; do - DRIVER="${TG_DRIVERS[0]}" + DRIVER="${TG_DRIVERS[${i}]}" bind_interfaces_to_driver || die + ((i++)) done + i=0 for ADDR in ${DUT1_PCIDEVS[@]}; do - DRIVER="${DUT1_DRIVERS[0]}" + DRIVER="${DUT1_DRIVERS[${i}]}" bind_interfaces_to_driver || die + ((i++)) done } @@ -315,9 +319,11 @@ function get_available_interfaces () { "1n_alt") # Add Intel Corporation XL710/X710 Virtual Function to the # whitelist. - pci_id="0x154c" - tg_netdev=(enp1s0f0 enp1s0f1) - dut1_netdev=(enP3p2s0f0 enP3p2s0f1) + # Add MT2892 Family [ConnectX-6 Dx] Virtual Function to the + # whitelist. + pci_id="0x154c\|0x101e" + tg_netdev=(enp1s0f0 enp1s0f1 enP1p1s0f0) + dut1_netdev=(enP3p2s0f0 enP3p2s0f1 enP1p1s0f1) ports_per_nic=2 ;; "1n_spr") @@ -503,6 +509,9 @@ function get_csit_model () { "0x1572"|"0x154c") MODEL="Intel-X710" ;; + "0x101e") + MODEL="Mellanox-CX6DX" + ;; *) MODEL="virtual" esac