Skip to content

Commit

Permalink
ts: change X3 driver name and TRC tag for it
Browse files Browse the repository at this point in the history
X3 driver name was changed from xilinx_efct to efct

AMD-Jira-Id: ON-14669
Signed-off-by: Yurij Plotnikov <yurij.plotnikov@arknetworks.am>
Reviewed-by: Denis Pryazhennikov <denis.pryazhennikov@arknetworks.am>
  • Loading branch information
okt-yurijp committed Feb 17, 2023
1 parent 0c7058c commit 9b01562
Show file tree
Hide file tree
Showing 10 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions conf/scripts/export_driver_sources
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ guess_driver_sources() {
# Get and export paths to driver sources for IUT/TST1
#
# @param Role: IUT, TST1
# @param driver name: sfc, xilinx_efct
# @param driver name: sfc, efct
#
obtain_driver_sources() {
local role=$1 ; shift
Expand All @@ -63,7 +63,7 @@ obtain_driver_sources() {
guess_driver_sources SFC_LINUX_NET_SRC sfc-linux-net "${role}"
fi
sfc_linux_net_src="${SFC_LINUX_NET_SRC}"
elif test "${driver_name}" = "xilinx_efct" ; then
elif test "${driver_name}" = "efct" ; then
if test -z "${CNS_AUX_BUS_SRC}" ; then
guess_driver_sources CNS_AUX_BUS_SRC cns-auxiliary-bus "${role}"
fi
Expand Down
4 changes: 2 additions & 2 deletions net-drv-ts/basic/read_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ main(int argc, char *argv[])

CHECK_NOT_NULL(iut_drv_name = net_drv_driver_name(iut_rpcs->ta));

if (strcmp(iut_drv_name, "xilinx_efct") == 0)
if (strcmp(iut_drv_name, "efct") == 0)
{
char *device_path;
char *bdf;
Expand All @@ -76,7 +76,7 @@ main(int argc, char *argv[])
iut_drv_name, bdf);
free(bdf);
if (rc != 0)
TEST_FAIL("Failed to construct xilinx_efct sysfs debug path");
TEST_FAIL("Failed to construct efct sysfs debug path");
}
else
{
Expand Down
6 changes: 3 additions & 3 deletions net-drv-ts/prologue.c
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ load_required_modules(const char *ta, void *cookie)
{
rc = tapi_cfg_module_add_from_ta_dir_or_fallback(ta, "sfc", TRUE);
}
else if (strcmp("xilinx_efct", driver) == 0)
else if (strcmp("efct", driver) == 0)
{
rc = tapi_cfg_module_add_from_ta_dir(ta, "auxiliary", TRUE);
if (rc == 0)
rc = tapi_cfg_module_add_from_ta_dir(ta, "xilinx_efct", TRUE);
rc = tapi_cfg_module_add_from_ta_dir(ta, "efct", TRUE);
}
else
{
Expand Down Expand Up @@ -106,7 +106,7 @@ net_drv_cfg_pci_get_net_if(const char *pci_oid, const char *agent,
return rc;
}

if (strcmp(driver, "xilinx_efct") != 0)
if (strcmp(driver, "efct") != 0)
{
rc = cfg_get_instance_fmt(&type, interface, "%s/net:", pci_oid);
if (rc != 0)
Expand Down
10 changes: 5 additions & 5 deletions scripts/trc-status.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,11 +56,11 @@ te-trc-diff \


#
# X3 xilinx_efct driver status
# X3 efct driver status
#

declare -a X3_XLNX_EFCT_TAGS
X3_XLNX_EFCT_TAGS+=(xilinx_efct)
X3_XLNX_EFCT_TAGS+=(efct)
X3_XLNX_EFCT_TAGS+=(pci-10ee pci-10ee-5084)

declare -a X3_XLNX_EFCT_OPTS2
Expand All @@ -76,13 +76,13 @@ declare -a X3_XLNX_EFCT_STATUS_OPTS
X3_XLNX_EFCT_STATUS_OPTS+=("${COMMON_OPTS[@]}")
X3_XLNX_EFCT_STATUS_OPTS+=(--1-name="Reference")
X3_XLNX_EFCT_STATUS_OPTS+=("${REF_OPTS[@]}")
X3_XLNX_EFCT_STATUS_OPTS+=(--2-name="X3 xilinx_efct")
X3_XLNX_EFCT_STATUS_OPTS+=(--2-name="X3 efct")
X3_XLNX_EFCT_STATUS_OPTS+=(--2-show-keys)
X3_XLNX_EFCT_STATUS_OPTS+=("${X3_XLNX_EFCT_OPTS2[@]}")

te-trc-diff \
--html=X3-xilinx_efct.html \
--title="X3 xilinx_efct driver status" \
--html=X3-efct.html \
--title="X3 efct driver status" \
"${X3_XLNX_EFCT_STATUS_OPTS[@]}"


Expand Down
34 changes: 17 additions & 17 deletions trc/basic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,7 @@
<verdict>ETHTOOL_RESET is not supported</verdict>
</result>
</results>
<results tags="xilinx_efct" key="X3-1105" notes="On X3 sometimes in_errors isn't zeroed">
<results tags="efct" key="X3-1105" notes="On X3 sometimes in_errors isn't zeroed">
<result value="PASSED"/>
<result value="PASSED">
<verdict>Interface statistic in_errors was not zeroed</verdict>
Expand Down Expand Up @@ -271,7 +271,7 @@
<verdict>ETHTOOL_RESET is not supported</verdict>
</result>
</results>
<results tags="xilinx_efct" key="X3-1105" notes="On X3 sometimes in_errors isn't zeroed">
<results tags="efct" key="X3-1105" notes="On X3 sometimes in_errors isn't zeroed">
<result value="PASSED"/>
<result value="PASSED">
<verdict>Interface statistic in_errors was not zeroed</verdict>
Expand Down Expand Up @@ -368,7 +368,7 @@
<arg name="pkt_size"/>
<arg name="sends_num"/>
<notes/>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -388,7 +388,7 @@
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -413,7 +413,7 @@
<arg name="pkt_size"/>
<arg name="sends_num"/>
<notes/>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -433,7 +433,7 @@
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -458,7 +458,7 @@
<arg name="pkt_size"/>
<arg name="sends_num"/>
<notes/>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -478,7 +478,7 @@
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -513,7 +513,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -538,7 +538,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -573,7 +573,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -598,7 +598,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TSO" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -618,7 +618,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<results tags="efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<result value="FAILED">
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
Expand All @@ -638,7 +638,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<results tags="efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<result value="FAILED">
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
Expand All @@ -658,7 +658,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<results tags="efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<result value="FAILED">
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
Expand All @@ -683,7 +683,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<results tags="efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<result value="FAILED">
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
Expand Down Expand Up @@ -755,7 +755,7 @@
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<results tags="efct" key="NET-44" notes="X3 NIC: MTU can be configured to be between 576 and 1960 bytes">
<result value="FAILED">
<verdict>Failed to set MTU on IUT, rc=TA_UNIX-EINVAL</verdict>
</result>
Expand Down
4 changes: 2 additions & 2 deletions trc/ethtool.xml
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
<verdict>Preset maximums RX: 4096, TX: 4096</verdict>
</result>
</results>
<results tags="xilinx_efct">
<results tags="efct">
<result value="PASSED">
<verdict>Current ring sizes RX: 2048, TX: 512</verdict>
<verdict>Preset maximums RX: 6144, TX: 512</verdict>
Expand Down Expand Up @@ -253,7 +253,7 @@
<verdict>Pause autonegotiation is disabled</verdict>
</result>
</results>
<results tags="xilinx_efct" key="X3-892">
<results tags="efct" key="X3-892">
<result value="PASSED">
<verdict>Pause autonegotiation is disabled</verdict>
</result>
Expand Down
18 changes: 9 additions & 9 deletions trc/offload.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<arg name="sock_type"/>
<arg name="rx_csum">FALSE</arg>
<notes/>
<results tags="xilinx_efct" key="NO-TX-CKSUM" notes="TCP/IP checksum offload on transmit will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TX-CKSUM" notes="TCP/IP checksum offload on transmit will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-checksum-ip-generic' cannot be modified</verdict>
</result>
Expand All @@ -25,7 +25,7 @@
<arg name="sock_type"/>
<arg name="rx_csum">FALSE</arg>
<notes/>
<results tags="xilinx_efct" key="NO-TX-CKSUM" notes="TCP/IP checksum offload on transmit will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-TX-CKSUM" notes="TCP/IP checksum offload on transmit will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-checksum-ip-generic' cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -71,7 +71,7 @@
<verdict>Feature 'rx-gro-hw' is enabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand All @@ -94,7 +94,7 @@
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" notes="TCP segmentation offload will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'tx-tcp6-segmentation' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -182,7 +182,7 @@
<verdict>Feature 'rx-checksum' is enabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -220,7 +220,7 @@
<verdict>Feature 'rx-checksum' is enabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -263,7 +263,7 @@
<verdict>Feature 'rx-checksum' is enabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -332,7 +332,7 @@
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -375,7 +375,7 @@
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<results tags="efct" key="NO-RX-LRO" notes="LRO (large receive offload) will not be implemented: XN-200494-PD-1D/KD-070">
<result value="SKIPPED">
<verdict>Feature 'rx-lro' is disabled and cannot be modified</verdict>
</result>
Expand Down
2 changes: 1 addition & 1 deletion trc/ptp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<verdict>PTP device index is not known</verdict>
</result>
</results>
<results tags="xilinx_efct" key="X3-893">
<results tags="efct" key="X3-893">
<result value="PASSED">
<verdict>Frequency adjustment range is less than expected</verdict>
</result>
Expand Down
2 changes: 1 addition & 1 deletion trc/rss.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<verdict>NIC uses symmetric-or-xor Toeplitz hash</verdict>
</result>
</results>
<results tags="xilinx_efct" key="X3-1288" notes="X3 net does not support RSS">
<results tags="efct" key="X3-1288" notes="X3 net does not support RSS">
<result value="SKIPPED">
<verdict>There is no multiple indirection table entries</verdict>
</result>
Expand Down
6 changes: 3 additions & 3 deletions trc/rx_path.xml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
<verdict>Feature 'rx-fcs' is disabled and cannot be modified</verdict>
</result>
</results>
<results tags="xilinx_efct" key="NO-RX-FCS" notes="xilinx_efct does not support FCS on Rx on EA release: XN-200494-PD-1D/NPT-450">
<results tags="efct" key="NO-RX-FCS" notes="efct does not support FCS on Rx on EA release: XN-200494-PD-1D/NPT-450">
<result value="SKIPPED">
<verdict>Feature 'rx-fcs' is disabled and cannot be modified</verdict>
</result>
Expand Down Expand Up @@ -93,7 +93,7 @@
<verdict>rx_coalesce_usecs=300 is not supported</verdict>
</result>
</results>
<results tags="xilinx_efct" key="XNET-423">
<results tags="efct" key="XNET-423">
<result value="PASSED"/>
<result value="FAILED">
<verdict>Actual timestamps of received packets differ too much from the expected distribution</verdict>
Expand All @@ -119,7 +119,7 @@
<verdict>rx_coalesce_usecs=511 is not supported</verdict>
</result>
</results>
<results tags="xilinx_efct" key="XNET-423">
<results tags="efct" key="XNET-423">
<result value="PASSED"/>
<result value="FAILED">
<verdict>Actual timestamps of received packets differ too much from the expected distribution</verdict>
Expand Down

0 comments on commit 9b01562

Please sign in to comment.