Test-Name: DPDK Fast test suite Test-Label: aws-unit-testing Test-Status: FAILURE _Unit Testing Apply error encountered_ http://dpdk.org/patch/154410 Test Status Summary: +--------------+------------------+ | Architecture | DPDK Unit Test | +--------------+------------------+ | x86_64 | FAILURE | +--------------+------------------+ | arm64 | FAILURE | +--------------+------------------+ Test environment (aarch64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1030-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (aarch64) ../drivers/net/r8169/r8169_phy.c:752:1: error: version control conflict marker in file 752 | ======= | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:772:1: error: version control conflict marker in file 772 | ======= | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:778:1: error: version control conflict marker in file 778 | >>>>>>> drivers/net: remove use of non-standard array range initialization | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_get_hw_phy_mcu_code_ver’: ../drivers/net/r8169/r8169_phy.c:870:1: error: version control conflict marker in file 870 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:1702:1: error: expected declaration or statement at end of input 1702 | } | ^ ../drivers/net/r8169/r8169_phy.c:868:13: warning: unused variable ‘hw_ram_code_ver’ [-Wunused-variable] 868 | u16 hw_ram_code_ver = ~0; | ^~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:1702:1: warning: no return statement in function returning non-void [-Wreturn-type] 1702 | } | ^ ../drivers/net/r8169/r8169_phy.c:866:44: warning: unused parameter ‘hw’ [-Wunused-parameter] 866 | rtl_get_hw_phy_mcu_code_ver(struct rtl_hw *hw) | ~~~~~~~~~~~~~~~^~ In file included from ../drivers/net/r8169/r8169_ethdev.h:13, from ../drivers/net/r8169/r8169_phy.c:12: ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_powerdown_pll’: ../drivers/net/r8169/r8169_compat.h:530:46: warning: statement will never be executed [-Wswitch-unreachable] 530 | #define RTL_PCI_REG_ADDR(hw, reg) ((u8 *)(hw)->mmio_addr + (reg)) | ~~~~^~~~~~~~~~~ ../drivers/net/r8169/r8169_compat.h:537:21: note: in definition of macro ‘RTL_W8’ 537 | rte_write8((val), RTL_PCI_REG_ADDR(hw, reg)) | ^~~ ../drivers/net/r8169/r8169_compat.h:532:35: note: in expansion of macro ‘RTL_PCI_REG_ADDR’ 532 | #define RTL_R8(hw, reg) rte_read8(RTL_PCI_REG_ADDR(hw, reg)) | ^~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:750:34: note: in expansion of macro ‘RTL_R8’ 750 | RTL_W8(hw, 0xF2, RTL_R8(hw, 0xF2) & ~BIT_6); | ^~~~~~ ../drivers/net/r8169/r8169_phy.c: At top level: ../drivers/net/r8169/r8169_phy.c:866:1: warning: ‘rtl_get_hw_phy_mcu_code_ver’ defined but not used [-Wunused-function] 866 | rtl_get_hw_phy_mcu_code_ver(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:838:1: warning: ‘rtl8125_set_hw_phy_before_init_phy_mcu’ defined but not used [-Wunused-function] 838 | rtl8125_set_hw_phy_before_init_phy_mcu(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:806:1: warning: ‘rtl_xmii_reset_enable’ defined but not used [-Wunused-function] 806 | rtl_xmii_reset_enable(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~ [2119/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_filter.c.o [2120/3484] Linking target drivers/librte_net_null.so.25.2 [2121/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_sriov.c.o [2122/3484] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o FAILED: drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o cc -Idrivers/libtmp_rte_net_r8169.a.p -Idrivers -I../drivers -Idrivers/net/r8169 -I../drivers/net/r8169 -I../drivers/net/r8169/base -Ilib/ethdev -I../lib/ethdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/arm/include -I../lib/eal/arm/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -mcpu=neoverse-n1 -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.r8169 -MD -MQ drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o -MF drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o.d -o drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o -c ../drivers/net/r8169/r8169_rxtx.c ../drivers/net/r8169/r8169_rxtx.c: In function ‘rtl_tx_init’: ../drivers/net/r8169/r8169_rxtx.c:1110:1: error: version control conflict marker in file 1110 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_rxtx.c:1730:1: error: expected declaration or statement at end of input 1730 | } | ^ ../drivers/net/r8169/r8169_rxtx.c:1731: warning: control reaches end of non-void function [-Wreturn-type] ../drivers/net/r8169/r8169_rxtx.c: At top level: ../drivers/net/r8169/r8169_rxtx.c:1087:1: warning: ‘rtl8168_set_mtps’ defined but not used [-Wunused-function] 1087 | rtl8168_set_mtps(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_rxtx.c:1055:1: warning: ‘rtl8125_set_tx_tag_num’ defined but not used [-Wunused-function] 1055 | rtl8125_set_tx_tag_num(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~ [2123/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_spq.c.o [2124/3484] Generating drivers/rte_net_pfe.pmd.c with a custom command [2125/3484] Compiling C object drivers/libtmp_rte_net_octeon_ep.a.p/net_octeon_ep_cnxk_ep_rx_neon.c.o [2126/3484] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_fiber.c.o [2127/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_main.c.o [2128/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_dcbx.c.o [2129/3484] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_dash.c.o [2130/3484] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a.c.o [2131/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_init_fw_funcs.c.o [2132/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_vf.c.o [2133/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_l2.c.o [2134/3484] Compiling C object drivers/libtmp_rte_net_ngbe.a.p/net_ngbe_ngbe_rxtx_vec_neon.c.o [2135/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_cxt.c.o [2136/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_int.c.o [2137/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_ethdev.c.o [2138/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_mcp.c.o [2139/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_sriov.c.o [2140/3484] Compiling C object drivers/libtmp_rte_net_ngbe.a.p/net_ngbe_ngbe_rxtx.c.o [2141/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_rxtx.c.o [2142/3484] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_dev.c.o [2143/3484] Compiling C object drivers/libtmp_rte_net_cnxk.a.p/net_cnxk_tx_cn20k_tx_64_79_vec_mseg.c.o [2144/3484] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_debug.c.o [2145/3484] Compiling C object drivers/libtmp_rte_net_cnxk.a.p/net_cnxk_tx_cn20k_tx_96_111_vec_mseg.c.o ninja: build stopped: subcommand failed. Test build failed. FAILURE Test environment (x86_64): Description: Apply error encountered OS : Ubuntu 24.04.1 LTS Kernel : 6.8.0-1030-aws NIC : Elastic Network Adapter GCC : 13.3.0-6ubuntu2~24.04 Test last 100 lines (x86_64) 560 | >>>>>>> drivers/net: remove use of non-standard array range initialization | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_powerup_pll’: ../drivers/net/r8169/r8169_phy.c:571:1: error: version control conflict marker in file 571 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_powerdown_pll’: ../drivers/net/r8169/r8169_phy.c:732:1: error: version control conflict marker in file 732 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:752:1: error: version control conflict marker in file 752 | ======= | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:772:1: error: version control conflict marker in file 772 | ======= | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:778:1: error: version control conflict marker in file 778 | >>>>>>> drivers/net: remove use of non-standard array range initialization | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_get_hw_phy_mcu_code_ver’: ../drivers/net/r8169/r8169_phy.c:870:1: error: version control conflict marker in file 870 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_phy.c:1702:1: error: expected declaration or statement at end of input 1702 | } | ^ ../drivers/net/r8169/r8169_phy.c:868:13: warning: unused variable ‘hw_ram_code_ver’ [-Wunused-variable] 868 | u16 hw_ram_code_ver = ~0; | ^~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:1702:1: warning: no return statement in function returning non-void [-Wreturn-type] 1702 | } | ^ ../drivers/net/r8169/r8169_phy.c:866:44: warning: unused parameter ‘hw’ [-Wunused-parameter] 866 | rtl_get_hw_phy_mcu_code_ver(struct rtl_hw *hw) | ~~~~~~~~~~~~~~~^~ In file included from ../drivers/net/r8169/r8169_ethdev.h:13, from ../drivers/net/r8169/r8169_phy.c:12: ../drivers/net/r8169/r8169_phy.c: In function ‘rtl_powerdown_pll’: ../drivers/net/r8169/r8169_compat.h:530:46: warning: statement will never be executed [-Wswitch-unreachable] 530 | #define RTL_PCI_REG_ADDR(hw, reg) ((u8 *)(hw)->mmio_addr + (reg)) | ~~~~^~~~~~~~~~~ ../drivers/net/r8169/r8169_compat.h:537:27: note: in expansion of macro ‘RTL_PCI_REG_ADDR’ 537 | rte_write8((val), RTL_PCI_REG_ADDR(hw, reg)) | ^~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:750:17: note: in expansion of macro ‘RTL_W8’ 750 | RTL_W8(hw, 0xF2, RTL_R8(hw, 0xF2) & ~BIT_6); | ^~~~~~ ../drivers/net/r8169/r8169_phy.c: At top level: ../drivers/net/r8169/r8169_phy.c:866:1: warning: ‘rtl_get_hw_phy_mcu_code_ver’ defined but not used [-Wunused-function] 866 | rtl_get_hw_phy_mcu_code_ver(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:838:1: warning: ‘rtl8125_set_hw_phy_before_init_phy_mcu’ defined but not used [-Wunused-function] 838 | rtl8125_set_hw_phy_before_init_phy_mcu(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_phy.c:806:1: warning: ‘rtl_xmii_reset_enable’ defined but not used [-Wunused-function] 806 | rtl_xmii_reset_enable(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~ [2139/3295] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_dash.c.o [2140/3295] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o FAILED: drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o cc -Idrivers/libtmp_rte_net_r8169.a.p -Idrivers -I../drivers -Idrivers/net/r8169 -I../drivers/net/r8169 -I../drivers/net/r8169/base -Ilib/ethdev -I../lib/ethdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.r8169 -MD -MQ drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o -MF drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o.d -o drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_rxtx.c.o -c ../drivers/net/r8169/r8169_rxtx.c ../drivers/net/r8169/r8169_rxtx.c: In function ‘rtl_tx_init’: ../drivers/net/r8169/r8169_rxtx.c:1110:1: error: version control conflict marker in file 1110 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/r8169_rxtx.c:1730:1: error: expected declaration or statement at end of input 1730 | } | ^ ../drivers/net/r8169/r8169_rxtx.c:1731: warning: control reaches end of non-void function [-Wreturn-type] ../drivers/net/r8169/r8169_rxtx.c: At top level: ../drivers/net/r8169/r8169_rxtx.c:1087:1: warning: ‘rtl8168_set_mtps’ defined but not used [-Wunused-function] 1087 | rtl8168_set_mtps(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~ ../drivers/net/r8169/r8169_rxtx.c:1055:1: warning: ‘rtl8125_set_tx_tag_num’ defined but not used [-Wunused-function] 1055 | rtl8125_set_tx_tag_num(struct rtl_hw *hw) | ^~~~~~~~~~~~~~~~~~~~~~ [2141/3295] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a_mcu.c.o FAILED: drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a_mcu.c.o cc -Idrivers/libtmp_rte_net_r8169.a.p -Idrivers -I../drivers -Idrivers/net/r8169 -I../drivers/net/r8169 -I../drivers/net/r8169/base -Ilib/ethdev -I../lib/ethdev -Ilib/eal/common -I../lib/eal/common -I. -I.. -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include -Ilib/eal/linux/include -I../lib/eal/linux/include -Ilib/eal/x86/include -I../lib/eal/x86/include -I../kernel/linux -Ilib/eal -I../lib/eal -Ilib/kvargs -I../lib/kvargs -Ilib/log -I../lib/log -Ilib/metrics -I../lib/metrics -Ilib/telemetry -I../lib/telemetry -Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool -I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter -Idrivers/bus/pci -I../drivers/bus/pci -I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev -I../drivers/bus/vdev -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -O3 -include rte_config.h -Wvla -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototypes -Wundef -Wwrite-strings -Wno-packed-not-aligned -Wno-missing-field-initializers -D_GNU_SOURCE -fPIC -march=native -mrtm -DALLOW_EXPERIMENTAL_API -DALLOW_INTERNAL_API -Wno-format-truncation -Wno-address-of-packed-member -DRTE_LOG_DEFAULT_LOGTYPE=pmd.net.r8169 -MD -MQ drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a_mcu.c.o -MF drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a_mcu.c.o.d -o drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a_mcu.c.o -c ../drivers/net/r8169/base/rtl8125a_mcu.c ../drivers/net/r8169/base/rtl8125a_mcu.c: In function ‘rtl_release_phy_mcu_patch_key_lock’: ../drivers/net/r8169/base/rtl8125a_mcu.c:164:1: error: version control conflict marker in file 164 | <<<<<<< HEAD | ^~~~~~~ ../drivers/net/r8169/base/rtl8125a_mcu.c:175:17: warning: statement will never be executed [-Wswitch-unreachable] 175 | rtl_mdio_direct_write_phy_ocp(hw, 0xA438, 0x0000); | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ [2142/3295] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_r8169_fiber.c.o [2143/3295] Compiling C object drivers/libtmp_rte_net_r8169.a.p/net_r8169_base_rtl8125a.c.o [2144/3295] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_ethdev.c.o [2145/3295] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_dev.c.o [2146/3295] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_mcp.c.o [2147/3295] Compiling C object drivers/librte_net_pfe_base_lib.a.p/net_qede_base_ecore_sriov.c.o [2148/3295] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_rxtx.c.o [2149/3295] Compiling C object drivers/libtmp_rte_net_qede.a.p/net_qede_qede_debug.c.o ninja: build stopped: subcommand failed. Test build failed. FAILURE