From 23fb00c21b036c70e45c0552836775917ce6f96a Mon Sep 17 00:00:00 2001 From: Andriy Kokhan <43479230+akokhan@users.noreply.github.com> Date: Sat, 11 May 2019 11:54:47 -0700 Subject: [PATCH] [bfn] fixed build failure (#2885) * fixed barefoot platform build * added TNA config * updated port_config.ini Signed-off-by: Andriy Kokhan --- .../montara/port_config.ini | 66 ++++----- .../montara/switch-tna-sai.conf | 40 ++++++ .../mavericks/port_config.ini | 131 +++++++++--------- .../mavericks/switch-tna-sai.conf | 40 ++++++ platform/barefoot/bfn-platform.mk | 8 +- platform/barefoot/bfn-sai.mk | 8 +- 6 files changed, 186 insertions(+), 107 deletions(-) create mode 100644 device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf create mode 100644 device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/port_config.ini b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/port_config.ini index 816bb0e94a70..37ed4b68986e 100644 --- a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/port_config.ini +++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/port_config.ini @@ -1,33 +1,33 @@ -# name lanes -Ethernet0 0,1,2,3 -Ethernet4 4,5,6,7 -Ethernet8 8,9,10,11 -Ethernet12 12,13,14,15 -Ethernet16 16,17,18,19 -Ethernet20 20,21,22,23 -Ethernet24 24,25,26,27 -Ethernet28 28,29,30,31 -Ethernet32 32,33,34,35 -Ethernet36 36,37,38,39 -Ethernet40 40,41,42,43 -Ethernet44 44,45,46,47 -Ethernet48 48,49,50,51 -Ethernet52 52,53,54,55 -Ethernet56 56,57,58,59 -Ethernet60 60,61,62,63 -Ethernet64 64,65,66,67 -Ethernet68 68,69,70,71 -Ethernet72 72,73,74,75 -Ethernet76 76,77,78,79 -Ethernet80 80,81,82,83 -Ethernet84 84,85,86,87 -Ethernet88 88,89,90,91 -Ethernet92 92,93,94,95 -Ethernet96 96,97,98,99 -Ethernet100 100,101,102,103 -Ethernet104 104,105,106,107 -Ethernet108 108,109,110,111 -Ethernet112 112,113,114,115 -Ethernet116 116,117,118,119 -Ethernet120 120,121,122,123 -Ethernet124 124,125,126,127 +# name lanes alias speed autoneg fec +Ethernet0 0,1,2,3 Ethernet0 100000 0 rs +Ethernet4 4,5,6,7 Ethernet4 100000 0 rs +Ethernet8 8,9,10,11 Ethernet8 100000 0 rs +Ethernet12 12,13,14,15 Ethernet12 100000 0 rs +Ethernet16 16,17,18,19 Ethernet16 100000 0 rs +Ethernet20 20,21,22,23 Ethernet20 100000 0 rs +Ethernet24 24,25,26,27 Ethernet24 100000 0 rs +Ethernet28 28,29,30,31 Ethernet28 100000 0 rs +Ethernet32 32,33,34,35 Ethernet32 100000 0 rs +Ethernet36 36,37,38,39 Ethernet36 100000 0 rs +Ethernet40 40,41,42,43 Ethernet40 100000 0 rs +Ethernet44 44,45,46,47 Ethernet44 100000 0 rs +Ethernet48 48,49,50,51 Ethernet48 100000 0 rs +Ethernet52 52,53,54,55 Ethernet52 100000 0 rs +Ethernet56 56,57,58,59 Ethernet56 100000 0 rs +Ethernet60 60,61,62,63 Ethernet60 100000 0 rs +Ethernet64 64,65,66,67 Ethernet64 100000 0 rs +Ethernet68 68,69,70,71 Ethernet68 100000 0 rs +Ethernet72 72,73,74,75 Ethernet72 100000 0 rs +Ethernet76 76,77,78,79 Ethernet76 100000 0 rs +Ethernet80 80,81,82,83 Ethernet80 100000 0 rs +Ethernet84 84,85,86,87 Ethernet84 100000 0 rs +Ethernet88 88,89,90,91 Ethernet88 100000 0 rs +Ethernet92 92,93,94,95 Ethernet92 100000 0 rs +Ethernet96 96,97,98,99 Ethernet96 100000 0 rs +Ethernet100 100,101,102,103 Ethernet100 100000 0 rs +Ethernet104 104,105,106,107 Ethernet104 100000 0 rs +Ethernet108 108,109,110,111 Ethernet108 100000 0 rs +Ethernet112 112,113,114,115 Ethernet112 100000 0 rs +Ethernet116 116,117,118,119 Ethernet116 100000 0 rs +Ethernet120 120,121,122,123 Ethernet120 100000 0 rs +Ethernet124 124,125,126,127 Ethernet124 100000 0 rs diff --git a/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf new file mode 100644 index 000000000000..79b10cafa864 --- /dev/null +++ b/device/barefoot/x86_64-accton_wedge100bf_32x-r0/montara/switch-tna-sai.conf @@ -0,0 +1,40 @@ +{ + "instance": 0, + "chip_list": [ + { + "id": "asic-0", + "chip_family": "Tofino", + "instance": 0, + "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0", + "pcie_domain": 0, + "pcie_bus": 5, + "pcie_fn": 0, + "pcie_dev": 0, + "pcie_int_mode": 1, + "sds_fw_path": "share/tofino_sds_fw/avago/firmware" + } + ], + "p4_devices": [ + { + "device-id": 0, + "agent0": "lib/platform/x86_64-accton_wedge100bf_32x-r0/libpltfm_mgr.so", + "p4_programs": [ + { + "p4_pipelines": [ + { + "p4_pipeline_name": "pipe", + "config": "share/tofinopd/switch/pipe/tofino.bin", + "context": "share/tofinopd/switch/pipe/context.json" + } + ], + "program-name": "switch", + "switchsai": "lib/libswitchsai.so", + "bfrt-config": "share/tofinopd/switch/bf-rt.json", + "model_json_path" : "share/switch/aug_model.json", + "switchapi_port_add": false, + "non_default_port_ppgs": 5 + } + ] + } + ] +} diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/port_config.ini b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/port_config.ini index c1001741d28a..f81066d53bfe 100644 --- a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/port_config.ini +++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/port_config.ini @@ -1,66 +1,65 @@ -# name lanes -Ethernet0 0,1,2,3 -Ethernet4 4,5,6,7 -Ethernet8 8,9,10,11 -Ethernet12 12,13,14,15 -Ethernet16 16,17,18,19 -Ethernet20 20,21,22,23 -Ethernet24 24,25,26,27 -Ethernet28 28,29,30,31 -Ethernet32 32,33,34,35 -Ethernet36 36,37,38,39 -Ethernet40 40,41,42,43 -Ethernet44 44,45,46,47 -Ethernet48 48,49,50,51 -Ethernet52 52,53,54,55 -Ethernet56 56,57,58,59 -Ethernet60 60,61,62,63 -Ethernet64 64,65,66,67 -Ethernet68 68,69,70,71 -Ethernet72 72,73,74,75 -Ethernet76 76,77,78,79 -Ethernet80 80,81,82,83 -Ethernet84 84,85,86,87 -Ethernet88 88,89,90,91 -Ethernet92 92,93,94,95 -Ethernet96 96,97,98,99 -Ethernet100 100,101,102,103 -Ethernet104 104,105,106,107 -Ethernet108 108,109,110,111 -Ethernet112 112,113,114,115 -Ethernet116 116,117,118,119 -Ethernet120 120,121,122,123 -Ethernet124 124,125,126,127 -Ethernet128 128,129,130,131 -Ethernet132 132,133,134,135 -Ethernet136 136,137,138,139 -Ethernet140 140,141,142,143 -Ethernet144 144,145,146,147 -Ethernet148 148,149,150,151 -Ethernet152 152,153,154,155 -Ethernet156 156,157,158,159 -Ethernet160 160,161,162,163 -Ethernet164 164,165,166,167 -Ethernet168 168,169,170,171 -Ethernet172 172,173,174,175 -Ethernet176 176,177,178,179 -Ethernet180 180,181,182,183 -Ethernet184 184,185,186,187 -Ethernet188 188,189,190,191 -Ethernet192 192,193,194,195 -Ethernet196 196,197,198,199 -Ethernet200 200,201,202,203 -Ethernet204 204,205,206,207 -Ethernet208 208,209,210,211 -Ethernet212 212,213,214,215 -Ethernet216 216,217,218,219 -Ethernet220 220,221,222,223 -Ethernet224 224,225,226,227 -Ethernet228 228,229,230,231 -Ethernet232 232,233,234,235 -Ethernet236 236,237,238,239 -Ethernet240 240,241,242,243 -Ethernet244 244,245,246,247 -Ethernet248 248,249,250,251 -Ethernet252 252,253,254,255 -Ethernet256 256,257,258,259 +# name lanes alias speed autoneg fec +Ethernet0 0,1,2,3 Ethernet0 100000 0 rs +Ethernet4 4,5,6,7 Ethernet4 100000 0 rs +Ethernet8 8,9,10,11 Ethernet8 100000 0 rs +Ethernet12 12,13,14,15 Ethernet12 100000 0 rs +Ethernet16 16,17,18,19 Ethernet16 100000 0 rs +Ethernet20 20,21,22,23 Ethernet20 100000 0 rs +Ethernet24 24,25,26,27 Ethernet24 100000 0 rs +Ethernet28 28,29,30,31 Ethernet28 100000 0 rs +Ethernet32 32,33,34,35 Ethernet32 100000 0 rs +Ethernet36 36,37,38,39 Ethernet36 100000 0 rs +Ethernet40 40,41,42,43 Ethernet40 100000 0 rs +Ethernet44 44,45,46,47 Ethernet44 100000 0 rs +Ethernet48 48,49,50,51 Ethernet48 100000 0 rs +Ethernet52 52,53,54,55 Ethernet52 100000 0 rs +Ethernet56 56,57,58,59 Ethernet56 100000 0 rs +Ethernet60 60,61,62,63 Ethernet60 100000 0 rs +Ethernet64 64,65,66,67 Ethernet64 100000 0 rs +Ethernet68 68,69,70,71 Ethernet68 100000 0 rs +Ethernet72 72,73,74,75 Ethernet72 100000 0 rs +Ethernet76 76,77,78,79 Ethernet76 100000 0 rs +Ethernet80 80,81,82,83 Ethernet80 100000 0 rs +Ethernet84 84,85,86,87 Ethernet84 100000 0 rs +Ethernet88 88,89,90,91 Ethernet88 100000 0 rs +Ethernet92 92,93,94,95 Ethernet92 100000 0 rs +Ethernet96 96,97,98,99 Ethernet96 100000 0 rs +Ethernet100 100,101,102,103 Ethernet100 100000 0 rs +Ethernet104 104,105,106,107 Ethernet104 100000 0 rs +Ethernet108 108,109,110,111 Ethernet108 100000 0 rs +Ethernet112 112,113,114,115 Ethernet112 100000 0 rs +Ethernet116 116,117,118,119 Ethernet116 100000 0 rs +Ethernet120 120,121,122,123 Ethernet120 100000 0 rs +Ethernet124 124,125,126,127 Ethernet124 100000 0 rs +Ethernet128 128,129,130,131 Ethernet128 100000 0 rs +Ethernet132 132,133,134,135 Ethernet132 100000 0 rs +Ethernet136 136,137,138,139 Ethernet136 100000 0 rs +Ethernet140 140,141,142,143 Ethernet140 100000 0 rs +Ethernet144 144,145,146,147 Ethernet144 100000 0 rs +Ethernet148 148,149,150,151 Ethernet148 100000 0 rs +Ethernet152 152,153,154,155 Ethernet152 100000 0 rs +Ethernet156 156,157,158,159 Ethernet156 100000 0 rs +Ethernet160 160,161,162,163 Ethernet169 100000 0 rs +Ethernet164 164,165,166,167 Ethernet164 100000 0 rs +Ethernet168 168,169,170,171 Ethernet168 100000 0 rs +Ethernet172 172,173,174,175 Ethernet172 100000 0 rs +Ethernet176 176,177,178,179 Ethernet176 100000 0 rs +Ethernet180 180,181,182,183 Ethernet180 100000 0 rs +Ethernet184 184,185,186,187 Ethernet184 100000 0 rs +Ethernet188 188,189,190,191 Ethernet188 100000 0 rs +Ethernet192 192,193,194,195 Ethernet192 100000 0 rs +Ethernet196 196,197,198,199 Ethernet196 100000 0 rs +Ethernet200 200,201,202,203 Ethernet200 100000 0 rs +Ethernet204 204,205,206,207 Ethernet204 100000 0 rs +Ethernet208 208,209,210,211 Ethernet208 100000 0 rs +Ethernet212 212,213,214,215 Ethernet212 100000 0 rs +Ethernet216 216,217,218,219 Ethernet216 100000 0 rs +Ethernet220 220,221,222,223 Ethernet220 100000 0 rs +Ethernet224 224,225,226,227 Ethernet224 100000 0 rs +Ethernet228 228,229,230,231 Ethernet228 100000 0 rs +Ethernet232 232,233,234,235 Ethernet232 100000 0 rs +Ethernet236 236,237,238,239 Ethernet236 100000 0 rs +Ethernet240 240,241,242,243 Ethernet240 100000 0 rs +Ethernet244 244,245,246,247 Ethernet244 100000 0 rs +Ethernet248 248,249,250,251 Ethernet248 100000 0 rs +Ethernet252 252,253,254,255 Etherner252 100000 0 rs diff --git a/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf new file mode 100644 index 000000000000..647f41838285 --- /dev/null +++ b/device/barefoot/x86_64-accton_wedge100bf_65x-r0/mavericks/switch-tna-sai.conf @@ -0,0 +1,40 @@ +{ + "instance": 0, + "chip_list": [ + { + "id": "asic-0", + "chip_family": "Tofino", + "instance": 0, + "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0", + "pcie_domain": 0, + "pcie_bus": 5, + "pcie_fn": 0, + "pcie_dev": 0, + "pcie_int_mode": 1, + "sds_fw_path": "share/tofino_sds_fw/avago/firmware" + } + ], + "p4_devices": [ + { + "device-id": 0, + "agent0": "lib/platform/x86_64-accton_wedge100bf_65x-r0/libpltfm_mgr.so", + "p4_programs": [ + { + "p4_pipelines": [ + { + "p4_pipeline_name": "pipe", + "config": "share/tofinopd/switch/pipe/tofino.bin", + "context": "share/tofinopd/switch/pipe/context.json" + } + ], + "program-name": "switch", + "switchsai": "lib/libswitchsai.so", + "bfrt-config": "share/tofinopd/switch/bf-rt.json", + "model_json_path" : "share/switch/aug_model.json", + "switchapi_port_add": false, + "non_default_port_ppgs": 5 + } + ] + } + ] +} diff --git a/platform/barefoot/bfn-platform.mk b/platform/barefoot/bfn-platform.mk index b0d40cd8ba6c..bdba34177604 100644 --- a/platform/barefoot/bfn-platform.mk +++ b/platform/barefoot/bfn-platform.mk @@ -1,9 +1,9 @@ ifdef BLDENV -BFN_PLATFORM = bfnplatform_master.92171a1_deb9.deb -$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb9.deb" +BFN_PLATFORM = bfnplatform_8.9.x.98de3ce_pr_deb9.deb +$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9/bfnplatform_8.9.x.98de3ce_pr_deb9.deb" else -BFN_PLATFORM = bfnplatform_master.92171a1_deb8.deb -$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnplatform_master.92171a1_deb8.deb" +BFN_PLATFORM = bfnplatform_8.9.x.98de3ce_pr_deb8.deb +$(BFN_PLATFORM)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9/bfnplatform_8.9.x.98de3ce_pr_deb8.deb" endif SONIC_ONLINE_DEBS += $(BFN_PLATFORM) # $(BFN_SAI_DEV) diff --git a/platform/barefoot/bfn-sai.mk b/platform/barefoot/bfn-sai.mk index 51c1e1a74f11..a93dd71bc1bb 100644 --- a/platform/barefoot/bfn-sai.mk +++ b/platform/barefoot/bfn-sai.mk @@ -1,9 +1,9 @@ ifdef BLDENV -BFN_SAI = bfnsdk_master.92171a1_deb9.deb -$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb9.deb" +BFN_SAI = bfnsdk_8.9.x.98de3ce_pr_deb9.deb +$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9/bfnsdk_8.9.x.98de3ce_pr_deb9.deb" else -BFN_SAI = bfnsdk_master.92171a1_deb8.deb -$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/sde-master/bfnsdk_master.92171a1_deb8.deb" +BFN_SAI = bfnsdk_8.9.x.98de3ce_pr_deb8.deb +$(BFN_SAI)_URL = "https://github.com/barefootnetworks/sonic-release-pkgs/raw/rel_8_9/bfnsdk_8.9.x.98de3ce_pr_deb8.deb" endif SONIC_ONLINE_DEBS += $(BFN_SAI) # $(BFN_SAI_DEV)